Update composer deps and certificates

Backup Mac · Backup Mac · commit caf2555a5553 · 2015-12-01T16:46:17.000+01:00
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
         "php": ">=5.4",
         "symfony/options-resolver": "^2.7",
         "php-http/httplug": "^1.0@dev",
-        "php-http/message-factory": "^0.3@dev"
+        "php-http/message-factory": "^0.4@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",
diff --git a/tests/server/ssl/ca.pem b/tests/server/ssl/ca.pem
@@ -1,22 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIJAJ1FcryL1pnoMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
-BAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJhbmNlMQ4wDAYDVQQHDAVQYXJpczER
-MA8GA1UECgwIUEhQLUhUVFAxFjAUBgNVBAMMDXNvY2tldC1zZXJ2ZXIwHhcNMTUx
-MDI2MTMxMTQ4WhcNMTUxMTI1MTMxMTQ4WjBgMQswCQYDVQQGEwJGUjEWMBQGA1UE
-CAwNSWxlLWRlLUZyYW5jZTEOMAwGA1UEBwwFUGFyaXMxETAPBgNVBAoMCFBIUC1I
-VFRQMRYwFAYDVQQDDA1zb2NrZXQtc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAwqFj6OpQoN1VNAaRzKQSDV/149EKE4JW7/253KZxQ7WnpEU3
-E8bxTpY2IEv5ZF6Bq2cPIl3u3CzM00gC5nyQI/HsnBU+fxfmn4p54mYx1qeD82hq
-4xr/glB+NDZkgry/xpWwpc9oikt0324hfs+QCTUoT4WWIxcacwxPcOrQCw5bzu/5
-2xfJRxqI28+PBIYeLtqvQ/3uHVgx4ex2X0+4UQe9g6IS2zYkt/X2I35y2HnO1siY
-3j2cmP+MOTzBUNQWJaegbxsshNYEWzwXMe9aRpfXpEzVWQLm8w4e/TqpSXxZJhrg
-5Ln5guvlcIzZMoPSBvKdb0Xwq7JiSzcMe1lplwIDAQABo1AwTjAdBgNVHQ4EFgQU
-MHoNpyg8KI7bxSCyHkaxOsKhFDswHwYDVR0jBBgwFoAUMHoNpyg8KI7bxSCyHkax
-OsKhFDswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEfFKka4Jh9WW
-C6DAeJ7h4iSKUGoCIGvlW86ra/RC++jL3IC6cfrxtTbKZRwjV3bS0Ge2/CP/8DQy
-/+4vkMhwk3qC6DYJM+KhV/EPH01ZkUJJ+OVkUNwUQU4UiQ7AL7uDwtSJfqOPDpGx
-fTFZUPIWoU5dz0UIj3w2fUXEhYyrBXdiDHUSLioFRoUO/tW9e2A9ikN2VRCjt5Pi
-S+sX7/qmJgi3WqrHsp6Sa8lvoSsU+MpPNIds0GkcCK1Bj/ZYSPBoGhFiM6pcxSI5
-+iH3xmUxOoT2/HaU8PLh3LRJhns97WEb3I0M7Rg/J2Ouj16S9URpHb01+q6wRnK2
-B+uxYNtHYw==
+MIIDBDCCAm2gAwIBAgIJAJ7LN9oqTFJOMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNV
+BAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJhbmNlMQ4wDAYDVQQHEwVQYXJpczER
+MA8GA1UEChMIUEhQLUhUVFAxFjAUBgNVBAMTDXNvY2tldC1zZXJ2ZXIwHhcNMTUx
+MjAxMTU0NTM5WhcNMTUxMjMxMTU0NTM5WjBgMQswCQYDVQQGEwJGUjEWMBQGA1UE
+CBMNSWxlLWRlLUZyYW5jZTEOMAwGA1UEBxMFUGFyaXMxETAPBgNVBAoTCFBIUC1I
+VFRQMRYwFAYDVQQDEw1zb2NrZXQtc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQCXtjry4IlYqHGa3xgGvBFxIrTmT/NlhOlaM3z6Ilr6WXLdHx9LjpU3
++bASTf9c7UERgyImYCLQTNF2CJtxcguvFZk1Mr1+X6rmYMp/yq7MkT+uRrzXxW0J
+/2Y8kYkrBW8JDzdZ5DUNEPLd6gtKokK9kmNTFtetqQraeMfKfnk/iwIDAQABo4HF
+MIHCMB0GA1UdDgQWBBTv+BDZ6/FtdAij6eVc8VXjgLDukjCBkgYDVR0jBIGKMIGH
+gBTv+BDZ6/FtdAij6eVc8VXjgLDukqFkpGIwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcoIJAJ7LN9oqTFJOMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAVRpZlwGSVSEDy9jFW3EBzoesq8QBOD75
+t7tM4hXowM1ocFOGVZukwjKhcT+sDYzL68Ppvyo3Oyfv1udVSA1zx3tAxL4j3EiQ
+3RovWSTwB3IMRECh4RZsOiT+NhiMnrx9/SZ+OwLH32H9bH5EfH2jjill519DMs5s
+CaekJpAGnSs=
 -----END CERTIFICATE-----
