From b06fd07ae46903179827c346e9b0be2fa6a1d574 Mon Sep 17 00:00:00 2001
From: halx99 <halx99@live.com>
Date: Tue, 23 Jan 2024 21:00:10 +0800
Subject: [PATCH] Update self-signed ssl certs

---
 certs/ca-cer.pem     | 32 +++++++++++++--------------
 certs/ca-csr.pem     | 27 +++++++++++------------
 certs/ca-prk.pem     | 52 ++++++++++++++++++++++----------------------
 certs/gen.sh         | 27 ++++++++++++++++++-----
 certs/server-cer.pem | 33 ++++++++++++++--------------
 certs/server-csr.pem | 27 +++++++++++------------
 certs/server-prk.pem | 52 ++++++++++++++++++++++----------------------
 7 files changed, 131 insertions(+), 119 deletions(-)

diff --git a/certs/ca-cer.pem b/certs/ca-cer.pem
index e23595725..7f369cc07 100644
--- a/certs/ca-cer.pem
+++ b/certs/ca-cer.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-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
+MIICzzCCAbcCFAgNYFXnEDjiDuQSdlHleiZeJL33MA0GCSqGSIb3DQEBCwUAMCMx
+CzAJBgNVBAYTAkNOMRQwEgYDVQQKDAtTaW1kc29mdCBDQTAgFw0yNDAxMjMxMjU3
+MzlaGA8yMTI0MDEyMzEyNTczOVowIzELMAkGA1UEBhMCQ04xFDASBgNVBAoMC1Np
+bWRzb2Z0IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmEdGAwdA
+l1jStetTUnAB5XMCn2inX8ZMX/UnHSB4/A8m9dqtRPCRmR08ARJU2Pzf+y7q/Dgs
+bxwUC0glpeOnUIi5aujyFZ015Tnt5hxpyxo58l/xpBTnSsyUB2Im+3GBloFS3Rl0
+0hUnwKC2lJjVg0VpzjheIOIfSSDQIpl491jBkYmWQAXxDqzAtzk/rATQg41fKjX6
+uIJAyaT++zYTLN4jsw49ooxVUfnnx9eK8MEXTybJgTrBGysvpMsTmSZDlZLjmUSj
+BbvVjDaI1XJMU50G/yNh6k7UnzFnoC06T7aPWFx9UyaxzQlO9KDpo0BVQT6KUoa5
+s4J+v2d/H0rTBQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCFdmwb0RbLESRO7n2C
+klPaIa8uNrVtO6qClfYZOkHnK5lZqva26RL2pGYURQADcpKOYaELtVR2tRYEVbtS
+yWpfzhI5FWsToX5kcW8AMlYkjO653ZbWnQr7FsmF9IfZbJDSxBMoPIhkYDFxXWoc
+qAy76pj0rzIYpbnsjg04AU51qGxig5dQbiZaW7oEqzAIAR6McgLc8Pe4GGwMmtxx
+kwDQuX8tTFlqapCcmG0MPh2GyOBckl7d/Xnp/WZTMf9BCYQXNfe+GEevOCjhgUN4
+4YbNHhyxJRv58bylcrnDlBIUOXv0VMla7mkbSt0KR1hu0dBZmthm21Ww0L5lnH1a
+AnVG
 -----END CERTIFICATE-----
