diff --git a/certdir/Makefile b/certdir/Makefile
new file mode 100644
index 0000000000..004adee9c3
--- /dev/null
+++ b/certdir/Makefile
@@ -0,0 +1,69 @@
+ROOT_CA_PASSWORD=ssl_ca_pwd
+PK8_PASSWORD=sslpwd
+P12_PASSWORD=sslpwd
+SERVER_CRT_DIR=server/
+
+all : $(SERVER_CRT_DIR)root.key $(SERVER_CRT_DIR)root.crt $(SERVER_CRT_DIR)server.crt goodroot.crt goodclient badclient
+
+goodclient: goodclient.crt goodclient.pk8 goodclient.p12
+
+badclient: badclient.crt badclient.pk8 badclient.p12
+
+.PHONY: clean
+clean:
+	@echo Removing certificate files
+	@rm -f *.crt *.key *.csr *.srl *.p12 *.pk8
+	@rm -rf $(SERVER_CRT_DIR)*.crt $(SERVER_CRT_DIR)*.key $(SERVER_CRT_DIR)*.csr $(SERVER_CRT_DIR)*.srl $(SERVER_CRT_DIR)*.p12 $(SERVER_CRT_DIR)*.pk8
+	@echo
+
+%.pk8 : %.key
+	@echo Exporting key $@
+	openssl pkcs8 -topk8 -in $< -out $@ -outform DER -v1 PBE-MD5-DES -passout pass:$(PK8_PASSWORD)
+
+%.p12 : %.crt
+	@echo Exporting certificate $@
+	openssl pkcs12 -export -in $< -inkey $*.key -out $@ -name user -CAfile $(SERVER_CRT_DIR)root.crt -caname local -passout pass:$(P12_PASSWORD)
+
+%root.key :
+	@echo Generating CA key $@
+	mkdir -p $(*D)
+	openssl genrsa -aes256 -passout pass:$(ROOT_CA_PASSWORD) -out $@ 4096
+	@echo
+
+goodroot.crt : $(SERVER_CRT_DIR)
+	cp $(SERVER_CRT_DIR)root.crt goodroot.crt
+
+%root.crt : %root.key
+	@echo Creating root certificate $@
+	openssl req -x509 -new -nodes -key $< -passin pass:$(ROOT_CA_PASSWORD) -sha256 -days 1024 -out $@ -subj "/C=US/ST=CA/O=PgJdbc test/CN=root certificate"
+	@echo
+
+
+$(SERVER_CRT_DIR)server.crt : $(SERVER_CRT_DIR)root.key $(SERVER_CRT_DIR)root.crt
+	$(eval $@_CERT_FILE := $(SERVER_CRT_DIR)server)
+	@echo Creating good client certificate $@
+	openssl genrsa -out $($@_CERT_FILE).key 2048
+	openssl req -new -sha256 -key $($@_CERT_FILE).key -passin pass:$(ROOT_CA_PASSWORD) -subj "/C=US/ST=CA/O=PgJdbc tests/CN=localhost" -out $($@_CERT_FILE).csr
+	openssl x509 -req -in $($@_CERT_FILE).csr -CA $(SERVER_CRT_DIR)root.crt -CAkey $(SERVER_CRT_DIR)root.key -passin pass:$(ROOT_CA_PASSWORD) -CAcreateserial -out $($@_CERT_FILE).crt -days 500 -sha256
+	@rm $($@_CERT_FILE).csr
+	@echo
+
+goodclient.crt goodclient.key : $(SERVER_CRT_DIR)root.key $(SERVER_CRT_DIR)root.crt
+	$(eval $@_CERT_FILE := goodclient)
+	@echo Creating good client certificate $@
+	openssl genrsa -out $($@_CERT_FILE).key 2048
+	# CN=test has to match user name
+	openssl req -new -sha256 -key $($@_CERT_FILE).key -subj "/C=US/ST=CA/O=PgJdbc tests/CN=test" -out $($@_CERT_FILE).csr
+	openssl x509 -req -in $($@_CERT_FILE).csr -CA $(SERVER_CRT_DIR)root.crt -CAkey $(SERVER_CRT_DIR)root.key -passin pass:$(ROOT_CA_PASSWORD) -CAcreateserial -out $($@_CERT_FILE).crt -days 500 -sha256
+	@rm $($@_CERT_FILE).csr
+	@echo
+
+badclient.crt badclient.key : badroot.key badroot.crt
+	$(eval $@_CERT_FILE := badclient)
+	@echo Creating bad client certificate $@
+	openssl genrsa -out $($@_CERT_FILE).key 2048
+	# CN=test has to match user name
+	openssl req -new -sha256 -key $($@_CERT_FILE).key -subj "/C=US/ST=CA/O=PgJdbc tests/CN=test" -out $($@_CERT_FILE).csr
+	openssl x509 -req -in $($@_CERT_FILE).csr -CA badroot.crt -CAkey badroot.key -passin pass:$(ROOT_CA_PASSWORD) -CAcreateserial -out $($@_CERT_FILE).crt -days 500 -sha256
+	@rm $($@_CERT_FILE).csr
+	@echo
diff --git a/certdir/README.md b/certdir/README.md
index 34dcbc4733..5127f09249 100644
--- a/certdir/README.md
+++ b/certdir/README.md
@@ -22,35 +22,8 @@ In order to configure PostgreSQL for SSL tests, the following changes should be
 * Uncomment enable_ssl_tests=true in ssltests.properties
 * The username for connecting to postgres as specified in build.local.properties tests has to be "test".
 
