diff --git a/justfile b/justfile
index 0dab70b1..c576193e 100644
--- a/justfile
+++ b/justfile
@@ -131,7 +131,7 @@ coverage-html: coverage
 
 # (Re)generates Test Certificates, if tests are failing, this needs to be run yearly
 generate-test-certs: init-openssl
-    cd {{TEST_DATA}} && rm ca.key ca.pem cert.key cert.csr cert.pem cert.p12
+    cd {{TEST_DATA}} && rm -f ca.key ca.pem cert.key cert-key.pkcs8 cert.csr cert.pem cert.p12
     scripts/gen_certs.sh
 
 # Publish all crates
diff --git a/scripts/gen_certs.sh b/scripts/gen_certs.sh
index 8f01939b..3a6a2717 100755
--- a/scripts/gen_certs.sh
+++ b/scripts/gen_certs.sh
@@ -69,6 +69,9 @@ echo "----> Generating CERT  <----"
 ${OPENSSL:?} req -new -nodes -newkey rsa:4096 -keyout cert.key -out cert.csr \
              -verify \
              -config /tmp/cert.conf
+
+${OPENSSL:?} pkcs8 -in cert.key -inform pem -out cert-key.pk8 -topk8 -nocrypt
+
 ${OPENSSL:?} x509 -in ca.pem -inform pem -pubkey -noout > ca.pubkey
 
 echo "----> Signing Cert <----"
diff --git a/tests/test-data/ca.der b/tests/test-data/ca.der
index 5f83c6f1..985e21a1 100644
Binary files a/tests/test-data/ca.der and b/tests/test-data/ca.der differ
diff --git a/tests/test-data/ca.key b/tests/test-data/ca.key
index 35c37cff..972c8457 100644
--- a/tests/test-data/ca.key
+++ b/tests/test-data/ca.key
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCtfmMScxpD/XUB
-T0N+c96uWAVYIkFj+niGYuNsONdA6BnN6NHjtn6PCVTcj1G9nkcABJw4URBL2e/1
-5MT+ou3qqg5Qu/jwt9KAV6OF9Wh2a4ACn/rLinpu9KqL+FiIFwrGpPAapNr5kAYT
-sv7plxiRbhqW6FjQ4Z/mCC+vtaEGWL70YLhSRXt4EbWpk2xVkjX+KMS0OYU2Z0y9
-oKYSTWMyWYafwiFi7fcdd7JGTx9LL8Tke+1YEk3eeQMPRKoBE2rfVRp4Ppa/DrxG
-HXB9dyo40j9VDSktIYcyqkppt2IA8o48i37A4pczYD/xZv5DqmZsY37G01Jxfi8/
-82pHBmopIS1HTHy2Gloh0zURz72TzvMmuAPENj5mGAre0iRmG2LVUkDX9ZalkbJv
-LheNdlBEvbK4qIM8PQcE69YiITO+Ji23leRLoCA1aDWW5K/K1kpDfAvFlNxM1rkp
-QLobuqm6ZLvB4i/3qgjGI04D/0MBs8E8Jk/q02yvz2lehxG604Ivncf+fRCsuOH4
-c1Jkcs4IXI83LGh4Ho0VKPyjBibUg5EcbfJgM4/7xO8K5Ik1syYjG9r3q/39JVxA
-kBz/Si8UQn2phgLo5QVFOkEp0Us9qUlH8mEbo5coZDH9cvyfWk0kjXzVn7CdbVRV
-0xC+kZDiN9VOKQt6jMXgPshrp0wyqQIDAQABAoICAAZQpueJhAe8hpFFItZL/muH
-La6fFJVAjTmLCO8sBH3K1QGfO2CYCHRJaSrcFqQZykjQYiVUogy4wpjHOnpwUMut
-Y/cBWJbegg2E4yFhpOtGj3LJAvZ8tGcshbaxk/tkJ1LCtzCpFoVl/iqiZc/33X+R
-q+sZSv5TcCAN5Tp2mIVkHpNDoAHyoINm1Z92C8fzmf6F2l8bBuPLj8oJOnJJGda/
-1nwjM1boBYovjLAtehyhAQA2GJYPmIEEE53vKGcAn2/Ap8V/tbn/nc/Ji4otl75Y
-vNBqObj4UvT/qNS/RZR2P8Ipa7Q2qz1GAB3X22J4JeFFH9y53XLfHnYr9I7gR2Xn
-dTrBy40L6xu4D6NhMX8YwwK1yF5ekdD9Umc0rch4ytUJuiotyoorkvl0zOnErxO/
-wdPtslWz+WlGt8V3l9jvdcAFhqXXpt0lvi1SUS2wzL6iBodBK3G5X5lrDwmbPtT6
-UVa37jFksSRF6B/QLON0ev63HygVne4Rhv+g1iyZS6mz2ZqdkXPmMmYYD029aCkW
-y9LJ+9FXK78pCTyLsnRuDLxhWoRKQOcEmy1SveV4rU3OwY67t8uudN31I3mb6IIf
-tz7N/xpoFRpKmhGcLhVrdXIGdmaYuY8IoCvJMO+FuQfaox5aKZSM7gY+fSupPosn
-u1KYzsuaOx4nKWZlRmRnAoIBAQDAoHpw2ffwNeZRgFQJGJh994tKvmyJID2s6UJ/
-jStn4GgS9OMs2LhSRHGYOoEKJZsXL5k+RToMhWvMT9Nszg4URc//45/gku0Oe1w0
-K3ZDdjOFI8F4yTlyhklOkue8YeGkMF+FBUmWDgxHHx039LIYA7TMuIp1xb69n5Yz
-vyS71nUjjZ70wX/T7fJb1aBS5Ap8kvt1GQurfTTwmAFraUOvoOYyQvKrO8GZUYWy
-AaeY5JIL7QX33s7ADRmwzSvGt5rOrm0gHp1sUzNkBV5ZS27m/0HZe6BXgJZYv8eI
-/qxqpzolCIUgjDkrsbsvh8IZRINTHvVuJ3LHPEjBa0xmmC7zAoIBAQDmkncA10pf
-/z9nzgU2UaySs6fKTfcLsjFPkBanJ/spoXWBDx5fmnaZSlvVCEoCzMTtHgMUyoxg
-ySZ/MN1lAQXxUNxXhu+lgX/f49xOfBD3qGRyMahjQbcsd6+jHtCW1ehncGP/mPcQ
-iqOkA8p4CDhjgzxTAVPxDDon1ZIKsQfLxWB+DvfLRDuUmI9n4Jcw06utIJqabllm
-+s57oxRwTB7AY6L8wYx2wyltpZOWGCOjYAu3hC+zvjufQQyUXAiX5cpzgGktFA92
-Yycrq9zTu5kmiS4wdcKl8qVXdPTlWon3DBJB7mLst9HS7oLCgTCUm4a7PMbtt0ok
-pgruQORfJlbzAoIBAQClfrrzjjGYrZZN24VXs0wAndeMxgIV5h9XGalKUQ1D1+dS
-shckBqaF98vo0ArhnuGakAiHGY8ABvlQthyd1IMAI+LKpNRNa65DzPSw1c5rs3gc
-IVYt4iR7IqiE225ByY7FM9I9RQet5i/iQvclhhQk0bpaUQqUmOqBnES9/LEguOY3
-P4ucGUsr17lr8SQnU0k3MkjcmEIQeigrtU0y7WN71y8va5l2SIbSpNnKz+UgVPCt
-UlzYUxMqqZay8fN0bXaRsAaNnAAAe5MhkgM3kLmduRzoL3DY/N8vLMXQC44yq64m
-9yT5i7/qrG54LZkzgEub9HNEypuwVTjlBLzFQGbFAoIBADSxKhL+IFgZ2+KcGWLV
-fWu1NNYtxRReL5iwJA0lPOfBpznMO7O7d/kGHkBr+YX0R9iscCXTOAtyTKLqht3r
-QvFn+kLiamfXVWLUDue8wJ/oUrQqFwI/5V17KJ9Njnu5/LeO3rttuKCGHmmAGEgg
-EMrlFeceOZGvqqapzws0c8Skoa2NPCGuwTLvPm6Ny99zsBsLhWlfaHz5OjDVDvmu
-26Q54OiETtZhOVl+amD1uUc/zs2snr4j7joxwm8xLSGReRe2M9MCb5othKkdSIT2
-rUQ6O10FvGryLcjzyHeVnkvf7Vg141OXmpLqwOU0YubDOCIX/Joctgv0CjFykP4R
-o/MCggEAG193iAEvhTvLXuGihrWdpqeCNjJzEHDGcljE1MuWA+IG0WTc0fR65mL0
-b4GmLwcK65x+yPdM75XiC7+Vzfn/VxLza9uRLa6ZPNHw5zgOZNRHSeKvmjvQBkZG
-tPPaRQRDZjcl9t6lVxlFFfmv7LbCXmH1ixss9/sLC4uMPI3d/aKDVENvuN+ur45M
-aEU5y10XhIiS/u9tJQeo68irCy5R+Pb+GGTtZ7Js/Q36Ote+jIhz3VoEmOX5h7KH
-HHO98LL+21oJapJzI1G9Np9jp/THwzyHWdUpcOatf5jauKTTpgcrrIBLjHzj3gjP
-dGcY+b1yZpoODxeTcCRKEvxWGCl7hA==
+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
+D0JcmFgg3q0h6ymehzBBBKV6fgLnpXA=
 -----END PRIVATE KEY-----