diff --git a/certs/ca-csr.pem b/certs/ca-csr.pem
index 47edc86bc..46f64eccb 100644
--- a/certs/ca-csr.pem
+++ b/certs/ca-csr.pem
@@ -1,16 +1,15 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICfzCCAWcCAQAwOjELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkdEMQswCQYDVQQH
-DAJTWjERMA8GA1UECgwIeWFzaW8gQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCzZjLvZToe4qwLqH2S5oB5N1r1dSpUB2TVUGJZJs4TMRZqkuOFSdsk
-Oo0wSp/0MaTjf2bAB/UuW0mcZQKcWpUaTWwhoz9iDMjisEndbHOSlVI4Y6i9O3i2
-KrYHId3E31YJLf2Oi9iyBIrGYPO2kGrH8DmmjWgGz+Sfl9nMRbz7NrKwu2SQ4isX
-XLPvJvrduVbnxlaefl0n8Yo13hdZHG7dcCaZHIH+nAJVElVKwQgUensGiIiwGaaS
-WHtSSJizawaalnaRGrAMdNOWnGkrHmQxi4w0PBJ4M6GaQkJUykIsNjN24R+mUJjb
-GMejG48+nOyzZxAi3yT5fMzAaOBtn6UtAgMBAAGgADANBgkqhkiG9w0BAQsFAAOC
-AQEAIjk4xgfkP25czSJPcM/aOQQsUP1plINZxgtxmv5XpQVGLOG+91Wh3emColA3
-qCaX7caY0wVk62/X7L/Y5Wim5CMzRYbZ4/MTOEf9rLI7Uph5LmRYauVLWeKN3pzV
-IqXQBH6ZGblwoYu9ZJgdkyXLwHp7evMAT97LVSSkUajDac3l5WYfA59GpAGHsPVh
-05+r/AVrES4sJbfKyMKEY/uphAQr3WBY+z09LrPw8qomPmVeT1LIWdc0DrZbC3zt
-nnhtMfz6CNR2duzQbmwlv0MactdR91UFEstRgntt90StJkewjwGQqgR9icDOuh9+
-qC5yeiWsFY/3v1rNUMS+WmJjyQ==
+MIICaDCCAVACAQAwIzELMAkGA1UEBhMCQ04xFDASBgNVBAoMC1NpbWRzb2Z0IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmEdGAwdAl1jStetTUnAB
+5XMCn2inX8ZMX/UnHSB4/A8m9dqtRPCRmR08ARJU2Pzf+y7q/DgsbxwUC0glpeOn
+UIi5aujyFZ015Tnt5hxpyxo58l/xpBTnSsyUB2Im+3GBloFS3Rl00hUnwKC2lJjV
+g0VpzjheIOIfSSDQIpl491jBkYmWQAXxDqzAtzk/rATQg41fKjX6uIJAyaT++zYT
+LN4jsw49ooxVUfnnx9eK8MEXTybJgTrBGysvpMsTmSZDlZLjmUSjBbvVjDaI1XJM
+U50G/yNh6k7UnzFnoC06T7aPWFx9UyaxzQlO9KDpo0BVQT6KUoa5s4J+v2d/H0rT
+BQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAJQ8yL+PsPC1TwzlpNIC4LQ5c8WL
+oQ2Hs8zxuA2Xp76Sg/3iQ40WJ8ZqL0xI7GaIi4pVE5iCh8bPLFR0KA4vn7SEpnjr
+Gkz9QM2kI0c8nwKJPO+GXNof0K19PzplsnYEJY6TUKnFtTZj8AN6U4pHJyNC8dy4
+8lVvGBfezaDFSet862DgyvRgG429P1NQWvSgVjUEQkvoCIuRKOSOwREupSaacwLD
+eg5lRL93XMoJiVp+5Gky1w/9dNyojIsWrOUT6f4j4IzFEwG6GcY/S4sHXAmEZ6cr
+gAkmFyVdRL9Q3SnE1I6ireEFbJHWJuU7wuTH0nJmuRpkJ4KHqqf6BDQ5f2Q=
 -----END CERTIFICATE REQUEST-----