-This directory contains example certificates generated by the following
-commands:
+The certificates are generated with Makefile.
 
-openssl req -x509 -newkey rsa:1024 -days 3650 -keyout goodclient.key -out goodclient.crt
-#Common name is test, password is sslpwd
-
-openssl req -x509 -newkey rsa:1024 -days 3650 -keyout badclient.key -out badclient.crt
-#Common name is test, password is sslpwd
-
-openssl req -x509 -newkey rsa:1024 -days 3650 -nodes -keyout badroot.key -out badroot.crt
-#Common name is localhost
-rm badroot.key
-
-openssl pkcs8 -topk8 -in goodclient.key -out goodclient.pk8 -outform DER -v1 PBE-MD5-DES
-
-openssl pkcs8 -topk8 -in badclient.key -out badclient.pk8 -outform DER -v1 PBE-MD5-DES
-
-cp goodclient.crt server/root.crt
-
-cd server
-
-openssl req -x509 -newkey rsa:1024 -nodes -days 3650 -keyout server.key -out server.crt
-
-cp server.crt ../goodroot.crt
-
-#Common name is localhost, no password
-
-#PKCS12
-
-Create the goodclient.p12 file with
-
-openssl pkcs12 -export -in goodclient.crt -inkey goodclient.key -out goodclient.p12 -name local -CAfile client_ca.crt -caname local
+* To remove all certificates: `make clean`
+* To generate certificatess: `make all`
+* To update a single certificate: remove the file, and execute `make all`
diff --git a/certdir/badclient.crt b/certdir/badclient.crt
index 4f37a71e51..53bc3e5621 100644
--- a/certdir/badclient.crt
+++ b/certdir/badclient.crt
@@ -1,18 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIC3jCCAkegAwIBAgIJAIHg5fMq+z8aMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxDTALBgNVBAMTBHRlc3QwHhcNMTExMTEwMjE0MjI3WhcN
-MjExMTA3MjE0MjI3WjBUMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0
-ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQ0wCwYDVQQDEwR0
-ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbMINU6XwQ/0OSQ4xYRp0o
-gYzzsaaGgZjBZEpRMCZkB+TPUD/yxDpyfcknsvsBQPQ0bqLLS9yqf5iS26jHGd4U
-/nInOy5rjIKEbJMUgkbNWiuVl5q1K+GFuTEpjpdLI9NH5X+jL1CxH/h8+j8Mr2iX
-s4C2gIFu6povShJiIwBNBQIDAQABo4G3MIG0MB0GA1UdDgQWBBQ6L/fB+7uwDN9q
-T5Do9X4GIbJnxDCBhAYDVR0jBH0we4AUOi/3wfu7sAzfak+Q6PV+BiGyZ8ShWKRW
-MFQxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJ
-bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDTALBgNVBAMTBHRlc3SCCQCB4OXzKvs/
-GjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKq2Q+aE5eC04gW58pAt
-pobnL/2L0JHCeLPsv0k/1vjulzjBuphbwaibZtiYWZSDKWL8Dvsg+khq7rEIY0W6
-xXGw5y2scRlCukQvseIxbHUoyOCAWJnoqr7d8MyxP2GlpqSDXHk9wEywZ/6f89oN
-yudtXjoYuW8157tmvrX3D1yd
+MIIEEjCCAfoCFBrHU9NbhHp2sM0sVwcQtK0+b/TVMA0GCSqGSIb3DQEBCwUAMEsx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEUMBIGA1UECgwLUGdKZGJjIHRlc3Qx
+GTAXBgNVBAMMEHJvb3QgY2VydGlmaWNhdGUwHhcNMjAwMjEyMjIxNTM4WhcNMjEw
+NjI2MjIxNTM4WjBAMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFTATBgNVBAoM
+DFBnSmRiYyB0ZXN0czENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANRuNLHPeanP1kCMqoFR6ovvtD5Z9XCj8ZQHNWI7Xfs9JBd4
+KeF+hYlQ9oECI4I8By1lxx1YhEtpfu8pokekc+TBPnxLlmZDGbLJ0ZTmw+MRZ56f
+Frnzre1yCB8BiZRxdW9iqHuWntGfnKNdOVWP5JYa2y/2HetB3LQFql5CtRffOcVP
+4nrIZVmvNr+xh0o2DIcoAuLm80Bg1aDMbiJWP9C/4kJp7+SFCcGbOa8GftL8jcj5
+nbTGtjCDmViAF3TozfOJahaO2AQtD9mBXIECrd0ce3reO6aviTF08t/m1O2Qwdvd
+xAvNQgr6bWa0uCxHMmhzpxj+0m22aco5dJ/h610CAwEAATANBgkqhkiG9w0BAQsF
+AAOCAgEAIH6tchU76zbdl0C9enJUBa08rMmzdJ73aUm1n8wSE9M4gQSfiN5JNJsa
+9/pdpYzKcJYigSiRcmZR1ltZptu+tPuf8f6XW5ayamCifuKoxi+Z5sLLzD8J604y
+nujotuAq81OoS3ujPB+RyNgrWHfphFJsDTeJPFbyhzUUwrhiiGOx9RGhffYfZmkr
+3XdXJqQBak89aJaSLWJ2fyAMSc/ec4DgwAVr5mZ3F/ISiChgZ5oTGoooNZkI67yA
+Tkh0iN+9Vo6j/gtD2zgL40I/nQP8kRw/9gNRd+ljTts38r3AfDtXsl1H6kN9MYFf
+X761UI/aZgGa9GGgnh0+YK1Dd3BXZDtoV3r8Gl2iL0Mg+3syrYGVHwMFJ9ggEB9s
+QUhcKR07NxMWUmM0vF4Mp2zMZD1lRc5L+5TgeVYjSoADj1UWAeyJCVJWG/iv3i7h
+SRe/Je4c2fTw99zs4HZY6QQVF+D5iVBM+kCm5DPNCVHQb4oHejeCBMmgac+YpQ6s
+IgFCBmW0RaW51eqWHsy+/BnEZAZwgw7mU3Y2oWHFE5JJ2Qto2EXDcYfefLQyzGtS
+Bd1TMQybJ59VkGpsVc2Im/pJmA5w/8dxjwlewHuQGY/mf9xGe4bVQMY8lT2lCEra
++QZ4DjFH8SaeULU7QLxHJZ+xrAs0IvpSr9XC0Kcl+Oo5GY65NWw=
 -----END CERTIFICATE-----
