Hello!
The 1.3.x branch has test failures due to expired test certificates:
[[
There were 14 failures:
1) test_ssl_trust_rootca: test\test_util.c:456:
expected <0> but was <120199>
2) test_ssl_certificate_chain_with_anchor: test\test_util.c:456: expected <0>
but was <120199>
3) test_ssl_certificate_chain_all_from_server: test\test_util.c:456: expected
<0> but was <120199>
4) test_ssl_no_servercert_callback_allok: test\test_util.c:456: expected <0>
but was <120170>
5) test_ssl_large_response: test\test_util.c:456: expected <0> but was <120170>
6) test_ssl_large_request: test\test_util.c:456: expected <0> but was <120170>
7) test_ssl_client_certificate: test\test_util.c:456: expected <0> but was
<120170>
8) test_ssl_future_server_cert: test\test_util.c:456: expected <0> but was
<120199>
9) test_setup_ssltunnel: test\test_util.c:456: expected <0> but was <120170>
10) test_ssltunnel_basic_auth: test\test_context.c:2133: expected <0> but was
<120170>
11) test_ssltunnel_basic_auth_server_has_keepalive_off:
test\test_context.c:2133: expected <0> but was <120170>
12) test_ssltunnel_basic_auth_proxy_has_keepalive_off:
test\test_context.c:2133: expected <0> but was <120170>
13) test_ssltunnel_basic_auth_proxy_close_conn_on_200resp:
test\test_context.c:2133: expected <0> but was <120170>
14) test_ssltunnel_digest_auth: test\test_util.c:456: expected <0> but was
<120170>
]]
I would like to propose updating the certificates by copying them from the
trunk. A similar fix was already made in r1792234 [1], but now certificates are
generated with a validity of 100 years [2].
[1] https://svn.apache.org/r1792234
[2] https://svn.apache.org/r1900591
Kind Regards,
Denis Kovalchuk
On 1.3.x branch: Fix ssl test failures due to expired certificates. Copy test
certificates from trunk.
* test/server/serfcacert.pem,
test/server/serfclientcert.p12,
test/server/serfrootcacert.pem,
test/server/serfserver_expired_cert.pem,
test/server/serfserver_future_cert.pem,
test/server/serfservercert.pem: copy from trunk test/certs
* test/server/serfserverkey.pem: copy from trunk test/certs/private
Index: test/server/serfcacert.pem
===================================================================
diff --git a/test/server/serfcacert.pem b/test/server/serfcacert.pem
--- a/test/server/serfcacert.pem (revision 1902507)
+++ b/test/server/serfcacert.pem (working copy)
@@ -1,25 +1,25 @@
-----BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGuMQswCQYDVQQGEwJC
+MIIEHzCCAwegAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGuMQswCQYDVQQGEwJC
RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM
FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGzAZBgNVBAsMElRlc3QgU3VpdGUgUm9v
dCBDQTEVMBMGA1UEAwwMU2VyZiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzZXJm
-cm9vdGNhQGV4YW1wbGUuY29tMB4XDTE1MDkyMDE5MTg1MloXDTE4MDkxOTE5MTg1
-MlowgaAxCzAJBgNVBAYTAkJFMRAwDgYDVQQIDAdBbnR3ZXJwMREwDwYDVQQHDAhN
-ZWNoZWxlbjEfMB0GA1UECgwWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEWMBQGA1UE
-CwwNVGVzdCBTdWl0ZSBDQTEQMA4GA1UEAwwHU2VyZiBDQTEhMB8GCSqGSIb3DQEJ
-ARYSc2VyZmNhQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEArNOyobONvsFz/bA9pvhKTeCGhFVjMv1Jw7ooLW0jLn3yWaQ7iMFBLXp4
-HjMbI9oLdVPfJgv7S/vpiX00eG6t/xuQb4+g2/0mcmOHuqK9bsEElkWyCP77SqV3
-uqLcw9pqjz0JO2pUcNu4Uh7PtEJjXHHC3l18akZIX+GwISGzBP/RnWbiFP56vnT2
-/SIgB3LIy0QBZHTyvggHFM9s7FvWcgoyoYhSXsvTwlRRjaty1RAKYQP13sbpwCh8
-qTJHaG4gKoDC/IrO69tZIS7ulcWLLFpd7Qkv4RPQzmx5vezlZRkgqxjVjYGm2CcU
-sU+AbKp48mCQLHYrt22GB+2mLX8X9QIDAQABo1AwTjAMBgNVHRMEBTADAQH/MB0G
-A1UdDgQWBBTVcpNL7Ey5qBIxCHgYEyK4wCuVsjAfBgNVHSMEGDAWgBTdURuV/Fid
-HUONkLf8COJ7MCHscTANBgkqhkiG9w0BAQsFAAOCAQEASTtdzNrIx9EJzrryTYVY
-QrP4jl3DKeOGy9KN9HTClSuj2BSTFaizpzzxA++rbZs1Du8NxQWdb8kuIahLyUxY
-hC1ZXTdZCC9Ki13aO1kIdXBLNI9QbQwkLukObqj62aWhhW1Bk6fvkbMli6Zmtt16
-Pf/9dPQjKq1H79bz1dArM0vuG4lNjy0RspOoTmfbbRAkY4MApY9gPoC5W9UdHKzB
-wVg/YMgEzAaKXAhgKExM/AGCMdprJFK9btDAJzkU/YLYd00EgEGrUmvwyYpANydP
-l39A1MB3Nkb9rQeyfo32Do4cDbhRZZMlDhWN3984cg5zVHwBFzUOgKZwV/NrRGNZ
-iQ==
+cm9vdGNhQGV4YW1wbGUuY29tMCAXDTIxMTAwNDIyNDQ1MloYDzIxMjEwOTEwMjI0
+NDUyWjCBoDELMAkGA1UEBhMCQkUxEDAOBgNVBAgMB0FudHdlcnAxETAPBgNVBAcM
+CE1lY2hlbGVuMR8wHQYDVQQKDBZJbiBTZXJmIHdlIHRydXN0LCBJbmMuMRYwFAYD
+VQQLDA1UZXN0IFN1aXRlIENBMRAwDgYDVQQDDAdTZXJmIENBMSEwHwYJKoZIhvcN
+AQkBFhJzZXJmY2FAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDF7F+MfBDiTD4q/9XO5A1m/D9ZW1/3zgSyXldVrxb4bHBty6EKyWtM
+PbGAENS6Lt6JyuzgNtX9Qxp2slO1UB6zZS2SE6qMw81V/td4+NuyFssQIjMexINx
+cmvkg9OOOxEnkWVEpzf6cwHZKIPnT2Z/jrAXVIc2eery+fBDQ9qncUSmWMKKASHD
+h9DN38DqHdxkwyFhOpo3ag0ARxK5kNFzn6T3jXo2c0AC+eFhqTW04ZxQ1Lv3Rmdi
+jSACge/0DcWDhYpW3hSpNM9RlggHn48s8NVqN/YbQ4x3qk4zGLSgFXuVKcUTIHy3
+3Din/Nr2VNLSVK4Th4KapJOKO59qG1BxAgMBAAGjUDBOMAwGA1UdEwQFMAMBAf8w
+HQYDVR0OBBYEFBX4uVoH+c83XDA765aLBA9CNO30MB8GA1UdIwQYMBaAFDd9r2kG
+qmu3sBEddrdQuRXCMNgjMA0GCSqGSIb3DQEBCwUAA4IBAQCY+TcCh2rGLv7+rT4g
+PelB1U1xVVgMp7tOLb56CNJfEKi/KIVYJxNMwyivvNQgDWcX4TCoH7WbQsaSVTyB
+sz7w9udD8U9A4urz3hiTRTBXCghzlxiIggAmj7/E+QsoxF7QX0HZnGwqqSVS//rc
+c0G3u/rzaWWlzNHJDT7TofT4qgRxO8oz/rTH2z5V0c5oH1iVXlSsu9HduxVseV/M
+K/3NpZ33cj3b/eosjnTYSbxO7OWEydWHvi5pss9Pb2GzyFpoDiG4u62G7TPvHwG8
+WvQ/z7bDAcikrDrFr5xjtEbeUbmMq2xTRHqkbs2cENUNcJoKZypM2JNaVPbXpT24
++3bJ
-----END CERTIFICATE-----
Index: test/server/serfclientcert.p12
===================================================================
diff --git a/test/server/serfclientcert.p12 b/test/server/serfclientcert.p12
GIT binary patch
literal 3669
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
literal 3677
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
Index: test/server/serfrootcacert.pem
===================================================================
diff --git a/test/server/serfrootcacert.pem b/test/server/serfrootcacert.pem
--- a/test/server/serfrootcacert.pem (revision 1902507)
+++ b/test/server/serfrootcacert.pem (working copy)
@@ -1,25 +1,25 @@
-----BEGIN CERTIFICATE-----
-MIIEKzCCAxOgAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGuMQswCQYDVQQGEwJC
+MIIELTCCAxWgAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGuMQswCQYDVQQGEwJC
RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM
FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGzAZBgNVBAsMElRlc3QgU3VpdGUgUm9v
dCBDQTEVMBMGA1UEAwwMU2VyZiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzZXJm
-cm9vdGNhQGV4YW1wbGUuY29tMB4XDTE1MDkyMDE5MTg0OVoXDTE4MDkxOTE5MTg0
-OVowga4xCzAJBgNVBAYTAkJFMRAwDgYDVQQIDAdBbnR3ZXJwMREwDwYDVQQHDAhN
-ZWNoZWxlbjEfMB0GA1UECgwWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEbMBkGA1UE
-CwwSVGVzdCBTdWl0ZSBSb290IENBMRUwEwYDVQQDDAxTZXJmIFJvb3QgQ0ExJTAj
-BgkqhkiG9w0BCQEWFnNlcmZyb290Y2FAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDFuK4gqHm89lXVVX7PiHgXAJQRhMd2B1da7HhH
-2684/ELutwspKqsdsfDAQUNI2HkvQdklpcR7D+Q9wr6qLV26/vBS/GGFbLV2EYXu
-ezdlSW+bawKMRzQ++w1nclu9ZczPnYw21R/h7rFrYXChA+iklgNm0ZOmeI/vJ14i
-iT4eh00lQbrf8/jtqVt44h+2PvuBDOE99H1EG2H8Sdwd55S07zv3qx5jDyUgBtp5
-BoAAVRMM0tzyHe4fJvSu8FIyCPxkjvkwPTh0thg5rSD1BUTRhbj5zlvoq5D2WWnW
-zYM32neNBa1qOIQrz5KeBXgTb+jaLJuUxmKnbbssBvO1LD2tAgMBAAGjUDBOMAwG
-A1UdEwQFMAMBAf8wHQYDVR0OBBYEFN1RG5X8WJ0dQ42Qt/wI4nswIexxMB8GA1Ud
-IwQYMBaAFN1RG5X8WJ0dQ42Qt/wI4nswIexxMA0GCSqGSIb3DQEBCwUAA4IBAQBa
-peHLvPD9qy27XfvEmAfshZDC95+QEe7YEncKztP2N4OIAtTf/otOIdTA3bQF2HeC
-Pb5TZU26/l4uPcrsDAYYfHxfZ5ijzp//aL3JfRZA5H5TdIXtTnS0F1QoWdCbcdtg
-SVcuwphz2rTIlQIibMKxKmUY0GMYqLohXAnzWm6ne7m2EluAc8hHAE562/Z3UQsS
-IMWkMHhsJnZCt1qcZ93ZIGuTEcRvVB8TFOV/o5WMK+bW2T9JZ0CP8h96X4YLgfEI
-WrHTiIojvcNeviCC4Wu6AIWTg2Q3uIKBt8xE564QuOLNkvh2RDr3rPsgpI4xE5kf
-3q2PBC1IAhlLRm0qlzzB
+cm9vdGNhQGV4YW1wbGUuY29tMCAXDTIxMTAwNDIyNDQ1MloYDzIxMjEwOTEwMjI0
+NDUyWjCBrjELMAkGA1UEBhMCQkUxEDAOBgNVBAgMB0FudHdlcnAxETAPBgNVBAcM
+CE1lY2hlbGVuMR8wHQYDVQQKDBZJbiBTZXJmIHdlIHRydXN0LCBJbmMuMRswGQYD
+VQQLDBJUZXN0IFN1aXRlIFJvb3QgQ0ExFTATBgNVBAMMDFNlcmYgUm9vdCBDQTEl
+MCMGCSqGSIb3DQEJARYWc2VyZnJvb3RjYUBleGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMHRLqkhe4RGOq5PNkXFc7pvxA8AaEpSJNDu
+3YE2JSBuXUWjcchFy90L4IYg6Ars2QLUpT4QvvavtCUub0ACMUkA8vKqSRsL1T+m
+xySXduaKCF04VQDIdaxW7DBAWNLdW6SOx+IG5DFe4FFOtPUWedxSdfcky1v8fG0U
+Dl3Ic5TXEfB9sQNks+5OtxnPnIJq+uXJCg2sBLJxdGgZbFnHZ7+x1KXeyfZYA4k1
+6XGxiGhZHQb/FkuZiI62gGfAjyNoF6tX/OvxH7oViRPzR4GGeD5vzpbI/SP6QkEJ
+XeOUb2R5UbDmvrSWbSSV+l4B/bCEwdbF1OgPH7K5+LzQ7Klw7FMCAwEAAaNQME4w
+DAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUN32vaQaqa7ewER12t1C5FcIw2CMwHwYD
+VR0jBBgwFoAUN32vaQaqa7ewER12t1C5FcIw2CMwDQYJKoZIhvcNAQELBQADggEB
+AFAH3BvIMrBy9rSkWTtztHzEmqC+w/zohBw7Z3owA5K6P4UVAwEYOU6ayMf+HNN0
+UtoGwSqdvi7j2S2n1Q9t+l2fe4lzzpsjM3TFAdtfWKc87X315lW5xBe6WM68Cdxv
+Xxw1KRFfejdSUiRea+2KeHBYBOyaRjaYU0pfsm52qVVhRBw6EGs/5p6oRVx0PS58
+Fs73YwDmj/lu+VH99IzTMU/fiGQXyHPVtnBEBGFblbeJU/B+Mk5DQrEm24gZ/n9P
+Gh9ZJDTmPZyUSlSzyWC6AWBrc9wBz3orMNIimx59QVBQl78rYhHS19VgZJN68WtQ
+MwWOqBs37qKlzj0NS1AYtDo=
-----END CERTIFICATE-----
Index: test/server/serfserver_expired_cert.pem
===================================================================
diff --git a/test/server/serfserver_expired_cert.pem
b/test/server/serfserver_expired_cert.pem
--- a/test/server/serfserver_expired_cert.pem (revision 1902507)
+++ b/test/server/serfserver_expired_cert.pem (working copy)
@@ -3,21 +3,21 @@
RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM
FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsMDVRlc3QgU3VpdGUgQ0Ex
EDAOBgNVBAMMB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl
-LmNvbTAeFw0xNTA5MjAxOTE4NTNaFw0xNDA5MjAxOTE4NTNaMIGqMQswCQYDVQQG
+LmNvbTAeFw0yMTEwMDQyMjQ0NTJaFw0yMDEwMDQyMjQ0NTJaMIGqMQswCQYDVQQG
EwJCRTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNV
BAoMFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsMEVRlc3QgU3VpdGUg
U2VydmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QxJTAjBgkqhkiG9w0BCQEWFnNlcmZz
ZXJ2ZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDBx5VPS8uSwXFD/sDrfJXSSr+eedVpzXsme9MpOMdY/+Z5GOd94S0Q8RoWIeSo
-ffkIAbcdK0v2EI8Wu82Kio8Y/DBkBiOCe5MsTHzSg+uvC4/FARXUAZfsxqgPQmLc
-99GtPSVkZwbk7gYFnmhJSNM6fRG5vb0t3WJA7+xkzUoL78WK76hlhfAZ0Q6AzlPl
-pMOXAF0YKKhghGo1/vKd8i66o54SLZ4FYkR/LCW4b/hvLZGND75hYR1ujcwI1IyE
-m/geBtF8BfKSqNVsjxDULiWQ2egK6BwtOBd+IyYJOjElQmak0guimykBOIkiv6r5
-Z/np1OXr5v4AWW2flkPYFL1ZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACPTIazy
-1oWLHfuOGE8a3KGOyfsmRG70J+/08noxOb+0kC4/cAVFMvrLQJY0qYINmkeJjch0
-KW4/D4RZis5lVaP4qU+ctCJ/OHnNHtVNza9+RdSzC6K4JWcQjZ+sD1wQ5/rMtoJ9
-yzblrps8BKZvN6a+loVIUXtwHXMNjM7DP5gHNeOA8MGn6vz8cC9Wrmyi+kA52Aap
-EMGwWz5kmIyYX6zq8zngOVh1hGaw0qLEmJpZ485e+ow5YyIUI7EfxyDWIXifId8h
-aFR3A2jDL17gnwR1DvNtyFMNk++1oOdm1II9ueQQdMY55CJgalZUO72qW1HLiagf
-sa1VMFzmN3HpGCY=
+AQDKOObefa3mgWxJHgHITVXNj5KmPbb8B4roOq75dbaIB2qZ18+rhcfgSEcMrKYG
+wHDJJyOI8ZT80Jhvq9+U1oyxyr7X5cOfuTJGo0Be2SqgrTYcJI/yTxS+4hNKDAUu
+VwuwzsiB9Qc+tea7y721ClQf9/sJCY39C5uELhGHwt2YtaGVpjhzC1ungajRJoov
+4QZYony5U/RjlvShES42fGDKJSrMzykhug7EkO45aVUnTTwPZFJy6RBB9JZ+WzRr
+mDDimQxQ8NRgn4C99Up9+E1VEUtPA3R+ud0TByktVamyqXBK76I32DFoqr+G9ArL
++A0VHysAyULPUkTT0vW0XYFHAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJBm4EPk
+d42ahVlmd+EdT5YoGAuJP9NeTBTPnPsPnHvH8IiIn5G/UzARI/jqjEAFxNwMm+bX
+YjuzH+mIpVMBBsDDmaiNJCdRIMArQPJs6cR3udt86bBZjgdfTywagjLykYgtC19n
+G5/oNgdsIcsWIujj/2LpQLnXjT8CZrDrtaJ1j41wHNvFnePhN1YDUur6Ig8r/LpD
+i28mcLbcV7kneLgw/RDRxiLwdyFPuT3pL/R2ejF4XXPHTzmo4aDPSv0j+GOwsKPE
+K6yx7bkmk/SbSkbbiD6GKLmGlCURa4F1o3RDF0+QrAyqqR2Gw/OMWY+ouYKYYl15
+mIaumWPYV5ZcR7I=
-----END CERTIFICATE-----
Index: test/server/serfserver_future_cert.pem
===================================================================
diff --git a/test/server/serfserver_future_cert.pem
b/test/server/serfserver_future_cert.pem
--- a/test/server/serfserver_future_cert.pem (revision 1902507)
+++ b/test/server/serfserver_future_cert.pem (working copy)
@@ -1,23 +1,23 @@
-----BEGIN CERTIFICATE-----
-MIIDxzCCAq+gAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYDVQQGEwJC
+MIIDyTCCArGgAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYDVQQGEwJC
RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM
FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsMDVRlc3QgU3VpdGUgQ0Ex
EDAOBgNVBAMMB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl
-LmNvbTAeFw0yNTA5MTcxOTE4NTNaFw0yODA5MTYxOTE4NTNaMIGqMQswCQYDVQQG
-EwJCRTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNV
-BAoMFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsMEVRlc3QgU3VpdGUg
-U2VydmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QxJTAjBgkqhkiG9w0BCQEWFnNlcmZz
-ZXJ2ZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDBx5VPS8uSwXFD/sDrfJXSSr+eedVpzXsme9MpOMdY/+Z5GOd94S0Q8RoWIeSo
-ffkIAbcdK0v2EI8Wu82Kio8Y/DBkBiOCe5MsTHzSg+uvC4/FARXUAZfsxqgPQmLc
-99GtPSVkZwbk7gYFnmhJSNM6fRG5vb0t3WJA7+xkzUoL78WK76hlhfAZ0Q6AzlPl
-pMOXAF0YKKhghGo1/vKd8i66o54SLZ4FYkR/LCW4b/hvLZGND75hYR1ujcwI1IyE
-m/geBtF8BfKSqNVsjxDULiWQ2egK6BwtOBd+IyYJOjElQmak0guimykBOIkiv6r5
-Z/np1OXr5v4AWW2flkPYFL1ZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEGt3pLx
-BwWeRd19WVsXpOoUMLtRbRUGIJtouFSIwH4XTexqtGvW7iPsMRaeGC9NFRCmJJP/
-Pu10+tpBT7BpW46ObfvLAbDi8r/LlHpt8qajAO7N51/ELZdyDbW29mry+562eF1C
-fVsk6U97hDeqbXpOCgdaFoyIGiQRCCstkCG8kGOOajRlrGfxo8+VaqU877NzWyf9
-fAu+q7SrzWCpOCbcjylICJc1rtNNnLjnSsw1gu9as7PBdI6MJSGID3BxYENDJCPL
-bzZfmCG46De6+MiVI4jJyL7RWjRNjR7zyMdoUEEMXyfn3Oy4H9KCly1icTmMwmz9
-Wy1l/P9tXx5hj4I=
+LmNvbTAgFw0zMTEwMDIyMjQ0NTJaGA8yMTIxMDkxMDIyNDQ1MlowgaoxCzAJBgNV
+BAYTAkJFMRAwDgYDVQQIDAdBbnR3ZXJwMREwDwYDVQQHDAhNZWNoZWxlbjEfMB0G
+A1UECgwWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEaMBgGA1UECwwRVGVzdCBTdWl0
+ZSBTZXJ2ZXIxEjAQBgNVBAMMCWxvY2FsaG9zdDElMCMGCSqGSIb3DQEJARYWc2Vy
+ZnNlcnZlckBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMo45t59reaBbEkeAchNVc2PkqY9tvwHiug6rvl1togHapnXz6uFx+BIRwys
+pgbAcMknI4jxlPzQmG+r35TWjLHKvtflw5+5MkajQF7ZKqCtNhwkj/JPFL7iE0oM
+BS5XC7DOyIH1Bz615rvLvbUKVB/3+wkJjf0Lm4QuEYfC3Zi1oZWmOHMLW6eBqNEm
+ii/hBliifLlT9GOW9KERLjZ8YMolKszPKSG6DsSQ7jlpVSdNPA9kUnLpEEH0ln5b
+NGuYMOKZDFDw1GCfgL31Sn34TVURS08DdH653RMHKS1VqbKpcErvojfYMWiqv4b0
+Csv4DRUfKwDJQs9SRNPS9bRdgUcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAM0Ex
+GfLuzQ6S75JvVj1YxRvRoY2ZNL0aXenJ40CAhrOvTGFTr5r2uOTfYh61Fnw0VUbE
+c/aH7812yhhxBNv71Zgt6zAt+jwuvHec6NBchA2hZgp9aAGLwcWBbdtlAPK+PkTa
+YZRJmhe++PlspFjnEeKjTjWkUf+3QAzY0QW5GGas1z7WD5Z6goFRRO83M/J9BGVr
+1V2EtCk9YvC/SOnZ2R7I2bwaRD4YdIha3ifw8eJaVrYIvMEKCAKEoXBuseuZnitE
+MTmgPQdzPlGgyevstMu0HXD3ejHB0TWTwVFzqVQxh3YahgdW3GcJOPlGZCI9G1w7
+A5R/DdQ0s/t0FiYHeQ==
-----END CERTIFICATE-----
Index: test/server/serfservercert.pem
===================================================================
diff --git a/test/server/serfservercert.pem b/test/server/serfservercert.pem
--- a/test/server/serfservercert.pem (revision 1902507)
+++ b/test/server/serfservercert.pem (working copy)
@@ -1,23 +1,23 @@
-----BEGIN CERTIFICATE-----
-MIIDxzCCAq+gAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYDVQQGEwJC
+MIIDyTCCArGgAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYDVQQGEwJC
RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM
FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsMDVRlc3QgU3VpdGUgQ0Ex
EDAOBgNVBAMMB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl
-LmNvbTAeFw0xNTA5MjAxOTE4NTNaFw0xODA5MTkxOTE4NTNaMIGqMQswCQYDVQQG
-EwJCRTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNV
-BAoMFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsMEVRlc3QgU3VpdGUg
-U2VydmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QxJTAjBgkqhkiG9w0BCQEWFnNlcmZz
-ZXJ2ZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDBx5VPS8uSwXFD/sDrfJXSSr+eedVpzXsme9MpOMdY/+Z5GOd94S0Q8RoWIeSo
-ffkIAbcdK0v2EI8Wu82Kio8Y/DBkBiOCe5MsTHzSg+uvC4/FARXUAZfsxqgPQmLc
-99GtPSVkZwbk7gYFnmhJSNM6fRG5vb0t3WJA7+xkzUoL78WK76hlhfAZ0Q6AzlPl
-pMOXAF0YKKhghGo1/vKd8i66o54SLZ4FYkR/LCW4b/hvLZGND75hYR1ujcwI1IyE
-m/geBtF8BfKSqNVsjxDULiWQ2egK6BwtOBd+IyYJOjElQmak0guimykBOIkiv6r5
-Z/np1OXr5v4AWW2flkPYFL1ZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAI6WJcKh
-NItjHNK5d8crJU+SGXgqQ3nItMEdri23lCALBdxhtPKEdrN4K3r8zZVFdb26qMDa
-c45Ap4xCGYtjV366wQ6W414jFFevaHQBAoBe4m5P41ZXqF9IxxhGOlyhY3vn3KNQ
-N5V7ZEykcFDmRMt+4eAOfnoIhbjkmt2UA+t9Bc+Efb44wcr1QDKcdD/Q8Kg4ktgc
-r5u9zJeZg4nTvCn0mhj939CMalx1TC/13k/sbCLPYA0VMHdo/7JL4LuedSockPu9
-ykn66wmX/epHouRlrtapNY2bC5DO/Q4BPkzwUzK7Br8cw8oe+dM/FmwmgKPyWwHg
-yjlCT0D4mUvHaAU=
+LmNvbTAgFw0yMTEwMDQyMjQ0NTJaGA8yMTIxMDkxMDIyNDQ1MlowgaoxCzAJBgNV
+BAYTAkJFMRAwDgYDVQQIDAdBbnR3ZXJwMREwDwYDVQQHDAhNZWNoZWxlbjEfMB0G
+A1UECgwWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEaMBgGA1UECwwRVGVzdCBTdWl0
+ZSBTZXJ2ZXIxEjAQBgNVBAMMCWxvY2FsaG9zdDElMCMGCSqGSIb3DQEJARYWc2Vy
+ZnNlcnZlckBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMo45t59reaBbEkeAchNVc2PkqY9tvwHiug6rvl1togHapnXz6uFx+BIRwys
+pgbAcMknI4jxlPzQmG+r35TWjLHKvtflw5+5MkajQF7ZKqCtNhwkj/JPFL7iE0oM
+BS5XC7DOyIH1Bz615rvLvbUKVB/3+wkJjf0Lm4QuEYfC3Zi1oZWmOHMLW6eBqNEm
+ii/hBliifLlT9GOW9KERLjZ8YMolKszPKSG6DsSQ7jlpVSdNPA9kUnLpEEH0ln5b
+NGuYMOKZDFDw1GCfgL31Sn34TVURS08DdH653RMHKS1VqbKpcErvojfYMWiqv4b0
+Csv4DRUfKwDJQs9SRNPS9bRdgUcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAlaKG
+fkZcJZSocY0W/UKuf9v6Ml8i4Qe6jwDHTlrMutn9FCWe9Ln3a7cIaNxP3sFExiP3
+epWMLcH0MBS593fdl/whnlQDJntTfVZWv0/qirmRB7kDfC0hBeYHuGp8LSec63Sl
+gv4EC3nFgN16g87X8dZ6h5lfaV7oxTGg0873c+hqaC2utgqZ3KbNyzvmkCmWZGyI
+L0IYXfqGnOCxyjY72Z2Mhym6DKF0O3JxTr3UpesWs4g4Rqvwr2BRB+p02D3PFb5S
+rPrHRfYdALTQv25pbF5ZZ194DN3Wg4Mw47LTlbpeDu/ktC5OxuTmxAB12PXEM66n
+eg5rIib3GXgNkIRKlA==
-----END CERTIFICATE-----
Index: test/server/serfserverkey.pem
===================================================================
diff --git a/test/server/serfserverkey.pem b/test/server/serfserverkey.pem
--- a/test/server/serfserverkey.pem (revision 1902507)
+++ b/test/server/serfserverkey.pem (working copy)
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIlu67PS+3+cACAggA
-MBQGCCqGSIb3DQMHBAhaSMe0OcI+zASCBMgDwEtC7nCmW9OIf8vqZDDOXlyiHNTm
-2nEYtKMfr8QSGYgzQwbVF7z+OUOLQDxJgFJbrKFNbw7ummGaAR8WszH3GoCm6p4H
-zAx61MyvM1uQzY1eykAj0/JD2/rwuwA68rV845OpB6nzz1ClrffvRPeiBuVyelyf
-WwcV57D+lD421FDATtF46inMtT/g7hv7EaFJKBMXWTbnPY3M7NIK8jKaoL5NgQ9E
-stZCZ4jmWVnhM00lUjevWz8RTsb6kZguTe7WxFl7TH0AlrpFjsYglwkZDzYnnvsJ
-KBwIFYFYRNA24+adRwa1TurRCzaxtj5DxRDoAaBVw5uiYVNKbrrB4q2uqePB6aSo
-Z6toK83FqZtTt1rHB8qbxWdKIJJiZsa0xSl1kGcWI8APmgzzVqyzDzBalI/Ze9pb
-5LR9IpLqcYhpvbYRmf8lwU104G5tab1n7ZY8Q37J7HrPVG0g5WIj/SrwvwjY9e/B
-oO/IFRsoyh3NJXUl2L75ra7vnk2h823R1k2YYOcnthRjQetq7CgblFQyS6Wa3bIJ
-iTSCSauTqNolDCER0XbX3p80gVoh9wV9ELKws+b3Fx+jvFgvDtdBRnSRenD548XD
-wy9n9/S2muffJw4D0xXFNfk2yVMjt4d7x9gbTgU8PUImoPZuNzj/bH9LKMgBYrdj
-a1tmRLXV5x6BuVmwoCk4ao10cpyOKmFpl2Ba79QqOIQqTOveSJyGK18fQBu6OJar
-WbvVbNhdISlU+/Qz9skxxRMBd87/MFK4D0YlWCdLBTvyVYEVQNk+HZjbuSEt34gZ
-ST3eSNDcUD5IzPLWk08qaOVt18EDrUMNcqNiG/xBTh+Ya0Q8QrU5Wii3eeFpLlcP
-3XOHadChmc/17OUyRcFgtfg1NbmOLtyk0Nbo9rLGmF1+3nrKba001P3oP9mbRNio
-iD/zaXsAUXt8PGLomcntXidyAH3Qgjw8Y1WI3GIUFS9EYND7YrK3kaotdv790+Hi
-xReOaL5zdviD9stKhNJicT33YsEu5XsTv1xxv/pAdDtMTP+YvUJURpju1G3S2RBO
-8gcs/X8A/bCjREEOm7VQYFvcBl02KCS5HQ0R5NKy/cj4Yx27/y8r4GUDIhxOOul9
-JhCL1rLyEBSmuoL/tNTyCjPH/Mp5UP1/oqm0ZiFl8zfu4DfkZP1w19S1SFLlLRH1
-dTclmX090orsTJcNksFNmH8sXOsLbWYjWcMome1NiKHyFfjTsdWhA4dZrw86tP/j
-4mOtGKwt+TFPtD/0UzwkhDVcW4Zs7jjPBtNu0Tts+XbNyRN8Oy38N6HCf+iHTuIN
-yjZBZvpyAFIfoTRCENn9D77LvmohU4LjNLJb6YwfOACnDrEikb0TYAj7AMw042q5
-0Do+84bJwN1PXenVDQ1p+rc4zBB3dkDQjLXw7BaGn4X93egKNCZl3tirjf23pIsL
-yY1vyrODf44+p9PJoJmnmyOn3WzgJgdUAycX/JnGxdKxZWKrmvV+MMqyq3KUO+2C
-0JkEc3tJoR2crvOzLpvojLu3yhZOC/BQKitAYW54PL7lacxDgkgN6fSHg1lX1Y6Y
-/y0+IxImb5Rfees9++2f6kv87xQBBs3fMAYZR3/vA1oKzHn5RYx8x43D2DOgN6Vu
-35g=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIGJFDf32EGxcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD7lJn7uvJmOBIIEyEP/6D6L5ddd
+I1xC8yzBTYRuON7FnvpUpTJEsdQqvpIfkRAI0wldMzzyIoA5ypf/W3I0FIaxTWkL
+BMGfdVV0+KhX/aStq8Qv2wEfP6OCGDayjEHzkOIm7KliUfYJOSK7hWEB5mLGx166
+u7zacnnx225SQcurOYGQ44VVnUX7PkluJGVXXNwrHiZMoyx0SL1JPM8V2Y27n0HK
+zgg3Puf3bHDESHEq3aUGrxwsGKmC2IUTCDDlB/r2R3IVm+XIFMTiMY7xq/vkASMt
+IRJhwtDp4OrW+Iq4v9TXAG1Bpgia1gO5e1ZAcQm38XXfESHcmmbbiFKfuGH7GveS
+PvzQ2Rf3KbQORhgL/FKP951iMYC94r6/oC7jbc3nFSX56jzLQgD/QIxZM3tTbXjP
+qEcvUgglA368zJxx+7JmRRuR9R3Yy8RYJqe4Rx4iVGxK5lrfcnFR8b7VcLMREDtE
+P80hcZQltPJ/xpacS7H3z8OWu4Bg85j6yiV0LdrPdQQiwbNaLE66RO6wZ+Y+L3D7
+mivo6jQAwkBIXefYMTGOk61Cc/XzVZjWjs/K7WNOEEGNbzrPczbIPZFBaaVxtys0
+60/seK6+wHCLleKN6Y8zjm4pmpuKtQKBCF4SM+d54HFfvg7RG6+ql3v0fowC6nhp
+AvUJGbXUtU5FldEXFOxQaXb2cXbya2CiPMyrqruIUNDgnfH2HZc22M9YxDKP99xt
+3FrLYUOE0KFB0KgIBvRYIsmprreAW5mZLIVDL/3o47ym+8gy5OK88XC9qRmRX2oS
+YW3rY2g7or3ZZxvaULCIjbj/4B6FPNE+Z01wpoeRZXCjnkGRaoi4kxTBbiM66fpl
+V9TgFTFlRd4g/r55Xh1qwo2UlhYtvMTFoIkEPJYZH0899B7YxLUrF2MvZ70tM2q2
+g2DrI46I+mcsvsKHD8zyYWFctSotimzw0ZsQ2uPWthb1JowA0GhyGspzjn+rVlKU
+Iexx3ve3E4Si8SRtAK8vUDIMVcGvIwP4YbW/dyClzOgEOLFJWCeQMEqBFGxY4sxC
+rANcbJV94Ba0K4pLmuNOz/m0MrdftLbxTchXOYMK9yHM0zC0y6XrWgg1rVJImKUW
+tHWE/K9Fm1BmQYasDaFN2c3uzx3PtxQ06iYNxHytK9XmLW8PjFXJbyVXNkmMuRhq
+6wLoLRBOPxgTV35zOuhWEOuLr5apNB8faASvaJeDwvf3E9GxVUt/UpUj/TL9mf2m
+1itKk2az0XSEizgQ+TX4eZVs8cjWlwXC/Nxv6CvF6eYm2PW3wTN70x+UiyVKB46W
+YryyRIs/2SxcgWptJ2duKCpvLprBHQgkmyaabxeO4FCr+c0i7QRf+/hLbAJfxUrz
+bOHwXi0cQ5nLio4xDd/rhRSTJ55EcxsLJupKSOt9OzJSEl+WCt4DAnWsFTKunuuA
+IaEdjPFVoAykzTOpzC1ZJPEOAEwOpKbqNA/mcj8VywgqGEIcYiYDsHWf6OWNxd89
+OgIWhVWrvhOYq6MYNHTaYZlEdTEXrF2vY/ZRJrxaXp8ew9kvdzibNvuQMc+Nk/BQ
+uaPDeP0eLGV0xQFB9we8ZFimAtO+2xV/sDqzDCTMe/lUzj38yYUVjwl4bS2UhByn
+IZttXz5GF3D+BemUB0dDVw==
-----END ENCRYPTED PRIVATE KEY-----