diff --git a/certs/ca-prk.pem b/certs/ca-prk.pem
index c1aac726e..8b3b25281 100644
--- a/certs/ca-prk.pem
+++ b/certs/ca-prk.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzZjLvZToe4qwL
-qH2S5oB5N1r1dSpUB2TVUGJZJs4TMRZqkuOFSdskOo0wSp/0MaTjf2bAB/UuW0mc
-ZQKcWpUaTWwhoz9iDMjisEndbHOSlVI4Y6i9O3i2KrYHId3E31YJLf2Oi9iyBIrG
-YPO2kGrH8DmmjWgGz+Sfl9nMRbz7NrKwu2SQ4isXXLPvJvrduVbnxlaefl0n8Yo1
-3hdZHG7dcCaZHIH+nAJVElVKwQgUensGiIiwGaaSWHtSSJizawaalnaRGrAMdNOW
-nGkrHmQxi4w0PBJ4M6GaQkJUykIsNjN24R+mUJjbGMejG48+nOyzZxAi3yT5fMzA
-aOBtn6UtAgMBAAECggEAHZGD5ii7TGFkZXSDI/35YWFCDPBfhmOEl1MNLrACaa/e
-x7iHpw2eAKnk4Pd/xyYSjQuP0ilNnDMgHhaY+E/GwQPPRXkMZpsAVjqjpgrsvpV9
-bH1ij7P4aKAACgtnK756xf8OSlsa33Z3sAxFRwslCmi5+81VPsAvqK1E0NISvJ3H
-kK30gnufyrtitgyrOAyMh4W8ZUgHpfXkgWJMlDRhxAn679TAJup4zreSiRjR7QTC
-1WMvSagOxow56JtTljfPW/RoNi3lw80LYPZuKL/Q2mgsdzFdP0OFYm2RFJSI2lJp
-q+gR8zojj3aLA26lWl15q1oAa9to2/dinifk64FDqQKBgQDtantviLZ5jJ3CB2I7
-lJ9baPgbKrygvRUhh7gHbUJoSY+RmFkZODePYGHYXjfr+scQD15h1tb7w1qRrO+T
-XTq9rxnKOv6cNK2j7aOhEnaPdgASR8wEUquaA9Bhv9ZxBvtxtZyCAlDr9wWs2TZk
-wW6nPQx6nAS4iKFAYAm83M0JOQKBgQDBcSJei5DC0RCp1end3vkb3Jp2OjigxxaI
-m/m7g57fHQK9c4aE0FrwqtHc/kdCWAz+tny/X3btUdnA7vjCXyTIXA+bwBZCsVvz
-rnN0hTmqaUUmYn2i/xoC6H0ukZWU/JoGSA4mpf5LQEC3MMjL4P2pf2QrjmHGOYxV
-4jF6tmZ/lQKBgQDpUKyvhkX1G6hpZsI11S/qMDUq1Yv71vXuNqc2vTv2qtvpdDOT
-YjjPsSNW8/i28oMwGDpjojMxxeC6qp3iT0uL34lTwTg4IFjIcaBNiYx0Hb2iOWaY
-lPnI6Jifh1xhRUBTleuRpF8MFX1BSVF4INPyjD84Ox00kCkPz5GiRcdFmQKBgQCu
-CCukpamSK+by9PnXW7AAKgNpFE44D4UtWC5gTjUTg5UgfpvqR01ZskTmrnnLrU3b
-prAquCdVsUrX8ecpb9G21GRSeolMbSZN4IgMr4NG1jiZJQjlKN7s+N8Ok3ngtTWZ
-KyBYEwTqDJ9scF5mVj/AS1UCfrFmVgX0inB7dzhV1QKBgBUtRBVRf6bulWo9tMjd
-gZMJ2zdFqflcQ/PrnAAQSefWpLeIilWr3mZAS0Zj/C3j0sktzdW7ZVpI8NdbDO84
-7JJq3EN1W1TgVcb5SDEgoEuz4k+ZYLjn+9FBY8joWW0+ersrdXirdWhK4/qUpXS+
-D+SvHpWrKr+tPhZv72hxKLVV
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYR0YDB0CXWNK1
+61NScAHlcwKfaKdfxkxf9ScdIHj8Dyb12q1E8JGZHTwBElTY/N/7Lur8OCxvHBQL
+SCWl46dQiLlq6PIVnTXlOe3mHGnLGjnyX/GkFOdKzJQHYib7cYGWgVLdGXTSFSfA
+oLaUmNWDRWnOOF4g4h9JINAimXj3WMGRiZZABfEOrMC3OT+sBNCDjV8qNfq4gkDJ
+pP77NhMs3iOzDj2ijFVR+efH14rwwRdPJsmBOsEbKy+kyxOZJkOVkuOZRKMFu9WM
+NojVckxTnQb/I2HqTtSfMWegLTpPto9YXH1TJrHNCU70oOmjQFVBPopShrmzgn6/
+Z38fStMFAgMBAAECggEAHks5kqMn9qPxQUcoS5NkUS7849UYTQ2gRou5BQqffveN
+tuXSyA76zCTcedMZhZRjA6+tCFGth0ok86yd7r9YGwWkK3Bdrq6YmPpaCUf4RPM5
++W2cXxnYfJEv1rswSZ/mWZhvMXSdwKh8QM5IHE4+Va/isWeV1EFf23a3aVayUbRs
+NuFi0dHaVES4nsmA3FveUqC1SG4z2QwHrVsSBI+0/gkXf0ibzC/V7IMV8V2W0bxn
+7eZDXB9XCumFCCAGNPY5tVhCf/9xYCFO/1YmjsithzinJZrVbc/kwvIKxEgzqXp/
+8A8TeZdscjWZaB8ry3peAr2tlKzzGahm44WVkEufuQKBgQDCsXRFnlTVchaIAy1y
+tvJTvHy+v1lnq6cCWQz9ZEEcFtBwuCxj2iGXf7xOmbKSJw6WSfjcfNbWfcR3Qxw5
+FzLR+y+RnCMuhS/YivJoh6PAc7qXbLT/GFHtcip3VAEFDREi/MzT7EywVXm8ydT4
+Zzr/LFNW6gHRTN7vg4KDg8J8jQKBgQDIOrF4cqv3JELBCnBeol0m5de4bHtYRaEd
+OBpkVTzydQ/nDiRydgoVqGXK7V3x5PifjpLU1+wZQ2qZbHdzcnmKJVPxqGzXpOml
+aLi3u4n2yShz9JagvL76DvHdpwLVKqYQJO9++fdQyTzibU9GS+hTSVYb0H9L6RS8
+hPP3wakeWQKBgQCcW9nOY5csCMExoKOqYmUBfPoOUyyhRskM6Km3AwILZgMm07LK
+yo951VtNIMC6AeYEKwpTQWtkvYLAaURMUWY+H2YXofbbUJmZZhXCf1Sypf7vx50g
+1c5OTQbv6KYdAV6G49I4TKlWYH8xcEK68GUANAAGaE7nYb4VS1/Q8UuLrQKBgErE
+X/CyITSv/Z1H4J310wLrYJolKAnWNktK39AHZDLFM6L7zPBQ04My1o/oAuSIs64g
+9wMzfZ4RZoTT0+bwICJNvgLG+Z2snvJ9IDy7ctEMXGawNm7fDBEj83zpGE2xF0GA
+CU5I2Oj5vBpw5uFBBwfSoqzQNjiKWIvsuY0Sa6xBAoGALEYNiZLASnGtx2Viw0bn
+0EWjzbA6N0fHdthjJEHbRtx+dR4tXyw1TlAbug+AurQXfKR+o1gSJ78V+ShKMpUc
+45FYt5zaGuV3vf0ldJOG3qESvWb0AOZFYNGyutZxX9liiQAuC9SJHIJcEUUcgrA9
+KaWWWLINJTseVl8vGVkw6io=
 -----END PRIVATE KEY-----