diff --git a/certdir/badclient.key b/certdir/badclient.key
index efc9b6c013..53639934b5 100644
--- a/certdir/badclient.key
+++ b/certdir/badclient.key
@@ -1,18 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,95718EE22B89E019
-
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/certdir/badclient.p12 b/certdir/badclient.p12
new file mode 100644
index 0000000000..56b86061ca
Binary files /dev/null and b/certdir/badclient.p12 differ
diff --git a/certdir/badclient.pk8 b/certdir/badclient.pk8
index cebb2d78fa..1db3521e47 100644
Binary files a/certdir/badclient.pk8 and b/certdir/badclient.pk8 differ
diff --git a/certdir/badroot.crt b/certdir/badroot.crt
index 88ffbcf766..e0e2702643 100644
--- a/certdir/badroot.crt
+++ b/certdir/badroot.crt
@@ -1,18 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAligAwIBAgIJANwlio9cWdoXMA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMTExMTAyMTQy
-NTdaFw0yMTExMDcyMTQyNTdaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l
-LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
-BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA055WKnuQ
-i6RPdI3LEtx8ztXV7BuiYihPXCRYUahLyF4TAzNGfmqsdQhqUlqzr1P+nlqxh8sm
-hZGS4NtGPaEjrbPgsBsTVg0XBKpH5yf2RIhBtvAaDG+cCFBjM+LJGzc4we59JkB6
-n1a/22iSFsCAm+BFBwHk6FqF7u2gGSUOrI0CAwEAAaOBvjCBuzAdBgNVHQ4EFgQU
-rw3IpiBN56GCi44/goVmHlZdmJswgYsGA1UdIwSBgzCBgIAUrw3IpiBN56GCi44/
-goVmHlZdmJuhXaRbMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
-MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxv
-Y2FsaG9zdIIJANwlio9cWdoXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-gYEAa08IbYDJsgc45mYG/mviionvhBGs9BS2YapZDIREc/vd0W4FIzHXh5oTJAdF
-fkPjvHoczPuzGX8EKMBjANPs7h4Cd5xKSSE2Su+QwmZOxVg6eIeQwVZsY7SZFmkC
-Y2XwdxWvk3VzLdjgj/McmSBp4/aJUGRP6f5ehnR4B1ykVss=
+MIIFdzCCA1+gAwIBAgIUbj8F0il3g59jSOi60A/xzVkFRPcwDQYJKoZIhvcNAQEL
+BQAwSzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQKDAtQZ0pkYmMg
+dGVzdDEZMBcGA1UEAwwQcm9vdCBjZXJ0aWZpY2F0ZTAeFw0yMDAyMTIyMjE1Mzha
+Fw0yMjEyMDIyMjE1MzhaMEsxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEUMBIG
+A1UECgwLUGdKZGJjIHRlc3QxGTAXBgNVBAMMEHJvb3QgY2VydGlmaWNhdGUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDfvDvQ38M5p8DtAwrhEAU9OFkS
+RfLNOJFs+No8RnytCSoXepyQLC+OwH2HFji7U9dKuiXTu8gszjKGqL/0p6S3e8cc
+WHPzGzoOCifM46kN/W9EUrD0bO47zJuRKlcoc+fa1g5v6XYHqSpFDAmdP1yRTtvo
+OG/n8/wmpOH07uc0ddEOX8oq5PE8hJJlyahaI3Vh7hCjfJ0cplnLsmmPLnD9cFM6
+snErOlWep+88eTywoylp2H7R2dBcwZfNXxuhE0RWXe7mwVCJ4yMra19mmtMgfuEF
+YqR/IuYbVu3R8uPifoR51yXxoHcEGZn/vf9NDqAFDachY2ChXiEBVHieVqPZwmEP
+jZobJEet0TG+wKQfxpLwIY982jh1QJcsvk23Mn78Et6BQQlyXC7b5WAO6RwoQXxv
+jVBViV77dEee1sp9aDrFEQjYvQYdFMhkLzakIEEoAjDPTUIFUWZDvwLjp/9mi4MZ
+/iOkQOojZCvsWOIEDjfJWIHhH23a/Ow3eFZ05J8v+AK6GkbFZz2XJCsNPMEk0Ue2
+h2ReLRNufcfN5ezM3Suwb9TWBm8CviZlYhpJkFidvf/CBRgTOP4i0yaommdGpO2F
+RfHFURwkmyDddz4hZ5qGWs/LXvRb+QHELH0yZdwhlheMBBEpjxr9FuqzNHxmAGsu
+PCmT3UcFuk6mVVduWQIDAQABo1MwUTAdBgNVHQ4EFgQUQ+IJXE1ZvTo6ArM/IHmd
+cMdGhOowHwYDVR0jBBgwFoAUQ+IJXE1ZvTo6ArM/IHmdcMdGhOowDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAnK2wP2RM2dDD3fGC0uLoGXATLZyG
+Y8Z0fuqxQA5PM7NWKhZQrOOq+1GhUU6iFSzm1ahcNQuYeAQK7x7Ulq+eIoAbdHWC
+CIXg2iyRR1sk1HANR5a8UUANfIfyriU56scDllb/bWUx4M/g1j8Z4d5u7+NlSLOb
+JP2vVnhA3fT0LA/au37spejYiKuf9XJXp9vpggJH1tnamSEgJWBsH+MfvX/MgRln
+83UU4BCAtKEAs1A4xvWp9TcKeiaObRRXFZ50y73cjxc4rAyHu+BOQemz/Lv2lsyv
+LVtU33Fo0B05qM7/vOvZweNq/U0DarCz6pgmTeXXtvkodd1NaliMkAcTWfuzGSl0
+FwWCjHtK8si8vTAVnM6Wk0NKh99JM6bJCtRx/WFhHE3PrCLIN9JpVqBPz7nDUOj5
+uOd3CvtZrx5TxZ9W06MzkZXD6YeJUEimjNeh2PE7cBrN80dQO5chCy9E2Z7my6yM
+VQkeIGXOIvKCDpQQU/f+rDmf/+LyLVzqvNZXuXIzNGFby9vG0/EUu1ejmdCNGaJ8
++uMCm99Q+i2WAbpWZiOthAtHlZH8+z6sMNxGG0Pt7ZdxV4Ea2F8tUASA6iQij3fj
+mjOACjE/wfZby5t1+rWE0KKnC94Is2WioHbJ7O6dItGMhI1BDgmYAa+DepN/DIqz
+csW5Kiyql9L0VuM=
 -----END CERTIFICATE-----