diff --git a/tests/test-data/ca.pem b/tests/test-data/ca.pem
index c4b26b73..a2f601ad 100644
--- a/tests/test-data/ca.pem
+++ b/tests/test-data/ca.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFWTCCA0ECFCjit4xzVF45CewzmKO5a3vtrQ9VMA0GCSqGSIb3DQEBCwUAMGkx
+MIIFXTCCA0UCFFj+1xJIcU9PPCiJS48/96ZcpVH+MA0GCSqGSIb3DQEBCwUAMGsx
 CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4g
-RnJhbmNpc2NvMRIwEAYDVQQKDAlUcnVzdC1ETlMxGTAXBgNVBAMMEHJvb3QuZXhh
-bXBsZS5jb20wHhcNMjIxMTI3MTE1OTMxWhcNMjMxMTI3MTE1OTMxWjBpMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
-aXNjbzESMBAGA1UECgwJVHJ1c3QtRE5TMRkwFwYDVQQDDBByb290LmV4YW1wbGUu
-Y29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArX5jEnMaQ/11AU9D
-fnPerlgFWCJBY/p4hmLjbDjXQOgZzejR47Z+jwlU3I9RvZ5HAAScOFEQS9nv9eTE
-/qLt6qoOULv48LfSgFejhfVodmuAAp/6y4p6bvSqi/hYiBcKxqTwGqTa+ZAGE7L+
-6ZcYkW4aluhY0OGf5ggvr7WhBli+9GC4UkV7eBG1qZNsVZI1/ijEtDmFNmdMvaCm
-Ek1jMlmGn8IhYu33HXeyRk8fSy/E5HvtWBJN3nkDD0SqARNq31UaeD6Wvw68Rh1w
-fXcqONI/VQ0pLSGHMqpKabdiAPKOPIt+wOKXM2A/8Wb+Q6pmbGN+xtNScX4vP/Nq
-RwZqKSEtR0x8thpaIdM1Ec+9k87zJrgDxDY+ZhgK3tIkZhti1VJA1/WWpZGyby4X
-jXZQRL2yuKiDPD0HBOvWIiEzviYtt5XkS6AgNWg1luSvytZKQ3wLxZTcTNa5KUC6
-G7qpumS7weIv96oIxiNOA/9DAbPBPCZP6tNsr89pXocRutOCL53H/n0QrLjh+HNS
-ZHLOCFyPNyxoeB6NFSj8owYm1IORHG3yYDOP+8TvCuSJNbMmIxva96v9/SVcQJAc
-/0ovFEJ9qYYC6OUFRTpBKdFLPalJR/JhG6OXKGQx/XL8n1pNJI181Z+wnW1UVdMQ
-vpGQ4jfVTikLeozF4D7Ia6dMMqkCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAC2nO
-NZHxdkMlrgvVit6EKJzT+ZeSygbXDnxnPAbAPvCg6+j4L/Ja2mnnWAQHXXd9DoKb
-TG2UR61U0Js+2fOe8ZJEL+zsjZYf8U+UC4+eJbTZTFe60kP/PEXCEA0qBhExQeR4
-TVlth36k88gUREZj3fnx+UZVN5aiWVgN1PjB4zJm+6VK1JqabzB56BgddBBB9Mkp
-sYxCdlWyNpSdcvy/7S82NTonJ6E7q0oInbzTBLz6h4Sn83Ur3sGsTXatG+TOOZrW
-Ougx4ZJMzeHoDnvWK+exjXUEhVP9KSXmIAzxKBjUsMLQuszmLDBmdtfDuT/Mx/2x
-YejiYDatPw5Q2HzxkbXCXpOHvUlAAQTKx4RP14NV7FP/knTXGTmTjwE1q1Hh4H+W
-MCy8jKH+uNNP5Bo5h/w4ffHCTF8U9vZ0gW1NA23wzHOoGeXU3iNqUoVCOrHs00W/
-ryu8N0nQhcKvy0XvaPAWK6vLnfCcLQ5u5KSjb2kc7fpEGuOC6wuP97DA+12gv+aX
-nW1BFXgC2UiK3UscvZQGz3fQudKa1BzuR9YExHgcA5k9aiTdnlkpJ2D951X9dHSZ
-smnZtg2KGg/e1Gvzat8MW7lPMqgYf06wpMoiI9G65MpTiB81XW8sZw72W6x2zLJ3
-PAf+Y591HKpqmGR6TpgWQpoASakqqqAjCsbban0=
+RnJhbmNpc2NvMRQwEgYDVQQKDAtIaWNrb3J5IEROUzEZMBcGA1UEAwwQcm9vdC5l
+eGFtcGxlLmNvbTAeFw0yMzEyMDMwMDA0NThaFw0yNDEyMDIwMDA0NThaMGsxCzAJ
+BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJh
+bmNpc2NvMRQwEgYDVQQKDAtIaWNrb3J5IEROUzEZMBcGA1UEAwwQcm9vdC5leGFt
+cGxlLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDb1VaUSkQC
+Dj9/GRULeB3MlOqpKCtZYZL0WV5jF5/KBDtVcM3M8cCr42gcsQ9aCc+cUyrF7PTt
+ULkrti30cLNSvACG9XIQNwC895MjElebBSCPonAsi3Hjl6jb5ogl8mp938aJV7kh
+n8F0yQruBj7PDw0PI6kTc9EkpGI8gkXsOzKc3IsE9ITtESR8GBQENe/Obf/dJHuh
+jUbNpNcUmGVFhcRkwVJnlL+Oav7NbJNkQKEFKzyB1+JlFekUA5Ls+ov6k75rCW+3
+65myXjowRTz2s6OukuPNR3EnJSuTYeHdKIeuXfFFe8IF7/xi5yfsGpS6YmvExjVn
+LM6vpwnujXy9bz9t7SUCfHh+cMFblFbxeuWMWLKkkTfhOO6Zu2tUqVeTMNGF0q5p
+/ICAiC1rKimspgZj6mJLksQBG4M/+6zJKp0xN4Hfk0jCYfV0TAX8PNan/Vcgf3jb
+QS2stdi71q77N4zrhlvL4780n0FK2lfxo37Po5FVl3zGZEDYXJKEfVCbkLIWwSvY
+zl59qKZ1ydoTecPMxkYcIjxc3QoIreU0TOPkvOMgMg9gjVT1017T6ffFiAznApEc
+IC6WaKXJQSoPPW0+MlHH3jP2//lvx0XieNbS5AQuOuncZy1bX+fyJJQDw+TZJwgk
+VYMPP4aqt8pixdaG70SE74U/468CZqxbAgMBAAEwDQYJKoZIhvcNAQELBQADggIB
+AKnf7ZX8uA5UyoMFJ5K6ct6Mq7ZjJlvr7845gEr4x6mnLoYoScA7IKRAvR1GDY2Q
+WPLjnT0y65x4IvyriOfu6RLxJKM84eTB6xHKLzPg2HjOrVYNUwGG4HCApYXik2rr
+X3YG9AATKVfYCj2WX1Ak1hOfzFjmKigE8YnK/+Eih5rxyVhOyU115x558WgM2U5l
+hey5DXo55Hw7rLU39n0v7NUjuNC22L3ETS0Py4QUv+Q92UEAHDZnfnQNSeUcDiKx
+VMSmKcWINjDnzUBVaXIdMY0jNFrswIodSEfBWaz9Yr4YqU/QSv4Lsy6KKHN7ioHG
+6XkMPzMIhFXR5MCe2+J0kDTtO5JXZ3ilmkaFSiz2UNNkdfqLL7JM4rirA8KiJTSi
+wi/ga4l883EEioEv2UA/gsmkKIqNJivsj8PAlkJMa19oiBXmnAuTru8sCk14mvsT
+npRZdkmQ+h6rlI8PrUoRlkMTWY6metdWsd9mqu9K+b82wzJKqQI1shFsZB22BuZy
+bXUkfKrUMdphp6uYMLj4rt485kAAuPDbg3UC2j55RPCicnyJMz9uWZigDIBxSpZ3
+9ftZ2dXEPuxnuudkHh3Rx59DMSXiSD2Rvzp56hgqriFjvUqofkuX9siRV5qcxDMz
+99ZZbqDznjKTfR7JgrQ3GGWSmYQhFFC59TTJBKOKzLvV
 -----END CERTIFICATE-----