diff --git a/certs/gen.sh b/certs/gen.sh
index ac95fc20d..4a8506ab4 100755
--- a/certs/gen.sh
+++ b/certs/gen.sh
@@ -1,18 +1,33 @@
 # refer to: https://gist.github.com/Barakat/675c041fd94435b270a25b5881987a30
 
+# cert settings
+key_bits=2048
+server_host="127.0.0.1"
+hash_alg=-sha256
+valid_years=100
+
+# compute valid_days
+time_ts=`date +%s`
+date_year=`date +%Y`
+date_ts=`date -d @$time_ts --iso-8601=seconds`
+date_expire_year=`expr $date_year + $valid_years`
+date_expire_ts=${date_ts/$date_year/$date_expire_year}
+time_expire_ts=`date -d $date_expire_ts +%s`
+valid_days=$((($time_expire_ts - $time_ts) / 86400))
+
 # Certificate Authority
 
 # 1. Generate unencrypted 2048-bits RSA private key for the certificate authority (CA)
 
-openssl genrsa -out ca-prk.pem 2048
+openssl genrsa -out ca-prk.pem $key_bits
 
 # 2. Generate certificate signing request (CSR) for the CA
 
-openssl req -new -sha256 -key ca-prk.pem -out ca-csr.pem -subj "/C=CN/ST=GD/L=SZ/O=yasio CA"
+openssl req -new $hash_alg -key ca-prk.pem -out ca-csr.pem -subj "/C=CN/O=Simdsoft CA"
 
 # 3. Self-sign the CSR and to generate a certificate for the CA
 
-openssl x509 -req -signkey ca-prk.pem -in ca-csr.pem -out ca-cer.pem -days 3650
+openssl x509 -req -signkey ca-prk.pem -in ca-csr.pem -out ca-cer.pem -days $valid_days
 
 # 4. Add the CA certificate to the client trust chain. Now every certificate signed by this certificate is trusted by the client
 
@@ -20,11 +35,11 @@ openssl x509 -req -signkey ca-prk.pem -in ca-csr.pem -out ca-cer.pem -days 3650
 
 # 1. Generate unencrypted 2048-bits RSA private key for the server (CA)
 
-openssl genrsa -out server-prk.pem 2048
+openssl genrsa -out server-prk.pem $key_bits
 
 # 2. Generate CSR for the server
 