diff --git a/certdir/badroot.key b/certdir/badroot.key
new file mode 100644
index 0000000000..ee4683d5aa
--- /dev/null
+++ b/certdir/badroot.key
@@ -0,0 +1,54 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,0FD2DF610C4C6635674474640336EB8B
+
+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
+-----END RSA PRIVATE KEY-----
diff --git a/certdir/badroot.srl b/certdir/badroot.srl
new file mode 100644
index 0000000000..258fde8c02
--- /dev/null
+++ b/certdir/badroot.srl
@@ -0,0 +1 @@
+1AC753D35B847A76B0CD2C570710B4AD3E6FF4D5
diff --git a/certdir/goodclient.crt b/certdir/goodclient.crt
index a45ae6c1c7..6193fcaee4 100644
--- a/certdir/goodclient.crt
+++ b/certdir/goodclient.crt
@@ -1,18 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIC3jCCAkegAwIBAgIJAM9GGWA8iSiIMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxDTALBgNVBAMTBHRlc3QwHhcNMTExMTEwMjE0MTQ3WhcN
-MjExMTA3MjE0MTQ3WjBUMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0
-ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQ0wCwYDVQQDEwR0
-ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCns68NbjKQAnHCpmN6amR1
-GdtliqiXDaCjoeBPpVXNQ/ZhqinP9gnDyRPXC5kPqw5/6GqNHcYJqg+IIS8G85Rq
-t3Cs5ZL+JlEDAwd0CkD0Ey5h0oJNfN1bDhV2e/yqc831ElBGK6VItGqKopSUV2y/
-pNijOOdeMZ8GuktT+9mbAQIDAQABo4G3MIG0MB0GA1UdDgQWBBTE93pAIzHiFRFw
-IU38WhnwXm03GzCBhAYDVR0jBH0we4AUxPd6QCMx4hURcCFN/FoZ8F5tNxuhWKRW
-MFQxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJ
-bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDTALBgNVBAMTBHRlc3SCCQDPRhlgPIko
-iDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKUsXLsp3i9Tsj1wp46R
-4IkIjwWT1bN3+JOjmA9aqwEVcxTRSStAa5kfTQwc4QSAgHK1oFPsA8gsv3sftYmZ
-MtvYrvba8cOPonuaCrvtJQMvKgv3d10S6esUGlW+5o3PVPUq5yQ7OaN5JHCDTZGS
-phuxlq7//rNjvypX2hbKUj6z
+MIIEEjCCAfoCFGeKHvYImPIGI/TzylXxoP4/g8A+MA0GCSqGSIb3DQEBCwUAMEsx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEUMBIGA1UECgwLUGdKZGJjIHRlc3Qx
+GTAXBgNVBAMMEHJvb3QgY2VydGlmaWNhdGUwHhcNMjAwMjEyMjIxNTM3WhcNMjEw
+NjI2MjIxNTM3WjBAMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFTATBgNVBAoM
+DFBnSmRiYyB0ZXN0czENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOdbOeXK9oeRv+J7OdTqXbtdo4PdXyAozQK7gg+Vc+UwXQ/p
+IkwWawI2yPTHeER30J78L0MUtiDyXH/aYyMSoAp+LoD2LwWcm6eywzSkLFFcwPts
+OB7qCYkXXz+9E04k6Ydk/6K/Tx7mfRNDYp6UrSD+BUq+4FQ6WZhfLC2Y+pRoDArK
+RoKpxWSNXGHd5RNxEgwXqpWemoMpGuw2q7pFSO4+c1h0dznRwfYRe3d8UYBGS9L6
+b/iNuV+XT9ukhOgB3kh2OCZWSpv3JaLQwKdFTEPBZr9foD6JlTzV7kKCcGFACx3M
+CzwXhwuetNlNvUrSwQQDaAXl0EeDcQJfsxLmQHUCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAgEAQYClYu0RqhkRdG25IX8vq5h2K1/m4hNclyqYfjGKiDgJ05VRvCUVdY4z
+SQ9qb7F/aFOvMjp+0vuYbJKxAvDfmRobe9u8txrPd5Rn1Ia69EgA8D5lhFU11+/e
+lh0Tcm4EEj7bqhsAXhyt94A3YIVFr32hQKUuOWYFwPJoQfQjsRmnfhWDviocErPi
+PDWG42+313WYoYsLmWWfgKoRn4W3Ive9Qy+fG0SL3bIn4M+IDUL178TtGexxVXCD
+olHRESEE73DQ9gFPKBMGCrbZNzVZmgybfd76bdWE3ZviLH0bETc7QAEpjqHyPUXU
+bnma/KfO/8RLAZvEA/UYI0y0lTD7qmpf3J8nj4U0elBt0KOFDOyZ66gvFEopoJ24
+lQNg22q+7Nk0XX7WdcnB1e+iDvt34NVCQ4uS1hHtRyPPfObl9ebuuN8Oma2wR4VO
+HsRc5wUPn5ZMXDiTtR0cCCUDr1EGsx1sKJ9V4qtvHKmyrFnKL32dpuH9P2WVVGZf
+kabAnPDNqimeZcQ5afC3YAxn0ni19047YXrb8BZMWNJxfBz5XOmN9dCSXy40gSVi
+xijOzUF46DTkbgl2vygWaYqO5Qkn+vHOrUxlw7qJpP+Xb5NxUZRPcyaIZLegZjrX
+kQRwsCkEvllKbdFmqNz0LIjg8btPLdaOHlMhqgRcK2t41Gq0+lo=
 -----END CERTIFICATE-----