diff --git a/tests/test-data/ca.pubkey b/tests/test-data/ca.pubkey
index 040d058e..b952cb49 100644
--- a/tests/test-data/ca.pubkey
+++ b/tests/test-data/ca.pubkey
@@ -1,14 +1,14 @@
 -----BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArX5jEnMaQ/11AU9DfnPe
-rlgFWCJBY/p4hmLjbDjXQOgZzejR47Z+jwlU3I9RvZ5HAAScOFEQS9nv9eTE/qLt
-6qoOULv48LfSgFejhfVodmuAAp/6y4p6bvSqi/hYiBcKxqTwGqTa+ZAGE7L+6ZcY
-kW4aluhY0OGf5ggvr7WhBli+9GC4UkV7eBG1qZNsVZI1/ijEtDmFNmdMvaCmEk1j
-MlmGn8IhYu33HXeyRk8fSy/E5HvtWBJN3nkDD0SqARNq31UaeD6Wvw68Rh1wfXcq
-ONI/VQ0pLSGHMqpKabdiAPKOPIt+wOKXM2A/8Wb+Q6pmbGN+xtNScX4vP/NqRwZq
-KSEtR0x8thpaIdM1Ec+9k87zJrgDxDY+ZhgK3tIkZhti1VJA1/WWpZGyby4XjXZQ
-RL2yuKiDPD0HBOvWIiEzviYtt5XkS6AgNWg1luSvytZKQ3wLxZTcTNa5KUC6G7qp
-umS7weIv96oIxiNOA/9DAbPBPCZP6tNsr89pXocRutOCL53H/n0QrLjh+HNSZHLO
-CFyPNyxoeB6NFSj8owYm1IORHG3yYDOP+8TvCuSJNbMmIxva96v9/SVcQJAc/0ov
-FEJ9qYYC6OUFRTpBKdFLPalJR/JhG6OXKGQx/XL8n1pNJI181Z+wnW1UVdMQvpGQ
-4jfVTikLeozF4D7Ia6dMMqkCAwEAAQ==
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwNvVVpRKRAIOP38ZFQt4
+HcyU6qkoK1lhkvRZXmMXn8oEO1VwzczxwKvjaByxD1oJz5xTKsXs9O1QuSu2LfRw
+s1K8AIb1chA3ALz3kyMSV5sFII+icCyLceOXqNvmiCXyan3fxolXuSGfwXTJCu4G
+Ps8PDQ8jqRNz0SSkYjyCRew7MpzciwT0hO0RJHwYFAQ1785t/90ke6GNRs2k1xSY
+ZUWFxGTBUmeUv45q/s1sk2RAoQUrPIHX4mUV6RQDkuz6i/qTvmsJb7frmbJeOjBF
+PPazo66S481HcSclK5Nh4d0oh65d8UV7wgXv/GLnJ+walLpia8TGNWcszq+nCe6N
+fL1vP23tJQJ8eH5wwVuUVvF65YxYsqSRN+E47pm7a1SpV5Mw0YXSrmn8gICILWsq
+KaymBmPqYkuSxAEbgz/7rMkqnTE3gd+TSMJh9XRMBfw81qf9VyB/eNtBLay12LvW
+rvs3jOuGW8vjvzSfQUraV/Gjfs+jkVWXfMZkQNhckoR9UJuQshbBK9jOXn2opnXJ
+2hN5w8zGRhwiPFzdCgit5TRM4+S84yAyD2CNVPXTXtPp98WIDOcCkRwgLpZopclB
+Kg89bT4yUcfeM/b/+W/HReJ41tLkBC466dxnLVtf5/IklAPD5NknCCRVgw8/hqq3
+ymLF1obvRITvhT/jrwJmrFsCAwEAAQ==
 -----END PUBLIC KEY-----