-openssl req -new -sha256 -key server-prk.pem -out server-csr.pem -subj "/C=CN/ST=GD/L=SZ/O=yasio Server/CN=127.0.0.1"
+openssl req -new $hash_alg -key server-prk.pem -out server-csr.pem -subj "/C=CN/CN=$server_host"
 
 # 3. Hand over the CSR to the CA for signing
 
@@ -36,7 +51,7 @@ openssl req -in server-csr.pem -noout -text
 
 # 2. Sign the server CSR
 
-openssl x509 -req -sha256 -in server-csr.pem -CA ca-cer.pem -CAkey ca-prk.pem -CAcreateserial -out server-cer.pem -days 365
+openssl x509 -req $hash_alg -in server-csr.pem -CA ca-cer.pem -CAkey ca-prk.pem -CAcreateserial -out server-cer.pem -days $valid_days
 
 # 3. Hand over the signed server certificate to the requester
 
diff --git a/certs/server-cer.pem b/certs/server-cer.pem
index 5c1fe0e46..d196efe40 100644
--- a/certs/server-cer.pem
+++ b/certs/server-cer.pem
@@ -1,19 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIDEzCCAfsCFAcsoPOdGfx9dqf5iPUDLcD+q0w5MA0GCSqGSIb3DQEBCwUAMDox
-CzAJBgNVBAYTAkNOMQswCQYDVQQIDAJHRDELMAkGA1UEBwwCU1oxETAPBgNVBAoM
-CHlhc2lvIENBMB4XDTIzMDEwODA4MzMwN1oXDTI0MDEwODA4MzMwN1owUjELMAkG
-A1UEBhMCQ04xCzAJBgNVBAgMAkdEMQswCQYDVQQHDAJTWjEVMBMGA1UECgwMeWFz
-aW8gU2VydmVyMRIwEAYDVQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCyUGMNaBJsZdS4MshX9ny4zXH5qknv9LIpK/6UyNhJz5XP
-CKUYpDD15nDnwWMIojWOyJUgtSFE6QHLUnpNDRr1GWcooeOQWes4ZHDT1pwiys3s
-50ga0D4eZ3DYwFcv9MIrY/DOhPO4vRGZMcO48+yBLA4LIoN9z+rc2QtmVjTFAUaM
-Yrf9PZh9GAo+E+NK1WQM4TzEE5fycjOP1tNzm1nM9h/qX0dIjlzIx0hSxXBg9aaN
-kgwGcFPuD0i7VXI7pkFcRXbQhBmInKumaCUmr+llVcbS6gclXTH3nr9DqpMx+Fba
-ly+/GFfZpONbNNtW2CE1r9MWAWFTS8a8YqcUwyrHAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBACx3t5CW70uV+CzcTJzAOpenkAz+4KAioEXMt8umkvLLXTjhbocw7qCh
-lnpSnL4YESa521xJoVLvC+/IVPs6Qu6Wjsde3/TtbGuA+Ry3359Bf9ldm4FxzzSL
-8SVzhxswhxz0l2ioi4mpnE+NhmMWIt19cRqN5Hq+eJuKP+BRiGf/nv3+8Ope+plf
-QzBPVheLlxSogWp8b8dHMMcqtvITtaKkBYKIsZh2btv2Mkjl+Cal9rN35yyJqbf2
-OWADpLGwX1t4/W3ltuELShH6ep7uVi3jA8ndljTrJ4UJqicIlEC6IaCBLq3DLmjO
-UFs6S526eebDmgJThg8K+36m7SMw9d0=
+MIICzTCCAbUCFDqVWHvIIR4hcabZ+D1jatItevQVMA0GCSqGSIb3DQEBCwUAMCMx
+CzAJBgNVBAYTAkNOMRQwEgYDVQQKDAtTaW1kc29mdCBDQTAgFw0yNDAxMjMxMjU3
+MzlaGA8yMTI0MDEyMzEyNTczOVowITELMAkGA1UEBhMCQ04xEjAQBgNVBAMMCTEy
+Ny4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALnWYKirDS3H
+91C/8vdqGQPoU/+fonC/MLbv5CrwKd6Zm+TltpIrGRKK6FsVwMEYOpCm35WTPP8F
+TsE9Ymh1EqJIhD2XvLCLZ8wi2byxCw/uy8IE7bWeups7/DYnqk3v347UVLkNolfB
+T+USGixxT70/NDSy+jkeY7MvG0Y102u7zozCv2sLC5mYWtkVarwbqkzVyAbzyubw
+yq28KAvF5NohdrnRo9G+MpHAITQMkE1fy8sfNxsAJOKpX/SuMx029dk5DMMK2KsJ
+W4q/m4iV4aF6F0yaEa8MnrdBSiWkidIXXwSGBHGYZjC0T2QL9KHTAOz52iycEvBa
+59NimIpebusCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAuHKS/eaQ7sovuTsh1t8
+ilQJnwa1nSyrxmyW0hWKILuzP5fGP0BENV79s5YY/gIfPy+pr2Zxp4ndmiUsFJKu
+9dL6HZT9js+1WEDJje2JFtydqndXpzX+/bqTAROiMo01owobLo0rnkNjaNTIXyUd
+5IPzj6LfakIyUtMlK8aylmU5qP48aoxTC+nndGOHNCPMHEs+6AZ9t+LcFU7XMw3i
+zWW2vOp2qNWFF3gBZT8p53jA7xcQzhLcoWR6v8/opA8oxnafJpY8CRK4zJ1p3zTT
+xTJj9dJ6+v8+ox2N8+NmirVRDGEHYNyrV3ybmNsyNtr8GyToBfcLmB9n7ErgE2e3
+8Q==
 -----END CERTIFICATE-----