diff --git a/certdir/goodclient.key b/certdir/goodclient.key
index 37d2ac5ae0..a4fdfa82fa 100644
--- a/certdir/goodclient.key
+++ b/certdir/goodclient.key
@@ -1,18 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,D2A0607D6E4CE1FD
-
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/certdir/goodclient.p12 b/certdir/goodclient.p12
index 7b46833693..3030bbf715 100644
Binary files a/certdir/goodclient.p12 and b/certdir/goodclient.p12 differ
diff --git a/certdir/goodclient.pk8 b/certdir/goodclient.pk8
index 50af7714af..1772e4cec1 100644
Binary files a/certdir/goodclient.pk8 and b/certdir/goodclient.pk8 differ
diff --git a/certdir/goodroot.crt b/certdir/goodroot.crt
index 09c853dbb9..f27dd804bc 100644
--- a/certdir/goodroot.crt
+++ b/certdir/goodroot.crt
@@ -1,18 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAligAwIBAgIJAOjCfnzSGkPLMA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMTExMTAyMTQz
-NTdaFw0yMTExMDcyMTQzNTdaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l
-LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
-BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApE4i3cM5
-zVAgfw8juoNN9kh/jiqZexQTUgQUrjQAMStSBVvPeoPcShbXYAZFCkICZlPdRrjY
-rCyJfdFkII5W+CRh5uNPuv30NDMkCdDYvre02EsOhpmuXaJcUPL24vlTe+9+su4U
-Hjy7FxOrQLe4S4kB7CNEE0lqLVDr5gXOKGkCAwEAAaOBvjCBuzAdBgNVHQ4EFgQU
-0Cs8cRK/hNU0+IkSJO+rxuebtmcwgYsGA1UdIwSBgzCBgIAU0Cs8cRK/hNU0+IkS
-JO+rxuebtmehXaRbMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
-MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxv
-Y2FsaG9zdIIJAOjCfnzSGkPLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-gYEATKWuep0dRQdOwO3QSOYZX3bmbgbMX5rIMn8RT3a/SX4ZD5MSZSqgVOjdmj/I
-kRnlGTyexXIXgKxps4WefCuU8uFqEfGE/yKRD1Lxy4AVve9soPddKtxTAbq1TNXr
-A/5bu1Qqf4tSx48qlQkWbj3Okz2yDbWEjYXWoG3ky4CCtfc=
+MIIFdzCCA1+gAwIBAgIUGc1fU1BurY/TzdSmEN2P2Ul5U84wDQYJKoZIhvcNAQEL
+BQAwSzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQKDAtQZ0pkYmMg
+dGVzdDEZMBcGA1UEAwwQcm9vdCBjZXJ0aWZpY2F0ZTAeFw0yMDAyMTIyMjE1Mzda
+Fw0yMjEyMDIyMjE1MzdaMEsxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEUMBIG
+A1UECgwLUGdKZGJjIHRlc3QxGTAXBgNVBAMMEHJvb3QgY2VydGlmaWNhdGUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+EwtKkC0DvQdayFPLmTI2Xcw6
+byE+OOTby4dHTQXaxRqquVVM6nWhPHDzVmq9DdasKcbchmA3c4d62Kq7Sw6578V5
+C+8tjKDst/5NNCfLR8qOgZwJn0keTEIsjMT4pJf8mz+qZxN45qilBo/ubin0sxLU
+1suMXqf2+Od1wzKY7IuMb1p+/73AGMXQ9yAOCuQ2efldr/WGbDZDzDTqF0zOWgdT
+Bwn+UiLCIaxbSpPIygpTqdwaePdRoVzKv8lLXSH2hpYgPxn9pYFO02KXIj9zlTzm
+7vSwRKMTxZSLIFBVvGIVOYk0w8pL3MxZ77EFt2+275eP+fHYjMmx79QvDENc1UGq
+ktmC/0+lPo2hk9g0SZlgaXiY4VsnuQKnTTeytSAtu+UNcWR/uX3srIsH5ZbeaNYO
+JD189o3kmW50Hirbqvzo5ykU+lknGjk190wZ35y/J1iARq6n31xYvHMRzWU+zDCD
+/f33YTPFH+Hz0MlqqsFBAarHWbds19wIxMF4MRSG96oE661FSUjCzT2qX4WAkNav
+V92cL7CCnON+SJG4jfdjMKIegggljm1RKcGpg5x4kuwg6qnLULFGPpw0Y3zcDJQa
+Cy1WfmJv1Lg0Oi1NmGtgYUSVXmUttkbx5iu2yC93CxWa2Vf2inLwfyqN6K2sRvp6
+yg3T92AXajPuSCItwQIDAQABo1MwUTAdBgNVHQ4EFgQUZh+BTFHH2OFVuiZ2k5LI
+51IrQgQwHwYDVR0jBBgwFoAUZh+BTFHH2OFVuiZ2k5LI51IrQgQwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAVe/hTGr4eBYnWAm7IYaK8GrNgepi
+fim9QZizBn9jKOwoRZAttwE9+59AE6wh+YBFZ5y+RQvEYiB1Pzqsyzh9QsZHVcdg
+NoJh6kAGz5CDlw2WbJ7hLBAmCLWHTDESfJvHqttCHVmwm1oJllMAgxcPBsqO8sa1
+5Gm39Ohze4vPP9cAjKQQvXV4msqykYl5htKIIZV736sgzT9bHi5CwahKwId4SK1f
+t6LGHfGRfBmNeH3+Ueg1I+vEDKyiQgRztYqrYQY04Gsr+f341bflCId5ZXEvePUE
+jrFJvL6pM9ocErWCPwUn2nSerfCtNLPKjo7iWX75Kf6rGQ4Ydo1VkTa9Q40IkKXy
+aawHi95KKX2cpEnXSbsKh1QQZFoON+3ih4OCWhMl1StkKMfAX/p/ptV6FXDZ8Ncy
+dH51EYQbFZDGHTlayqnTsZWQYTJwcEl2x/W+QzFZyGZWejIOADpBIEHGuL1tjp+6
+vXvBqn2+YQ8PZJVm9AvpDYfcc14bNBTes9uFqTBW0wBAuB/JFa+9pEfdZE/+MRVg
+ehZhV4XtF7Q1Pf2INj1g8+DSa5AKdMGEqEvuOYyZlUeKJ/+Sxt4AfyM/pfLLycm3
+7r9onVx6ha9IcKn8/rbz/JDPdI+0A9edMqIEQvuFmYardfZQtAMsGEasTiCLvcQj
+3iB68vF1iUJv+dY=
 -----END CERTIFICATE-----