diff --git a/tests/test-data/cert-key.pk8 b/tests/test-data/cert-key.pk8
new file mode 100644
index 00000000..47f1488b
--- /dev/null
+++ b/tests/test-data/cert-key.pk8
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+fcT+M1fvYWDIzDCxJ6U/PTAYmA7y3Q==
+-----END PRIVATE KEY-----
diff --git a/tests/test-data/cert.csr b/tests/test-data/cert.csr
index 219e2e4c..0746891d 100644
--- a/tests/test-data/cert.csr
+++ b/tests/test-data/cert.csr
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIE8DCCAtgCAQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
-FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoMCVRydXN0LUROUzEXMBUG
-A1UEAwwObnMuZXhhbXBsZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQC/gFqZ6cpMTEtSWfPo44h0UFu9dukmuGxj/LC43VZxH2JhbLvcl+/29QBd
-YFQW1FyAD1mbLQMn2dsQsoU3FaQXklPI5BJfDCDFECs7guCCPx2lE6ICd6jYHsTk
-U4VDiaMCzGaR+gF/TD6yTaLf65GYPrJd3E+1FdPAzrYuttduT2nJdkvQMmyRWQGs
-dZjZE54JKCzCkAM+H3LRq0QY9i/YA3gxwHJVCpDVXl7v7z2dFXreVR581JBu4Hgp
-PdIzSIlnrfOHuLNglNaI0SUH0k2Ys9NcYKHvASq/Lm83hddX7X+gRepq48PGiBbp
-A6TvGOSMveHGNK2XkTX0pFTriCBWix9Z817IAQF9LuKb5FBXGmgNll/qEvl4UA+R
-l/K/tZ9+1xTGd0Oa+zYqnRAF16fSOkdN9VGOwRXb92cdHlx2zzSH4yyjaJFzyw4o
-tu+cFDhEoo+D/dj+bQDooxwf0K72qP6wcs2CRcIl0vLlHBZL8S6IQtQQCX/6SToB
-PDxu1y6plrcyiv2SGbg2WT0UAnXPoFSApj6eS6T2UhdCmPLbyoiewPG+3VbwiqPE
-IWeiyZtsg6yf1jNbDqEbKzDGAC7fxiLvB+YdL8yi28l/5sdBJ9Uzfn4skVA99N0V
-kkVXIFEXC8K8qTvFE5tg7gr/xjgQ4GOd3q8zgLrrUsyaFvzrDQIDAQABoEQwQgYJ
-KoZIhvcNAQkOMTUwMzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAZBgNVHREEEjAQ
-gg5ucy5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAgEAY/O8JFy4yjlD6LfM
-ivxnEbnzSmnQGeN5yOZMzUxG3X3AttB1yEnGz2eXOWqdWaJINmqTWD8ur6378Q8B
-r1sqT0cBHCm0h7XcA2eRgLGipTTcC2DNaO0Pd9mbds/kP8oChUC0SOnoZlMK/EwT
-m4wbzxx2jmslev95OKleD9ov70xPwDful8IngZN8hjryERsluZt7rGk1Js114Cbu
-2O3LDu4WzURpvBuNOg0R8vhmwmL+syrmGp+c7zs19L4RjNykCtBy4PUB+NsKszzK
-M57FHgR4Vn+3OLgu9F4n6D8ZC9nH0/inOkxKA415CC6vfKVUmozgHgBgQ241K5vS
-Inj4p2usGV/OeGZqSOREsUTX14xmsUDmRi0XxckT2kWTl83taVmMeNLIjJ6daQYG
-l5JH46FgaIU1eGY51n3qcFSb1EPSkiWcV6fPPZo5DMEDbHoQV0N2aTEY5pZo/K48
-umPZLdhgHig2YkJqMbQFfmMitdLlNrLZrQICCf0rIQuGhy5AfYIPJobZgb4oM24V
-5n6o7OF2M5HIEMUYDmOX/s2CaifuI6ES9Grd0IyZlbFxUBBkdCxF5o7l/3Z9uRCQ
-XtXOm6PkBamhCsXab8lqmQgeI7k0TcyxMEPPU+RoCho3K3DLSZ4vtzrJzsV7AMqY
-99JpK1/13gudvv1/YKH9g2sy5js=
+MIIE8jCCAtoCAQAwaTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xFDASBgNVBAoMC0hpY2tvcnkgRE5TMRcw
+FQYDVQQDDA5ucy5leGFtcGxlLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAMNXJGaG3wlLbKpLZotIG8Jfmqn4isuZqZs9v3zPDqc5FZ5PbNHRORTt
+N3tzXwtklz5jjXwOCYzarhFuYimvt3YYy7FYDLBReZrbnI0LI8OTp+MSeYGkNleE
+qGumWlHE6w9usp6Qyx0+8TvnXGNNSIPOgU9FVkBYFRIuZuYtrbCou3iMjPCeq2co
+nPC/ixtTdQPvR9HmBUMm4lfnZo3MCYrvjLBT0rqF5SD2IpHeU5kPyDyOAkFGFwPN
+TgX1wHFPq3B17xABqmGR2rH9Uts6Tn1siFAT7kA3wQNYp7WvewnsMIcBJYVya9uO
+Df56VxEt8XGqXg7VuSjaJ27AV1+znLBwvR1Vxljl0/Vi7hrMFHGVQvubCey/nd3B
+62HgfpAcMbgC3P8Ym0A1TC+GPe0yIoa1rD80vu8oIHGLzOKMRGCfMoGHBXlOYXUy
+v/hbVHwO/tx4blQZVVRkr49UFqujjPPFl2//TrguzR15vCUiYUHtfF/rQh1G6zGz
+YtxAlIzO8HmYxofM2lFGllCEfPqHg69xusv0PMbPmrWqTlAeuDfncHQhFPuWprOt
+GHBq0zq8OeQN5C5l/092VNJa+l93JPqQbpC82Od6KZFXdw85666Lijw5j4dcIHdG
+xmdbc5Vl1dIlaLdOXh5FVFBE5e4W0hUW1dBhYUkzV3StzZZXNxz1AgMBAAGgRDBC
+BgkqhkiG9w0BCQ4xNTAzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMBkGA1UdEQQS
+MBCCDm5zLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4ICAQBqtgQbAJC+jTqQ
+qBBjRtGTfdKImT3lDE3rPWwtJD+RskP8Qy9g7PvVLwQlpfTbov8AWJtKn4nFNCI6
+bis8HWnvRCnioMVkquAA9M+VhcIbYWGKUr0HWB1wfSMkuNlhKXmpPveedI34scyX
+E3i+Ciwy8uUYyMBW7N43PWBA5bXmOX6CEaUaLeNfHbaGQAwi6gVfUxF4mRSJdrK8
+Jd0GzkLx6pPiPq1FPUQ9wdRnS+u8cnHDk1wZTkhMdk5i5+EptwJe2dYrdBF3RItT
+3/cvPCqxyKON1Df3WSbehBpS6JSn52UobhNY5Gqh056Vz8TwZ5wqrqz+NlMQO4eU
+RSX2C1lSNBDXNPmDlc0QYLCEWDq42oXymBcDxsnvMzPn9ta2ebp95OMrWf9JNhgx
+uNZDyvqrdkM/rDM0RYXDtxRzUWbSW1Stv+kb7rrj5V4/KM2Rb8g4yncRY7/vlYkL
+h/guFOsWpDGUx31/sptR3VOFkj7Il4vwrbWzmJWATKYhCejDs6jgWixUc3t/N2NC
+SMPEovRnv18gSKC2nnEXznM3LRKFK8IzvpTBEC4tfZsRkxtB42JY5YV3vAPq66Wd
+CXnBWmxN2amazxoWSOF1VG/3xZYi9jun3YSVpKCa4cJEuUvRq+bAtGGL5azAdsSb
+GXXFptbd40Am7EAiZoefqjNxIQoBwQ==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/test-data/cert.key b/tests/test-data/cert.key
index 44331905..47f1488b 100644
--- a/tests/test-data/cert.key
+++ b/tests/test-data/cert.key
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC/gFqZ6cpMTEtS
-WfPo44h0UFu9dukmuGxj/LC43VZxH2JhbLvcl+/29QBdYFQW1FyAD1mbLQMn2dsQ
-soU3FaQXklPI5BJfDCDFECs7guCCPx2lE6ICd6jYHsTkU4VDiaMCzGaR+gF/TD6y
-TaLf65GYPrJd3E+1FdPAzrYuttduT2nJdkvQMmyRWQGsdZjZE54JKCzCkAM+H3LR
-q0QY9i/YA3gxwHJVCpDVXl7v7z2dFXreVR581JBu4HgpPdIzSIlnrfOHuLNglNaI
-0SUH0k2Ys9NcYKHvASq/Lm83hddX7X+gRepq48PGiBbpA6TvGOSMveHGNK2XkTX0
-pFTriCBWix9Z817IAQF9LuKb5FBXGmgNll/qEvl4UA+Rl/K/tZ9+1xTGd0Oa+zYq
-nRAF16fSOkdN9VGOwRXb92cdHlx2zzSH4yyjaJFzyw4otu+cFDhEoo+D/dj+bQDo
-oxwf0K72qP6wcs2CRcIl0vLlHBZL8S6IQtQQCX/6SToBPDxu1y6plrcyiv2SGbg2
-WT0UAnXPoFSApj6eS6T2UhdCmPLbyoiewPG+3VbwiqPEIWeiyZtsg6yf1jNbDqEb
-KzDGAC7fxiLvB+YdL8yi28l/5sdBJ9Uzfn4skVA99N0VkkVXIFEXC8K8qTvFE5tg
-7gr/xjgQ4GOd3q8zgLrrUsyaFvzrDQIDAQABAoICAAKwwjUa3oN7Z+yAhId/WN2v
-elZ7WvO3EBjIhlAWlf4RX4+4WBxViyLIVui4732BnsoSzSK7u2leK3B83ZfER1Go
-deJi5+orcLNsEntrz40s51T4JWTM+xOMPR5rGPp1rtNdfUxsO4SnFNNq+VCVje5a
-ZSWh8IG+DINPNCqMWZL8bSNONOr4JmPVYQtj/JGCL8x3osdaAB2pkfKlqheCr/Hk
-PJZQWprcwuOoh4Nt9ErmcBs7DWpaDyxrnWyQ6IjdakbJYBxGSUjgVnJGI/PL7dip
-IB1SYzwJI2lbtObOC9Q5qzsceFpnmErMAyxjZ3gPfLiIe2lOOKkiOmSVQXcsqq2e
-Vl9FzqhOzf4V0RpsbbLoP7wxpGsQnWL3us2QZxBfGRmYeV5IVXK42F9UDyqqUS0v
-1L5nAb54yH8VTLSz1C+qyPzMGyLBFwvcnoguyW8PAoDiqRj3wjqyLZl9nTfPBQX7
-XdhhYQef6lerTBS97nRyY3hoIm939w7gbFv0bHjX75yb3qvdxrX5DNeFCR7gjKNa
-vH5oLKsMCKARWRynyYyge01l3tCOUBKiR9prQvkqFWJw51eQt9+Uxen6P2LVJ5g4
-WanEVXzjlNHwnw3TBDX1TLjtOowzP+Q8waUuemWXhIjejRiuXoW0xIbMarsxWFav
-r3+AkUDP6gi3BGCPy3NhAoIBAQD1AzkGuwQfL3QH2OuWzmJmf5WOLgtGD+MHFYqG
-VuA01WguajMoEnCbn6dGd41H8gd19g2NO6zvc/ifutADJMBzD+tlqMsBF3PnDAG3
-Fb9lVglEIx8ntsz9zNvBDA91mJX5eygJ9Lz8QhVg5+2DS3w2b2HyVgH+QoZ/9fxs
-kwx2SJDdel/npJItKm9vgskjrtHnwj/YtzRj+aSjuFsEEP2S8cYJ6NzD09PbvPPp
-drPraUm+6dCfETRuzO//0MMUOGk+Pycs/E3BFvwCQ2nRbVRVHDC0wSI5jQ8RlB0n
-VL1Abm2uHVmyTgn08ZlSfrXXb9Njnlm4ZcLspuzw4JgOvENhAoIBAQDIFtC7K0Zc
-NgUI9S+z/6xKE5R+vsar+pb9jdwxwXhyRSJinJo0OmUGzJyojCzNMx1pEmukB9jq
-Cej1uYHaiT868ccSsvEEV+JffDHkpAkvLeLoiqn3yljNTiN7wfUucKs6t83bEwSO
-HUTit1ZnLYwkJQlepYHNpeXspkSuLcsVfpX7rerFqdaiBcyB+2Bwq+jVdaUyKA5O
-Wt6VFtLBzCK+dJzAJpV3PlA602843+yO8UcKm51//tOo744JAZizisJzEdUQBDsm
-x5Q82mpO5QTM+QjrHBQPlkjF/C5AqCdZJISAnk03ywZ0uDgWkeN0t2kQAgizmKS7
-mgovS0hB8PMtAoIBAQC4htrWFNd/3S9YEaktBPbbF0+9qzPWanSjizevAZMOd4Nl
-IZqxnWGt80n6KmP/QWsZDl0ad01BcmhXdEzhcTZ38g9pmvx5L/6cjlBkYT6qxWdp
-J8J5GJW+uCDxfXHPMUISiQyYovgKTILpXwNklN9R6AUujFQn+FZv3QVliEIke3aP
-N3EvdqSY25LduvRdqXZxQ7zuLNyKRyQWIex6XYl8uBZctEJAQjMXFXHl7P6IV92w
-qUvz4PNKV5KRadriSbIJrWqF2Od+ex8FXVw+3EZda0PLfoGWMoScyp5CVvHJquFz
-9qrtPRUGo0bD+KZfQNtF9abA1/M8ZGOi7qPWxTdBAoIBACDjPyPElSgK6QDz7AdV
-+ueiGEJM8TLLWY4LhynWdwmxO1miC+aRwpE/iHBbufFweWEP2gl4ELtHLbdV6nYV
-IQN7QhFcwCjKmTbAnyLJo4jRrf4y7IUCCV6VfVeWJcqgUkSweXGMyq7hOLVbFSSY
-Y/R88fFQmulGX2hqW9eVR1AdImHf0Dr1E4ZGFbs3qj5aw0Zys9hupQtT/EndGn8o
-In3ThQBAV0jmQSGqJxneFG/aUKb5tQWYyQl3do0cahD4ucVYJQEg8OgK3d6yt86H
-7iYSuNiMIO/+7687KA8QlIcebXkGjAKjqEf/D5kGGbDRhL9Q1kVOzaTYSNxFL3dH
-N3ECggEAcdG2duA7qYVX6AKSpco4HlzZechSvowkaGEV+uYRqPP9dT6mDO2Gx64P
-p9p27z6f5//NISYfsXKKJoJe9mtbTuUdt5Yjt0YS+cAw/uhuevhC2WstuzP3Yn1n
-cgcOjj/7nEBlcd5jpPq9+FjKg84ntN/CuGwoIoK40jXs32Yf6BkGjJ7Fluq1lBwR
-5wBWKg+X75KEXG7jx4/lcw3glwapbcOePMg/DLFFoPcRoUgVFD4n5XvaPTnGsTV9
-+8ytpKSp2VLZ1bkDlIeFQiMYuFhwg3nPosResVqlAS25ECEHkz0v7gQMheRIbnhO
-bPLsMSwzUl5XrzdT74t4xqc40dTzDA==
+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
+fcT+M1fvYWDIzDCxJ6U/PTAYmA7y3Q==
 -----END PRIVATE KEY-----