diff --git a/tests/server/ssl/client-and-key.pem b/tests/server/ssl/client-and-key.pem
@@ -1,32 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaACASAwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
-BAgMDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAt
-SFRUUDEWMBQGA1UEAwwNc29ja2V0LXNlcnZlcjAeFw0xNTEwMjYxMzExNTBaFw0x
-NTExMjUxMzExNTBaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJh
-bmNlMQ4wDAYDVQQHDAVQYXJpczERMA8GA1UECgwIUEhQLUhUVFAxHjAcBgNVBAMM
+MIICNzCCAaACASIwDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNTEyMDExNTQ1NDNaFw0x
+NTEyMzExNTQ1NDNaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh
+bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxHjAcBgNVBAMT
 FXNvY2tldC1hZGFwdGVyLWNsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAwE8JbahTW0eO4pMH2p2qW9CAbH9pLs/hv5A0dVoMX7H4HmLNxeXFkPTsJwRu
-urApy71P5qi5CwGva4pmvpYzuEo9IowcN71YLAyjbog+x6pY+3myh3xxweK6Kl8T
-9rhta0BWTYyn+CIt3m6lp5Uo9sZ6MdLybeljd4cLxLrHMxcCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAXFN7JhzrRcZFHrVEc/82aqxyo1IMVOfbZjlkYvLQetGws5uU
-8vWwQYew7GlGwwGMhVeVAkqAHvywxJWDcYJRv6k7kYSmPB7Wua6COkjeIFZEsnsf
-Jjs97uB4V/7hyaxrwIglTpu9+ZzXcjBeZL4jU0HyABTThtwvuY4bJiImvCl5Rwuo
-iRsfI60L5u/1uzUFs9ltT+j+2A2obfr3fR1JYidsKW39PMnLKre4zj6EtL1IUOko
-s/V35yoEXI6A6uH0Fadz5FoMHLAGuDJhkMe2Fnh/ApEala62Jqy/rpCbx5rmUZ0r
-3Ld2a5WqSXJMBFQIDrh9sM2W/nt1YV5blyaWaw==
+gYEAr/MEAzVRzwEOO/5uaHrjSmk6LKmpiB+tdh/AQvo/B4cr5JhhC6U+Kf9yLN3n
+azgv7c6ZPWCh0KR24Fqj7NqUWDVunteJg4hMFVaBkxmp4fckXdH20R6V7yXnJfYj
+qcEhgPah+x0Cbw+K7VVmmpGSGic11Y3BZUDf99pAKF6GK1UCAwEAATANBgkqhkiG
+9w0BAQUFAAOBgQBjdA7wE/bXdy07SzYw59H3ZpZR5U0Ma2cbWlfNroxE+Rf4Sflg
+U1MEbtsj334ZHZ6QwmC3BaPL8/rvF9oiw5DsszCtA/VPrNeOTOliOaiEvY8p1cye
+r47pujLg/PmyZnElus3sE96YEojzzIibF6M/5LyiwtYFO/R+0YlbUSREbQ==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDATwltqFNbR47ikwfanapb0IBsf2kuz+G/kDR1WgxfsfgeYs3F
-5cWQ9OwnBG66sCnLvU/mqLkLAa9rima+ljO4Sj0ijBw3vVgsDKNuiD7Hqlj7ebKH
-fHHB4roqXxP2uG1rQFZNjKf4Ii3ebqWnlSj2xnox0vJt6WN3hwvEusczFwIDAQAB
-AoGAL1QETQGNKjzNNIPc/fepkpkY0hr1RvkQZPXXgz4bJ34EQ24rmFW5LrioWd3k
-ZnuufZ7kyC6kA8pxYrUYHjWXGok8SKQIaqwVf9/qFlNss6vkVazngbpLS50II98T
-89QSOnJvhibP8/KdhvUCVjW5LP/NK2lkIT+U1eSWEPy3UjkCQQDyob4uXUylNhW2
-rXv5SD+WRcWR382BqGV8vumqg5t2kEDXId24Y79dAaVqTPmPotrlstGUChCUIAks
-rwehOtudAkEAyueAGwDCnNYj5lll2EJ2OpSbMnNXZs+t8ZRzfgvXpWFzaWlgaX5h
-dQLuNB3Ws102CRdR65Y3d4uwW6oXAJ/NQwJAcvFKzl4mvDGmEbeX/p1Kel8tXJDg
-o2bqRTGQMtZMJNvry77gccTXWDE6cuRqabBl8OFIxdAK0JFop0F35NqkRQJAPfeL
-kTOfO+TOW/greWt6zhM6fqLpK3X7qo7q4rDdMB3d8HCFSFKXkvPNKc9/FZI/AXHE
-zA05bWIU/zmoAsHLHwJBALAjQU1WbFz6MgVUQ9FyMs7a7rzb0Ah8gRYdlN7Ursy9
-GYCBhw+fw3cNndAQJm7CIvzluHMuhxw04sVW47JbAU0=
+MIICXgIBAAKBgQCv8wQDNVHPAQ47/m5oeuNKaTosqamIH612H8BC+j8HhyvkmGEL
+pT4p/3Is3edrOC/tzpk9YKHQpHbgWqPs2pRYNW6e14mDiEwVVoGTGanh9yRd0fbR
+HpXvJecl9iOpwSGA9qH7HQJvD4rtVWaakZIaJzXVjcFlQN/32kAoXoYrVQIDAQAB
+AoGBAKlpdg2Yw0Jro8cEPk5/NGYrV4Y1fjTBO4WnILnctd+LuSmLxrUtz+MkQE0P
+BInqOcvhxw6gAm4gTQ3MeFXQSE/ksPpRU9hxsMsaTX+xIv3DHeyMAQ6MN9cwAVjn
+EJY8r0R2JjAFRPq5NVdpNC1oX+HNbAueNB7W9ZCKn3BXcEmpAkEA5AmOIfv9vIMJ
+8H27HbpygrOy8IUrIYozGMny3U0UHrvtjeUdT56fLB5eF9z8i76YhpGlNvF35sNB
+kijslmvgywJBAMWGVghcscZkiPrtD13d3YClBPgPEBqzS8nlk1NZaCrVSFmtAuKB
+lPDFZUHSxwDpfoGpzrhsQJ66tPdmDCqBQF8CQGrgf5k1/cposDPi+dwJErpndqp7
+/6cMmr43iHhoM9HjyocCpyY19ew7n2YX0NW+UsZfZMvHiKbDROw3+grWLNkCQQC6
+NqL0zy5psm3Q4ZwTCg7AMNI2aTztbwqME/qIIUmq19eVcx29HBylv/Jt05/4pCe3
+ZbaU9rkU6z+f3HyrtZ5RAkEAhJrEsHdVPPMDePhplzzffW5ELNvqw1OKi6n1ElN7
+5WH7KJqR2WZVHJ2XF/h9stnHS0OzHtmFuGfwG5LZE3RVdw==
 -----END RSA PRIVATE KEY-----