diff --git a/certdir/server/root.crt b/certdir/server/root.crt
index a45ae6c1c7..f27dd804bc 100644
--- a/certdir/server/root.crt
+++ b/certdir/server/root.crt
@@ -1,18 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIC3jCCAkegAwIBAgIJAM9GGWA8iSiIMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxDTALBgNVBAMTBHRlc3QwHhcNMTExMTEwMjE0MTQ3WhcN
-MjExMTA3MjE0MTQ3WjBUMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0
-ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQ0wCwYDVQQDEwR0
-ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCns68NbjKQAnHCpmN6amR1
-GdtliqiXDaCjoeBPpVXNQ/ZhqinP9gnDyRPXC5kPqw5/6GqNHcYJqg+IIS8G85Rq
-t3Cs5ZL+JlEDAwd0CkD0Ey5h0oJNfN1bDhV2e/yqc831ElBGK6VItGqKopSUV2y/
-pNijOOdeMZ8GuktT+9mbAQIDAQABo4G3MIG0MB0GA1UdDgQWBBTE93pAIzHiFRFw
-IU38WhnwXm03GzCBhAYDVR0jBH0we4AUxPd6QCMx4hURcCFN/FoZ8F5tNxuhWKRW
-MFQxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJ
-bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDTALBgNVBAMTBHRlc3SCCQDPRhlgPIko
-iDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKUsXLsp3i9Tsj1wp46R
-4IkIjwWT1bN3+JOjmA9aqwEVcxTRSStAa5kfTQwc4QSAgHK1oFPsA8gsv3sftYmZ
-MtvYrvba8cOPonuaCrvtJQMvKgv3d10S6esUGlW+5o3PVPUq5yQ7OaN5JHCDTZGS
-phuxlq7//rNjvypX2hbKUj6z
+MIIFdzCCA1+gAwIBAgIUGc1fU1BurY/TzdSmEN2P2Ul5U84wDQYJKoZIhvcNAQEL
+BQAwSzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQKDAtQZ0pkYmMg
+dGVzdDEZMBcGA1UEAwwQcm9vdCBjZXJ0aWZpY2F0ZTAeFw0yMDAyMTIyMjE1Mzda
+Fw0yMjEyMDIyMjE1MzdaMEsxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEUMBIG
+A1UECgwLUGdKZGJjIHRlc3QxGTAXBgNVBAMMEHJvb3QgY2VydGlmaWNhdGUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+EwtKkC0DvQdayFPLmTI2Xcw6
+byE+OOTby4dHTQXaxRqquVVM6nWhPHDzVmq9DdasKcbchmA3c4d62Kq7Sw6578V5
+C+8tjKDst/5NNCfLR8qOgZwJn0keTEIsjMT4pJf8mz+qZxN45qilBo/ubin0sxLU
+1suMXqf2+Od1wzKY7IuMb1p+/73AGMXQ9yAOCuQ2efldr/WGbDZDzDTqF0zOWgdT
+Bwn+UiLCIaxbSpPIygpTqdwaePdRoVzKv8lLXSH2hpYgPxn9pYFO02KXIj9zlTzm
+7vSwRKMTxZSLIFBVvGIVOYk0w8pL3MxZ77EFt2+275eP+fHYjMmx79QvDENc1UGq
+ktmC/0+lPo2hk9g0SZlgaXiY4VsnuQKnTTeytSAtu+UNcWR/uX3srIsH5ZbeaNYO
+JD189o3kmW50Hirbqvzo5ykU+lknGjk190wZ35y/J1iARq6n31xYvHMRzWU+zDCD
+/f33YTPFH+Hz0MlqqsFBAarHWbds19wIxMF4MRSG96oE661FSUjCzT2qX4WAkNav
+V92cL7CCnON+SJG4jfdjMKIegggljm1RKcGpg5x4kuwg6qnLULFGPpw0Y3zcDJQa
+Cy1WfmJv1Lg0Oi1NmGtgYUSVXmUttkbx5iu2yC93CxWa2Vf2inLwfyqN6K2sRvp6
+yg3T92AXajPuSCItwQIDAQABo1MwUTAdBgNVHQ4EFgQUZh+BTFHH2OFVuiZ2k5LI
+51IrQgQwHwYDVR0jBBgwFoAUZh+BTFHH2OFVuiZ2k5LI51IrQgQwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAVe/hTGr4eBYnWAm7IYaK8GrNgepi
+fim9QZizBn9jKOwoRZAttwE9+59AE6wh+YBFZ5y+RQvEYiB1Pzqsyzh9QsZHVcdg
+NoJh6kAGz5CDlw2WbJ7hLBAmCLWHTDESfJvHqttCHVmwm1oJllMAgxcPBsqO8sa1
+5Gm39Ohze4vPP9cAjKQQvXV4msqykYl5htKIIZV736sgzT9bHi5CwahKwId4SK1f
+t6LGHfGRfBmNeH3+Ueg1I+vEDKyiQgRztYqrYQY04Gsr+f341bflCId5ZXEvePUE
+jrFJvL6pM9ocErWCPwUn2nSerfCtNLPKjo7iWX75Kf6rGQ4Ydo1VkTa9Q40IkKXy
+aawHi95KKX2cpEnXSbsKh1QQZFoON+3ih4OCWhMl1StkKMfAX/p/ptV6FXDZ8Ncy
+dH51EYQbFZDGHTlayqnTsZWQYTJwcEl2x/W+QzFZyGZWejIOADpBIEHGuL1tjp+6
+vXvBqn2+YQ8PZJVm9AvpDYfcc14bNBTes9uFqTBW0wBAuB/JFa+9pEfdZE/+MRVg
+ehZhV4XtF7Q1Pf2INj1g8+DSa5AKdMGEqEvuOYyZlUeKJ/+Sxt4AfyM/pfLLycm3
+7r9onVx6ha9IcKn8/rbz/JDPdI+0A9edMqIEQvuFmYardfZQtAMsGEasTiCLvcQj
+3iB68vF1iUJv+dY=
 -----END CERTIFICATE-----