diff --git a/certs/server-csr.pem b/certs/server-csr.pem
index cdbb80b2e..8ad4e2fcd 100644
--- a/certs/server-csr.pem
+++ b/certs/server-csr.pem
@@ -1,16 +1,15 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIClzCCAX8CAQAwUjELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkdEMQswCQYDVQQH
-DAJTWjEVMBMGA1UECgwMeWFzaW8gU2VydmVyMRIwEAYDVQQDDAkxMjcuMC4wLjEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyUGMNaBJsZdS4MshX9ny4
-zXH5qknv9LIpK/6UyNhJz5XPCKUYpDD15nDnwWMIojWOyJUgtSFE6QHLUnpNDRr1
-GWcooeOQWes4ZHDT1pwiys3s50ga0D4eZ3DYwFcv9MIrY/DOhPO4vRGZMcO48+yB
-LA4LIoN9z+rc2QtmVjTFAUaMYrf9PZh9GAo+E+NK1WQM4TzEE5fycjOP1tNzm1nM
-9h/qX0dIjlzIx0hSxXBg9aaNkgwGcFPuD0i7VXI7pkFcRXbQhBmInKumaCUmr+ll
-VcbS6gclXTH3nr9DqpMx+Fbaly+/GFfZpONbNNtW2CE1r9MWAWFTS8a8YqcUwyrH
-AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEABdY4vwBNH7r2PnLjBQ5A72bK4jCK
-ssYzqMPomSJX+d/Ua2rYCZwsIIpN9vlf33jlz2CuKadWt1S6lrjR8KYRO2V9vraU
-frrA5sK5IQYqVWVqKtp9z7gI7dGdrxrcIj9eWxPrQh+6tY45vwyIFKwMd+m3uy0l
-xP2G1odJG6DPcCGlXtnDVuhfrygpQs5L+0thKr5cAKNcR4amEie+qnmzZQAmE/is
-YhmojH8RDoV9Nzgt9uXG92H8QQKhNzBUPOXL8tk8YWKqNKMyqiVk2cZAFxDl+GnM
-Aqz6HwOlU/3si3hKAahFipY8sI44JisXliFy29GIY1gjCYwe0QOMAikesA==
+MIICZjCCAU4CAQAwITELMAkGA1UEBhMCQ04xEjAQBgNVBAMMCTEyNy4wLjAuMTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALnWYKirDS3H91C/8vdqGQPo
+U/+fonC/MLbv5CrwKd6Zm+TltpIrGRKK6FsVwMEYOpCm35WTPP8FTsE9Ymh1EqJI
+hD2XvLCLZ8wi2byxCw/uy8IE7bWeups7/DYnqk3v347UVLkNolfBT+USGixxT70/
+NDSy+jkeY7MvG0Y102u7zozCv2sLC5mYWtkVarwbqkzVyAbzyubwyq28KAvF5Noh
+drnRo9G+MpHAITQMkE1fy8sfNxsAJOKpX/SuMx029dk5DMMK2KsJW4q/m4iV4aF6
+F0yaEa8MnrdBSiWkidIXXwSGBHGYZjC0T2QL9KHTAOz52iycEvBa59NimIpebusC
+AwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQCpKvqJCZAS6Nq6ZMl3ycNEp2gNCY/N
+b5GqASr++sLE2mwTQey/rbyTWcwe3/pkGm1uCTGLySubAOyqef4OWB4RgUqTmmIT
+qwtPhqeWwHvN3AdMaYKUL/dAMPSNByKpJFZUFsegNjBMwcYJf2oFqz3nyhwGvzaJ
+aUtPgeNeqwuC/8hEe9Rm/7kM9LQPd1AGa9kmXMSUjF3arD/JArCTBDsr+UucrUK6
+5WE3160NwD6kC/zQS6ZbfkhpVrXLp67OH1fM/9qHSaYJeiOewVztvBHbrZLSRkPV
+KD4hbntd7VAPkqxCwG4a9UMK5bStztZqZGrUL3NSa6YOz3cuFdzawYCp
 -----END CERTIFICATE REQUEST-----