diff --git a/tests/server/ssl/client.key b/tests/server/ssl/client.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDATwltqFNbR47ikwfanapb0IBsf2kuz+G/kDR1WgxfsfgeYs3F
-5cWQ9OwnBG66sCnLvU/mqLkLAa9rima+ljO4Sj0ijBw3vVgsDKNuiD7Hqlj7ebKH
-fHHB4roqXxP2uG1rQFZNjKf4Ii3ebqWnlSj2xnox0vJt6WN3hwvEusczFwIDAQAB
-AoGAL1QETQGNKjzNNIPc/fepkpkY0hr1RvkQZPXXgz4bJ34EQ24rmFW5LrioWd3k
-ZnuufZ7kyC6kA8pxYrUYHjWXGok8SKQIaqwVf9/qFlNss6vkVazngbpLS50II98T
-89QSOnJvhibP8/KdhvUCVjW5LP/NK2lkIT+U1eSWEPy3UjkCQQDyob4uXUylNhW2
-rXv5SD+WRcWR382BqGV8vumqg5t2kEDXId24Y79dAaVqTPmPotrlstGUChCUIAks
-rwehOtudAkEAyueAGwDCnNYj5lll2EJ2OpSbMnNXZs+t8ZRzfgvXpWFzaWlgaX5h
-dQLuNB3Ws102CRdR65Y3d4uwW6oXAJ/NQwJAcvFKzl4mvDGmEbeX/p1Kel8tXJDg
-o2bqRTGQMtZMJNvry77gccTXWDE6cuRqabBl8OFIxdAK0JFop0F35NqkRQJAPfeL
-kTOfO+TOW/greWt6zhM6fqLpK3X7qo7q4rDdMB3d8HCFSFKXkvPNKc9/FZI/AXHE
-zA05bWIU/zmoAsHLHwJBALAjQU1WbFz6MgVUQ9FyMs7a7rzb0Ah8gRYdlN7Ursy9
-GYCBhw+fw3cNndAQJm7CIvzluHMuhxw04sVW47JbAU0=
+MIICXgIBAAKBgQCv8wQDNVHPAQ47/m5oeuNKaTosqamIH612H8BC+j8HhyvkmGEL
+pT4p/3Is3edrOC/tzpk9YKHQpHbgWqPs2pRYNW6e14mDiEwVVoGTGanh9yRd0fbR
+HpXvJecl9iOpwSGA9qH7HQJvD4rtVWaakZIaJzXVjcFlQN/32kAoXoYrVQIDAQAB
+AoGBAKlpdg2Yw0Jro8cEPk5/NGYrV4Y1fjTBO4WnILnctd+LuSmLxrUtz+MkQE0P
+BInqOcvhxw6gAm4gTQ3MeFXQSE/ksPpRU9hxsMsaTX+xIv3DHeyMAQ6MN9cwAVjn
+EJY8r0R2JjAFRPq5NVdpNC1oX+HNbAueNB7W9ZCKn3BXcEmpAkEA5AmOIfv9vIMJ
+8H27HbpygrOy8IUrIYozGMny3U0UHrvtjeUdT56fLB5eF9z8i76YhpGlNvF35sNB
+kijslmvgywJBAMWGVghcscZkiPrtD13d3YClBPgPEBqzS8nlk1NZaCrVSFmtAuKB
+lPDFZUHSxwDpfoGpzrhsQJ66tPdmDCqBQF8CQGrgf5k1/cposDPi+dwJErpndqp7
+/6cMmr43iHhoM9HjyocCpyY19ew7n2YX0NW+UsZfZMvHiKbDROw3+grWLNkCQQC6
+NqL0zy5psm3Q4ZwTCg7AMNI2aTztbwqME/qIIUmq19eVcx29HBylv/Jt05/4pCe3
+ZbaU9rkU6z+f3HyrtZ5RAkEAhJrEsHdVPPMDePhplzzffW5ELNvqw1OKi6n1ElN7
+5WH7KJqR2WZVHJ2XF/h9stnHS0OzHtmFuGfwG5LZE3RVdw==
 -----END RSA PRIVATE KEY-----