diff --git a/certdir/server/root.key b/certdir/server/root.key
new file mode 100644
index 0000000000..12b842d8e6
--- /dev/null
+++ b/certdir/server/root.key
@@ -0,0 +1,54 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,4233EB1838B2CF8852E37799EF8D9F62
+
+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
+-----END RSA PRIVATE KEY-----
diff --git a/certdir/server/root.srl b/certdir/server/root.srl
new file mode 100644
index 0000000000..db1050b05f
--- /dev/null
+++ b/certdir/server/root.srl
@@ -0,0 +1 @@
+678A1EF60898F20623F4F3CA55F1A0FE3F83C03E
diff --git a/certdir/server/server.crt b/certdir/server/server.crt
index 09c853dbb9..e49436b5d4 100644
--- a/certdir/server/server.crt
+++ b/certdir/server/server.crt
@@ -1,18 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAligAwIBAgIJAOjCfnzSGkPLMA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMTExMTAyMTQz
-NTdaFw0yMTExMDcyMTQzNTdaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l
-LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
-BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApE4i3cM5
-zVAgfw8juoNN9kh/jiqZexQTUgQUrjQAMStSBVvPeoPcShbXYAZFCkICZlPdRrjY
-rCyJfdFkII5W+CRh5uNPuv30NDMkCdDYvre02EsOhpmuXaJcUPL24vlTe+9+su4U
-Hjy7FxOrQLe4S4kB7CNEE0lqLVDr5gXOKGkCAwEAAaOBvjCBuzAdBgNVHQ4EFgQU
-0Cs8cRK/hNU0+IkSJO+rxuebtmcwgYsGA1UdIwSBgzCBgIAU0Cs8cRK/hNU0+IkS
-JO+rxuebtmehXaRbMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
-MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxv
-Y2FsaG9zdIIJAOjCfnzSGkPLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-gYEATKWuep0dRQdOwO3QSOYZX3bmbgbMX5rIMn8RT3a/SX4ZD5MSZSqgVOjdmj/I
-kRnlGTyexXIXgKxps4WefCuU8uFqEfGE/yKRD1Lxy4AVve9soPddKtxTAbq1TNXr
-A/5bu1Qqf4tSx48qlQkWbj3Okz2yDbWEjYXWoG3ky4CCtfc=
+MIIEFzCCAf8CFGeKHvYImPIGI/TzylXxoP4/g8A9MA0GCSqGSIb3DQEBCwUAMEsx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEUMBIGA1UECgwLUGdKZGJjIHRlc3Qx
+GTAXBgNVBAMMEHJvb3QgY2VydGlmaWNhdGUwHhcNMjAwMjEyMjIxNTM3WhcNMjEw
+NjI2MjIxNTM3WjBFMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFTATBgNVBAoM
+DFBnSmRiYyB0ZXN0czESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAvlNXYWAfKYrpe800tAp9vf/r6kR2/kOPoZEHHWwH
+IEWncGC5g9y2ldXlf+qZ5nJ832a5DTEwxP8JrqBFzcIqJgdS3DxEeTd5U5GAi6F6
+LaOcXnVlYfavo0mkzy7QirtIf1lXRNpzjy6woBZqOumpr4LcoL6crcVtSEcgGaGt
+6pLXK0GseF/GWFiLN5kV0ogu2obUFvuXL+kR1MqaBGlzXU4P9bBlWh7wAwHQhOIc
+JHYZrstJf4Gu1lu+IqkMJnHonMF8sTkhkGuhABQVQokImJCR0gGkhtk+WRytd/CU
+IGyqPTMOWYPEiD8WLR8Scgfji8PIx5P9g9lIQIui6L+MPwIDAQABMA0GCSqGSIb3
+DQEBCwUAA4ICAQBy0OYRw2Ez4guh5GotRkHOuJvVhC4kr9NWjJKuTu3y+GuUpR2y
+NdWalrmn9LEkCAsvZ7ajfAnZY7Q6upatdWRPPLQHTy6jHkSIH8ESg4DIP5OiiKRR
+bX9diKGmk+9sMvDCXW5vcKTpsYF41LZCS2CPKwb3D6h4Iy4G6QZT0MBPm8JtpHtS
+iGueykg3PQAkHR7em0UH7Lgws6mXcCJYU7bWapTrWzFNYKpKJn65RBRgmEfCRi5E
+1v4pctirgjqrQJFSQoqyXgLQbPkwVg7UVR2Km1aOJUHMggd+FBRZzRno9ahgUugG
+9WC3l/zMSwXXbVFlsyxe+oAqw7pvLinCM25p8Eamud2g1CD+Rh3zGkBztdjJHLD0
+bXipml0gL2OaiK46DmsdV6hv1/SnLh08FYAqbRamJ1C1SdH6JWRjlKABi3mhmMKc
+4UsinhVoN5X0sAOH3hFoupiQ5+JWcqiXIjfkqgN4invs1WEjQitQSt++szekTCNk
+aUXRHAQslU5N5S8+MuI4M9bXLeoRkK6qYwR/qNLNozAVuPvcdZ53oJ6sxELUF1CP
+hhTxIUetXXe12GxA9/9U7ZYXGd1CCb9EwPwEA940LJNV3ZtKRCEBEnqLWJzv8ogH
+PPSBdwIlXhUjlZBJBH2QeILjVzY6tUR+W0owugA/anXMuM0YzOC4nGoRJw==
 -----END CERTIFICATE-----