diff --git a/tests/test-data/cert.p12 b/tests/test-data/cert.p12
index affe1b22..5c147979 100644
Binary files a/tests/test-data/cert.p12 and b/tests/test-data/cert.p12 differ
diff --git a/tests/test-data/cert.pem b/tests/test-data/cert.pem
index a91f3ba6..810d5e55 100644
--- a/tests/test-data/cert.pem
+++ b/tests/test-data/cert.pem
@@ -1,36 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIGPDCCBCSgAwIBAgIJAIdx973umC+mMA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNV
+MIIFjDCCA3SgAwIBAgIJAIdx973umC+mMA0GCSqGSIb3DQEBCwUAMGsxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMRIwEAYDVQQKDAlUcnVzdC1ETlMxGTAXBgNVBAMMEHJvb3QuZXhhbXBsZS5j
-b20wHhcNMjIxMTI3MTE1OTM2WhcNMjMxMTI3MTE1OTM2WjBnMQswCQYDVQQGEwJV
-UzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzES
-MBAGA1UECgwJVHJ1c3QtRE5TMRcwFQYDVQQDDA5ucy5leGFtcGxlLmNvbTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL+AWpnpykxMS1JZ8+jjiHRQW712
-6Sa4bGP8sLjdVnEfYmFsu9yX7/b1AF1gVBbUXIAPWZstAyfZ2xCyhTcVpBeSU8jk
-El8MIMUQKzuC4II/HaUTogJ3qNgexORThUOJowLMZpH6AX9MPrJNot/rkZg+sl3c
-T7UV08DOti62125Pacl2S9AybJFZAax1mNkTngkoLMKQAz4fctGrRBj2L9gDeDHA
-clUKkNVeXu/vPZ0Vet5VHnzUkG7geCk90jNIiWet84e4s2CU1ojRJQfSTZiz01xg
-oe8BKr8ubzeF11ftf6BF6mrjw8aIFukDpO8Y5Iy94cY0rZeRNfSkVOuIIFaLH1nz
-XsgBAX0u4pvkUFcaaA2WX+oS+XhQD5GX8r+1n37XFMZ3Q5r7NiqdEAXXp9I6R031
-UY7BFdv3Zx0eXHbPNIfjLKNokXPLDii275wUOESij4P92P5tAOijHB/Qrvao/rBy
-zYJFwiXS8uUcFkvxLohC1BAJf/pJOgE8PG7XLqmWtzKK/ZIZuDZZPRQCdc+gVICm
-Pp5LpPZSF0KY8tvKiJ7A8b7dVvCKo8QhZ6LJm2yDrJ/WM1sOoRsrMMYALt/GIu8H
-5h0vzKLbyX/mx0En1TN+fiyRUD303RWSRVcgURcLwrypO8UTm2DuCv/GOBDgY53e
-rzOAuutSzJoW/OsNAgMBAAGjgegwgeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-GQYDVR0RBBIwEIIObnMuZXhhbXBsZS5jb20wHQYDVR0OBBYEFI+OX/cZzkcIT7hR
-ffpqG/5IeM4WMIGQBgNVHSMEgYgwgYWhbaRrMGkxCzAJBgNVBAYTAlVTMRMwEQYD
-VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMRIwEAYDVQQK
-DAlUcnVzdC1ETlMxGTAXBgNVBAMMEHJvb3QuZXhhbXBsZS5jb22CFCjit4xzVF45
-CewzmKO5a3vtrQ9VMA0GCSqGSIb3DQEBCwUAA4ICAQBn6dzJpo1YpAinWX65D7IJ
-sIKM5Gazyj33KUNXDKK0xhoS1fJWGiHG3Rg9x8R11MSASueva++h8Ve8eaFbZHrY
-lnNHea9x4XGlhhM+XVis2tgk7NtucofZlOnmJq68vxTu3hpKkzX7kNRkytnBGoqD
-nZVwKxDFAlAm1oCno1fn85/4h6UCxAe06dGq4yyqAREbv4xquZIsd8Wpyl2aLTLb
-2ba2q4v8YZ1jTjpNuQuI/HiNbXJoQR6hswkh4sknP1iv1QFOlRa98KubJQdSJ57Z
-e1pyCNvTSzC5G77ZfMzA6jeK4HZRe2yrz75CKRWgo76CSW9A7sCoDBPM3ylN5eqp
-rpWnVsaWFTDvhxiXOCDY7rjnM0xLItNWNxnev+ItNmqQkGO9PYFtFzBEz7JV/6lb
-ns7y2Q1OpFsIfluT4XTJsNjjzbCTEIrG4fWgZ6W6VDq7qSoTgQElu8gwAwwkj2eF
-Jm7BT7+HXD0G+Me2nkezUhy1GVe1dASecTQ+omfI4ubp0+qqVDt1PMIb/0GT2bZo
-bzSb+7RuzjIczlgaOFW+8GEY4V0xVKSEe5btMJHAprysnbfniV/Q4wrLa8LB+LbN
-WgaUVvt2TuOYjJoJ12HWFc6YttecsvVD4ZXYfosqOt+vMBNhq55k20FTpxXseD8q
-J8aHzxshGtoM32JkFwwO3w==
+c2NvMRQwEgYDVQQKDAtIaWNrb3J5IEROUzEZMBcGA1UEAwwQcm9vdC5leGFtcGxl
+LmNvbTAeFw0yMzEyMDMwMDA0NThaFw0yNDEyMDIwMDA0NThaMGkxCzAJBgNVBAYT
+AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv
+MRQwEgYDVQQKDAtIaWNrb3J5IEROUzEXMBUGA1UEAwwObnMuZXhhbXBsZS5jb20w
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDDVyRmht8JS2yqS2aLSBvC
+X5qp+IrLmambPb98zw6nORWeT2zR0TkU7Td7c18LZJc+Y418DgmM2q4RbmIpr7d2
+GMuxWAywUXma25yNCyPDk6fjEnmBpDZXhKhrplpRxOsPbrKekMsdPvE751xjTUiD
+zoFPRVZAWBUSLmbmLa2wqLt4jIzwnqtnKJzwv4sbU3UD70fR5gVDJuJX52aNzAmK
+74ywU9K6heUg9iKR3lOZD8g8jgJBRhcDzU4F9cBxT6twde8QAaphkdqx/VLbOk59
+bIhQE+5AN8EDWKe1r3sJ7DCHASWFcmvbjg3+elcRLfFxql4O1bko2iduwFdfs5yw
+cL0dVcZY5dP1Yu4azBRxlUL7mwnsv53dweth4H6QHDG4Atz/GJtANUwvhj3tMiKG
+taw/NL7vKCBxi8zijERgnzKBhwV5TmF1Mr/4W1R8Dv7ceG5UGVVUZK+PVBaro4zz
+xZdv/064Ls0debwlImFB7Xxf60IdRusxs2LcQJSMzvB5mMaHzNpRRpZQhHz6h4Ov
+cbrL9DzGz5q1qk5QHrg353B0IRT7lqazrRhwatM6vDnkDeQuZf9PdlTSWvpfdyT6
+kG6QvNjneimRV3cPOeuui4o8OY+HXCB3RsZnW3OVZdXSJWi3Tl4eRVRQROXuFtIV
+FtXQYWFJM1d0rc2WVzcc9QIDAQABozUwMzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAZBgNVHREEEjAQgg5ucy5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAgEA
+fUROEwk5KnoJl5iyQC2thpMPzXaRAJCUPTzM2Px1J7k0rSGlkg9JPNIgU0gaPZ99
+vWzhsqFIynhwoKItyYv/utnyHwOZ8cArW4PG8SJUsUxKN9tRqyFa7CxxwQvSbIcU
+GyN/+VU2UUqX5osDNqj0aHS+AUnlh6BVIcrz38oJtrnsQufVV5PwPC/DXGVUapgJ
+aaVrB95N7aExUtKO3l/nLhLx5RDAUBK7vWtyLrtu5WrwVwiBrIN0pyGlxQCTGwKn
+55LOsImtBHVcrauJ/1Z5LDVnPHOuExTmcvlWKBjZoDyNTVeMp0+9PV4hoxne+rGQ
+dBYHy/d6r7Hdfg/yDrAxDQEsrMupzOR5Y6rqs3mBT76Tb8MK8wTLwTmm/WAZzWPK
+ebSIujuQA4gmYpoKMz8c2mZWAMz8SLlziv7O5kxs7HHDidaJQSK7A+nr2AVbrjgH
+VraqgmN+PXT3rAIK67WApOJtRxrPxKPv1oeO4NJeWZtQdVOeLphZno0i9sDd/f3q
+FTVZd800yDlLLUdQqTvKc5gKKvHi23CpHZeFfWMT6aWyaXdS2E/ogImd0ok91A+f
+M5TYfENU/uzBteEOOBj8r48mCH49HpzJK0uDZlQDkedww1oy9YsS45bd33Kdwniy
+RUftYtc0WaxdnUhgoPx9qLBOiH84P6TAJCXfQ/btoiA=
 -----END CERTIFICATE-----