diff --git a/tests/server/ssl/client.pem b/tests/server/ssl/client.pem
@@ -1,17 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaACASAwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
-BAgMDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAt
-SFRUUDEWMBQGA1UEAwwNc29ja2V0LXNlcnZlcjAeFw0xNTEwMjYxMzExNTBaFw0x
-NTExMjUxMzExNTBaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJh
-bmNlMQ4wDAYDVQQHDAVQYXJpczERMA8GA1UECgwIUEhQLUhUVFAxHjAcBgNVBAMM
+MIICNzCCAaACASIwDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNTEyMDExNTQ1NDNaFw0x
+NTEyMzExNTQ1NDNaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh
+bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxHjAcBgNVBAMT
 FXNvY2tldC1hZGFwdGVyLWNsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAwE8JbahTW0eO4pMH2p2qW9CAbH9pLs/hv5A0dVoMX7H4HmLNxeXFkPTsJwRu
-urApy71P5qi5CwGva4pmvpYzuEo9IowcN71YLAyjbog+x6pY+3myh3xxweK6Kl8T
-9rhta0BWTYyn+CIt3m6lp5Uo9sZ6MdLybeljd4cLxLrHMxcCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAXFN7JhzrRcZFHrVEc/82aqxyo1IMVOfbZjlkYvLQetGws5uU
-8vWwQYew7GlGwwGMhVeVAkqAHvywxJWDcYJRv6k7kYSmPB7Wua6COkjeIFZEsnsf
-Jjs97uB4V/7hyaxrwIglTpu9+ZzXcjBeZL4jU0HyABTThtwvuY4bJiImvCl5Rwuo
-iRsfI60L5u/1uzUFs9ltT+j+2A2obfr3fR1JYidsKW39PMnLKre4zj6EtL1IUOko
-s/V35yoEXI6A6uH0Fadz5FoMHLAGuDJhkMe2Fnh/ApEala62Jqy/rpCbx5rmUZ0r
-3Ld2a5WqSXJMBFQIDrh9sM2W/nt1YV5blyaWaw==
+gYEAr/MEAzVRzwEOO/5uaHrjSmk6LKmpiB+tdh/AQvo/B4cr5JhhC6U+Kf9yLN3n
+azgv7c6ZPWCh0KR24Fqj7NqUWDVunteJg4hMFVaBkxmp4fckXdH20R6V7yXnJfYj
+qcEhgPah+x0Cbw+K7VVmmpGSGic11Y3BZUDf99pAKF6GK1UCAwEAATANBgkqhkiG
+9w0BAQUFAAOBgQBjdA7wE/bXdy07SzYw59H3ZpZR5U0Ma2cbWlfNroxE+Rf4Sflg
+U1MEbtsj334ZHZ6QwmC3BaPL8/rvF9oiw5DsszCtA/VPrNeOTOliOaiEvY8p1cye
+r47pujLg/PmyZnElus3sE96YEojzzIibF6M/5LyiwtYFO/R+0YlbUSREbQ==
 -----END CERTIFICATE-----
diff --git a/tests/server/ssl/client.req b/tests/server/ssl/client.req
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBqDCCARECAQAwaDELMAkGA1UEBhMCRlIxFjAUBgNVBAgMDUlsZS1kZS1GcmFu
-Y2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAtSFRUUDEeMBwGA1UEAwwV
+MIIBqDCCARECAQAwaDELMAkGA1UEBhMCRlIxFjAUBgNVBAgTDUlsZS1kZS1GcmFu
+Y2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAtSFRUUDEeMBwGA1UEAxMV
 c29ja2V0LWFkYXB0ZXItY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDATwltqFNbR47ikwfanapb0IBsf2kuz+G/kDR1WgxfsfgeYs3F5cWQ9OwnBG66