diff --git a/certdir/server/server.key b/certdir/server/server.key
index f3db7c57ee..20d42eedf4 100644
--- a/certdir/server/server.key
+++ b/certdir/server/server.key
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCkTiLdwznNUCB/DyO6g032SH+OKpl7FBNSBBSuNAAxK1IFW896
-g9xKFtdgBkUKQgJmU91GuNisLIl90WQgjlb4JGHm40+6/fQ0MyQJ0Ni+t7TYSw6G
-ma5dolxQ8vbi+VN7736y7hQePLsXE6tAt7hLiQHsI0QTSWotUOvmBc4oaQIDAQAB
-AoGAXkP1/QVkxEaUXlFxTjDHKeWuSQJnzBVYgFWXB9sNwSf5htmFz+SXHmq8Znsy
-YRA+EDdNXKXwqddjiqv3pjYD7q6TgzF4D32/NwZGfF7VzBDj2fXpVxjSMZpsHixq
-7GIMUTZxzqTlUMmozEFCgHycN84Pw9dmPpJ6FerqsxhPA4ECQQDQfIZuhBhBqinP
-qHs1ttZQ1VIgJvCnjXXovyQF0fo53xhCqBIHAPQk/zbFDEjdH54e2gSYekBSvtwD
-Dy9KmjbjAkEAyb//56WAYY3gFYBVDSyCZF5Afax0KS/eDYKlPiF45BtdxhdNTY6M
-56C1+K3FiAuTMzNUbfXnDq9mZ1lZreX5QwJBAMx1gqS5WMx044Ip2YMI5s7pFRxA
-8/ttiHeTk/E9RmcgubsM9nj133i07PJ7pK1uR3Q8HQunwJMlZ8B8UMWZzT8CQBD7
-zcIlZ4pO1DdbJ03FmnByksFBnEG/WtUOU3TIgpHJT/qWCZbm0ivJlqgJkOBkAQ9F
-We0rzzioQVmf5vHBs1sCQDCEzTU8Ge/BrWtd1EP9JVx7aFY8c5bRvj+3FPp+43Ep
-5kc1lJK8EINevxykfJ4f94S6GPLuSFfIWEys//WrH14=
+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
 -----END RSA PRIVATE KEY-----