diff --git a/certs/server-prk.pem b/certs/server-prk.pem
index d6b49af46..9d0c87afa 100644
--- a/certs/server-prk.pem
+++ b/certs/server-prk.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCyUGMNaBJsZdS4
-MshX9ny4zXH5qknv9LIpK/6UyNhJz5XPCKUYpDD15nDnwWMIojWOyJUgtSFE6QHL
-UnpNDRr1GWcooeOQWes4ZHDT1pwiys3s50ga0D4eZ3DYwFcv9MIrY/DOhPO4vRGZ
-McO48+yBLA4LIoN9z+rc2QtmVjTFAUaMYrf9PZh9GAo+E+NK1WQM4TzEE5fycjOP
-1tNzm1nM9h/qX0dIjlzIx0hSxXBg9aaNkgwGcFPuD0i7VXI7pkFcRXbQhBmInKum
-aCUmr+llVcbS6gclXTH3nr9DqpMx+Fbaly+/GFfZpONbNNtW2CE1r9MWAWFTS8a8
-YqcUwyrHAgMBAAECggEARK3FmPJOtkV6av/UPl0HqL4oefrmw29B962kPnYlKDi2
-AKnZvOXwnaWGMx0/IaIocrg7B//7smj0cfVweaDkkyaXnwTLe1vGx0+YTV9Jf/UQ
-34AtO3adlmRNCI78hdIFv2Sc6U43+R2JW7HZKrF4lD/9oLhIYPrmAO3wABiP9phk
-l7COugAiyYjNKhmMKvDqvr65DEJuq5D7/Y4Tu9WVAK38jqCr/6pRofrdU7Qt2N+0
-sfZVcPQ2NyiK2mpbWj347PwiFFSy36Bum44MyV5vQJ2Xd1MUwYso3JLLE2EEz7Nz
-Yg2ScARhYoJ/59pwxfeuQKxrgt7voIpFzA7DGO4WYQKBgQDW40qjIaAwG0ccWboH
-X6hWHMC9rjQ6IH1z/C44Qv9qfxlr4GZ70WKOz5107WK2+StgZQ1BJH0he3uhUI3I
-gLg9E+6SQkk5tBBQy085Lgh2J2Je8VscRTmJqXnQ3uYVP4o8Z8CE/hkXefIWFT4a
-Qpmw7m4u3BDV5Wv9W4+nzW3cSQKBgQDUbcsUm9rHMPT8jEWsklfGZqZUgAWsQc26
-IqMtamd5Bwq231frNL0qFA3xWWcrwQXABp1CucWG1X4ScbmWqFDy1DRrieGiY0Vm
-en/6w5Rlw1Pajjo7fyn7WWe6lmFiVWli8ojk/hAXzCgEUc5Xwx/9l0n0uBRCVQxJ
-Gd3GwFAujwKBgGk4HiHGo0Mq+CTfooFdy3Vu2smF9TjJE+SpBJCz7ZDd7zqtREE4
-g4PeEQFiA0YIt76ZfGX7UfIFHsIcSXB15sCxc83V+zjv/FUzV/VtnuML4dUPZUdw
-df38KBOoMQ0SccOmIdR8/xhJs8owWJpPJiZGeVkklHHHxprmLG9D3ZlRAoGATNOg
-fMWZLC0ijSvWDwGmSRTa1viuFIx/8O+SAFzZK0ZGs7i2vVQHje5O1Ji23XYjtD0w
-Ju+05nzT6avDqR8al5fzlWj6d5ZbhSKMoo6VXvBzpTmHCfmFn2fIQg0dD0lAog6B
-QAA6pcCqQFWtwMPLEBXlI2JnwU2s8csvEDCBTzUCgYB2VhD1YrZ75oGMZ30hXdGS
-kwTWO7CwNgNyvDrCwNANDpQGKBAz/Bj01ot8XZkbS0opRVXIHILYu8KE+9RYZx8E
-DFuI4vqiiqEuTcCBkR5fVLFCSKtq5ZClwYmIOY9jd8ZET/Dlo2DV8hL4Xc8J+4+N
-zWWMwLYlQ6CEhV3vuVoUWA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC51mCoqw0tx/dQ
+v/L3ahkD6FP/n6JwvzC27+Qq8CnemZvk5baSKxkSiuhbFcDBGDqQpt+Vkzz/BU7B
+PWJodRKiSIQ9l7ywi2fMItm8sQsP7svCBO21nrqbO/w2J6pN79+O1FS5DaJXwU/l
+EhoscU+9PzQ0svo5HmOzLxtGNdNru86Mwr9rCwuZmFrZFWq8G6pM1cgG88rm8Mqt
+vCgLxeTaIXa50aPRvjKRwCE0DJBNX8vLHzcbACTiqV/0rjMdNvXZOQzDCtirCVuK
+v5uIleGhehdMmhGvDJ63QUolpInSF18EhgRxmGYwtE9kC/Sh0wDs+dosnBLwWufT
+YpiKXm7rAgMBAAECggEAMmLOmEywaQ5DnvA8RxrMJ4QRakh0+Y7M/XyzZ3TwVTte
+ykQCKUVoKd/hufh+55vTHS8xhdODAT4GKVykVuAPKlLxD+YZMeDKRs3YLVHvRuWe
+9z7w2IJt4/LyohhFE5aLDaXCRt5MevCd4eTzlcMvNIdzdypjr6Lus0F9ap7jcNzn
+ObWAblymqJImTuH370HcCyZdsdw/Yfn6IGfmqX1UlyROVJmbrH1QNEBhmjPdSlUY
+7nO1E2bZIYbP175cPkge+OnN04fws/gTs02sX8QWojMG5w00fN7fi3ZxkgDwNleF
+0BDe3+Ej9X2IHxSXnChd0+DVIDT9kqr2hK68gpta8QKBgQDKRKLuctnwHSWzOosE
+PVLxhsfqgov+T/9jGM9zwsi+OvykSJypydwSNFlUZjMhMuBbOUZyuDquIN2tNh8S
+AJI8XrwkxwS4mJu2FQz+BrrLjZdyQZMTfaLWdPknwIOFk4Ybs6fWwyEJakCObC6g
+oqpEMnwU75mdbbf07dwDT+ORuQKBgQDrNFyVXoY9G+/4NlR6KF+H9lOVZFYIHdiU
+ZZFrd0duy2O7KWNr2Hg9EfFtZ/v9U+Ph363emu5uF8rmh6pCFJ0KuD1yVMZtlWRj
+Jxn9rsyhUXsKq3LwC00bKsFP5pHOh9iIYAda1kXcpMaSS3VxYF1AWS0XL3caKOML
+Gwtiig1nwwKBgGG/+d2ys5BPBcEwMa7C1CrVMBgtLuqgTpPdkaQoJkuIxj++t7d2
+Tlyd3+3h1iPdKn/rlhgq4HD2gSsMVMembwWt4s8DP0zWs6mzUqwRJITq0J3vAt0Q
+gnmR3jdP2j/bo5wPnrUzZ+vc5YXu0jnfYtnCbCTSBjMGqzg7G3CeUyRBAoGBAJxu
+ovUlfRq/rgbj+6OTnpYLGuRNa3rSfu2T7/gNyRDDbX1ZtapQuwfDG1OsyUhftzzP
+TBC18sZ+RJC2wmJY22n5x8R25dKUfcQEiaDT1X2ld7RM+5Dzs0DSWugNbgRzDW0G
+kV21DZoGbZt3XJEfimX16at2Ajz/3KHSRuwu7WOJAoGBAI1UJSsjwUQvUSw3uNCm
+USc4tY718Lm9KNh5P4XJOWpffs4WfTlZqcUR+DlINpPI7g+XQzljh90eyP/WEJpN
+kn3owbfArhJQsH4Q33rhfQKcApsVwGFTGo8fp/jA87b/R+UNf1QXWUIZvK7ciX9B
+7wU16R8KuKGrfXQeJWzroUjl
 -----END PRIVATE KEY-----