-sCnLvU/mqLkLAa9rima+ljO4Sj0ijBw3vVgsDKNuiD7Hqlj7ebKHfHHB4roqXxP2
-uG1rQFZNjKf4Ii3ebqWnlSj2xnox0vJt6WN3hwvEusczFwIDAQABoAAwDQYJKoZI
-hvcNAQELBQADgYEAHDyOsz9Cxfz7xaYMk/GR7LbB1Q1EIjH/jm51zA3Xa6Fw+o5Z
-G9yb4xGEVuJalo0RfRFWMJsPG6xfTpEj69I1ZNNvCMP3kbdkaaunuS1lemSwl7rI
-TtoAfU0xD1BSpeb564w75nNE8aXd4ecNhbjonUfdBME1EZ6r533+EKf0IVY=
+gQCv8wQDNVHPAQ47/m5oeuNKaTosqamIH612H8BC+j8HhyvkmGELpT4p/3Is3edr
+OC/tzpk9YKHQpHbgWqPs2pRYNW6e14mDiEwVVoGTGanh9yRd0fbRHpXvJecl9iOp
+wSGA9qH7HQJvD4rtVWaakZIaJzXVjcFlQN/32kAoXoYrVQIDAQABoAAwDQYJKoZI
+hvcNAQEFBQADgYEAOum8pe5h9SiqRPrKosLygfqiObU1lQvYBkQh9n2bmDbQ3H94
+ffTyipUxUQTtyUMMZwY894wxAPwSICQ4OmXVzamIc2NWaf2FL9SnqUKnT6ujno8A
+XzIs3OdpBMatvg7RkfWaf3nfSbps0D5n+k6Gzy5kaEWFUda4rrBwh5dhE/A=
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/server/ssl/file.srl b/tests/server/ssl/file.srl
@@ -1 +1 @@
-20
+22
diff --git a/tests/server/ssl/privkey.pem b/tests/server/ssl/privkey.pem
@@ -1,30 +1,18 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQITuysNXb/9mICAggA
-MBQGCCqGSIb3DQMHBAj3JSc6fGfCSgSCBMg7nZ5HFtlw5e6hAmV0Hr3+cGa0XMrm
-AFXVGbvBHUU/QGdqm/4Mu+f2Sh+svpV4RgUmc3SpULiI4PKRkaezyGubWvsfCG43
-N1C9XEJZZDR6BSE2a27hBa77UnzNlVWpAIx0T0Ltzxv2X27QTk1wTJfYdHgmCGWT
-JIF46XoTuQgy8+TlnmPmTRVxhLP1mjh1uj+qox2yZT0aVIaAmju2VRxNUINddaAf
-/nQkmh97qKcxWXTATY9x77OL0U5yrCTaa76fHx8Nt1jno4m4ICFI2VXA2T27R1sa
-p0QxGyWqeiPEmjnqIXhgP3PWnHXDuq/22wLlVEdl3cO6tKG8D6+cCcHJAMNHsfkY
-YYGx3dOJc1fmXxjpZQj9+Rb5yh2+EUIRryC89VKwf79uaQ33CqooN9UwpV/gmp68
-Tzns23ihStd1zfbRPvBedBic1oCVF6qALX7iJ6EGon3rBPBxlpq5pYRKGlGrRPDA
-1EUhKjXR2ASna3R/f608xlogNEaV9/PAZWLaPgav56PLc3+dUBOsrgmpRdkqVOsI
-jxUfhab7VkjWHoneF9K2yT/1dpAoEXJUfA2odRBmicpKM/YkHOQvKK53fdawuiYD
-26CAG4hEWIaTqcpO8Cl0EGyZ5QbQio/dfJXhqLul6rKVly4tpe+nrNrq6POI1/qC
-120yMNIY1WWTDVV/eFKp92TNAd3Kjevw5Axt5VUwUPcasnDYc8VU+r1dhaIj4J04
-jLz7Zl9V7T2DV9Zid9HV/VzcZeFeAK1u4UqLSlMySwNtvlCPHkGBWY3SVe2Z0V9L
-VJ/OE0FKHB5yoC8BB03yL9PM7sWn3eNlCnYt/LoKVr5KDCfdbq0gbC4ZtgjHQjcR
-H4H8paW9JbEBe1HiTbbMKHAfGXyeSONLhpIdzrWt58rDx3EQKZhnRbgCRzzSDccc
-9zGIJS1rYqMOsMe2ecuAAaZ5GLVzqVZM5YM9F3Xrb5j0VV5usroegOl9xJuwLEf4
-gYljK2QqkkdqR5TDdWj0jdmNPGj1CVzPAn6vXgHvIMW2dbnwW2XeXSehzXFdpju6
-uVtuzUJTb83nbLITxBhWo7/tfv9QXwY/GLA9T7r/L5rcAu7NUrbjwaLsFy1zY9fj
-84YD/bIq3z8h++TRLuBzXHbS3UZJ4GXYTMCpI3/xUmTmiJ3WbOJOTk6FqeWkwzBy
-EMZVMCsmysRxTC3EjONeKe4DripCjLmHfIJmDnHOyYZ7hiSSwHLN8aBJDIWwvrd/
-p/rn1FQ3lEavknxlNcpPY8GxF3XfxIGOyCD+OVqkhWDlux29HOc62Stz2Jn0/5No
-KQlFaHXNBNprbZUMdd70lkonsmD920PA2QyCyajKZzBFNztMMDJRm7suVFAVNbQ7
-wbIp2IZdl/U/yd3bXF3UbGIRN1FYuv/C/wley08cCp7xFkbQNRnOFNbrSH34SP+6
-0yteQx512YXSEYqUnGmRc7qmozAXqG8tD1BUXaHmNIK5hG252coBZaR1ymHOupQ+
-Bb0SL+Xtw4EHNIGwIxtp1fNSfyn0OxBbUpQBP3DsHPk2IKsjB88HcExJ8Xo7456X
-w7aJPT/ZTxJANvGc7mhn5y5rlD9zE3EZdm8DslC2KtMPHOFFXl9zrb1HhqscOHy8
-dgw=
------END ENCRYPTED PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,77AE784288F744F7
+
+YUKeXKhfyReeacgoZRwO4V5Kh3OwobFIuwCi9XdVScXTAqvtpvzi1l2GYj+wc35G
+nuDkBUjCmgjTQU7dx61ASw6dcg+EiY5CkMdN7Lk3oZPDjboSir/Lqi+EdYigtyFz
+o8oOhJvUhsdC0nnAj1974IinLUl6gvdiZjpXBmcbQ0q6zkQar0kTaMzHQAaxYFhk
+Om2a1RznybR8cV+Ud5THJhFVuLCqzAoGVNbUzAxwYvSS49UfZhEqMq8ArBq5FqVr
+5KEzCqC/ZenC5ne9gBzewrFZW17sLPYVO3NOYk0TSqk6Rjs1KfLpEnXzfYBM7mO/
+SbXfs48ZfF+O3Pi2DuWoDe/zzEXgLmc6RlwEkg5k0fGRiZT4ymEHeiK7+f3v8m9X
+JCjeFSQToB8akV+E9KoQae9kwteF37WUR/RzOv+tEpKcHpIIbBjqN/zkIGfWiKO4
+78kFhbUpnu6y0MJOf/ALdpFTieLM7d8gmSMqMt8snwO+h0KUKbDPBPqdfrTAdG9i
+V2k9RdKB78F8RDHFQSkayCCkdX4eV8isHLXfssHxt7ZUXgRwauzJmprK7ZH+QCzW
+uMA47nenxAUVrmmXJWDYbjEtTWclv7GS+Dr6RrYcLDtleOeimWFojpF0cJVzbM2r
+AbaskCVsud4JQTZ2WM90Nbddv4ZifVwQKqu+IBgTlgi5Qj/a4k+18whNJW1XultM
+Wbx0HT80smAKb53nBP02GUct0w2FOI2uE1UCY5GZf4PT714ZJTFLILYB7aK7lrwi
+v+tK+/5SR4te7KRMEL0GoIrf6s4vTz18CiLy3mlOi0abbRDUNXmsDw==
+-----END RSA PRIVATE KEY-----
diff --git a/tests/server/ssl/server-and-key.pem b/tests/server/ssl/server-and-key.pem
@@ -1,32 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIICsTCCAZkCAR8wDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
-BAgMDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAt
-SFRUUDEWMBQGA1UEAwwNc29ja2V0LXNlcnZlcjAeFw0xNTEwMjYxMzExNDlaFw0x
-NTExMjUxMzExNDlaMGExCzAJBgNVBAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJh
-bmNlMQ4wDAYDVQQHDAVQYXJpczERMA8GA1UECgwIUEhQLUhUVFAxFzAVBgNVBAMM
-DnNvY2tldC1hZGFwdGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClWP8c
-hGBuLlCi5vwwClm+Ceb/G70LekrdcHp2kmKEyjgue4f0M9UA07ugb2B+9XHX28Dr
-iBNf3jzzw1e0KnopY+9l2vyfKJnz7Rxmu5LT6sPfOnuqFMwTxgyXFrGlzNk30s3u
-19tb9iyMcLjiMPFw5JDE5WP5ruVdHvFQle4eLQIDAQABMA0GCSqGSIb3DQEBCwUA
-A4IBAQAPIkP2zYsCSeUlI0OYrO3KBCjh/X9XMlGB587WAcVB6mqZr0o2CIougIKC
-FtWC1YSfIi0aQiukXnTN0/jv9hwxM5SEzTMYKZ876re4zGga8tWk23bhb37g2752
-tsGE9lsRFESF4eT7wtVmaR/owsGaAikd4dM/wWYwDjB7D21WhJL1AG1rMwuz6wDY
-jQ4m3pceOGZlIo0G/uLsIxDXWZAvwF46zp3JNXNCudtprRNz4OGZJDWr7PsHca19
-xbET6S1zphdCmWE1jSAzXTEwu7Dy+fCJEfMRnigaklW73qE1o3mjn2EYo6v/reuH
-HEhRZ+QTymYcjf4z6T5PKafl3y2R
+MIICMDCCAZkCASEwDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNTEyMDExNTQ1NDFaFw0x
+NTEyMzExNTQ1NDFaMGExCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh
+bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxFzAVBgNVBAMT
+DnNvY2tldC1hZGFwdGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXu+Id
+rN0bKfCY70iLnj8V1wKYoiOAEFsjzxduM1bfmgCcyWj5pBb0aJmupEs1ryp28mBJ
+hKOzGcX2+GSsaR7yLiELi545H5grqu6pErrZKw6T0VDmEyF9uKrx6soqcspaGIuW
+M9DX6I6y9ivCxwEqn6/ntwudw/tFve0T2SyQ/wIDAQABMA0GCSqGSIb3DQEBBQUA
+A4GBAI+F736sUJZYqPAFjqpK/DaDJQs+Bv5wqJbMZSYDEbmqtdtmCgRWZNpypjDp
+ID86V96jDDvO2eCoVDcugYTCVmzVrwQWwOEWEZcTNznV1mIK64sLiB3cWIX6sa8F
+GO4xa8EUjw15nCyvqcid9RohzH75Dy0jHlZGaDbdsNVYPQC2
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQClWP8chGBuLlCi5vwwClm+Ceb/G70LekrdcHp2kmKEyjgue4f0
-M9UA07ugb2B+9XHX28DriBNf3jzzw1e0KnopY+9l2vyfKJnz7Rxmu5LT6sPfOnuq
-FMwTxgyXFrGlzNk30s3u19tb9iyMcLjiMPFw5JDE5WP5ruVdHvFQle4eLQIDAQAB
-AoGADt4qymCo3x9xBsToZlV37lurlsLiw9ZyRuknSeQt0azxUlSvS+khPRrM40dA
-kQn2+6b5+PPaciNkrbKh/0RWiZ81fAfVObSzb+GZc/irMpBN+EWg9bvnCmuE/iFo
-aPH8MhbEC1t7xTZ1drZnyp0Bgpf47VioGcWgtxb8UFKerC0CQQDXjBq3maBBansC
-dbL65ly8Q8zZ/KTh88hRTstg+gR+UQW7aAD6pogVUkIN5DdWkLMs5i+Zplp1Qk0a
-pGJrg5C7AkEAxGERTdFbWXk14o57A04wC9q1eSkqFhi0TJVpFJz8Nl9biUCQcTSf
-pt9douKGPaLVMsGuHnSUEo/frfcIiZiyNwJBANHDFNUL+jrvBtqz9APbXvAQAzE4
-frUtawpFZgLwDKNo8e0ZH6rNma02KfYe3AOwOc4+DKC4lVt7tFFzHByJIrUCQHBS
-iOA2qAZEMxLzpd6dIRQWs4eqiNz8olvPdbwJkqTS4/tcR4HItKxwxBD/egLVGRaf
-+ySGT49SZYEOc/6nrP8CQEFMNqC5fdv7AM9SzptowV2L/axyuwxydZs35uCYJ3tP
-0f9n3YhNcfSpqPlnQI9YGxaH20z+bSbz0Y9rNEK7jVE=
+MIICXgIBAAKBgQDXu+IdrN0bKfCY70iLnj8V1wKYoiOAEFsjzxduM1bfmgCcyWj5
+pBb0aJmupEs1ryp28mBJhKOzGcX2+GSsaR7yLiELi545H5grqu6pErrZKw6T0VDm
+EyF9uKrx6soqcspaGIuWM9DX6I6y9ivCxwEqn6/ntwudw/tFve0T2SyQ/wIDAQAB
+AoGBAKOmuCHQxy3bA9PP+NVI5ww3PZXxsUJtpeWlLF4Bfg5DMeG9++8cJfmj+6j6
+or8HsQvoU1iR0OiFTaJKzXvohnrGBHpSa5olHwbDPAU+vaNPLeDer8CBM6dojIbm
+o4xY2/7vR0q+7IAOV65IGux9AKjapM8pnjRWoLhQegs4llNRAkEA8ic4JA260oDE
+YKqd/lmyUbedFelLlzdYcxqJ/xJdXFo/30RJHctU75kTXvuCGriT0SL/Px9KMt+K
+258c5VK9JwJBAOQR7Eq5KkkmuoHmh1G5bURuBwmBwYrHrYcVsyGfzNFaOVG7S5dy
+/0n4bTSNNffFtCAsrZFmdtCkBfnZxrhwpGkCQQCjNiP0yPw+nWO+88CBittRkLxj
+5FZ6mWcYTa7tKOecM4gRZ+kQF9grlbUks8hBUl7u+vOnC+Pq3hitZlUHi/jJAkBW
+J6MgcyRTL+siqSgTKj3prLrBz5+CQn392qepmwkvSKsAggVDN/DSS6NNR87MQ4YQ
+5W/HznIxzNRpFuhnwj2JAkEAgv/wFb4mDgeN9TT/4WBVxt+U4hx3UBwbG7PWKBqh
+Gi1LX9RuLHFvK1FpGHqwIFGzS9bn7gKdb2pEmskEANdPvg==
 -----END RSA PRIVATE KEY-----
diff --git a/tests/server/ssl/server.key b/tests/server/ssl/server.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQClWP8chGBuLlCi5vwwClm+Ceb/G70LekrdcHp2kmKEyjgue4f0
-M9UA07ugb2B+9XHX28DriBNf3jzzw1e0KnopY+9l2vyfKJnz7Rxmu5LT6sPfOnuq
-FMwTxgyXFrGlzNk30s3u19tb9iyMcLjiMPFw5JDE5WP5ruVdHvFQle4eLQIDAQAB
-AoGADt4qymCo3x9xBsToZlV37lurlsLiw9ZyRuknSeQt0azxUlSvS+khPRrM40dA
-kQn2+6b5+PPaciNkrbKh/0RWiZ81fAfVObSzb+GZc/irMpBN+EWg9bvnCmuE/iFo
-aPH8MhbEC1t7xTZ1drZnyp0Bgpf47VioGcWgtxb8UFKerC0CQQDXjBq3maBBansC
-dbL65ly8Q8zZ/KTh88hRTstg+gR+UQW7aAD6pogVUkIN5DdWkLMs5i+Zplp1Qk0a
-pGJrg5C7AkEAxGERTdFbWXk14o57A04wC9q1eSkqFhi0TJVpFJz8Nl9biUCQcTSf
-pt9douKGPaLVMsGuHnSUEo/frfcIiZiyNwJBANHDFNUL+jrvBtqz9APbXvAQAzE4
-frUtawpFZgLwDKNo8e0ZH6rNma02KfYe3AOwOc4+DKC4lVt7tFFzHByJIrUCQHBS
-iOA2qAZEMxLzpd6dIRQWs4eqiNz8olvPdbwJkqTS4/tcR4HItKxwxBD/egLVGRaf
-+ySGT49SZYEOc/6nrP8CQEFMNqC5fdv7AM9SzptowV2L/axyuwxydZs35uCYJ3tP
-0f9n3YhNcfSpqPlnQI9YGxaH20z+bSbz0Y9rNEK7jVE=
+MIICXgIBAAKBgQDXu+IdrN0bKfCY70iLnj8V1wKYoiOAEFsjzxduM1bfmgCcyWj5
+pBb0aJmupEs1ryp28mBJhKOzGcX2+GSsaR7yLiELi545H5grqu6pErrZKw6T0VDm
+EyF9uKrx6soqcspaGIuWM9DX6I6y9ivCxwEqn6/ntwudw/tFve0T2SyQ/wIDAQAB
+AoGBAKOmuCHQxy3bA9PP+NVI5ww3PZXxsUJtpeWlLF4Bfg5DMeG9++8cJfmj+6j6
+or8HsQvoU1iR0OiFTaJKzXvohnrGBHpSa5olHwbDPAU+vaNPLeDer8CBM6dojIbm
+o4xY2/7vR0q+7IAOV65IGux9AKjapM8pnjRWoLhQegs4llNRAkEA8ic4JA260oDE
+YKqd/lmyUbedFelLlzdYcxqJ/xJdXFo/30RJHctU75kTXvuCGriT0SL/Px9KMt+K
+258c5VK9JwJBAOQR7Eq5KkkmuoHmh1G5bURuBwmBwYrHrYcVsyGfzNFaOVG7S5dy
+/0n4bTSNNffFtCAsrZFmdtCkBfnZxrhwpGkCQQCjNiP0yPw+nWO+88CBittRkLxj
+5FZ6mWcYTa7tKOecM4gRZ+kQF9grlbUks8hBUl7u+vOnC+Pq3hitZlUHi/jJAkBW
+J6MgcyRTL+siqSgTKj3prLrBz5+CQn392qepmwkvSKsAggVDN/DSS6NNR87MQ4YQ
+5W/HznIxzNRpFuhnwj2JAkEAgv/wFb4mDgeN9TT/4WBVxt+U4hx3UBwbG7PWKBqh
+Gi1LX9RuLHFvK1FpGHqwIFGzS9bn7gKdb2pEmskEANdPvg==
 -----END RSA PRIVATE KEY-----
diff --git a/tests/server/ssl/server.pem b/tests/server/ssl/server.pem
diff --git a/tests/server/ssl/server.req b/tests/server/ssl/server.req
