From 43f5daf6b9908a386593f47cd0a778363bca2599 Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Thu, 22 Dec 2016 11:04:59 -0800
Subject: [PATCH 1/4] test: rename agent1-pfx.pem to agent1.pfx

PFX is not PEM, its binary DER. Use the same .pfx extension as
test/fixtures/test_cert.pfx does.
---
 test/fixtures/keys/Makefile                      |   8 ++++----
 .../fixtures/keys/{agent1-pfx.pem => agent1.pfx} | Bin
 test/fixtures/keys/ec-pfx.pem                    | Bin 1006 -> 0 bytes
 test/fixtures/keys/ec.pfx                        | Bin 0 -> 1006 bytes
 test/parallel/test-tls-multi-pfx.js              |   4 ++--
 test/parallel/test-tls-ocsp-callback.js          |   2 +-
 test/parallel/test-tls-pfx-authorizationerror.js |   2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename test/fixtures/keys/{agent1-pfx.pem => agent1.pfx} (100%)
 delete mode 100644 test/fixtures/keys/ec-pfx.pem
 create mode 100644 test/fixtures/keys/ec.pfx

diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
index 32e34705bb9794..c4ac0768e7685f 100644
--- a/test/fixtures/keys/Makefile
+++ b/test/fixtures/keys/Makefile
@@ -92,13 +92,13 @@ agent1-cert.pem: agent1-csr.pem ca1-cert.pem ca1-key.pem
 		-CAcreateserial \
 		-out agent1-cert.pem
 
-agent1-pfx.pem: agent1-cert.pem agent1-key.pem ca1-cert.pem
+agent1.pfx: agent1-cert.pem agent1-key.pem ca1-cert.pem
 	openssl pkcs12 -export \
 		-descert \
 		-in agent1-cert.pem \
 		-inkey agent1-key.pem \
 		-certfile ca1-cert.pem \
-		-out agent1-pfx.pem \
+		-out agent1.pfx \
 		-password pass:sample
 
 agent1-verify: agent1-cert.pem ca1-cert.pem
@@ -334,12 +334,12 @@ ec-cert.pem: ec-csr.pem ec-key.pem
 		-signkey ec-key.pem \
 		-out ec-cert.pem
 
-ec-pfx.pem: ec-cert.pem ec-key.pem
+ec.pfx: ec-cert.pem ec-key.pem
 	openssl pkcs12 -export \
 		-descert \
 		-in ec-cert.pem \
 		-inkey ec-key.pem \
-		-out ec-pfx.pem \
+		-out ec.pfx \
 		-password pass:
 
 dh512.pem:
diff --git a/test/fixtures/keys/agent1-pfx.pem b/test/fixtures/keys/agent1.pfx
similarity index 100%
rename from test/fixtures/keys/agent1-pfx.pem
rename to test/fixtures/keys/agent1.pfx
diff --git a/test/fixtures/keys/ec-pfx.pem b/test/fixtures/keys/ec-pfx.pem
deleted file mode 100644
index f5e76a76118e44c62e08a24d8dbe86b4bb2bf4ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1006
zcmXqLVt&QM$ZXKWyn&5VtIebBJ1-+U<ANsUg)B|XbAiG$4Vswx5mIamnwT1ZLN!c`
z3_z+BA;V}O!^Q<Qfd^<J9}CBeLSMn?L=8?RCJu&%CMJ(ty<bi*T5#=Y>MQF98S@);
zKE$lpYO>_Cq*ch&`wU&*%jD|KS9F@lc3a4Bym-hr`_%CYJx|>i-!s1dOtyN}dNWj6
z;_Fu1+();=_RMoqw_jnF;AJIcVm*h|n^&jxKxf>&j^&GNlYg(3v$)tQrs&Z+|5W#C
zPFYPki7k8qiE7tp#Kv7c^x)64fBKQHU!}VKOL$sl68cG0V0p*1OYgVX314}x@#c9J
z%iWB7lHm~(qZs~YZCmt7NNSDIhp_L5ZkzFG{#$TjGka=D#G~^@$_lqyei-g<sW{#C
z*Gk3r)Ws9i{{H0g;Ehj+Z{L4A-~91cw;Ju`K{FH7H%9PZnk-^!l4|+w`^vBUi*1aV
zixcMl_@0_~q5Yrojcp#Q=3bre?#}F{x4tb(G3qX-Y5f$>bn$1+8}@xS+<mNTZ`ye;
zt`GxfFVPj@JSr~E_a|oMsea_$dzK?vic3p-W0knV+?A!*gcfoM{;e)JP<l}?*GSeQ
z;d9s9>d+HbW*K6l&&xep89(;^-oM29rB}p^d$T`8f2;f~ULMuH`5t$r|KaZ516uNW
zN|TfK9&pzztLQ%R=>49(wh51azTL3nQ{kE^!r$(>oTysqGkvYIT&}g8^CTOCP>tJb
zPTziBv8_<v<J<b6Z~4LxpSW;b_o?1~?V6a8BA3PkcJ^Pleod`a|5{~mn|*O=`u~Z{
zg~rc56go+KTvA!@*qo*JfTPV)qi3VSjvuqX+D^T_@`TXak2B}<FxGPBC*9m~{pWil
zz1e^E9=15$)4#QMy26>D7onSUTD@<D?oTpkVq`)}cncc8urz)&XnbeT_?nFymIS#N
znHDr|F=*U~nJ!;{OEB9Ncq<*0E?F8U2pz~i({)txIY-8BnY=|zx7_xeSS|N1mifh&
z+Wj*!LtVKaEDu}1=A62B%*Q&J{vSVNa}72N@ZVLLuk&qQ^~^O-w2ab}dBVNx_uo7I
zZKM6!`o9mAE~=|mD$j_koF(!><JLotEB|gql+X0}AhXZfhby;Mf>X`%%evQVijEr0
z?q5BF@$@X+dG0!%6L}@4yXS15VW?`L4EG+VsG%5(h#;qZ_o`WKrn!?Quw4#hI=wq7
z-^jqwK+%Acja8eEnMsP3fkkAeiA=$*$5v6IX9cDnUB6ee*-K<23rA~=lEgs<2N95G
E0oTd5u>b%7

diff --git a/test/fixtures/keys/ec.pfx b/test/fixtures/keys/ec.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..3130860e9939309cb90c1ecae28ad88bd8ceb5e3
GIT binary patch
literal 1006
zcmXqLVt&QM$ZXKWyn&5VtIebBJ1-+U<ANsUg)B|XbAiG$4Vswx5mIamnwT1ZLN!c`
z3_z+BA;V}O!^Q<Qfd^<J9}9<H?`!`{%|G;+m^c_3nwUI}l`=mFn8?v&aO};a$5C7Q
z)CG2|TE4dD`!tTil?4uAf45ebJ-Qfl!+Arng~B}%la_#r(<_T5zUZ$L@?E5{?BJ_O
zA^Vqa&1OHT;=dyIcI(&U%invJMIEa<z0BzG>A!2PZtPfIyeN-Tr#61dzx&hg{@%)Y
zZ)&N|{lfZ)RP80)2aEkJuP;oT^KOl{hYNS&MEAyp-?RUV-;jRs;bh!C`Qxk$_w#Bh
zZjkxhWUHjDCsgY6LT5#E*8ihQDt{+B7Myers90(9b-LDke`_b}tua}DEG9`c%!pS#
z{VB8i@LrLYgFbU^C5TKu^IKcoNA<IS({w58MTcJd=XNpuvPhOt{i7{+|JNjMt*bA;
zo!+eNVATC>;-&QBye+Q}$$ru=Q7hvQYOq=AEU~9UM(B|CX6CM-X8-*EMZpQL)|m1C
z2)giNcHh0luaAA-+?i7lsPu<#p~K!Qo<FQOyKg@3U*)>*YlOv$sIO^{69bqh=(_8x
z9a*+Q;M}uYWy?F3hgB%5cSRM}UB7+qaaM|t^^_I6*T23dkaNLzM&-GqSMG3%u)a6+
z<zD&Hc3tA%O-lt!%|6}SJC((Asgt?ujF~a+=eFdB*u33zVP{hwj~`=0OWW^_)BZKR
zWE9lWZp-Rla6zE(t?;#@t3!Toa?}%v?3nqPox%F}<j#{Gt!dkKzE*2d(l1lD+&7I^
zvr*>BGUokr_pCFVUHL}a%_5BL?myona|~E49A3Rh$$Pl$)F$)9sy*ivWb_xkY3gI2
zT+_{{YFaW=)ldG8zW2Gv&;9wks;>q%oGvIeXkuhSN_YzzzpylZG-!Nh(D<5-8<qsQ
z7?~C{ZZT-wh?y?i_y3KWTQ#Q#lrC8sCw!bYL%MEll6B5YjkND#zQ6VziN7(U=p$q0
z<LBvLQ~wq6ho+x-<~1+G{>X-;PQEGr;qMZTobg{Z`*&>Sg!H{T$~2|Jm+sSfzjeb-
z&eckcxss>D?whG5rfHY#(~ebMwDtX?+mkk*EOwmSYvs9G@2SbV<;7WjC-T0n5h(iq
zCE?K{k>piY{AzQXq?fvzHL#be+Zn1FD8s$SDQYOjA|l9X-@R&9n`!Q(32c`GnNIIc
z$~Q7FG*C3)WMkFlV`h?KWnd9`Eb_x))*|&NvA3J@x=L=V_n4GDV&TY~+|<O#&(i|(
FEC34vzDxiB

literal 0
HcmV?d00001

diff --git a/test/parallel/test-tls-multi-pfx.js b/test/parallel/test-tls-multi-pfx.js
index f750aec325c957..28cd945e3cf3b9 100644
--- a/test/parallel/test-tls-multi-pfx.js
+++ b/test/parallel/test-tls-multi-pfx.js
@@ -10,10 +10,10 @@ const fixtures = require('../common/fixtures');
 const options = {
   pfx: [
     {
-      buf: fixtures.readKey('agent1-pfx.pem'),
+      buf: fixtures.readKey('agent1.pfx'),
       passphrase: 'sample'
     },
-    fixtures.readKey('ec-pfx.pem')
+    fixtures.readKey('ec.pfx')
   ]
 };
 
diff --git a/test/parallel/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js
index cf05f6967a967b..2670fefd3dcf72 100644
--- a/test/parallel/test-tls-ocsp-callback.js
+++ b/test/parallel/test-tls-ocsp-callback.js
@@ -35,7 +35,7 @@ const assert = require('assert');
 
 const SSL_OP_NO_TICKET = require('crypto').constants.SSL_OP_NO_TICKET;
 
-const pfx = fixtures.readKey('agent1-pfx.pem');
+const pfx = fixtures.readKey('agent1.pfx');
 
 function test(testOptions, cb) {
 
diff --git a/test/parallel/test-tls-pfx-authorizationerror.js b/test/parallel/test-tls-pfx-authorizationerror.js
index a4ea97f104e564..9ba10e4bb84057 100644
--- a/test/parallel/test-tls-pfx-authorizationerror.js
+++ b/test/parallel/test-tls-pfx-authorizationerror.js
@@ -11,7 +11,7 @@ const fixtures = require('../common/fixtures');
 const assert = require('assert');
 const tls = require('tls');
 
-const pfx = fixtures.readKey('agent1-pfx.pem');
+const pfx = fixtures.readKey('agent1.pfx');
 
 const server = tls
   .createServer(

From 2dc83b793128b203bef0bbc35d6ffb62ed6c0901 Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Tue, 20 Dec 2016 14:17:05 -0800
Subject: [PATCH 2/4] test: add independent multi-alg crypto identities

agent6 was the only cert that had a chain (an intermediate certificate),
and there were no non-RSA certs other than a single self-signed one.
This makes it impossible to test cert-chain scenarios with multiple
identities which require chains to prove chain completion, and
multi-algorithm because OpenSSL doesn't support multiple identities
unless they are multi-algorithm.

PFX files were also missing for most identities, making it difficult to
test multi-PFX and PFX interactions with cert-chain+key and CA options.

New server cert chains:

- ECC: ca5 signs ca6 signs ec10, CN=agent10.example.com
- RSA: ca2 signs ca4 signs agent10, CN=agent10.example.com

PFX added for:

- agent6
- agent10
- ec10

All pem and pfx regenerated from scratch to test that the Makefile is
actually working as intended.
---
 test/fixtures/keys/Makefile                   | 214 +++++++++++++++++-
 test/fixtures/keys/agent1-cert.pem            |  22 +-
 test/fixtures/keys/agent1-csr.pem             |  16 +-
 test/fixtures/keys/agent1-key.pem             |  26 +--
 test/fixtures/keys/agent1.pfx                 | Bin 2445 -> 2445 bytes
 test/fixtures/keys/agent10-cert.pem           |  32 +++
 test/fixtures/keys/agent10-csr.pem            |  13 ++
 test/fixtures/keys/agent10-key.pem            |  15 ++
 test/fixtures/keys/agent10.cnf                |  17 ++
 test/fixtures/keys/agent10.pfx                | Bin 0 -> 3061 bytes
 test/fixtures/keys/agent2-cert.pem            |  20 +-
 test/fixtures/keys/agent2-csr.pem             |  16 +-
 test/fixtures/keys/agent2-key.pem             |  26 +--
 test/fixtures/keys/agent3-cert.pem            |  18 +-
 test/fixtures/keys/agent3-csr.pem             |  16 +-
 test/fixtures/keys/agent3-key.pem             |  26 +--
 test/fixtures/keys/agent4-cert.pem            |  20 +-
 test/fixtures/keys/agent4-csr.pem             |  16 +-
 test/fixtures/keys/agent4-key.pem             |  26 +--
 test/fixtures/keys/agent5-cert.pem            |  20 +-
 test/fixtures/keys/agent5-csr.pem             |  12 +-
 test/fixtures/keys/agent5-key.pem             |  26 +--
 test/fixtures/keys/agent6-cert.pem            |  38 ++--
 test/fixtures/keys/agent6-csr.pem             |  12 +-
 test/fixtures/keys/agent6-key.pem             |  26 +--
 test/fixtures/keys/agent6.pfx                 | Bin 0 -> 3029 bytes
 test/fixtures/keys/agent7-cert.pem            |  28 +--
 test/fixtures/keys/agent7-csr.pem             |  26 +--
 test/fixtures/keys/agent7-key.pem             |  50 ++--
 test/fixtures/keys/agent8-cert.pem            |  26 +--
 test/fixtures/keys/agent8-csr.pem             |  26 +--
 test/fixtures/keys/agent8-key.pem             |  50 ++--
 test/fixtures/keys/agent9-cert.pem            |  32 +--
 test/fixtures/keys/agent9-csr.pem             |  26 +--
 test/fixtures/keys/agent9-key.pem             |  50 ++--
 test/fixtures/keys/ca1-cert.pem               |  20 +-
 test/fixtures/keys/ca1-cert.srl               |   2 +-
 test/fixtures/keys/ca1-key.pem                |  32 +--
 test/fixtures/keys/ca2-cert.pem               |  18 +-
 test/fixtures/keys/ca2-cert.srl               |   2 +-
 test/fixtures/keys/ca2-crl.pem                |  10 +-
 test/fixtures/keys/ca2-database.txt           |   2 +-
 test/fixtures/keys/ca2-database.txt.attr      |   2 +-
 test/fixtures/keys/ca2-database.txt.attr.old  |   1 +
 test/fixtures/keys/ca2-key.pem                |  32 +--
 test/fixtures/keys/ca3-cert.pem               |  20 +-
 test/fixtures/keys/ca3-cert.srl               |   2 +-
 test/fixtures/keys/ca3-csr.pem                |  16 +-
 test/fixtures/keys/ca3-key.pem                |  26 +--
 test/fixtures/keys/ca4-cert.pem               |  16 ++
 test/fixtures/keys/ca4-cert.srl               |   1 +
 test/fixtures/keys/ca4-csr.pem                |  13 ++
 test/fixtures/keys/ca4-key.pem                |  15 ++
 test/fixtures/keys/ca4.cnf                    |  23 ++
 test/fixtures/keys/ca5-cert.pem               |  14 ++
 test/fixtures/keys/ca5-cert.srl               |   1 +
 test/fixtures/keys/ca5-csr.pem                |  10 +
 test/fixtures/keys/ca5-key.pem                |   8 +
 test/fixtures/keys/ca5.cnf                    |  35 +++
 test/fixtures/keys/ca6-cert.pem               |  14 ++
 test/fixtures/keys/ca6-cert.srl               |   1 +
 test/fixtures/keys/ca6-csr.pem                |  10 +
 test/fixtures/keys/ca6-key.pem                |   8 +
 test/fixtures/keys/ca6.cnf                    |  22 ++
 test/fixtures/keys/dh1024.pem                 |   6 +-
 test/fixtures/keys/dh2048.pem                 |  12 +-
 test/fixtures/keys/dh512.pem                  |   4 +-
 test/fixtures/keys/dns-cert1.cnf              | Bin 0 -> 565 bytes
 test/fixtures/keys/dsa1025.pem                |  14 +-
 test/fixtures/keys/dsa_private_1025.pem       |  20 +-
 test/fixtures/keys/dsa_public_1025.pem        |  20 +-
 test/fixtures/keys/ec-cert.pem                |  22 +-
 test/fixtures/keys/ec-csr.pem                 |   8 +-
 test/fixtures/keys/ec-key.pem                 |   6 +-
 test/fixtures/keys/ec.pfx                     | Bin 1006 -> 1006 bytes
 test/fixtures/keys/ec10-cert.pem              |  27 +++
 test/fixtures/keys/ec10-csr.pem               |  10 +
 test/fixtures/keys/ec10-key.pem               |   8 +
 test/fixtures/keys/ec10.pfx                   | Bin 0 -> 2198 bytes
 test/fixtures/keys/fake-cnnic-root-cert.pem   |  28 +--
 test/fixtures/keys/fake-cnnic-root-cert.srl   |   2 +-
 test/fixtures/keys/fake-cnnic-root-key.pem    |  50 ++--
 .../fixtures/keys/fake-startcom-root-cert.pem |  32 +--
 .../keys/fake-startcom-root-database.txt      |   4 +-
 .../keys/fake-startcom-root-database.txt.attr |   2 +-
 .../fake-startcom-root-database.txt.attr.old  |   2 +-
 .../keys/fake-startcom-root-database.txt.old  |   2 +-
 .../fake-startcom-root-issued-certs/01.pem    |  26 +--
 .../fake-startcom-root-issued-certs/02.pem    |  32 +--
 test/fixtures/keys/fake-startcom-root-key.pem |  50 ++--
 test/fixtures/keys/rsa_private_1024.pem       |  26 +--
 test/fixtures/keys/rsa_private_2048.pem       |  50 ++--
 test/fixtures/keys/rsa_private_4096.pem       |  98 ++++----
 test/fixtures/keys/rsa_public_1024.pem        |   8 +-
 test/fixtures/keys/rsa_public_2048.pem        |  14 +-
 test/fixtures/keys/rsa_public_4096.pem        |  24 +-
 test/parallel/test-tls-cert-chains-concat.js  |   6 +-
 test/parallel/test-tls-cert-chains-in-ca.js   |   6 +-
 test/parallel/test-tls-peer-certificate.js    |  14 +-
 .../test-tls-pfx-authorizationerror.js        |   4 +-
 100 files changed, 1254 insertions(+), 746 deletions(-)
 create mode 100644 test/fixtures/keys/agent10-cert.pem
 create mode 100644 test/fixtures/keys/agent10-csr.pem
 create mode 100644 test/fixtures/keys/agent10-key.pem
 create mode 100644 test/fixtures/keys/agent10.cnf
 create mode 100644 test/fixtures/keys/agent10.pfx
 create mode 100644 test/fixtures/keys/agent6.pfx
 create mode 100644 test/fixtures/keys/ca2-database.txt.attr.old
 create mode 100644 test/fixtures/keys/ca4-cert.pem
 create mode 100644 test/fixtures/keys/ca4-cert.srl
 create mode 100644 test/fixtures/keys/ca4-csr.pem
 create mode 100644 test/fixtures/keys/ca4-key.pem
 create mode 100644 test/fixtures/keys/ca4.cnf
 create mode 100644 test/fixtures/keys/ca5-cert.pem
 create mode 100644 test/fixtures/keys/ca5-cert.srl
 create mode 100644 test/fixtures/keys/ca5-csr.pem
 create mode 100644 test/fixtures/keys/ca5-key.pem
 create mode 100644 test/fixtures/keys/ca5.cnf
 create mode 100644 test/fixtures/keys/ca6-cert.pem
 create mode 100644 test/fixtures/keys/ca6-cert.srl
 create mode 100644 test/fixtures/keys/ca6-csr.pem
 create mode 100644 test/fixtures/keys/ca6-key.pem
 create mode 100644 test/fixtures/keys/ca6.cnf
 create mode 100644 test/fixtures/keys/dns-cert1.cnf
 create mode 100644 test/fixtures/keys/ec10-cert.pem
 create mode 100644 test/fixtures/keys/ec10-csr.pem
 create mode 100644 test/fixtures/keys/ec10-key.pem
 create mode 100644 test/fixtures/keys/ec10.pfx

diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
index c4ac0768e7685f..964fb2f5f1451b 100644
--- a/test/fixtures/keys/Makefile
+++ b/test/fixtures/keys/Makefile
@@ -1,4 +1,41 @@
-all: agent1-cert.pem agent1-pfx.pem agent2-cert.pem agent3-cert.pem agent4-cert.pem agent5-cert.pem agent6-cert.pem agent7-cert.pem agent8-cert.pem agent9-cert.pem ca1-cert.pem ca2-crl.pem ca3-cert.pem ec-cert.pem dh512.pem dh1024.pem dh2048.pem dsa1025.pem dsa_private_1025.pem dsa_public_1025.pem rsa_private_1024.pem rsa_private_2048.pem rsa_private_4096.pem rsa_public_1024.pem rsa_public_2048.pem rsa_public_4096.pem ec-pfx.pem
+all: \
+  ca1-cert.pem \
+  ca2-cert.pem \
+  ca2-crl.pem \
+  ca3-cert.pem \
+  ca4-cert.pem \
+  ca5-cert.pem \
+  ca6-cert.pem \
+  agent1-cert.pem \
+  agent1.pfx \
+  agent2-cert.pem \
+  agent3-cert.pem \
+  agent4-cert.pem \
+  agent5-cert.pem \
+  agent6-cert.pem \
+  agent6.pfx \
+  agent7-cert.pem \
+  agent8-cert.pem \
+  agent9-cert.pem \
+  agent10-cert.pem \
+  agent10.pfx \
+  ec10-cert.pem \
+  ec10.pfx \
+  dh512.pem \
+  dh1024.pem \
+  dh2048.pem \
+  dsa1025.pem \
+  dsa_private_1025.pem \
+  dsa_public_1025.pem \
+  ec-cert.pem \
+  ec.pfx \
+  fake-cnnic-root-cert.pem \
+  rsa_private_1024.pem \
+  rsa_private_2048.pem \
+  rsa_private_4096.pem \
+  rsa_public_1024.pem \
+  rsa_public_2048.pem \
+  rsa_public_4096.pem \
 
 #
 # Create Certificate Authority: ca1
@@ -17,7 +54,7 @@ ca2-cert.pem: ca2.cnf
 	touch ca2-database.txt
 
 #
-# Create Subordinate Certificate Authority: ca3
+# Create Subordinate Certificate Authority: ca3 issued by ca1
 # ('password' is used for the CA password.)
 #
 ca3-key.pem:
@@ -42,6 +79,81 @@ ca3-cert.pem: ca3-csr.pem ca3-key.pem ca3.cnf ca1-cert.pem ca1-key.pem
 		-CAcreateserial \
 		-out ca3-cert.pem
 
+#
+# Create Subordinate Certificate Authority: ca4 issued by ca2
+# ('password' is used for the CA password.)
+#
+ca4-key.pem:
+	openssl genrsa -out ca4-key.pem 1024
+
+ca4-csr.pem: ca4.cnf ca4-key.pem
+	openssl req -new \
+		-extensions v3_ca \
+		-config ca4.cnf \
+		-key ca4-key.pem \
+		-out ca4-csr.pem
+
+ca4-cert.pem: ca4-csr.pem ca4-key.pem ca4.cnf ca2-cert.pem ca2-key.pem
+	openssl x509 -req \
+		-extfile ca4.cnf \
+		-extensions v3_ca \
+		-days 99999 \
+		-passin "pass:password" \
+		-in ca4-csr.pem \
+		-CA ca2-cert.pem \
+		-CAkey ca2-key.pem \
+		-CAcreateserial \
+		-out ca4-cert.pem
+
+#
+# Create Certificate Authority: ca5 with ECC
+# ('password' is used for the CA password.)
+#
+ca5-key.pem:
+	openssl ecparam -genkey -out ca5-key.pem -name prime256v1
+
+ca5-csr.pem: ca5.cnf ca5-key.pem
+	openssl req -new \
+		-config ca5.cnf \
+		-key ca5-key.pem \
+		-out ca5-csr.pem
+
+ca5-cert.pem: ca5.cnf ca5-key.pem ca5-csr.pem
+	openssl x509 -req \
+		-extfile ca5.cnf \
+		-extensions v3_ca \
+		-days 99999 \
+		-passin "pass:password" \
+		-in ca5-csr.pem \
+		-signkey ca5-key.pem \
+		-out ca5-cert.pem
+
+#
+# Create Subordinate Certificate Authority: ca6 issued by ca5 with ECC
+# ('password' is used for the CA password.)
+#
+ca6-key.pem:
+	openssl ecparam -genkey -out ca6-key.pem -name prime256v1
+
+ca6-csr.pem: ca6.cnf ca6-key.pem
+	openssl req -new \
+		-extensions v3_ca \
+		-config ca6.cnf \
+		-key ca6-key.pem \
+		-out ca6-csr.pem
+
+ca6-cert.pem: ca6-csr.pem ca6-key.pem ca6.cnf ca5-cert.pem ca5-key.pem
+	openssl x509 -req \
+		-extfile ca6.cnf \
+		-extensions v3_ca \
+		-days 99999 \
+		-passin "pass:password" \
+		-in ca6-csr.pem \
+		-CA ca5-cert.pem \
+		-CAkey ca5-key.pem \
+		-CAcreateserial \
+		-out ca6-cert.pem
+
 #
 # Create Fake CNNIC Root Certificate Authority: fake-cnnic-root
 #
@@ -179,7 +291,7 @@ agent4-verify: agent4-cert.pem ca2-cert.pem
 #
 # Make CRL with agent4 being rejected
 #
-ca2-crl.pem: ca2-key.pem ca2-cert.pem ca2.cnf
+ca2-crl.pem: ca2-key.pem ca2-cert.pem ca2.cnf agent4-cert.pem
 	openssl ca -revoke agent4-cert.pem \
 		-keyfile ca2-key.pem \
 		-cert ca2-cert.pem \
@@ -219,7 +331,7 @@ agent5-verify: agent5-cert.pem ca2-cert.pem
 	openssl verify -CAfile ca2-cert.pem agent5-cert.pem
 
 #
-# agent6 is signed by ca3
+# agent6 is a client RSA cert signed by ca3
 #
 
 agent6-key.pem:
@@ -240,8 +352,17 @@ agent6-cert.pem: agent6-csr.pem ca3-cert.pem ca3-key.pem
 		-out agent6-cert.pem
 	cat ca3-cert.pem >> agent6-cert.pem
 
-agent6-verify: agent6-cert.pem ca3-cert.pem
-	openssl verify -CAfile ca3-cert.pem agent6-cert.pem
+agent6-verify: agent6-cert.pem ca3-cert.pem ca1-cert.pem
+	openssl verify -trusted ca1-cert.pem -untrusted ca3-cert.pem agent6-cert.pem
+
+agent6.pfx: agent6-cert.pem agent6-key.pem ca1-cert.pem
+	openssl pkcs12 -export \
+		-descert \
+		-in agent6-cert.pem \
+		-inkey agent6-key.pem \
+		-certfile ca1-cert.pem \
+		-out agent6.pfx \
+		-password pass:sample
 
 #
 # agent7 is signed by fake-cnnic-root.
@@ -318,9 +439,80 @@ agent9-cert.pem: agent9-csr.pem
 		-days 99999 \
 		-passin "pass:password" \
 		-in agent9-csr.pem \
-		-startdate 161021000001Z \
+		-startdate 20161021000001Z \
 		-notext -out agent9-cert.pem
 
+# agent10 is a server RSA cert signed by ca4 for agent10.example.com
+#
+
+agent10-key.pem:
+	openssl genrsa -out agent10-key.pem 1024
+
+agent10-csr.pem: agent10.cnf agent10-key.pem
+	openssl req -new -config agent10.cnf -key agent10-key.pem -out agent10-csr.pem
+
+agent10-cert.pem: agent10-csr.pem ca4-cert.pem ca4-key.pem
+	openssl x509 -req \
+		-days 99999 \
+		-passin "pass:password" \
+		-in agent10-csr.pem \
+		-CA ca4-cert.pem \
+		-CAkey ca4-key.pem \
+		-CAcreateserial \
+		-extfile agent10.cnf \
+		-out agent10-cert.pem
+	cat ca4-cert.pem >> agent10-cert.pem
+
+agent10-verify: agent10-cert.pem ca4-cert.pem ca2-cert.pem
+	openssl verify -trusted ca2-cert.pem -untrusted ca4-cert.pem agent10-cert.pem
+
+agent10.pfx: agent10-cert.pem agent10-key.pem ca1-cert.pem
+	openssl pkcs12 -export \
+		-descert \
+		-in agent10-cert.pem \
+		-inkey agent10-key.pem \
+		-certfile ca1-cert.pem \
+		-out agent10.pfx \
+		-password pass:sample
+
+#
+# ec10 is a server EC cert signed by ca6 for agent10.example.com
+#
+
+ec10-key.pem:
+	openssl ecparam -genkey -out ec10-key.pem -name prime256v1
+
+ec10-csr.pem: ec10-key.pem
+	openssl req -new -config agent10.cnf -key ec10-key.pem -out ec10-csr.pem
+
+ec10-cert.pem: ec10-csr.pem ca6-cert.pem ca6-key.pem
+	openssl x509 -req \
+		-days 99999 \
+		-passin "pass:password" \
+		-in ec10-csr.pem \
+		-CA ca6-cert.pem \
+		-CAkey ca6-key.pem \
+		-CAcreateserial \
+		-extfile agent10.cnf \
+		-out ec10-cert.pem
+	cat ca6-cert.pem >> ec10-cert.pem
+
+ec10-verify: ec10-cert.pem ca6-cert.pem ca5-cert.pem
+	openssl verify -trusted ca5-cert.pem -untrusted ca6-cert.pem ec10-cert.pem
+
+ec10.pfx: ec10-cert.pem ec10-key.pem ca6-cert.pem
+	openssl pkcs12 -export \
+		-descert \
+		-in ec10-cert.pem \
+		-inkey ec10-key.pem \
+		-certfile ca6-cert.pem \
+		-out ec10.pfx \
+		-password pass:sample
+
+
+#
+# ec is a self-signed EC cert for CN "agent2"
+#
 ec-key.pem:
 	openssl ecparam -genkey -out ec-key.pem -name prime256v1
 
@@ -379,10 +571,12 @@ rsa_public_4096.pem: rsa_private_4096.pem
 	openssl rsa -in rsa_private_4096.pem -pubout -out rsa_public_4096.pem
 
 clean:
-	rm -f *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial
+	rm -f *.pfx *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial *.print *.old fake-startcom-root-issued-certs/*.pem
 	@> fake-startcom-root-database.txt
 
-test: agent1-verify agent2-verify agent3-verify agent4-verify agent5-verify
+test: agent1-verify agent2-verify agent3-verify agent4-verify agent5-verify agent6-verify agent7-verify agent8-verify agent10-verify ec10-verify
 
+%-cert.pem.print: %-cert.pem
+	openssl x509 -in $< -text -noout > $@
 
-.PHONY: all clean test agent1-verify agent2-verify agent3-verify agent4-verify agent5-verify
+.PHONY: all clean test agent1-verify agent2-verify agent3-verify agent4-verify agent5-verify agent6-verify agent7-verify agent8-verify agent10-verify ec10-verify
diff --git a/test/fixtures/keys/agent1-cert.pem b/test/fixtures/keys/agent1-cert.pem
index ee4d9c434e272d..664d00ca6d8f9c 100644
--- a/test/fixtures/keys/agent1-cert.pem
+++ b/test/fixtures/keys/agent1-cert.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC2DCCAkGgAwIBAgIJAPrVDMagf1FsMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIIC2DCCAkGgAwIBAgIJAOzJuFYnDamoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
 dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2ExMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTVaGA8yMjkyMDUyMjAx
-MTY1NVowfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgzMDE4
+NDIyMVowfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
 MA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQDDAZhZ2Vu
 dDExIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQDnXT3od/PORzybLaYoAhqwa87601hrKbOrcJH9XGVX
-TqFoSqkVZCbFFHDDlambsucH0jejao7cKFm7UKyMhlOxSYaynD2o28nS1ZBRwybV
-zOGsIhF2sPc3TY6+P2EQWhe1F9tZsUcoOSXihwx78V0HLVde3UoXmtDVwD8ASlRu
-vQIDAQABo2EwXzBdBggrBgEFBQcBAQRRME8wIwYIKwYBBQUHMAGGF2h0dHA6Ly9v
+DQEBAQUAA4GNADCBiQKBgQDvVEBwFjfiirsDjlZB+CjYNMNCqdJe27hqK/b72AnL
+jgN6mLcXCOABJC5N61TGFkiF9Zndh6IyFXRZVb4gQX4zxNDRuAydo95BmiYHGV0v
+t1ZXsLv7XrfQu6USLRtpZMe1cNULjsAB7raN+1hEN1CPMSmSjWc7MKPgv09QYJ5j
+cQIDAQABo2EwXzBdBggrBgEFBQcBAQRRME8wIwYIKwYBBQUHMAGGF2h0dHA6Ly9v
 Y3NwLm5vZGVqcy5vcmcvMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eubm9kZWpzLm9y
-Zy9jYS5jZXJ0MA0GCSqGSIb3DQEBBQUAA4GBAIi44Hk6phewUYEEmSSuuS4pViPZ
-Eu/uCDtDAdn/Qz/q2lFHRsaia9ov7xfncYpgV7/vq5MAHigas4ZGUoutwCzwnaAI
-l9wxkLG3G8wPN3x4wDGoLxpqaH5nqJIo6iWady9WM9PDaVHn+6ibrP9p55T65o+O
-BaF2ovk9NzkxpMPM
+Zy9jYS5jZXJ0MA0GCSqGSIb3DQEBCwUAA4GBAHrKvx2Z4fsF7b3VRgiIbdbFCfxY
+ICvoJ0+BObYPjqIZZm9+/5c36SpzKzGO9CN9qUEj3KxPmijnb+Zjsm1CSCrG1m04
+C73+AjAIPnQ+eWZnF1K4L2kuEDTpv8nQzYKYiGxsmW58PSMeAq1TmaFwtSW3TxHX
+7ROnqBX0uXQlOo1m
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent1-csr.pem b/test/fixtures/keys/agent1-csr.pem
index b6eb759b897b94..6ed2fb3aff9ef7 100644
--- a/test/fixtures/keys/agent1-csr.pem
+++ b/test/fixtures/keys/agent1-csr.pem
@@ -2,12 +2,12 @@
 MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjEPMA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQD
 DAZhZ2VudDExIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnXT3od/PORzybLaYoAhqwa87601hrKbOr
-cJH9XGVXTqFoSqkVZCbFFHDDlambsucH0jejao7cKFm7UKyMhlOxSYaynD2o28nS
-1ZBRwybVzOGsIhF2sPc3TY6+P2EQWhe1F9tZsUcoOSXihwx78V0HLVde3UoXmtDV
-wD8ASlRuvQIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
-b3JkMA0GCSqGSIb3DQEBCwUAA4GBAMFbLKd2LbXJ3DPnwzYPcToOYZbwirgZicQX
-AGyU93YrwnTwITgz8bfYlMDDm+tL8w8tLjUTZQNpYqAC7WrUeBw6HuxluQ3MNJz3
-1X9e0SXgeiuNXZjjBRP7zgXvjeZ+ArOC7KZJbswsFGAC/c3ZUpkGG0trcRULcYTA
-+wjl1ERh
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDvVEBwFjfiirsDjlZB+CjYNMNCqdJe27hq
+K/b72AnLjgN6mLcXCOABJC5N61TGFkiF9Zndh6IyFXRZVb4gQX4zxNDRuAydo95B
+miYHGV0vt1ZXsLv7XrfQu6USLRtpZMe1cNULjsAB7raN+1hEN1CPMSmSjWc7MKPg
+v09QYJ5jcQIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBCwUAA4GBAN3UIAdShj7eA91fH8m8UQBJndgigNwt88qk
+S2kS3XfZqkEawMu2HF/y5yWX7EyGs7OkRXZxJSR67GlgdrTi82qCBC3H2xF7fKXr
+s5b6ges5NZFjEA9JTvX5PFSAfo5APbXuuhRWBdxvagi00szTnYiaKgGU4C/dZWAz
+E0/tTFT4
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent1-key.pem b/test/fixtures/keys/agent1-key.pem
index 031aad87f10680..fe750dee3f47f5 100644
--- a/test/fixtures/keys/agent1-key.pem
+++ b/test/fixtures/keys/agent1-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQDnXT3od/PORzybLaYoAhqwa87601hrKbOrcJH9XGVXTqFoSqkV
-ZCbFFHDDlambsucH0jejao7cKFm7UKyMhlOxSYaynD2o28nS1ZBRwybVzOGsIhF2
-sPc3TY6+P2EQWhe1F9tZsUcoOSXihwx78V0HLVde3UoXmtDVwD8ASlRuvQIDAQAB
-AoGBAMaeCBh6aWWrR/8beCmebNUJJ/2x05TjjuddUybC3AjQasYCWhcQDCxh+NAe
-uiT8t1LCh5sVTiD3zth8UDSu2EaWrL6gpOHqTHx1SgrVL1D99ha0QnDyBQ+GWBkh
-0NoNHOF47mbmn7+gJpVNgiFtfTeOUyK3HUDlaa+/qJwdwEQNAkEA/9dzyExaFUzz
-E6p1UGN0rvjTdC48Bak2D33Ut6FiABdBn1smAVIlroVv8nb+Tfvq7vgsgPXYTJcy
-W2VN9f/tGwJBAOeB6QJLG7wUYRuKHndnXAPIJT6GW7TKuVQzNtRvB2wcqOZ3cF50
-gYi6dYmiV0SWEMr2IcYisgEnyE7uKh3tCQcCQQCB9OVBV1di/oVy9eFFhl+dCZQP
-rfSbQ4rMb7R/2qA3P5j744b4oMu3TNzCoyMmZdK+tJ2WnErVDPBtcJYbYXcFAkEA
-mTejbP8kle+u7TkWPNRNU7ts2tq1awwYaB+VFDd/ZA/7wLwfxIO7DzDIhZTJyPzA
-lHMdmzJvONCJg6OggDnWlQJBAPpS05NSnr/gzoccnVfDkf0bqBe7ATAEJ8F7PS/z
-kauA/tWM/Pec0unSdrAJKV9CLfKUvKBXwOIS3GPLTsYHTvc=
+MIICXQIBAAKBgQDvVEBwFjfiirsDjlZB+CjYNMNCqdJe27hqK/b72AnLjgN6mLcX
+COABJC5N61TGFkiF9Zndh6IyFXRZVb4gQX4zxNDRuAydo95BmiYHGV0vt1ZXsLv7
+XrfQu6USLRtpZMe1cNULjsAB7raN+1hEN1CPMSmSjWc7MKPgv09QYJ5jcQIDAQAB
+AoGAbqk3TlyHpKFfDarf6Yr0X9wtuQJK+n+ACt+fSR3AkbVtmF9KsUTyRrTTEEZT
+IXCmQgKpDYysi5nt/WyvB70gu6xGYbT6PzZaf1RmcpWd1pLcdyBOppY6y7nTMZA3
+BVFfmIPSmAvtCuzZwQFFnNoKH3d6cqna+ZQJ0zvCLCSLcw0CQQD6tswNlhCIfguh
+tvhw7hJB5vZPWWEzyTQl8nVdY6SbxAT8FTx0UjxsKgOiJFzAGAVoCi40oRKIHhrw
+pKwHsEqTAkEA9GABbi2xqAmhPn66e0AiU8t2uv69PISBSt2tXbUAburJFj+4rYZW
+71QIbSKEYceveb7wm0NP+adgZqJlxn7oawJBAOjfK4+fCIJPWWx+8Cqs5yZxae1w
+HrokNBzfJSZ2bCoGm36uFvYQgHETYUaUsdX3OeZWNm7KAdWO6QUGX4fQtqMCQGXv
+OgmEY+utAKZ55D2PFgKQB1me8r6wouHgr/U7kA+0Peba86TmOZMhIVaspD3JNqf4
+/pI1NMH1kF+fdAalXzsCQQCelwr9I3FWhx336CWrfAY20xbiMOWMyAhrjVrexgUD
+53Y6AhSaRC725pZTgO2PQ4AjkGLIP61sZKgTrXS85KmJ
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent1.pfx b/test/fixtures/keys/agent1.pfx
index 11893f48eed1c1ee9dcd754f34bb252f963dc827..f830eccead5284d4abe5be09830a64c4718287df 100644
GIT binary patch
delta 2311
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

delta 2311
zcmV+i3HbJn6O9v)U4IAeB*F&cpM?Sf2mpYB1@IIpkz~y`hyeqJZI7oDVM}tAD7pf>
z4IM<Nj}lv@O3hG>`$GZ|OViH~7GhG}jD`&Gi{8RgEIr!yJ}bpDW`<`0o>BEzOg0CW
zC&ar&)`WBRFq8ebWo*U(NIv*=er%lJQ}#e?woVO2RAR$PaDT1Q=Yct2f<4!?x)f(N
z7W*>F$Asvyftza~>_+3?aX{s4(cNPAidcK4>$<Op=b!?-Epv_{*w=*CT)__B8VBb*
z+?WFHjwXt`Sk&_S&Pw>iM(WY6j<1pGqKzBq3GVvY-AD=kSYZXAGzKBvv23MssXINn
zOk)0JlOM#ND1V1%SzxxLgPdQ^N1mLB)~ihG7ky;pLjImzbM@VfUdPw$MSFNfhmYP}
z<4B{zAlXIGsmRM|$q@WLvfA=u09hszd?5s%WSFl6pN%em4U_Q6$*)U!ql#fFY>C|J
zoKzHS#H2IR^he@_2_pLf6R)l?O6V)|69mFP#@gO&Q-5LAW$}mzV9UPmZ))Yyei@;&
z32!`Ae85eZU2->SmJoM~736Dsk5U9?$eDyfE)7-%_H_~TqKnV}cX!(S4Gb)y=SW(l
z?UGO+#<b*Och7!C8B>7L|K)Z?SNMNM>Jhf0)f01Z5Oge$RLZO?C;kGpXYImi68lz4
zqd}yGzJC)AE-ab60rUs+cJ|o7D|G0~@GxLq_IQXAfXPt@y>`*51Y&oG*w6h!ZoZ~j
z+lQ4z^o}w~iS~GQ^rf;Cb<eR=co~>3y9Iv~mN`ETM``Se8#l{)764>kOS@Bgxf6Mk
zfCt^<NQ3dLNPN%Tg(PJE{QNm*#Uj0q!Mw^k8h^%_-ExUFQo=`LKVbW%zz*x3H5(x0
zMFH@f@79vycH~D?{C>Ag0(jHsNh3HACU9Aw#RO=`Y4zcO+J?E3-;%sVFbd-jT`Bq}
zO0MZP?N-d5hlqJN{-lhbq*pmGz~m_h=U&@;&!-iawQMpwWlx}2X54d5A63zRooQVK
zEPuI;`WJt+;HB?<Rjd`g)`xCF93-pl1M|h4l3JqoIk{D-z0Y#aI@?*09uECcX&8e^
z-+wP3V}wFetO=h#f3RG-@w~{c-o(ohUCOQjnkG2uLSLZY&K9>4u3Y$|RJp4gHuXLw
zr;n60sOo{3vpQt%ukhd}_m&>`XJt{-=6}NFv7VsG(~Se9CLc4uKX91aE#zIyrBdEB
zqQcqBCzoB_Llwv*lQa>u8<IbG;x`%qTdji08hGz%);QJT^m&H32v(AJ<^n%)4&5`*
z-^d|-;mQ7rfT=ey_V{!6g9+A;!8-j`G*U*rzc-9}$vJHu3-wzfD1lVz2M{7|N`H;9
zR{+#VE*-Xhhz1|g%9(FpAU|sltW!raimCZbA&V5(J_g|qkk}E!@kbp&B-EZ#>Cv3o
zGbhFNY(|h;QENeF13Vf3f<iZNy*H%WU$O|@pU>Qy-_!1m2$o4a5v`R8@{8Qrm}8MU
zi|~E_CUCOQ%<)x3GEm#@T;Ml+Hh*#A;vbzc>GK(;>O+Y6<sWFDOkiHI*NnMxQkgRw
z&L2ev>I^31(g{IDF<9%9%foGr%Gt4x@EmWhzL>W*Lo{3I8PSy2g@CRRnuR6tB;^um
z8-NR^>Xzxv!cVo-U<7b<(@8*7>B&1Lln(cX0Buwx|E`Ky+8836TR#x*TYrmvz%VUH
zP^_3;9b72z95A3U==EJ%%lCmLt}cyB%W!&>iH$rhrP|yG0k|##D!bOZ@8RjP^?MKP
z5VpHfzVnxXDt5=l4!#fTM8*7jyRqX^YtGRgE=>T;dHT0@JG&dL6%1=89J$>x(dP+w
z^E!Sazqzho$<s?5kdaUWfPW_t$ThQ6)V>p-rIPWJj}wc1<3=JGLn~92#KbsJqyuq?
zj$$WU34!k(w)rMH#^H_pF90L+Q_L4!QU}kM8k7B-;l4GZ&}3Ql1q|G2_n-#AI$RNy
z^zsiJxrf5H?yBh;EH#_}k00!Dt*t$?kemN`jzl<|$8lAbZZ>sD#|%35IFE;F^VdFq
zX^)d#21b8P6Bv;;_@OTX0tf&Ef&zdI`6tz*I%+H(H=W8vX}d%F^rO4hhrta0fp=X_
z^k;aG^%Dn-L}}Je+EUjMjMtOee`vHuUW@mZDkYjaGcHRN4X3us<<Xk=r`--)qFk1|
zKgCyZ;|PeA?dL74@kgCnyWqjKy})2CwYx4R%Zh(}Ep|2?BoN;5jQf|Qd=jg!xRysM
znzG}7wmGt61Z^bcg{U!M*|l6Vw*^bsq_0zD$8#3s&oP5@rL`qObq0?|-Ad>vCC(db
ziQ)G0v$#B(T_%i0SU%pOHI+F?JJSw`<CcEYoAWe>ZOEJYpG;h?bU#=Gu|crSrP@#e
zNT+{2b?g*f{ULFd$MDTk4bsB5b`6@+FdcgTknfL^N_<`xou@D&4u93fS#D`k9W@#H
z0@GVReArH-;>;gqOtLe#o`ZcH<6sdj1GtBo=I-T8?sB&MdM6I1z#W<Xt5SjwB(ZST
zG^G`=#swu=m95Zm!+%z_sXO>eyWpIUW|n`fc!O#7OMuhN_3EUj)LETUohMz&t;D9G
zbj~#+S9%?k<4YBJ>Ol~NyL7_FlkG9Zu`pl~5~0+f2JA%pz<pH7065vaW*8ZTVSfun
z(y@?|sM@R0j)G>h0-j$4Js7lW1W8I?*qYcdS}fQ5YA_NCe$3g!?Sh{jcng~V;3|Jg
zOW+fbd$D$VZZpF^=XkcSd$7Wq_z0LJ*-`wH-^RyA@s}UMEV4@Px8VuV95OpQ(2VhN
zAnt^KR89Nn5JcQB>vF0pvMG;6FhPz9L&w1Y(;02lo}H64P$-IM$zxIKdgN_4u@vBo
z9VzAl>65KUD+u1`i&<?5Aq1X+)b?)^igJV{LcH>QI`M%FD|>kThj`rlF(oh~1_>&L
zNQU<f0SOf`76cS-!0>p4R+9qB2dxZkmVnHKZO%I|F)$%82?hl#4g&%j1povTwb|%i
h^@E<}pf9KZyD37^cf7h31PJW)O%B*uqJ;ti2mlkmbNK)O

diff --git a/test/fixtures/keys/agent10-cert.pem b/test/fixtures/keys/agent10-cert.pem
new file mode 100644
index 00000000000000..8aaabd3f938bea
--- /dev/null
+++ b/test/fixtures/keys/agent10-cert.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIICfzCCAeigAwIBAgIJAOyvM6GMZDW6MA0GCSqGSIb3DQEBCwUAMIGIMQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMR8wHQYDVQQKDBZUaGUg
+Tm9kZS5qcyBGb3VuZGF0aW9uMRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANj
+YTQxHjAcBgkqhkiG9w0BCQEWD2NhNEBleGFtcGxlLm9yZzAgFw0xODExMTYxODQy
+MjFaGA8yMjkyMDgzMDE4NDIyMVoweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNB
+MQswCQYDVQQHDAJTRjEfMB0GA1UECgwWVGhlIE5vZGUuanMgRm91bmRhdGlvbjEQ
+MA4GA1UECwwHTm9kZS5qczEcMBoGA1UEAwwTYWdlbnQxMC5leGFtcGxlLmNvbTCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArV2diVumrKDS5k81MrcdECnYYVZ5
+feQ/FZDqwEHM/zlXvs6vphU3rGmZeASMQEdHg7vUjzzvE8PDqJuJXKrC5lEO1OUY
+eUDhaZ/QvYS9tDp7qTJzORxT9im65dQH0Xq5JQwTy30hidQHxOgAkILNive07/Jk
+N1vle6TnZX6K/dkCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAAg+FpvhA6coalWxGR
+acWiUbc7CJ4RWjlSeA+fhd1G00x0Hl5hjt6IAqEHe4T9fV41U05X1eo5KaN3jXWU
+IS56SVX8BxOhU53lr0iID0MpxMqttA9LgjE3fc6uAjThnx1zX50VGR4P8LQqG+HL
+WJUW0+3oJrOgRbJ6wAEs0iCcTg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICkzCCAfygAwIBAgIJAJHwBmNgafKbMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
+dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2EyMSAwHgYJKoZIhvcNAQkB
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgzMDE4
+NDIyMVowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0Yx
+HzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAOBgNVBAsMB05vZGUu
+anMxDDAKBgNVBAMMA2NhNDEeMBwGCSqGSIb3DQEJARYPY2E0QGV4YW1wbGUub3Jn
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDC1M2aGVYsmrBiut1n0nfTU+9v
+TNVdAmKQBjnNsv3IIch/PPaEOIEm7dFhgdk86Z+wVCN3sAKu54Bz4JDKdPsFGvDy
+18JGuGH1vIVW5285IW7fMrzvAdZtETeBAiPM10Q69ddB4M6FbLiF273ZqCJ+vSsw
+kl5Dkas8YTZ0uwqKjQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4GBAGDMGSbPg/B4OripSxT2scXFIwoej47PW1byJgWaGoMJ8zgKUoKE7Z7A
+aWQbD22In05F0kBllqpSJWEZpTuVFsyyLeb3R7cuGQWs/puaaPul7sx+PRGhwxYe
+nrNIGtsaBf8TO/kb5lMiXWbhM5gZbBtbMMv3xWA4FxqU0AgfO3jM
+-----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent10-csr.pem b/test/fixtures/keys/agent10-csr.pem
new file mode 100644
index 00000000000000..b96e682d5bd7da
--- /dev/null
+++ b/test/fixtures/keys/agent10-csr.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIB3TCCAUYCAQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
+DAJTRjEfMB0GA1UECgwWVGhlIE5vZGUuanMgRm91bmRhdGlvbjEQMA4GA1UECwwH
+Tm9kZS5qczEcMBoGA1UEAwwTYWdlbnQxMC5leGFtcGxlLmNvbTCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEArV2diVumrKDS5k81MrcdECnYYVZ5feQ/FZDqwEHM
+/zlXvs6vphU3rGmZeASMQEdHg7vUjzzvE8PDqJuJXKrC5lEO1OUYeUDhaZ/QvYS9
+tDp7qTJzORxT9im65dQH0Xq5JQwTy30hidQHxOgAkILNive07/JkN1vle6TnZX6K
+/dkCAwEAAaAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBwYXNzd29yZDAN
+BgkqhkiG9w0BAQsFAAOBgQBeyxGhHnFF0ifHhWUbqqMM9zJ5OhLjGsQ0gvmK/LHL
+vmGJ43XgeYiN/U6xREQ7DZMss+C14mfQvp5oM0zQRWwQhLgV7YlIIIe09CYTKTfC
+xxc18OJewNQUje5cG5aSMZb2HfHmLDaavAJqK0Yaoj69e+iEnAkVFVZALqlhezS+
+xQ==
+-----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent10-key.pem b/test/fixtures/keys/agent10-key.pem
new file mode 100644
index 00000000000000..dd589cafdf6191
--- /dev/null
+++ b/test/fixtures/keys/agent10-key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCtXZ2JW6asoNLmTzUytx0QKdhhVnl95D8VkOrAQcz/OVe+zq+m
+FTesaZl4BIxAR0eDu9SPPO8Tw8Oom4lcqsLmUQ7U5Rh5QOFpn9C9hL20OnupMnM5
+HFP2Kbrl1AfRerklDBPLfSGJ1AfE6ACQgs2K97Tv8mQ3W+V7pOdlfor92QIDAQAB
+AoGAIAjiaVVEMTXugpw0SlDH0ArLbwEZpgedGJEUr7348VhZPGrYzimxhexlbWX5
+vI7vSgpVNrqduts7tlY3RaZQKQzFkSqkUUb432bXkJLHNIspd0XHOO2Hy/ZbTg0n
+OIQes7C91Z/OLUi9esXoh4AMsAoxiHoVee0dkEJt8RoywNkCQQDk39QND1rQ2eJq
+Fcfj/v6fXgsHmQT16w2Ii9P5uPAeIGrGcrsCoVWrsh+wjSlYc7emGV8JINiltNhZ
+fSg6ux8/AkEAwemf5LryUDCoZ68MlAYMcH+G7gtm06d+FUFpBclT3hJeXnUAdlyU
+6kCvazcVTQQKDTWIS1oIBuleVmc/VWc05wJBAMVRZyq/QydtwTJ+hq+8pl5VIKMz
+PECbnjZLfrv7wh/nCMcAINRarVZyIbn/aVbVpM3xb6qaA82QxTkZmvZPXtcCQFqx
+pjMYrNSMrXcxDDT/Tzoeq0ES3BkKMZJHcZNfQnaPKMwM9RZm3s9hSapfrPrEdN8Q
+tppnlXGGHLVUvO54wukCQBKbjspQONRZFBh9Fdeyf/rX+inBLhuMSnsY3FeBp0c6
+TAPbyuiezn7axr9kILojdjZgXK1b+MTHSEjqCpHwIvg=
+-----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent10.cnf b/test/fixtures/keys/agent10.cnf
new file mode 100644
index 00000000000000..7dc37fc7e3b7fb
--- /dev/null
+++ b/test/fixtures/keys/agent10.cnf
@@ -0,0 +1,17 @@
+[ req ]
+default_bits           = 1024
+days                   = 9999
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+prompt                 = no
+
+[ req_distinguished_name ]
+C                      = US
+ST                     = CA
+L                      = SF
+O                      = The Node.js Foundation
+OU                     = Node.js
+CN                     = agent10.example.com
+
+[ req_attributes ]
+challengePassword              = A challenge password
diff --git a/test/fixtures/keys/agent10.pfx b/test/fixtures/keys/agent10.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..c6a5dd0386e7cf68e2b9b2aa225b83b0aa6a8efb
GIT binary patch
literal 3061
zcmZXWX*3j!8pmf4ld(h?yRl66F{nrgjW9{JsqBq?1|wT`g$b{H$=LTLYt}+jLfQ9S
zl%2?K?279>=id9?bMA-dJm>uW=lOqnKKu|t;2jDeB_ar1M}1i=L^I@&9!LYs4gwcZ
z1%dM~a5f?cl=V+UogD;<y+Dx^K)}U%^-lssa8uL%yMgYak%0=tv4;%mSQ)dTpa210
z27#We(i95k?S2!tmbX8)6NfWC@1@L?h^CLl#RfhPBgI(DLfw}5JU%k=&hE+)aWyhk
zo5SS;&3{Ewg^yLXxeH8Y{^eEYJ6;~Q+nnfsgeJfjl&j?p3qJGRm76`3i>e}!zf9vh
zxzW&H3q(wb2wxXOyDo)OA+?1$`Bu08rJ^!;#=fZ}buOD&pqZAOT0w8&>e#PBRu040
zbCKAbXIW(B8_Yg<%Y38Ljm~981y19V?38|XYe`2G7h1D8SIkkj(K~p0>P86Z{E8BX
z&U^y|%dI{9{we`n6XNZ(98?VIHJ!cE3wUHAMXG@E8Y(9{GDd&r^CorJ@k~7!rmz-Y
zxgAd)ex3~d@La>s?1lPI%u#3Q-GsS6B`?sLC>{UXiM-ENv5Bpw8fxy{6J3RV01rmh
z4c|2b7pdYZ{4yKUhl3|cSWDEpC4{%VGa5V~CIg@xmiP&fChw2jpqD^gXY207G^<?d
z{6vJ#$uw(3T6HOROR9wC%Ni@6TJ67lE4FSsmJ(+u&AOgfWG5hKpZ=|F(2Ds$&<O)}
zjp_83QbOBuDo<241a4{j;D|$^QqggdT#7d#?)cNHkd#@XlYuMrYk!&D)b5NZ+Twi1
zdQb?0pa_RiS(41M#IiVaYN$NFM(;7Vl03;euqaYeK=d4hJ3W>{MZN1h-2k13OT@Hb
zKes23oEI4Fn(4w!$j?uR$A*I&;l~-IOxa*&|Fj;DuO!`3&g7uVJxC=_F2R1+qpYDt
zFY7!f++5F236)NZy>`s5YDgszsO^yYYK+2&W{`80fDD}ZDQ8Z8_~<MxoTdAU$Adrc
zaTntIqWH&yV(6#x1hBiA<ixhKFdFQ{01u7zT1SlqQb_O%&-k)9{)Dd7P5$^;Hj%Lq
zHgfL<s@jmh|E~v4zbR=D9(u`)VI1{LCXu%80q;YuraXPlW&Dt7=f&znA~B|Iuj&N=
zCOJf3ZW~iix9~$lr-oCLRKhB;tv0$a5TTJVLxc0fTiV&W_MP-MJZ8Twe&{{iVLnhS
zh+LXT=7$EzClvLB2G%WhrvL0oL`@h1l>)vJ1LmLfz2c|`P}<Y8vv4!yNanr2z2TD)
z`_xo`f}K}y0NiSU%a2UbA@e{xtd;9)L!%<bq>@1OKULZmAts-n{KmZNh3A`Y-;^<G
zgAq4`^x{N5ewAwPoYeEp(&tbl`^ax|)UoU+Lupb-teFpP(Af}#cCuPOxQz^k0V<e=
zO!eKzEXX$xQ7I>_QSYK3pjIRGA|{d;DtT@lZCv%flfRYfG*&kA)wJE%tnw9R;_zA0
z0)AR^^EUA)kRu9NVkK<YmnpOOd(T({$0cG82)mJN!{ZX*?_0|~@Fi|Ojj{Ekw&8cn
z#l?8Dx3DQ!rlO`rY`{HjhrMt(V%#Z_yCqMQq}3$brZfLuHkp{jyrK`JjhMxxZZjOj
z3>gdmMyp+~2DsgV09i7*JTDEN$iT$X9#f9fuceA@k9aYY`a!T7Le1n8k?4I?iRZ8G
zYps;+Kgk%C3_8U|P%T<8X~~uCFmL&EeQm~3d(Oi~;~>{gSa_#`@Pg9XZ0KI@9jx7`
ztEq0;Jt>P!Z69Upb_2Uv(GZ6dRDe6fSzK`->-2J|%vmUZ&iu!x@jm0%o9Y^Dkj$t9
z2|Ke-71iv%v_Y|GueS!)^+Q9qY9*<;U*dLyjn1--);wO%v_$(u_hfkp&>2@-=|;va
z>`J=7r^6wST4|nCW9gzSKf}W=$@B)5p3P6n^!xh5%9mQG@pjbBcUj7x#Pld>3FeET
z4>_DMiGup(cvT7ehu=6}`k`XvU!;tHIe3KXSh!RB-0ML=8b(S4GBaZ>?5hIRkBQTC
zT}2SqH0Ju58z=KvuLb=FeKKyScEqo|ETzflrbTe6*U@5l2{QPp8CZ$05gxIxBReyF
zt>+6{%|7+;(y@0^vO}Yb48FHl2RE&BH~w8mr)K~L=FO4Hz@{1o<?j~bCS**v%vO7E
zOApF@I<qiln`{#O4clS%j_}vJEt+!cz{>nMI5g)O+P|HPjxL7&a=aEZ;(e*Pw+mh9
zM4?gP&RD`a#PNV`6lL!!F>K+!lDn53OT_Q0wGSRCx<#ob<jxJqd!`Q$uGA$iL!G~z
zbna4riZ7xmD~|S33TU3lcj-^tY}0p6x?(ia&a;umsaHFTy?g#C<hrJPW2AdCOk@?T
z2WHJz@-2JsYCn%PR?L5PXBn@YqrJ}}E+Dz>e5FbpxXfgG|5&CX_k-M0LxwKIMt}rj
zFsYlY)^tE3xD)}p>Qu2Jkwa5ici(1hIG_vr$L40*j4?&DE~sus`1f%x7p@4!k?yk`
zQKnb<?R=?yq+=I1HDIKLbzhK>^$neQg>_(^nxEdUyR``~B7n)b)6LKnP^AO&@fcOt
z=D@d%C3vyzfCEXOkFU%x_&%3fd-fDPSx#^*@LNDkya)Sc`MjvmA8dS*&tV789Hdwr
z5C49dC&$8KG#70je-bH2o1ng*`Np@nxqd#S=eNRMHm>qsLyMHg!KOvW;I<n~;0N_0
z;!Its3d<gNKCGysF*F2P=rKIhlM<d|E4OBy_@T|Cu~-uOn2RYa;u?Flbq~0}gyF?E
zt;RH;9s}f6ym%wqA4oND%OX!Sa}Ny|M=FGP+#fAlm`Lh~xB|I4nvMbOO+x(%`pVMx
z8_ic6h}BvVE<{H4@S;X%k6=fc;x~@He*&h`t6M#OTk;l7hU2c)Ha+(geu^SAXqh2Q
zqne%8Fdj-g238q;C<k9tzIl$W-@+IhMp^w}l?T%auXl3KUMqz;6lw*>BCyTFpN_(g
zPMi=y6vzJ~BH2L{zo>#JmM`%9#Y|I!|Dz?eK#Gg7@B-%kzpd<3)*CeJhFkt^D;MW4
z71JA|_Kf?r1~h*RAJ_t7^8T9R79Y?7cjdo4?^s!Cf;G^O6a^YVgfd&a)PyaKl6hXg
z{#=;B=Gv*%?^;_x#N>{m_?hTxs@^c;hcN3i`w`s$z44ls6DBpv&uQGpHRf}NH1?~m
zWUo_KVOSi9ym}M6qEeOPW~2~plH}BA(x%<C3C9z>WxeKlgq$l`YSS5^;q^m0i~Lbz
zmFZH9NQ1@dk_`TA^Nn&%+gh<Lx|Z-7Uh$K&Nllui=JM;e*O4C|eJN;Qc5YUIsQgOk
zFXp|jH*m&{)wHF#UO1{yT%^cstMPC_N{j$pb#uhK$lqOpUu$owAf?6Ovj3PUB3Ks3
zdniLH`u9zky43FIwS4#L^}FZAd-X6Lg0~u}9Q-_38qA9;jfx&=?n=0MsVuWV%u@%W
zl0&U;i~I^#;5x1{rmW%H7^(xbJ_1oRzI%8)Y~0{oMiWw?>f<0OLfd}U6J)7^v#o`{
z|5$IJz6E|u3^7AikT(mE`T}M>TaQdmqGA$G#i^bvEj|E77H^gNE$Fj7du;Qi86U43
zJH1;SsHBec8<EJn!$noY&t)1Rx>-22BM2;MAZ*=<FAbGI?*3_637slhFJ5q;$57j)
zKT#(r!oQon1C{dC@&_bdd51PN9a24zSc3bY90QwFBX8<NSS|rpX5UDySjUT$KZLAl
zq#CsRx>Km*8fy|-l`d$#STPg9bN}`t*)jL3p>u@E)$dM2R&mPT2$$dbh}U5pxP;^g
zC(*eQI7jHwj5qZUTVYsV0lr3k*pV^W%Y1EYvz_wsW4>Jkuuk+c=@3x9cH@oz`Quh*
zlr+d5f10BhTz4-zu~^kn8io-3?^j=Dm1d)2k=3U))d^?H;Cc7c9QLu2^(dNE9wCk3
zM_i`9B+fud!FdTl#Ufg_1K_T-K{qYU>>%$=I#u^VmZ?Bh^ZlnbTFKA;{_cMP&@8o{

literal 0
HcmV?d00001

diff --git a/test/fixtures/keys/agent2-cert.pem b/test/fixtures/keys/agent2-cert.pem
index dba141a39e222b..12750543c327df 100644
--- a/test/fixtures/keys/agent2-cert.pem
+++ b/test/fixtures/keys/agent2-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICczCCAdwCCQDoSvlN91onszANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJV
+MIICczCCAdwCCQCtrfdcbYDS0jANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZKb3llbnQxEDAO
 BgNVBAsMB05vZGUuanMxDzANBgNVBAMMBmFnZW50MjEgMB4GCSqGSIb3DQEJARYR
-cnlAdGlueWNsb3Vkcy5vcmcwIBcNMTgwODA4MDExNjU1WhgPMjI5MjA1MjIwMTE2
-NTVaMH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzAN
+cnlAdGlueWNsb3Vkcy5vcmcwIBcNMTgxMTE2MTg0MjIxWhgPMjI5MjA4MzAxODQy
+MjFaMH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzAN
 BgNVBAoMBkpveWVudDEQMA4GA1UECwwHTm9kZS5qczEPMA0GA1UEAwwGYWdlbnQy
 MSAwHgYJKoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEA+ANNQJCYkK2xeMpXY7P0FqQRnWm757yDXwLfeoz4IRfk
-/20bdRPMIA3EIzDfIUyibq9Zdgm+sLixfv0WPRANEhLeMOdDAT4AuNDeZGu/4lTz
-Hl4wsMq/FGDokIlmFeC+IBjTcNFNllr0wXT3650lEnXANaTe2qb5eqgq1RHA9MUC
-AwEAATANBgkqhkiG9w0BAQUFAAOBgQDVUwS6OhVpM8nDknHMa1g05Ly9krwMP73V
-01JpCsHxlXRomptTdAob/UVDSXlZxm6OrtXHiXI3Lz9bwStg++F3hxEfhVV7YJ1c
-pc7HT1GqGkesFwYH6/KE871t54oIhpVzbeuJhtAdreRXRnjRrxxD11cYPwhn/f5O
-jJdQL5duew==
+AQEFAAOBjQAwgYkCgYEAq2BtovcwlIUNVAi3ukbyQveZNg3VkkxB6Ih+CL70VEX3
+0ji5EpQqGjwk5Ub6tRYfuGHwBWSO8+W2PwtdplDbuIOoK5MAp+wkDRCC8H1l4i8c
+dOA97Edw3nRU6MiPrUiirV1u2liHYp6YDLWix80UiNnH6EOLFd5Wy5s7CSt4rEkC
+AwEAATANBgkqhkiG9w0BAQsFAAOBgQCg75WmaDjpwBmMAl/+5oK8D7p2V98ChhyV
+bIwhpLPo9jf7iPW9VayxQKvV5HXuiT1vpIjuvhbRRH3wGj3by0TtI+sqECcPKu1v
+5bg2e+bX8s1OXFJh+x93KCnrcFNEwOVk9VjUX+ilJdTkdcGA75N4ZO7qEV5wKl9g
+658PRZl3KA==
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent2-csr.pem b/test/fixtures/keys/agent2-csr.pem
index 05faae06068269..02217de52bd5e4 100644
--- a/test/fixtures/keys/agent2-csr.pem
+++ b/test/fixtures/keys/agent2-csr.pem
@@ -2,12 +2,12 @@
 MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjEPMA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQD
 DAZhZ2VudDIxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQD4A01AkJiQrbF4yldjs/QWpBGdabvnvINf
-At96jPghF+T/bRt1E8wgDcQjMN8hTKJur1l2Cb6wuLF+/RY9EA0SEt4w50MBPgC4
-0N5ka7/iVPMeXjCwyr8UYOiQiWYV4L4gGNNw0U2WWvTBdPfrnSUSdcA1pN7apvl6
-qCrVEcD0xQIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
-b3JkMA0GCSqGSIb3DQEBCwUAA4GBAHVG4Ng4xzGOWDBCj7/6LyxOdRt7E7eknkPx
-BrU41OdwS4HEA4nNx3dcsvP5VmFDtLOBrUD499qPvhqW/QKBfTYwozollD/azi99
-kBpJK/mYKw9TBV34PGwgEZ/Eirg6vA/g5dE/8szIbzyWfYaRhnaFEzM9/0bAEOyI
-3gr2WmL7
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrYG2i9zCUhQ1UCLe6RvJC95k2DdWSTEHo
+iH4IvvRURffSOLkSlCoaPCTlRvq1Fh+4YfAFZI7z5bY/C12mUNu4g6grkwCn7CQN
+EILwfWXiLxx04D3sR3DedFToyI+tSKKtXW7aWIdinpgMtaLHzRSI2cfoQ4sV3lbL
+mzsJK3isSQIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBCwUAA4GBAJqJXQdhuPxsJA6O/yWt9t9lQIgoYCQyCG2w
+Xl0n84f14WDi/N9rF0IfGMSVWoLDCc5gcoqKal0X/vQI4lpPiZ0hctU5cXru1Pvi
+yfDbIPB0td7POf3Q3Ge3a3RHf4I4cfRuzA6jfzMlorpgQmAKL+sstC94LZZnDiNp
+ihciaeK7
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent2-key.pem b/test/fixtures/keys/agent2-key.pem
index 81a8bf343651df..6aca2ed78be7c3 100644
--- a/test/fixtures/keys/agent2-key.pem
+++ b/test/fixtures/keys/agent2-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQD4A01AkJiQrbF4yldjs/QWpBGdabvnvINfAt96jPghF+T/bRt1
-E8wgDcQjMN8hTKJur1l2Cb6wuLF+/RY9EA0SEt4w50MBPgC40N5ka7/iVPMeXjCw
-yr8UYOiQiWYV4L4gGNNw0U2WWvTBdPfrnSUSdcA1pN7apvl6qCrVEcD0xQIDAQAB
-AoGBANrNPuhJKO/q7Pldub9SUXNwB8JSN954J4Y46KQbngTEKdlWjrS5ZIqa2oEZ
-aqDcFSmFNW23py4NozofWfFBKeUdeRyQvSOg7wfhf2OdmpA4ilAhHx3Qih5wSPX1
-zz5cIpkO1f/d/SacT6Arl9eD1VEbhFUrMu59gTsUwfjJbhFBAkEA/TDhVL1PxH6l
-zBgNiBPv9hc3ztjJYm+a6KhiP8EBObdPBqDRm1YOo3n8VeIhfruxn2yoVpvBDjCi
-fD36XcQ2mQJBAPrDtvoqtiZjfjpzTnanAZjOYmVfS0VimQdLUd164A3lMAMV9nsG
-hQbtzttges16i2/NJF8hky3dsjw25WcsBw0CQArUM17/ddDupcKz6KhASgwZdB6Z
-sQtPwK1gvksBwz6ns26SJETjil69kehOcqZL+s3ZxN1nbftgYyKzN+kYwkkCQQDG
-tSfdfNLyAI0aDBz08MnXKFPYOHcQ+FyC5zBr7N52pFIzX8f9HOF06CSuufkVsjGj
-2k8kAxr5kV+XT3jhFIZRAkEAuDOSGDCVu+0vX120jTJu4PjfeHuaeNfWjC226x9h
-EQAxkDfFfKTN7dsBXqt0r0HmLZfWBVQ1svEXCkwvPuRaeg==
+MIICXAIBAAKBgQCrYG2i9zCUhQ1UCLe6RvJC95k2DdWSTEHoiH4IvvRURffSOLkS
+lCoaPCTlRvq1Fh+4YfAFZI7z5bY/C12mUNu4g6grkwCn7CQNEILwfWXiLxx04D3s
+R3DedFToyI+tSKKtXW7aWIdinpgMtaLHzRSI2cfoQ4sV3lbLmzsJK3isSQIDAQAB
+AoGAbaqNPiXUjpX+C3Jwr+FKkhQDlRWRP8dQvc7qaApaK7uCdKIbvInXz2YBbj7X
+nB4GOmVhxPGukODEmN9bFFzV3NbQVcAO8iPI6ldkYCmpmwfeEA1UJnBfBC2IYVFr
+0TSuq7OdniiO+FLhZvSAJXN+5yDv66nZEnojMuu1oqpG/gECQQDdxzSeNbOY2ak8
+Db2ZYKSBWjxVbW+UC8mYA7jHVpcUxlNnamcJrhg6hEfJqax6c/vAefECFsngG7yy
+XVTYX6rpAkEAxdI83zQz4NqYkZmFlCElNDRF7S1Sa2eX1HzzJYlOEMx3P1iE/z4U
+HOQh9py2jlY1th3GdbChF1VWMIOqGCtaYQJAJwxS/GQyKgBw5qz4rA+zBz9vDg+F
+rMhih0xodViOo07EEppOaArqIyt1RFGGl8ziD6Kox5hhlP7tO25paOt3OQJBALSL
+6y60EF06ZWENwxKtJa19wAx1/vEz/SjcWXZ62JsQYg2Yltn2KJktxam04hEKsb7j
+cgxcBsqrAh0JLicc+kECQDmH1wTvulw3E59jqOaKEbYNQFi18zzFkIIoNRVqMhtt
+zTJx8NYT9NUS3YE4OcUX0dQtVO3W+NIVrniaY8i29UM=
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent3-cert.pem b/test/fixtures/keys/agent3-cert.pem
index 6aaa99cc81225f..9460b44bb6abe1 100644
--- a/test/fixtures/keys/agent3-cert.pem
+++ b/test/fixtures/keys/agent3-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICcDCCAdkCCQD4FZz1QNuPSzANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+MIICcDCCAdkCCQCR8AZjYGnynDANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZKb3llbnQxEDAO
 BgNVBAsMB05vZGUuanMxDDAKBgNVBAMMA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwIBcNMTgwODA4MDExNjU2WhgPMjI5MjA1MjIwMTE2NTZa
+dGlueWNsb3Vkcy5vcmcwIBcNMTgxMTE2MTg0MjIxWhgPMjI5MjA4MzAxODQyMjFa
 MH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNV
 BAoMBkpveWVudDEQMA4GA1UECwwHTm9kZS5qczEPMA0GA1UEAwwGYWdlbnQzMSAw
 HgYJKoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEApAJcDHyQjhzkfzqJy5+U0umvbr5KUDm1EjOlsRha37w+6Hlp
-VM6zBgU0KtPfSgktRbKGYefB/W5JPzHE0gm0Cwye1WceUsM+IuEMSjRNz7A8BJuc
-cj/wnGJR9YUTEFJBheDPVcpo4LraTR/hWgA8zde4+LBUZhNNYRQpA80Bz9MCAwEA
-ATANBgkqhkiG9w0BAQUFAAOBgQAY3g3zQlroG4AgGPSc+OJvdmE6uxS22GLP2Z2S
-OZaFBsrom2GbKV9angrVLRYYyLwRrvCtSWJJ/7YWv1Yu5mB5ZS/t7U7+c/WAnZdb
-XhsAlDnAwaeioA9ktNfmsB72l1I4rdiBXjanhxNCV/yvGDN83ANibIxHql+FqgBW
-/K16Rg==
+AAOBjQAwgYkCgYEAv+hwfSVuJfHDQOXmF2D/HsI2JZkspfrPQE/ZL1tII2cXRnus
+IqWZvLg9v7IVY0gSvx5gWMHxmqqaK75McVJvO1XEzLYpa9Ddnj06xqNWl6hwLHnP
+bclRi2n63Cs6zSM80r1iQ16ovZ0hyWPjXaBlWmb71QeeBp6ynxhB+yA0eZsCAwEA
+ATANBgkqhkiG9w0BAQsFAAOBgQA/C2xJIYA3Vo8pr1cfmzN+os9uvbMQEAegg6W+
+6/t82tLGnrCEglMTFHFp7MJCNiKCY16Ixi5WCZoUrGCfbh+Obtd4bP/wAlR8AS67
+lYZDvjADGU4e7Aqu0o0AHeb4MiRUQbkD0EUioyD8091Qhzlrx43UtdojPvakwAXM
+N/LFEw==
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent3-csr.pem b/test/fixtures/keys/agent3-csr.pem
index 276ae2c2f2e454..21bb06e2ea72f5 100644
--- a/test/fixtures/keys/agent3-csr.pem
+++ b/test/fixtures/keys/agent3-csr.pem
@@ -2,12 +2,12 @@
 MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjEPMA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQD
 DAZhZ2VudDMxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCkAlwMfJCOHOR/OonLn5TS6a9uvkpQObUS
-M6WxGFrfvD7oeWlUzrMGBTQq099KCS1FsoZh58H9bkk/McTSCbQLDJ7VZx5Swz4i
-4QxKNE3PsDwEm5xyP/CcYlH1hRMQUkGF4M9VymjgutpNH+FaADzN17j4sFRmE01h
-FCkDzQHP0wIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
-b3JkMA0GCSqGSIb3DQEBCwUAA4GBAE8nEwmxEzcYwoGWz7Myjwbf+dBMPZz6xVAj
-IuW+h8ITimJ6lESWgAtXtWPCj2SSp95Kwmo3Ex0kp3opEAMe+8ShglyZaVvPwVyB
-d8usbQ1zD6NdrNdSmS4Zn/J9l+OfI17VZLUvacpyVLouJe0MvA30Sf0pxJKLwXKq
-UlecNvEf
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/6HB9JW4l8cNA5eYXYP8ewjYlmSyl+s9A
+T9kvW0gjZxdGe6wipZm8uD2/shVjSBK/HmBYwfGaqporvkxxUm87VcTMtilr0N2e
+PTrGo1aXqHAsec9tyVGLafrcKzrNIzzSvWJDXqi9nSHJY+NdoGVaZvvVB54GnrKf
+GEH7IDR5mwIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBCwUAA4GBAFHJUONDqOhZpGN8ZCFkWkGyD4iDPGdJyR1f
+lh1N2vSf9vx663ni6lG9XQrQZXyPH8n7vvyyX1bJE5X6dAKuiD4GYlcGUUCnsvcA
+r+JzSBrbtwD57bPnn21YSUl2QEoG2b+/6uPKWxKr8e1sreMxHOLwsPgSavnQ84Bc
+GvSLlIcR
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent3-key.pem b/test/fixtures/keys/agent3-key.pem
index 8f6057ed82e008..3470fdf4b7bab4 100644
--- a/test/fixtures/keys/agent3-key.pem
+++ b/test/fixtures/keys/agent3-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCkAlwMfJCOHOR/OonLn5TS6a9uvkpQObUSM6WxGFrfvD7oeWlU
-zrMGBTQq099KCS1FsoZh58H9bkk/McTSCbQLDJ7VZx5Swz4i4QxKNE3PsDwEm5xy
-P/CcYlH1hRMQUkGF4M9VymjgutpNH+FaADzN17j4sFRmE01hFCkDzQHP0wIDAQAB
-AoGBAJASSo3ldo6ALvDcmWM4AeHsyeD8ZAdpSfh9ShXxkRJtKM3KqY6ILJcjRxpA
-GCvPN+e71XR3w98+XDWZII5pW6/ZE/bINkO2IMDuFmIWCbadvUbleQNd7eCVk5OI
-bYtZwmRI8zxC5gfEf54ukwL2agR1Hq/uENqw35OAwMnINQgRAkEAz7/ckH3xIzyM
-9w3oqe3kTTB2XyBzrSPSZaelfasV5qzin78EI3X9BRQzRSe53Dx2bAxcprGhUwHj
-qMd047QZ3QJBAMoZ1r+tMn8bY9Am89ZKaXtOoLIlYrXVu83ieGNA78cdJy7+hspT
-b0GFPM4ZkidXR9oVDOSgWuSNddvGryDN7W8CQBriaEemlKsLre5WtXIwH+hBSkA7
-Md0JErQnAsqFdlsYqmcj0ARKw4iBubTMVEgE5wpKez7zI75bMzvnO+AvsV0CQQC9
-2vQwcIYlfheQLWeXgaQB4GV5tUE7zKN20C+EHjaieLKcpSL+4s57YK00eDUinA21
-w1yvUizQ1EtJwSY3zPwlAkAg28bieVGyYxCMcK6jaSW28DscFcUXy9EuNGWc9nu6
-VPoBbU5tgHCz3k5lcgJtODkOAREGXdU8KKUEMiC3+Mpi
+MIICXAIBAAKBgQC/6HB9JW4l8cNA5eYXYP8ewjYlmSyl+s9AT9kvW0gjZxdGe6wi
+pZm8uD2/shVjSBK/HmBYwfGaqporvkxxUm87VcTMtilr0N2ePTrGo1aXqHAsec9t
+yVGLafrcKzrNIzzSvWJDXqi9nSHJY+NdoGVaZvvVB54GnrKfGEH7IDR5mwIDAQAB
+AoGAa94V5HH2kMNskXznsPpnS/2z+7w2OXFZrvdyx0iSqruWfJqlLbBRUp9orehG
+V1C6oMxNMXaJ+/qqv62uQAAq3oCPHRrN5a1fLzYKk/ixUbk0F7saNvOsmWqbSIzv
+OEtsHBt3zJxEkgLFzuaFnfoBoFL7lvJYol+4QPVvxYj2exkCQQDqVRGFbhRmKBZ+
+ienF9JpUOruKEsW4lmSKP2fUAL4rH40cJEFD0OI80/WdN/34USPOEqSsFTZITvFH
++y+45PD/AkEA0acinvAAb0FLlMlhcG0LGzIwcYUWcEpPxwkioGgwGaEPLR276gHv
+NvgtL7xgLi4QMKB0n48zz4W4Usww6QmbZQJBAOGIZoipXfDEfIHlcp4XwcF3lbBa
+SPpTpQh55hBhdqZCg6mmKzp9/IDW7/oVPdaVIYTg5KTK9ae6cvb4hwHJNzkCQE3p
+YclVAaRWzKK/b/Ga5Gy36x7UybDzPNCHyZF5Bp8PppcqnKHrFB4GfqxlwgyHW8bm
+alC9pBBz7jr+3RJNWq0CQFHxhrjdhQFhYJoW8b+pqE1ryNSSSf/1yBEug6Xsqsjn
+MSuyCTLXRpoS/LAdL95ENCX3ULsu/5nlpKZmy99yY2M=
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent4-cert.pem b/test/fixtures/keys/agent4-cert.pem
index d4b231010fafe6..d39e9d2630b1ca 100644
--- a/test/fixtures/keys/agent4-cert.pem
+++ b/test/fixtures/keys/agent4-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgIJAPgVnPVA249MMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIICjjCCAfegAwIBAgIJAJHwBmNgafKaMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
 dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2EyMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTZaGA8yMjkyMDUyMjAx
-MTY1NlowfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjBaGA8yMjkyMDgzMDE4
+NDIyMFowfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
 MA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQDDAZhZ2Vu
 dDQxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQC9ODycAmQFQY9TjC+2PI65Oi2qfJhvAwSBxwrTOMII
-Piw/p2WxG/Nj2FVNIzMKnD8PxhSQLp9Jy+B8kInxmluAu/RYLlnTnp+RXVILn8eV
-/AYbDJ/es1lYOK1O23vfwfKn8lZx7n6atBTULFdXygAmRSzm5oZ2gy/KMJ69PUnl
-WwIDAQABoxcwFTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOB
-gQAnI7sDFf6+B9xDRZJIDM9ZRF+xZ/ZcfReyYVJRUNDZ/HltbuVHLvRdbEpf1CXw
-zFl4u6Zg0pYT+pOl/C8Cg9uJJZZ88U4IziWpgoK67Y830eAKr5st64YdNFDUjBKd
-t8iNbMQoppeNCdzH1LDzuVSddogho/ro6ax+4CoVAW7+9g==
+DQEBAQUAA4GNADCBiQKBgQCvcVH69FzdPGCUXgwowuBz4lLAV+COzishbuyNGF5l
+J6mw6eY8gizLmpxh0r6d/REnlzKRy3Uy9FdZEQZKKfeK63MxLU6BYaHX0fnqz2y1
+oCaA2eW4yeGOLaSBcjEKHIs964Ik9VKEDnioYtoObbFihRbcS6QLNajQR9ij+7hl
+pQIDAQABoxcwFTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOB
+gQAykzKtLG++xAfLoq2AZ3OKlEYGC4RuOCy9J75RYWNRuy18UnYl0HGSepeqQ/4c
+0r+dy/SLUVKxC7e87hs7gP8UX+f9UaVM7dvqvZbZMVH+A6w2nIAcO3zwtSJlfQ8H
+NJAdQl1lZ6qc97APtBlfeTMTdi/hTghqZLah21/hIE5lFw==
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent4-csr.pem b/test/fixtures/keys/agent4-csr.pem
index eeb06113f8299a..3e803a6a3c0d44 100644
--- a/test/fixtures/keys/agent4-csr.pem
+++ b/test/fixtures/keys/agent4-csr.pem
@@ -2,12 +2,12 @@
 MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjEPMA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQD
 DAZhZ2VudDQxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9ODycAmQFQY9TjC+2PI65Oi2qfJhvAwSB
-xwrTOMIIPiw/p2WxG/Nj2FVNIzMKnD8PxhSQLp9Jy+B8kInxmluAu/RYLlnTnp+R
-XVILn8eV/AYbDJ/es1lYOK1O23vfwfKn8lZx7n6atBTULFdXygAmRSzm5oZ2gy/K
-MJ69PUnlWwIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
-b3JkMA0GCSqGSIb3DQEBCwUAA4GBAI4ksOnyG7so/N9HdcDCopz+7DIS7FvggS6W
-eqMADvdWjmJu24wkQsO7322E8TD8ws9yyNKjalJHGic86Ugmvd7mJgv5po89Mqcz
-mHTHw/6QZ/3Y9rfQgg4nk8Mx0rVgLrg+dvgbzRpQ0ybK+/btCwI5iCNYR/tx1pns
-W0afkoLM
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvcVH69FzdPGCUXgwowuBz4lLAV+COzish
+buyNGF5lJ6mw6eY8gizLmpxh0r6d/REnlzKRy3Uy9FdZEQZKKfeK63MxLU6BYaHX
+0fnqz2y1oCaA2eW4yeGOLaSBcjEKHIs964Ik9VKEDnioYtoObbFihRbcS6QLNajQ
+R9ij+7hlpQIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBCwUAA4GBAJ4tZ0hFXYqGQ0BDpcI6QIjufzoFHXMHBmE0
+wHU1f8jVM2v9Df5eInArMvAVya4gXtuZnMpRZKNrcbnwPUK9spwIzHxPyw7qjeCP
+SG+TusJoFFIGgpZBo6zVdtpRCRbTxNfKteK+y34g+sYZolt88AmlzY8H2QYeQabI
+1SBuLdBH
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent4-key.pem b/test/fixtures/keys/agent4-key.pem
index a0c6bc9242c985..1e9a8b8d2ed911 100644
--- a/test/fixtures/keys/agent4-key.pem
+++ b/test/fixtures/keys/agent4-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQC9ODycAmQFQY9TjC+2PI65Oi2qfJhvAwSBxwrTOMIIPiw/p2Wx
-G/Nj2FVNIzMKnD8PxhSQLp9Jy+B8kInxmluAu/RYLlnTnp+RXVILn8eV/AYbDJ/e
-s1lYOK1O23vfwfKn8lZx7n6atBTULFdXygAmRSzm5oZ2gy/KMJ69PUnlWwIDAQAB
-AoGAUDom4JLW66+XYHogxKi6buiu8gkv7GmgIJJPEa2P/0S1KCwGnuhV8vCHglQ5
-UPdceYinsVZDLVvnC4mRI0IqJxlbZ383EmDGJU6K6gn0pLVM+VBcqQKG32y9GtXu
-eBBchRi/tFDiCWRkBETz4O3UDKJsr9ZvsxmlrmwypURnBmkCQQDhDeSBTfbErLRY
-rICMZZqXWK+Kg/oRX78sQCnOvehQCwRU/jCjbtSiKhs/FVJWNC5CRpCMQ5rpbWYc
-jguSpwtlAkEA1zzvYbKaLcEFRbmOwLyC70CQOll/IcviOKcd0TlBE4pfTrIZW+GW
-MhNTsf1bu/ZAfo/mKluuhxiPFeOEx9kBvwJBALPXmTmnJsJFzJxrxRHsg5vb9/M1
-wdiubaOb5ozaf1GvbBfLROzlPTAVe85uaGyQqEK4Bvy/bYSJsqaw8BiSOm0CQEOr
-3+OKoNjzz/GNFqnYWx5X4UDHNKZukNCZElHeu2wmXDLE4h42Pd++ndjfPIFLOhnQ
-ql/09Vl6Sjpqjyu6OccCP3TqpfqihkMkysTbC529Mh7h2okjWdkcHp9LNDn0EQj3
-BAkB5XEgSLxiqAsao37HDp/Dflhgv6ZL5em0E5bAaQ==
+MIICXQIBAAKBgQCvcVH69FzdPGCUXgwowuBz4lLAV+COzishbuyNGF5lJ6mw6eY8
+gizLmpxh0r6d/REnlzKRy3Uy9FdZEQZKKfeK63MxLU6BYaHX0fnqz2y1oCaA2eW4
+yeGOLaSBcjEKHIs964Ik9VKEDnioYtoObbFihRbcS6QLNajQR9ij+7hlpQIDAQAB
+AoGASgLVIbf6gP4ahByUppFnXJuqayfnPHcu7MC9m9we3i94P4C8tuP3f8Dunbno
+3f9HQFthYu3guCkpvBIZhCnmGgrge/Rm5IYN9Jktc8gTSQ0NlJbr3hjgHEkJXhca
+6zE/sFEgZVWF/yCIunyU3umbWBJE9R+suk+mpe1wZ9T+AXUCQQDU208b7AvW9Yoo
+8SomHE5B1FJOwnyEWHBJ9W0myGXOrJbf6zNJ4eOLQsn1UWSsI9tzgeh49f6smc7B
+bhWhHqoLAkEA0wCs6zyKs0pbzGfGYQFafDbjSUBbT+nn4tXR+3O7Z8K6x3gt7DBx
+VtlbJtfBBWCCrIgYsrU3TUwtweDV6umtDwJBAJN7tU+SeQ2jKex+VQb8+9gu5iy+
+IwqMQJluHQgPOENAYHWcAPiDNGdMiqSYldmUKrzY2RvezmwHUjPCM+hkV8sCQQCF
+MQL2RrQi8sg5ojQmXa1ZhWg5gAdjzXnTxTcUa/ybRd+TNDiAxB93PCL+xOiR1VcH
+Q62beSqcf37OyHcgHztfAkAEHZwjVSRXFELBQDPzespHXVC3rwpQlbd1tqOybmPd
+tpqmlWjvFxdvEDQZnemPUCtXNhMOaXcSOeeSYcUkIVX6
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent5-cert.pem b/test/fixtures/keys/agent5-cert.pem
index 2ae70a9788cdab..31e95265ff0470 100644
--- a/test/fixtures/keys/agent5-cert.pem
+++ b/test/fixtures/keys/agent5-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIChTCCAe6gAwIBAgIJAPgVnPVA249NMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIIChTCCAe6gAwIBAgIJAJHwBmNgafKdMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
 dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2EyMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTZaGA8yMjkyMDUyMjAx
-MTY1NlowdDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MREwDwYDVQQK
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgzMDE4
+NDIyMVowdDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MREwDwYDVQQK
 DAhUcmVzb3JpdDEWMBQGA1UEAwwNw4Fkw6FtIExpcHBhaTEnMCUGCSqGSIb3DQEJ
 ARYYYWRhbS5saXBwYWlAdHJlc29yaXQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQClldd/5IKiKBpRdTuJbkYpfM8ksSRn6kaDrmDXgnywjEZweBieQf4N
-T6KrnIVowtW+aDAigYKxFupdhKdzzSTLoQkxKxXzdeiIYjaL39SMtCBCQeziJ+0d
-yEVUnA23qySJkkQwAZgH6O09XOfxoaDwoXD5/exPAv341wN52GITxwIDAQABoxcw
-FTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQAYTgQziema
-Qm593zYGZ5xjQdRl5+cgA6hVAQ6SMDLFqxsPaLd+YumJhlZ2IqBrRT+mjXjS94Rh
-S8wCD2xZ8f4XRiE61Sc+K4xkY0ezaNMkc+iVw40aYX6nqoiNimGzk/k/2r9q5SGa
-MXzu74XMo0fyCKW2yAdiecQZMWvkadgwzQ==
+ADCBiQKBgQCksphKSkbE4aCa68r2o7j2xWbxbWP+bjAGwWWYQwnacQ6p5tlhaN10
+ebDAmPVakLo8xxPEXMqWFxCU2AWg0Wtd6TgqIQtIMNXQz6cif5Ufxo3lhus+dLhs
+flz+yTpFD5vREvn0kQ9ce+jVjVzh8bK5qfpaNlaIqQc64WpJKQe+8QIDAQABoxcw
+FTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOBgQAYcJ8LyVUB
+5GNqnVdJW4dndeUvllYW3txxuUXhcxgvT7b0glDXSp/cRq0yxZb1jRCLqESsHer0
+o064S5GCWCktZWwbDo75YFE2Vo1R8TChhmD1txFcAi2J161yn9QVoHVbOhyyIHXz
+Yw9zhrnJURZA+1lUpIarcRmkUsbSR25gyg==
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent5-csr.pem b/test/fixtures/keys/agent5-csr.pem
index 32424ab7239d7d..6d670ffd8c7302 100644
--- a/test/fixtures/keys/agent5-csr.pem
+++ b/test/fixtures/keys/agent5-csr.pem
@@ -2,11 +2,11 @@
 MIIB2TCCAUICAQAwdDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MREw
 DwYDVQQKDAhUcmVzb3JpdDEWMBQGA1UEAwwNw4Fkw6FtIExpcHBhaTEnMCUGCSqG
 SIb3DQEJARYYYWRhbS5saXBwYWlAdHJlc29yaXQuY29tMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQClldd/5IKiKBpRdTuJbkYpfM8ksSRn6kaDrmDXgnywjEZw
-eBieQf4NT6KrnIVowtW+aDAigYKxFupdhKdzzSTLoQkxKxXzdeiIYjaL39SMtCBC
-QeziJ+0dyEVUnA23qySJkkQwAZgH6O09XOfxoaDwoXD5/exPAv341wN52GITxwID
+AQUAA4GNADCBiQKBgQCksphKSkbE4aCa68r2o7j2xWbxbWP+bjAGwWWYQwnacQ6p
+5tlhaN10ebDAmPVakLo8xxPEXMqWFxCU2AWg0Wtd6TgqIQtIMNXQz6cif5Ufxo3l
+hus+dLhsflz+yTpFD5vREvn0kQ9ce+jVjVzh8bK5qfpaNlaIqQc64WpJKQe+8QID
 AQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3b3JkMA0GCSqG
-SIb3DQEBCwUAA4GBAJegSKpkqj2SlIyWOF1Km2YcAmW8sPlBsAVbP6Ymui6e63PM
-u4wnufVABUEAYomBXQYx1WVdnPOFw1as/buRrGGvbqQZm15LpjKE0JfuXo9fliqh
-f+TXRrTBkvIqhK+2nBQRGmxuZQ+6xFUwT3JRFxBzLhJuSLy7Xfhl+QFlq7HB
+SIb3DQEBCwUAA4GBABmDywVdbouxznVhI5cnTB2cZTGKMDYCnYx+0pFOZw6ux1eR
+oUF59E/QCIfibOI6b1+Dd7O3hK81aCQxd6oBiWWg8gyCjFcoCVqOkR/Ug176asZv
+72+l6pBLYoZlmPrQXkxtfL+FtLM3/xLdt6hDSZEWyznWcraanDqKx9M4NEgG
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent5-key.pem b/test/fixtures/keys/agent5-key.pem
index 07e358546ffa42..5de95c20b98020 100644
--- a/test/fixtures/keys/agent5-key.pem
+++ b/test/fixtures/keys/agent5-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQClldd/5IKiKBpRdTuJbkYpfM8ksSRn6kaDrmDXgnywjEZweBie
-Qf4NT6KrnIVowtW+aDAigYKxFupdhKdzzSTLoQkxKxXzdeiIYjaL39SMtCBCQezi
-J+0dyEVUnA23qySJkkQwAZgH6O09XOfxoaDwoXD5/exPAv341wN52GITxwIDAQAB
-AoGBAJj3rwggEqo4v+9mjKSuMbTb7wSnfMlevNujOSV+DzCNtfjqiVuR/V9QpSdC
-RmB8NTdcSrNlz1VHpSTVilhJOGZEJO0FMVPzEj3SHpYltfn6nULIhHCWnw1w1/1L
-HG6KpBqphGWD88VZrIrFYJqsqZ4dYJmo4wSuEWlNEY89IT4ZAkEA2QJS3nIetck1
-WDse+AcUxA5xu/cm2RKYMHCVtXFnLKM2LQBlHw1XKiDq4vnuOJcBdTplCHfurxzr
-H3QYiQxIGwJBAMNWM23i6w24nN6bAQvT+0cfdCRjfOAdA18a8NePBIBFGXFWLoNU
-ZX/B44pTbVJ3ZD193TQD34JT5CDx8EcTNcUCQEUvZngg7gWK1oUApEjzCP3QlRYW
-H76JHRgkbLZiJ0Cl8Dm8rICP4kA+KmSexgIosoBLU7a1ddVCZPusKb5Xug0CQAc8
-nlMn4QV1HXqxy2wgwmJ0K91dQjcbXBCd8uZJiiUmajbktnxvGAOPr1pklNxFSBVv
-IE7ZBeLSMNV3oStA7vECQD9fJpLUpakpuZn8k6/YI9KMeN6EvS3QEPPSzCZQV4A/
-BEgBKV4hPdIC7CkTzYmjIjSZMOYydx6dZZHu7+2SIhg=
+MIICXAIBAAKBgQCksphKSkbE4aCa68r2o7j2xWbxbWP+bjAGwWWYQwnacQ6p5tlh
+aN10ebDAmPVakLo8xxPEXMqWFxCU2AWg0Wtd6TgqIQtIMNXQz6cif5Ufxo3lhus+
+dLhsflz+yTpFD5vREvn0kQ9ce+jVjVzh8bK5qfpaNlaIqQc64WpJKQe+8QIDAQAB
+AoGASLj7ecI2YXTnP8DiC+nbIEul2vDceFobJsB6pbLkROoq+WaPke2F64pYO5LO
+s8C4G2IkHk6CvadNkQuZ4JrX9xgNdxWRHGAbDedEFnN8gi0inHQjHITj62Il9civ
+JB8cR5fJxzAKZS23elrocrzU6lU90V4gm4VUUJ6dQhZYO2ECQQDYoC6r+Qf9YCNU
+89/RnGdUzL26l1S/GmUw5VfIDorMNbwH1xfg6Z8MukF42Q9kZQdtoh+HVLG7Ljok
+2cLmmBA9AkEAwqIlSsiGSjfJlzQoDi13X2ZgVp6/nicKan1eKCPq+EnWhA5CP1u1
+5WaYBbLjlDl7A7VA7gMd19tSNGHzRQRAxQJBAJe4kRe3wsXOqNBeQnuf7Kty/suK
+JDv4s7jsWG/w53uhgwGGv92yIsiaRzLp7CLns60wqJ5zTkwIU4bt0dkJ1g0CQD9D
+YQe7whqho37oTxS8po51wl6lXvdTDUmr0k0Nz7RAm990mwfpEWitPkCr8tkdDeUY
+pzA2Bx9AhKnOJLqMNVkCQAwJYI4fS7Mec2f2Kv5SInxjMeasGivzDxe99EyLS8jz
+dWfNwtCGA+gmpqcWqpT/JNnJgG4ljseW7Xk6YogngVU=
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent6-cert.pem b/test/fixtures/keys/agent6-cert.pem
index f47b6bf28bad67..18ded35c1f3f04 100644
--- a/test/fixtures/keys/agent6-cert.pem
+++ b/test/fixtures/keys/agent6-cert.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIICbDCCAdWgAwIBAgIJAOmH20toP0GBMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIICbDCCAdWgAwIBAgIJANAIL0WLbvvoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
 dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2EzMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTdaGA8yMjkyMDUyMjAx
-MTY1N1owdDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MREwDwYDVQQK
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgzMDE4
+NDIyMVowdDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MREwDwYDVQQK
 DAhUcmVzb3JpdDEWMBQGA1UEAwwNw4Fkw6FtIExpcHBhaTEnMCUGCSqGSIb3DQEJ
 ARYYYWRhbS5saXBwYWlAdHJlc29yaXQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQClbVjopeoE3BHAf9O/zO5DyQvpNfRBB4QMnaUVhsfu0arp7YKMYS1v
-i+HjIP60m/6uaXpgWQPGJIAcO8V1fGq49U4/XgLmsgmSeaSjd5XzutDYVJRHFQVu
-Mr9oKKf/1cCfCqJzeUDirC5snz+rauzLlD6dqS1293v/1naCC+akMQIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBAKFx8usWox9ncOq+h3KPjXH1y6m7ceKHs3zUj1UiSmVp
-+E2cFQX9Azceqouf+m8At2e6Ki8JezY66JmZvh0vEUDg7RxIcQf9IRaPADub+MKp
-UtAeaIgAQMbRl2dEiSrfjPoOBoqNy3R1eIfrDEyDsiPpqJALbUxfA/S0Ly7JMQIC
+ADCBiQKBgQDBIF2kWViZb+GpjUKfQ2Jevk68mLWXib66z6vCi+mjpcvZeq6A5Z0M
+qNJYftEgSykluxL9EkpRqWr6qCDsSrpazMHG2HB+yip8/lfLWCv/xGAHh9+4XY3s
+UPGIGg+LmvhRCZvgxARxY2uG7AB+WZVMby4TCyAFAT7D/ri4L8iZZwIDAQABMA0G
+CSqGSIb3DQEBCwUAA4GBAFU3MAVxVCmsaoNxr0y+KK/n0iEAzsOH9r0L3PL2gJtl
+p62iOaOPw1/9x8c77RA6z/nXPX9IyAwASv0n8FEdxuIF2+KqFG6bXw5nyfgPIszr
+U7YSV2Pi/Heinr76RrI6aWGtvEuD56Qt3Ce5TYiMnzAWtqEcPLGjgsx0MAv+m48B
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIChDCCAe2gAwIBAgIJAPrVDMagf1FtMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIIChDCCAe2gAwIBAgIJAOzJuFYnDamnMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
 dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2ExMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTdaGA8yMjkyMDUyMjAx
-MTY1N1owejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgzMDE4
+NDIyMVowejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
 MA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANjYTMx
 IDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDIVigurX3u6qjhxxWERDRINbd8jc9VD1GD1T5SCt1oBjeK
-qyUSEV4f6KFvHuh3oKjmiJy4OvuiNMkzNxI3v32yoJHkQUchB4tlBVLec4gz+ZfO
-9RpM10gPBes9nSh6LUx4myZ8Rpungw0UcZaGvrwPNZYbFWvCqUSuea4GVF20fwID
-AQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBACbwa28NeiUG
-mqw14fpmT/ZDpc/BAR8gKO8OutMZO5oKjlFjplhujFlie3Zza/hxIlztF8IdYCE/
-/BZruPB+ed9ls5I7ODH1dFw8YAhxsa4y/lNP7Cq721SH49oFZJslqj1PYmhy1q4m
-XrNdd447SPkWlB1D1s9NYINmqzNEsJyU
+AQUAA4GNADCBiQKBgQCZ9fF/1UcYaurFIX0QIyAJdojn9+bfsTcjEIoGbsAnQLz2
+bsZ4pqRNhZbYJApxqc+oDzZOqJOaxe8mlB5jUZ/sUA9Sp+wfWly95tkEHBMSse4x
+UNJVM4vFPfOG4fv9fYGH3pcmAU1QnST4Fh+qZRzrh9wa99ltmB/U2mJEF6NriwID
+AQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAM3CFiDdGEcx
+07J6pm4zGX399VxPr50PID110jmX7BRAfqva+wBRhwweSxZ/QRcKe1v/FK3GE87y
+RbaXhFfnPRUHoUHQMtGwmZuZcdK65Pim9RPGb7qrEJ2wlPt/C1Q6VjL/fBGqjtJM
+Bq/2GR2GoBsE85jGM287hcvXV0eG5OwM
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent6-csr.pem b/test/fixtures/keys/agent6-csr.pem
index d19b5e31c9d5de..af864a617e9756 100644
--- a/test/fixtures/keys/agent6-csr.pem
+++ b/test/fixtures/keys/agent6-csr.pem
@@ -2,11 +2,11 @@
 MIIB2TCCAUICAQAwdDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MREw
 DwYDVQQKDAhUcmVzb3JpdDEWMBQGA1UEAwwNw4Fkw6FtIExpcHBhaTEnMCUGCSqG
 SIb3DQEJARYYYWRhbS5saXBwYWlAdHJlc29yaXQuY29tMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQClbVjopeoE3BHAf9O/zO5DyQvpNfRBB4QMnaUVhsfu0arp
-7YKMYS1vi+HjIP60m/6uaXpgWQPGJIAcO8V1fGq49U4/XgLmsgmSeaSjd5XzutDY
-VJRHFQVuMr9oKKf/1cCfCqJzeUDirC5snz+rauzLlD6dqS1293v/1naCC+akMQID
+AQUAA4GNADCBiQKBgQDBIF2kWViZb+GpjUKfQ2Jevk68mLWXib66z6vCi+mjpcvZ
+eq6A5Z0MqNJYftEgSykluxL9EkpRqWr6qCDsSrpazMHG2HB+yip8/lfLWCv/xGAH
+h9+4XY3sUPGIGg+LmvhRCZvgxARxY2uG7AB+WZVMby4TCyAFAT7D/ri4L8iZZwID
 AQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3b3JkMA0GCSqG
-SIb3DQEBCwUAA4GBAAQVVx4gJtdNpKrVpQ90Vu/nj/43Q4p/c2KdKlwzhkvcBp5X
-5oJQdU/z9OJTRJIz3U3utDsmsNwPIaeSomPISr1OgmKfroytr36AkUmpeqGjK7Cx
-ywkk2iENiiddS8eECmaYXO9iCwDelDMksFUrE8sEWYUwCjfuHMISiirmz5Dq
+SIb3DQEBCwUAA4GBAAX9mbfgDULEA541c1teuG+eW0KLghFaaotFb0+R6WD1ZQLO
+Url8y1iz6T/qqfuoAWu5OA8/7sKDdta/0mzV6UoGnDOcnWnH5FURmnQPUS/hBJ6A
+mJBslJx6y0z4Rl/fxJUy5K31YbeRHHLEneM211usTv8QguAD0y2BNAQ0Mno0
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent6-key.pem b/test/fixtures/keys/agent6-key.pem
index 898457f0ce6cb4..0a2f2fae4f0c32 100644
--- a/test/fixtures/keys/agent6-key.pem
+++ b/test/fixtures/keys/agent6-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQClbVjopeoE3BHAf9O/zO5DyQvpNfRBB4QMnaUVhsfu0arp7YKM
-YS1vi+HjIP60m/6uaXpgWQPGJIAcO8V1fGq49U4/XgLmsgmSeaSjd5XzutDYVJRH
-FQVuMr9oKKf/1cCfCqJzeUDirC5snz+rauzLlD6dqS1293v/1naCC+akMQIDAQAB
-AoGAGfA/VJtPSlvHXMuuRBC5+172wyZ2mgu3pNLDI9DyYHv3tJ5NLf2+xhLE5Hwz
-89XR5T8ctSa/9L2caNDmcTmE8iLLAquhc/ZrxVGrL3RvL4CSur2X+7BF5i4QESrr
-V50B23PlocoPyfhaZ+f/2HXm1i8JWZeHz/l7ky8e7+GQ58ECQQDXNDvF2cfGfG/c
-AiIuawr9uH55IPeii7hw6qmDpJ2haas7jGJ56rAU15Xb9dKDm6prNKaFyeHK9YLl
-olQmT2x1AkEAxMl17Sih9mt1yZFWWKWt2gmetQR3zITox1r98ocoMxtzN5d4JHd6
-1WleBvTvLnv6DQyKZgUHCo5YANHQA6pRTQJAXUlmM8DQ6cidULiYCpkaPZvRLz7M
-OejpPgFrFAay0fqVYI3dTk4eoBpH+v6Xj7dV63z6RnqZ5zn/0P1KDwVU1QJAWhVj
-X5KXOggNXp2iqmgFwudeeL033i8FpKUZ1Vlb5LFvOAal4AO1/lYCzip4B46HdEvG
-W1d31rQ8wvtJPzRLjQJAfhQXhlqngx7oUAdaz1Dy4AXyv6+khAXqq7aoQPq+Df+l
-buwTlQkUTyHdPXha6eUnpnKhD14omo8f3OY/1RdOsw==
+MIICXAIBAAKBgQDBIF2kWViZb+GpjUKfQ2Jevk68mLWXib66z6vCi+mjpcvZeq6A
+5Z0MqNJYftEgSykluxL9EkpRqWr6qCDsSrpazMHG2HB+yip8/lfLWCv/xGAHh9+4
+XY3sUPGIGg+LmvhRCZvgxARxY2uG7AB+WZVMby4TCyAFAT7D/ri4L8iZZwIDAQAB
+AoGAIfEMRBwnxB+zq1bWRKNVII2VzPORxqZAzRg+eZyZXVeAMiKrlJ/GMDljboYr
+Pt+2xZjRR4T1ZtC9qnvt/VlM0uWTEIgyzo29ZO0Bd9yMnIF2EUlzVtW07UnN6+VW
+z1/RxOgBiAvkrSTgN4SOQJJIgOZYAt2Xhrkz/0CLwEOis1ECQQD+1hQkEYwvNH6Y
+qUVoWvlNg0Q4kozNQCrwUrkHCtIOxCmr/KxcwcPBaVmEypcCnwf78KbgUQ/5oIgZ
+OReuNcWjAkEAwgIk38VZRxSyBP1RThbKrK5h+GIwkEO7RW7lZ9yoVKhV6YDMWof0
+xCl23YwdpflaTUHuBVOYa3EPegkOGCfxbQJAdCTDpzCsMHN/Yzp6nLYhu3chJ5t7
+OqyNJVy+YXxIAlzbFTyind/dxQ+rsf7XVmV+sQ+cLs4jNsU4Yi6IIWj2ewJBAKRH
+OH4bF9vulEdRUTV0ay4Jg3/VdRXTpJHIs4xc9lSpLgZJP8Ew+nvYOISlDr3qBSMC
+PtBX1uqzk81cOYkO2YkCQBUVMew70XetUXgh/2KOWyG/87uYy/s/NZ/LGImvo+tq
+FUapBPapob9I7WA6gRYVseiE+mSGPAciGIFg/d6iyxI=
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent6.pfx b/test/fixtures/keys/agent6.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..1f1d827dc9336527049a6d1722b27d2016ae4476
GIT binary patch
literal 3029
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
TNf{s&y?6%NjQ51~@9+K>A5NA-

literal 0
HcmV?d00001

diff --git a/test/fixtures/keys/agent7-cert.pem b/test/fixtures/keys/agent7-cert.pem
index 6a26fd45f2e5c5..98d3f6210cdd51 100644
--- a/test/fixtures/keys/agent7-cert.pem
+++ b/test/fixtures/keys/agent7-cert.pem
@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDEjCCAfqgAwIBAgIJAL1FQTepkhMPMA0GCSqGSIb3DQEBBQUAMDIxCzAJBgNV
+MIIDEjCCAfqgAwIBAgIJAJ4TtCDh9ccYMA0GCSqGSIb3DQEBCwUAMDIxCzAJBgNV
 BAYTAkNOMQ4wDAYDVQQKDAVDTk5JQzETMBEGA1UEAwwKQ05OSUMgUk9PVDAgFw0x
-ODA4MDgwMTE2NThaGA8yMjkyMDUyMjAxMTY1OFowXTELMAkGA1UEBhMCVVMxCzAJ
+ODExMTYxODQyMjFaGA8yMjkyMDgzMDE4NDIyMVowXTELMAkGA1UEBhMCVVMxCzAJ
 BgNVBAgMAkNBMQswCQYDVQQHDAJTRjENMAsGA1UECgwESU9KUzERMA8GA1UECwwI
 aW9qcy5vcmcxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALCm7Zzcl94OLdlf5kL64gZNJby8pnR/rODqM90iHBqQ3wNe
-645i/icRk2D89kOSFIJfPuyYBNxsslE10p1Z/+1SeptK6bf2G4BfDbAiEhkoGNfz
-gqj+CsvmCePlN0wKt5Dvr3ePc2ZzD+RPMe2nyPYaJzen3eG3gtxNcJjUNu5q8UmR
-acPXexRctxkGMknZwIQffZbw8imbXCx7UAqxsdbvqM5y3xYFhAEkoaavVYNbXdu+
-LxKiIpRSqqPRwMiKieI0gvMtGJ17VFyrQxReB1rRtG/FQyFc1KdnTLbMbpJ14I23
-uhe211TTfgXIdHJo5GWlvb8GH+jplPfvFIA+tzkCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAD+viY75WLCyN6U9VMYUT9K6AH3rEAMtxS5XgMUnXGDqz17BF88gDc+Rw
-qhDQBOdWSNgo7xYfAtYk8KYy2THo0tDoIT1lE1hUvK63kwY/HivKZD+/A8vQgWyM
-m/b6mX7fEHNf9UrqdU8IiUJy6Gayd2ZUeYW1xOm4hebdEy8/SE5rvlodePbfwrQe
-V/kAUN/SBjWsk1oYnAk/MYV03p5JbfqpYiVM3/wO63SS9Kos2JfoSLYT5/iUBLG7
-TaEToJFSoA1+UCL/1v2hbWcCRHZrku55a6MSyAUxuCoTWCFHWWnKyC9iBBk7zApI
-3zGymgVX6g21j3iVo97G07oAMIHjsw==
+ggEPADCCAQoCggEBAM2+DkRxPeRGI4JK0YpuaqCJkNswMYMyZM4VQYyn99SL7xS8
+lB9P0vIm+K1P4198WXwUHSykWRcyy54nMNpq+9Dfy8BalHRaUa8BO/7UQgipRGi0
+HidDk/bAuNNHNIzJr2sGYGHsZuHkO9inEqDcqrSlTc0G0zyLry5LekRZRTgAlXpl
+C9PsAZl0J+gGA83rUhdD/RDjaT4ldqjLKycHvcMLCIS6Wq0TszYCUdbvMsageDcQ
+zQerIJkHzfJFGYCetQR5/fiIKyF1bICKD22AnpLlfhdthAhLVlYQn34IlYJwdptq
+2miktcqvBw4rnBhE1ONj8DqF61S9BKr9aCf5OoMCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAbek4GyLi+vVeUg3Od17lr8qT108iP3esUJ5cfPrXaexxcypRAmYPB7r4
+NA/vVeOTNkxbb07Ct8dmz+rTn+FflI9h5eKRC7hbH/rFTDEfnoS66eSlxr/jJgtv
+LWuKTMJhzXjgliHleaBDGzo3mR5hcJbQvj9qyK4pXjxlt2QvkPdx2H9H76+nBh1g
+TY5bW4+3NFaHfaR2p2T20bY3no25/vfV7K5endff6pgzcZR3/SptGTywC4EZzIcz
+9Q0JnALQtxAAxq1yrljQcvpjM/aAYY7BxwFHJuLmb/FpMulkzZ2vJALluF/3G5ne
+RT9QhxJdwUz+Juv5QKH2i+nnb2Ur6g==
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent7-csr.pem b/test/fixtures/keys/agent7-csr.pem
index 556767b05c09c0..a3634a637f8cc3 100644
--- a/test/fixtures/keys/agent7-csr.pem
+++ b/test/fixtures/keys/agent7-csr.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICxzCCAa8CAQAwXTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjENMAsGA1UECgwESU9KUzERMA8GA1UECwwIaW9qcy5vcmcxEjAQBgNVBAMM
-CWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCm7Zzc
-l94OLdlf5kL64gZNJby8pnR/rODqM90iHBqQ3wNe645i/icRk2D89kOSFIJfPuyY
-BNxsslE10p1Z/+1SeptK6bf2G4BfDbAiEhkoGNfzgqj+CsvmCePlN0wKt5Dvr3eP
-c2ZzD+RPMe2nyPYaJzen3eG3gtxNcJjUNu5q8UmRacPXexRctxkGMknZwIQffZbw
-8imbXCx7UAqxsdbvqM5y3xYFhAEkoaavVYNbXdu+LxKiIpRSqqPRwMiKieI0gvMt
-GJ17VFyrQxReB1rRtG/FQyFc1KdnTLbMbpJ14I23uhe211TTfgXIdHJo5GWlvb8G
-H+jplPfvFIA+tzkCAwEAAaAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBw
-YXNzd29yZDANBgkqhkiG9w0BAQsFAAOCAQEAWo29DGuO+fzXS9/b6JYMbH/13+RN
-nuxZx/rWLjRG3v128hC5dn7+M54fPIbsSUUC22Xr+qq7JoleeG8IAaFJGeCtAAw/
-x00uBqTDPbwbDs8ph+NvzSAXLyW9chiz4mfCPy/G+sM+a8harUeDyHDeYHPM0Dhs
-yBiWKhVSkH0qbbbb2oLA1AAh4f4mN1J2/u88h6rtTTyKao/t9JkQkPmslxnW0e/W
-HYvvQiUxm41YiaugHqSWSSgDZPEEJils3SyS9d41z0SlsEnSoh/TtPsTgqTHACXd
-pW3CQ4lGPycXtKhkMW+wHm3iuiJtMCDVEhGw3eG5jOc/7wwSInqXrR0Iew==
+CWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2+DkRx
+PeRGI4JK0YpuaqCJkNswMYMyZM4VQYyn99SL7xS8lB9P0vIm+K1P4198WXwUHSyk
+WRcyy54nMNpq+9Dfy8BalHRaUa8BO/7UQgipRGi0HidDk/bAuNNHNIzJr2sGYGHs
+ZuHkO9inEqDcqrSlTc0G0zyLry5LekRZRTgAlXplC9PsAZl0J+gGA83rUhdD/RDj
+aT4ldqjLKycHvcMLCIS6Wq0TszYCUdbvMsageDcQzQerIJkHzfJFGYCetQR5/fiI
+KyF1bICKD22AnpLlfhdthAhLVlYQn34IlYJwdptq2miktcqvBw4rnBhE1ONj8DqF
+61S9BKr9aCf5OoMCAwEAAaAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBw
+YXNzd29yZDANBgkqhkiG9w0BAQsFAAOCAQEAKcwglrFyAj+pc26WqHv5R9NToUKF
+1Yd5zkExZHWH5glrAprCdRhUY575KcY1Sz4KCCRADdYo7KGUFHi4B/N+iyIS9m3t
+TWpJQVq4o98hF0+FalhdYyIND2FdiTmdxzmi788JFcTKZT1ryKyoB7vAj0kvXdED
+3VU2mDoxPc17ZInR5x0A8hJHDHY9SlDL96n6QTEAByXfqNq/c8S7bkBPEJJUln7G
+L/8YWxQJ25971PEX/QLbWADMkSPGkHCHF0znZhtJ6wxTFRkdQJSa9FASKpVgDMMu
+wQVEnOa10z2aQ3PayZUHh43zq441FakE7LAseeOoJChPb00lFrN3ph+TnQ==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent7-key.pem b/test/fixtures/keys/agent7-key.pem
index db2c889980e3ec..bc4cbe878af043 100644
--- a/test/fixtures/keys/agent7-key.pem
+++ b/test/fixtures/keys/agent7-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent8-cert.pem b/test/fixtures/keys/agent8-cert.pem
index eec8e13a85ccc9..7b9304d7448c15 100644
--- a/test/fixtures/keys/agent8-cert.pem
+++ b/test/fixtures/keys/agent8-cert.pem
@@ -2,19 +2,19 @@
 MIIDUDCCAjgCAQEwDQYJKoZIhvcNAQELBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNV
 BAoMDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsMIlNlY3VyZSBEaWdpdGFsIENlcnRp
 ZmljYXRlIFNpZ25pbmcxKTAnBgNVBAMMIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MCAXDTE2MTAyMDIzNTk1OVoYDzIyOTIwNTIyMDExNzAxWjBdMQsw
+QXV0aG9yaXR5MCAXDTE2MTAyMDIzNTk1OVoYDzIyOTIwODMwMTg0MjIxWjBdMQsw
 CQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZO
 T0RFSlMxDzANBgNVBAsMBmFnZW50ODESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwD0j4pL8gbhtpmcKdPo/Iq1HpuZi
-VOTjk16e/AfBXjvZoUg9lujr/Mw4X1+X56zfr05Y3+Pyr8euVf/2t81RwvqyjB84
-xFKrk3wBnciv3JodbzmL3aKqVeAwE2O3DSvcR/yaTJtW7EthnDfvaoUwSTN4zpZA
-c/PMVpPK0LWZ98vjIdQ7dTOFTLDmawtVxWouX7VPdo0vtYe3/DnzyTojhWQyCL68
-KS9AeWc1opYWmjLeHhOBC+8ovfPRBd9/kjZX0SsWRCC3bKqmJJ48/QTJe2jQnc1V
-ERgiWy8SCS9irPDJpqGeEXJiAhCEfZGqZzjW+G34803rBGZCW3t8BibtPwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQB1ixGtVRFWh3BGT096vdIhOjg/v1c8RZeIEgex
-/GKGxcTq7BnQTh4QCTIvcgj/x2Y3RVpKzjF6OCMgAxTeY8cq0uSxrJXAMtpEyOaQ
-izF0AwE0baehEY14VlYyuReZOcjVRoQOkNuDUa9lgmfLXQPMvC6rNnpRkD1mt/ot
-GBCdHEAGcQNzcRcGVsAFDf9X3Jq6misskbsq/m+If/XXaIiGvT71XsV3CQYp+RF+
-QjcI9bjOOKwb1V7iGl4BBIIDdqMAaLPdKLymYKGglmWAtwwm5n6F1ViOoDXi1VnH
-vai/7152egBZ0uoB/KumTa2LpuJUAGQ4b0QA6wb0v+JuOaOG
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCbXGqz553XQ+W9zsQEaBc1/mhd4
+TFjivwbK1hSdTuB8vWyOw6oZuqAJjctcIPmNXf01zV1+cAurpoU8k9SmtetwqaDV
+0K5ooKUuzgAefRoLJqU0XonW4VaK0ICQATkxSWdJzYET68NTukv5f9Fh0Jfi2Q6Y
+PKlgUIuoTPQJSErAMsdph4KWMP7zsaEZNJhmZ1Lprfm4DdVnwUfYvDhq5VmAHFLj
+Vor/z3DJS+pW9oORDta3CMvAY5oGcIYWWMxsoG9B9NtTTs58jjeFpJrw/RYJA/CM
+uRawLWKt/z1zPhzmvknTKfAIc6SjbBqu8Nx/Xvcd61c2V39U/nZDTs+H9QIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQBfy91+ceZDfZ0DnHHAlm8e+26V5sdrdOXZJtkc
+AacDcCX6AD1iMK+0axBgG6ZJs6m87cmFdaq23pLpBLQ+KHSdG5YgRCEuWW+RaJGj
+/vVn9AS4eB3EmX0RhhJgYyVbN7ye8qjfAv0NtHzUsdMS8ay3HbdUCtrcsHonGDR3
+t/0BGsYny9Kt2f2PNN32UEkx/jhcssXwnNGxyxR/04heJUe6LI5ErdQoxxvaZtrd
+u9ZgjSxix4dFH4nTYEYe3oXM1U7PakbzOzJvRMmDh8vYyK7/ih0w8/DcsK0d1Oej
+mgtTF/IyJqy8T9goFf9U2uSshia+sKJBfrrzRaUHZMx+ZobA
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent8-csr.pem b/test/fixtures/keys/agent8-csr.pem
index 251cb7fcb5ab4b..9b76b0f530b265 100644
--- a/test/fixtures/keys/agent8-csr.pem
+++ b/test/fixtures/keys/agent8-csr.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICxzCCAa8CAQAwXTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjEPMA0GA1UECgwGTk9ERUpTMQ8wDQYDVQQLDAZhZ2VudDgxEjAQBgNVBAMM
-CWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMA9I+KS
-/IG4baZnCnT6PyKtR6bmYlTk45NenvwHwV472aFIPZbo6/zMOF9fl+es369OWN/j
-8q/HrlX/9rfNUcL6sowfOMRSq5N8AZ3Ir9yaHW85i92iqlXgMBNjtw0r3Ef8mkyb
-VuxLYZw372qFMEkzeM6WQHPzzFaTytC1mffL4yHUO3UzhUyw5msLVcVqLl+1T3aN
-L7WHt/w588k6I4VkMgi+vCkvQHlnNaKWFpoy3h4TgQvvKL3z0QXff5I2V9ErFkQg
-t2yqpiSePP0EyXto0J3NVREYIlsvEgkvYqzwyaahnhFyYgIQhH2Rqmc41vht+PNN
-6wRmQlt7fAYm7T8CAwEAAaAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBw
-YXNzd29yZDANBgkqhkiG9w0BAQsFAAOCAQEAL406WiM09XflXU0d0pWbeKG3buIA
-L5iO1csseS4tbHTdcy7H0cr54JZEOGaBbsBTJrn/8ILJJsBzurPDdaA39KGv87qF
-DM9HrAiKGYWOUuUk9lEPoghZhvLsZ/FV/SI+HOzrMu6Yi7/En56vXk1YwqxOf3JL
-Gd0OCIxYbHnGlxvwhRATadBJk07NmG3w5WI46ClRdHSEVYLiCsTB1raRixCbKmxe
-9sJ7fG3vnRoxOVZ8b0mMzSPsPyCHYRoTCGHivIytm/tps5jRkF2v1+BFDcy/unUm
-NKRhIB8HNVYmZlTPlWdw/k8z8w/JIE72sJXp4jfgha8Zx8tL4qAiUbK9WA==
+CWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALwm1xqs
++ed10Plvc7EBGgXNf5oXeExY4r8GytYUnU7gfL1sjsOqGbqgCY3LXCD5jV39Nc1d
+fnALq6aFPJPUprXrcKmg1dCuaKClLs4AHn0aCyalNF6J1uFWitCAkAE5MUlnSc2B
+E+vDU7pL+X/RYdCX4tkOmDypYFCLqEz0CUhKwDLHaYeCljD+87GhGTSYZmdS6a35
+uA3VZ8FH2Lw4auVZgBxS41aK/89wyUvqVvaDkQ7WtwjLwGOaBnCGFljMbKBvQfTb
+U07OfI43haSa8P0WCQPwjLkWsC1irf89cz4c5r5J0ynwCHOko2warvDcf173HetX
+Nld/VP52Q07Ph/UCAwEAAaAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBw
+YXNzd29yZDANBgkqhkiG9w0BAQsFAAOCAQEAsLb6+50b2ck7DOop0M+EitLaY3H2
+PWZBS6A86RU+5y30pJsFKCtefN8Hb21DwSwqhkcFukHzZRcKuGA8IsMhlE2u7YAU
+Bx8pX5jOBhFWbUG+mAoe563XPCQNZ3GbKg3pGOCJ8b6gflmGvIxXlzQlR8lg1RG2
+dT5q/sWTOXOsDyu49bObDw0jEFM/HgHzpFyHdrnh3P2vEULx7qdRVUXQ9JIsuPjB
+bys9FhjDmV9yEabWfHRXqrFY318CPit25Q6Cl9G4EFMCYkUX2nVzjLojExkwJHdf
+y4wDaEzxtqJgEEaQwMu+j68v3wgYAGk0yKMFNDQ0gaSZkAQ6u8I5unTGYQ==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent8-key.pem b/test/fixtures/keys/agent8-key.pem
index e38210c6389e62..dac8716602122e 100644
--- a/test/fixtures/keys/agent8-key.pem
+++ b/test/fixtures/keys/agent8-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEAvCbXGqz553XQ+W9zsQEaBc1/mhd4TFjivwbK1hSdTuB8vWyO
+w6oZuqAJjctcIPmNXf01zV1+cAurpoU8k9SmtetwqaDV0K5ooKUuzgAefRoLJqU0
+XonW4VaK0ICQATkxSWdJzYET68NTukv5f9Fh0Jfi2Q6YPKlgUIuoTPQJSErAMsdp
+h4KWMP7zsaEZNJhmZ1Lprfm4DdVnwUfYvDhq5VmAHFLjVor/z3DJS+pW9oORDta3
+CMvAY5oGcIYWWMxsoG9B9NtTTs58jjeFpJrw/RYJA/CMuRawLWKt/z1zPhzmvknT
+KfAIc6SjbBqu8Nx/Xvcd61c2V39U/nZDTs+H9QIDAQABAoIBAQC0gx8EfMgWBLbF
+WORKAaCRyKKPl8zWksCYPVAFLCnwLvf+VFRz7JJatofz/hMZn9K9Rd2EdhqELO42
+CMYhnneDOasRUzlPyMSgu1m4UezuYTopjX485Um/T2RGvdFrGw/qOKpZ+2i9XNzL
+c3Cf7KZHljERxirQqD+7hwGlMsxlCYpIRYbe6orpT0aAiGr1iVioohyk8tT+7iXD
+mlPeF9qbWAChgfLzTmHcpxGpiFXS0w6KV1XG8sickm1tnoXbCV5ZJw6HscL5VBp9
+SBclRo8AXWBaqhcfj0mvLJWs5E5K3P6dM9X/RcxJwP4Q+kfABYoYjZrZ1/sOJkZr
+mHzoYznRAoGBAPeDWWG5RLSlYgs6Llw9ERF3917AiY+eWUCai7faWGP3SEigmPOm
+m7rHQcI650DN22aXm8DBSRM1QV0C/UWd1DoDpQAc76GexJhLYRA8/ZGAe24/q1nX
+V0aDHzTLC6m8fYGj5ATOotvzYYz6aK9dCuLxPYfWmyZsIXU6K+ypsZOrAoGBAMKa
+a+7es33C8aUf6kvBOtPPs9tJW8rhox9gMQxHXuibz+0ZUM7h0DUbsMkDpj4Ydwqr
+c7O5sIHUjJLSmw7Oaw6xByK51tZNZeA3bVB2ZUAPILNkF2UqldRYRT7DfLTHEbNV
+DMo5P4tR8HxWdrKuhcp+RdPfVmay7iIkFtcKWbLfAoGAR34nKTUMhWln4npRvc7d
+yT/vsezHTzab7S82wEpPUcCxnljVFTvAq7i2Y9YDyhIsF3wfPxQVeXjegnFEmwE1
+tfQritbQ2Mw1WRAc30XesFJ+VKALbI3o5bMmJmen3MVXM0UVrdXJ8OJiAQiriEvF
+wzuPXFc+xWBiYawF1/xEELUCgYAYBm6K2A262gVxSGZpodp8aekfiof9nSvBZOPJ
+S0ppV0stT3HNiM1msRt7RasRgX244H/xUVx8Otx8B+pCwrMu5iYmYGEopfeM3eru
+Ax/u768u1o2Y3NAQnjE2VXYg7269ACQLF1REBAK3pwkSeD9mR36hcLI/DZoetuvm
+8o0uawKBgQCGwazVcS1cOOODw8mP39KIlWNtbpeRI6T4Qz8Z4FO5B324uccRmxL6
+gCRTdO0990mYQ/BJQ0EQWyrcnpqSfw1YYQOYpYvPexhKpRV+sU5KqJJkqEBe3WLm
+oiaFpuz+NtKkQrCc9AlA3SHlJWPo7jTjIPCpGuVM+FipGTbLGHr7HA==
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent9-cert.pem b/test/fixtures/keys/agent9-cert.pem
index 520ae4fde95e35..7fdada43d59d7a 100644
--- a/test/fixtures/keys/agent9-cert.pem
+++ b/test/fixtures/keys/agent9-cert.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDUDCCAjgCAQIwDQYJKoZIhvcNAQELBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNV
+MIIDUjCCAjoCAQIwDQYJKoZIhvcNAQELBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNV
 BAoMDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsMIlNlY3VyZSBEaWdpdGFsIENlcnRp
 ZmljYXRlIFNpZ25pbmcxKTAnBgNVBAMMIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MCAXDTE2MTAyMTAwMDAwMVoYDzIyOTIwNTIyMDExNzAyWjBdMQsw
-CQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZO
-T0RFSlMxDzANBgNVBAsMBmFnZW50OTESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1RfsIHFH/58sMeDPPkKCj4sK4ujw
-jiSMLi/vuwBjK9h/LtnBZ0wd5kMq9J9mFtQe21dqb4f+z2G2ZthziJ7GHDpJ7WEf
-HQa6cEHrk7Tct3XpyGYMvLmSHD+y54U8cO/K66w0k9iZvTiQ1eJxdaPkoQsdqinC
-Z+fh2Icy9tWbGatwtddizcGFM71a2vJjcg8Fnb/X/D/fCbF9L8hl3EVqWSs8Y+BD
-gIiJqdnc/R9RW8T8W1QeCmkuX/Nm1dJqLF5fNXP8lMgdSMHASTgPE1v5OJqGpIvd
-wBYOuYCaGvjplsS+isBh2sDA98SgmL35GGHWiNhZIQkVMKzjgiDkKKU8hwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQBv4AYF2CfowizdqeL9vrDOSxMQAowxAZWLsixC
-RHfzkjPaaN0t0dApEIdttzmmif104LuK8lqQe9zvG/F7kh4Mhj1cfaJZraNbNprL
-QHnnV+sSL+flSJfkSmSkuu5Cn78g72qnERqzwYZKHIBnMQhUf6yUmHxmxQlJDtcP
-kNCX4vCkkC9MW91n3GDXpSQX8KkSIP+aP1kHqHkWr7mh7du9p/E7rnI2UfVcXg0C
-db3eSDVq94e41HK9uWQgYRLLMz9OSnMmOgfK21o+eBWaHb+07Wo87cSPzuGVBtj7
-0DueLUdvSpliM8wZBIf6xzTdF401VinLZfFGyg6pYM0ADfda
+QXV0aG9yaXR5MCIYDzIwMTYxMDIxMDAwMDAxWhgPMjI5MjA4MzAxODQyMjFaMF0x
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoM
+Bk5PREVKUzEPMA0GA1UECwwGYWdlbnQ5MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2oEMk2EKwIZrx4IPNcGjHw5DO
+u8A8yJrcWG4pThUadrvwMI7bQ4QwNgHm4PVpbjAPbSUsRPX98PWL6GcpoH0lmJ9+
+j9CCEIEkW+j5wM7hYBXUSGuAZZfkdrpbZHsvwpYj2U39sfmUyGT1gBbGBmaAzODh
+ZaqYSm9VdaKS56SRMey3Pbsx+ikylgiEyPFoRKA141Zuxz1MKiwszLHuyz6pCZKY
+K7x1dlEGi3h3dvkRAdMyeSXJkYCZGbS5Fbl2OuW4pSWP4no/M960vBwEYvuJPDtx
+qxGezE51oXp4W4l9k+TYPOfGJDVW0PAg+JpfbepLetgFaO9/eNWes34AhF6FAgMB
+AAEwDQYJKoZIhvcNAQELBQADggEBAD8ojlI4FdXLCyHVYwwTP6BncF4tfeGP82/i
+Zcr8U9k28T2vlsLwdCGu8UVqGWfYrSY5oZqZmHPcDfZmv6Uc39eQ72aweoyLedk3
+UF1Ucwq+MxEM98doLlqL4lnPO1+TcpdhtoHAgT28WkddbR3alfsu+GRU3br3s4lS
+DHcm6UzdA/lkgZtC8wFUSW04WhzSHB78gm8VOl+1JGY0pp/T+ae5swkfj45Q3jOd
+H6jdZiUrU+LJQwLlXYniF4qzmH0SN8Gd3djVNzWJtNF+LFKXzCOYSK8AFaQ6Ta+s
+Pd6Rqa8Hl6cMmlsDu1NLumstvGna5wsc7ks1VZwtWt6WfIyIN2k=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent9-csr.pem b/test/fixtures/keys/agent9-csr.pem
index b75a32311d6f2d..b93b34ec9412ce 100644
--- a/test/fixtures/keys/agent9-csr.pem
+++ b/test/fixtures/keys/agent9-csr.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICxzCCAa8CAQAwXTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjEPMA0GA1UECgwGTk9ERUpTMQ8wDQYDVQQLDAZhZ2VudDkxEjAQBgNVBAMM
-CWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANUX7CBx
-R/+fLDHgzz5Cgo+LCuLo8I4kjC4v77sAYyvYfy7ZwWdMHeZDKvSfZhbUHttXam+H
-/s9htmbYc4iexhw6Se1hHx0GunBB65O03Ld16chmDLy5khw/sueFPHDvyuusNJPY
-mb04kNXicXWj5KELHaopwmfn4diHMvbVmxmrcLXXYs3BhTO9WtryY3IPBZ2/1/w/
-3wmxfS/IZdxFalkrPGPgQ4CIianZ3P0fUVvE/FtUHgppLl/zZtXSaixeXzVz/JTI
-HUjBwEk4DxNb+TiahqSL3cAWDrmAmhr46ZbEvorAYdrAwPfEoJi9+Rhh1ojYWSEJ
-FTCs44Ig5CilPIcCAwEAAaAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBw
-YXNzd29yZDANBgkqhkiG9w0BAQsFAAOCAQEAlbvFevH6Xx79VvWyXdZOehokMpqr
-xbodQqntaxtk1pRtiostga5j2pBIos5BBE5KvgPCp2rJMYjdhjyxk6v4P04nhXDo
-rtD2PVIVZEaHWw743HVtFpDl9V/JK35jm/FgAbstFFP/OG3uNuHGTxvdPq4NW4dc
-TVWpJ09IdbAJ9YfWbro+r/FCP3anXO40TMTNZAJKztyhMlqcmrBC/GHahtav2Y37
-gPpc70WyhqfQE1paEXT/uO1GMiOaVqPt98RTlt7smnLxHodZ3aF3qONl7VFFEaC+
-8rdKdZWTpTJQiAbBo8Xn7UxY6PFvPjteCK9duRULV8+SfimEq0wmC6Fygg==
+CWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALagQyTY
+QrAhmvHgg81waMfDkM67wDzImtxYbilOFRp2u/AwjttDhDA2Aebg9WluMA9tJSxE
+9f3w9YvoZymgfSWYn36P0IIQgSRb6PnAzuFgFdRIa4Bll+R2ultkey/CliPZTf2x
++ZTIZPWAFsYGZoDM4OFlqphKb1V1opLnpJEx7Lc9uzH6KTKWCITI8WhEoDXjVm7H
+PUwqLCzMse7LPqkJkpgrvHV2UQaLeHd2+REB0zJ5JcmRgJkZtLkVuXY65bilJY/i
+ej8z3rS8HARi+4k8O3GrEZ7MTnWhenhbiX2T5Ng858YkNVbQ8CD4ml9t6kt62AVo
+73941Z6zfgCEXoUCAwEAAaAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBw
+YXNzd29yZDANBgkqhkiG9w0BAQsFAAOCAQEAms/rMyW2wVfNtBHZ7HAUxUlWl8ow
+0dlZgVmAXF0WBnfOGn31CQcGPyj9btJ48tmaTXmhIw96KqQDIi8KmYXDrDm0JmEp
+d+6Q704A0Qjwq4OmMqSobNHRVZUM24niF+U/oGuI8J5nSbCp/6m6chwM+R015cfl
+1yNqqQXYYIogcHQZVdofeKvGmrQhBfsEt5cdk2riGqfWVBwY6rfXW+MSHIw6cHIn
+vVFYG32Gk8ZU+MoWPQ/DLAy8B7Azo7ePMnidfaOxPAox6IGzCcZOfnCu2tZ09S5t
+gqcpdnecBLuQdIybhKhCbM7GOmIricDeIJXkVhmwmjpcu1WdQWUIUsD18A==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent9-key.pem b/test/fixtures/keys/agent9-key.pem
index ad01bf54ba7423..1dc2df9a064344 100644
--- a/test/fixtures/keys/agent9-key.pem
+++ b/test/fixtures/keys/agent9-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca1-cert.pem b/test/fixtures/keys/ca1-cert.pem
index 205e2f7226bd07..c126543553d904 100644
--- a/test/fixtures/keys/ca1-cert.pem
+++ b/test/fixtures/keys/ca1-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIChDCCAe2gAwIBAgIJAO5Yan0JUdezMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
+MIIChDCCAe2gAwIBAgIJAMsVOuISYJ/GMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
 dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2ExMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTVaGA8yMjkyMDUyMjAx
-MTY1NVowejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjBaGA8yMjkyMDgzMDE4
+NDIyMFowejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
 MA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANjYTEx
 IDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQC1XJLKHcMcvx9RG2L0jL3Oc7M4ogGOobVDSE8Fom9Xe4nz
-HRbOxNCell+HeJIvyieLNQ+UxF5qDa0hOdXgzFI3wzRmX8mzUoLsqIxeh1Tg4MOx
-yPeBrFCK4gsiCRaYWjGhfcIEAE3pIkUz9/CpQeG6psqzPNV7ZnJLbl/XopLQjQID
-AQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBACfO4emOcWWf
-sk98DJwfQQIc0i2D2ALRCgVUpszQOrhDci1ARGkSPc3oyx5xT/b9NCGYUxpHdz52
-t8bTqYJsU6u7kiOe6o0KcQT7FvKrzWgzcL+yCNiQ/2vrx6FJZBL/W3uvzVSoOYCU
-D6TJXtGA5d2TnarRMflWXSk3rFqGvtUf
+AQUAA4GNADCBiQKBgQDrNdKjVKhbxKbrDRLdy45u9vsU3IH8C3qFcLF5wqf+g7OC
+vMOOrFDM6mL5iYwuYaLRvAtsC0mtGPzBGyFflxGhiBYaOhi7nCKEsUkFuNYlCzX+
+FflT04JYT3qWPLL7rT32GXpABND/8DEnj5D5liYYNR05PjV1fUnGg1gPqXVxbwID
+AQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAHhsWFy6m6VO
+AjK14n0XCSM66ltk9qMKpOryXneLhmmkOQbJd7oavueUWzMdszWLMKhrBoXjmvuW
+QceutP9IUq1Kzw7a/B+lLPD90xfLMr7tNLAxZoJmq/NAUI63M3nJGpX0HkjnYwoU
+ekzNkKt5TggwcqqzK+cCSG1wDvJ+wjiD
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca1-cert.srl b/test/fixtures/keys/ca1-cert.srl
index 8ed0077c745736..d0ad2b1653b0c4 100644
--- a/test/fixtures/keys/ca1-cert.srl
+++ b/test/fixtures/keys/ca1-cert.srl
@@ -1 +1 @@
-FAD50CC6A07F516D
+ECC9B856270DA9A8
diff --git a/test/fixtures/keys/ca1-key.pem b/test/fixtures/keys/ca1-key.pem
index e46eb322c4781a..be4ad727f70200 100644
--- a/test/fixtures/keys/ca1-key.pem
+++ b/test/fixtures/keys/ca1-key.pem
@@ -1,18 +1,18 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICzzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIq7DAvJ4TiXMCAggA
-MB0GCWCGSAFlAwQBKgQQL6ValIJtDzAAQv3neNekGASCAoA54EMlceey59Q6XR4g
-YAb97wr31CN/b+vyi8pg30k1QVgIvqoubNpkm8zSLBOU7trfIKQyyq2MYXiHeVHk
-wEoNXDuGFesgE3xLc5aAVhh3wFNARGEwUkMhtKtrXn7rGIaQu59uHVOiSnM+9MaT
-O7mhfEG+z1tO1xrd7IAGap/mZVu+jQpWAHvmQdL2F0Nf1xvBnVfS7z6PBVFBmKQG
-hqtBWsDJtH2AwvdTsBAa8kNOr2/r3VuX33oJ6XHpzlbLFXqiGftqCzndCRYudpce
-fB9lxHT7dN3t/D/VQ4TsjS1nfFECDxN/B1rM5Seri/n+g7b87gXZk90vA7lvtEGj
-+d0kGJT/Fqnq7kusdDuhccMO7B7ZlKzc9i0umEeSoEbBgjk7RQT/AtxuRB7Nd5u+
-GWQjqePmaT3V0CR48LFCaZH0334RkF9vxKee+VVZUVOz5qbssclYDaZDR6gmZjFE
-em1d+IVlmus1UI1GloVM+m9toYvyCHPpoZAwwA9iTX1Ez41Ig7I0k63UcAD+ziQY
-juAP+L4HHtRBvT33TSDoLIq5unqRZD8uAd/ApHe9E3/NrCcbQNGK7vmT6A864uTS
-el6xo1wCdLI6jx0PR7NHw9VnWNyFaJNhld8gu0FYMehtjw+rEMpVgnibuFYTtKCN
-NRbMz+fFSOhfBgyUE+68GvqHHPoe05/Qep9uCeFJ9F6Y5uArArHMiIGNIv1ao7At
-O+vK8NjPoEsK881rnjeWste/eT75qIU3iEyuDGvBnJNzGuQykI8adG6X60CruMuH
-7LwS3kZK1W1QcBcG/xF3IZcs1o4le1zqzlsCH4qlWh4YfPID4HEKQGLS0DMzDY8x
-tmzr
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIO9cMY0yHJGgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAKYHSZXK7beBIICgHkIYlgRIfZt
+QZxMoahaz4Bu6t5F24ud9rdrpT8qKCnffj71z5mtwucE7sXMslcejgo4QEP5V3lS
+zFWQDY5B0p9al+M9DIsseSz8L9StqgQo3FfYLGVs8njO4PFyaWSdbPWWpaXRUmdm
+32CbOKwdvOMFhcR8G+jlezkm4uyQ9yCC5bERdrpsaaPJTlt8aMdrvxMytHw60OZo
+VVF88fRm9x4kUT+sKyiwG0JWTRDueeFoJR4oa5xlw1AVmEYBBQee9Tc73wqtOr2r
+4dnL/zwc6c9ZoTTDOGZNgBvxswVzg04K/qp9LIt3uOeHXqfnmzfmJ4eT5fG71pir
+pSfZPIYXJwgC1NjWvsWudI/kE1Wj0JnGYuPY/Vea9RSSrRqq9nL9kqTSa1jgo8l1
+zTR/uZHZH2wCMlH09tiz7uOiPihsO8qeYWIe+vkgC2xCm6O/B1vMuqQY36LOxeVt
+igi9hDLjWxNth9lEcC/0wsrft8Y1/CF5h3/j86h1IcgQKFrePu40kols/yBxp7/n
+MIzm4oUoClGe3q+a3aajEYL5Cos+7tu2jSM3MKVMiNZ5aTICQ9Sr/OOz+tYZOdJd
+hCDF/oncBALJ7nhe77mf1j+Qy/vZzCvDIl/ki3zK/S83U9InZW3oKFv4u3brh+77
+2zruIZ6l/zId8fFARdh6PvXz5avz2eC//EM1zNJiV6IC9DvB3xibvA05rmoK4g9V
+DIIIWJsTJUPPvEXszMAtb1zR+MhDs71RF6KvM67KCasI0k07hGY0rgDjlzeoWe/3
+SLgXPda5/WCkRcpgznzRu53HJwq27tUsh74hXPbqaQREDrX0bBBokAMCGBxCFrJi
+Btmo/ouOp4w=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca2-cert.pem b/test/fixtures/keys/ca2-cert.pem
index 8d2d4273df7ff5..0c72d6c64756fe 100644
--- a/test/fixtures/keys/ca2-cert.pem
+++ b/test/fixtures/keys/ca2-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICbTCCAdYCCQDakSqa9pRwoTANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJV
+MIICbTCCAdYCCQDRrfgRk8tC1zANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZKb3llbnQxEDAO
 BgNVBAsMB05vZGUuanMxDDAKBgNVBAMMA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwIBcNMTgwODA4MDExNjU2WhgPMjI5MjA1MjIwMTE2NTZa
+dGlueWNsb3Vkcy5vcmcwIBcNMTgxMTE2MTg0MjIwWhgPMjI5MjA4MzAxODQyMjBa
 MHoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNV
 BAoMBkpveWVudDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2EyMSAwHgYJ
 KoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAvQ+FcEz9z9g97WelMFbnT1lPXyimgyfWr5hYDG51rVo0L8hBbxW3
-uaS+lxOodW1Sb+ycTAvyVIdfiIUi1XFROGyTUY2Vi2r8yglS7+YSQyk5+6jTJbHe
-+UBLY8wO/B6vSZXBb1Ym1+LtfUeEJc1+5qtB7joyllwt3ID/qCeJxNECAwEAATAN
-BgkqhkiG9w0BAQsFAAOBgQCzAc/3u++UkXTShUZgT9L5lA/wg2yfMA737EEg/FG1
-JEW7OmkvYekZdL7V3o2CpymYXpUuFaWgW6cxMRJ1wylZkqk8Ad527uAfe21fGIFl
-9wiLSjXjoVYod0xHtsDE+5y3a46QspH/Rxq5gHkdhV3J4RkwYrx6deEnAEKHA5S4
-qg==
+jQAwgYkCgYEAv61gNiLff+zxCdAwdzlVoucGu5L+LFFN9TXzcT3ZD8U1H6CiLp3Q
+02IlbK1JRHwpJBXgYOFvMWd9LD6JiJgJsp61kpZShl2qZSUIfhzeExWH7kkuPHWC
+IEkiP/aDp5wuqbFBkNUJu8opYr0E6/t9sIzl4IK7WNDXWgQvv8cqin8CAwEAATAN
+BgkqhkiG9w0BAQsFAAOBgQB80WTJ9neA5yVaDVV+hZtOasLiZlUT8m49ImQMnInA
+jdoAkxgySNOJP8IrsilleAGeHF+JPy042z8NZ5C+xL9REaB1/OaQ7+nwHP0O0f+l
+kXHgZATQ3YVf6db5euK3R1mdO1Vv++R4Nu4NYBu0cmfMpdl/uKdYpXMjPVn21iB7
+5w==
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca2-cert.srl b/test/fixtures/keys/ca2-cert.srl
index d91d153202dea3..70dfed568de6b6 100644
--- a/test/fixtures/keys/ca2-cert.srl
+++ b/test/fixtures/keys/ca2-cert.srl
@@ -1 +1 @@
-F8159CF540DB8F4D
+91F006636069F29D
diff --git a/test/fixtures/keys/ca2-crl.pem b/test/fixtures/keys/ca2-crl.pem
index 6cd77ea257cf21..de416297dcd381 100644
--- a/test/fixtures/keys/ca2-crl.pem
+++ b/test/fixtures/keys/ca2-crl.pem
@@ -2,9 +2,9 @@
 MIIBXTCBxzANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQGEwJVUzELMAkGA1UECAwC
 Q0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZKb3llbnQxEDAOBgNVBAsMB05vZGUu
 anMxDDAKBgNVBAMMA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5v
-cmcXDTE4MDgwODAxMTcwMloXDTQ1MTIyMzAxMTcwMlowHDAaAgkA+BWc9UDbj0wX
-DTE4MDgwODAxMTcwMlowDQYJKoZIhvcNAQENBQADgYEAQLa20feEGeSrXOrh5WZ/
-YAvsB6dPEy4lumjNOH8k+mbOmdlWEOAKlf75p3hsi02HYyVwoR02vsdbGGIxPAXi
-WVa0h6/ZRmw3emLx08s7QxHLISrj3mzDgqU3mMrY27S07mtYaJqNd9gWJNusBXVF
-3N7qhYNDijxwYG+e+Ty1WS8=
+cmcXDTE4MTExNjE4NDIyMFoXDTQ2MDQwMjE4NDIyMFowHDAaAgkAkfAGY2Bp8poX
+DTE4MTExNjE4NDIyMFowDQYJKoZIhvcNAQENBQADgYEAiZKSPllC/hi1S9jedRFt
+eah65RINSkGZt40AuxPIFfyu5qSeKU+9p8zdXELtPqywSr2k6JjBP40yRIc5/odZ
+CxFM5XR/AIoeNspplxb+Qg1v1KlbGxzfeBHRIn91QpKcvsMCEYF8nu3xKOJmYrTR
+3Kj0gniNHbiLe/HTpEY7YOA=
 -----END X509 CRL-----
diff --git a/test/fixtures/keys/ca2-database.txt b/test/fixtures/keys/ca2-database.txt
index c943e0c0173e8f..3981127cab0db4 100644
--- a/test/fixtures/keys/ca2-database.txt
+++ b/test/fixtures/keys/ca2-database.txt
@@ -1 +1 @@
-R	22920522011656Z	180808011702Z	F8159CF540DB8F4C	unknown	/C=US/ST=CA/L=SF/O=Joyent/OU=Node.js/CN=agent4/emailAddress=ry@tinyclouds.org
+R	22920830184220Z	181116184220Z	91F006636069F29A	unknown	/C=US/ST=CA/L=SF/O=Joyent/OU=Node.js/CN=agent4/emailAddress=ry@tinyclouds.org
diff --git a/test/fixtures/keys/ca2-database.txt.attr b/test/fixtures/keys/ca2-database.txt.attr
index 8f7e63a3475ce8..3a7e39e6ee60a2 100644
--- a/test/fixtures/keys/ca2-database.txt.attr
+++ b/test/fixtures/keys/ca2-database.txt.attr
@@ -1 +1 @@
-unique_subject = yes
+unique_subject = no
diff --git a/test/fixtures/keys/ca2-database.txt.attr.old b/test/fixtures/keys/ca2-database.txt.attr.old
new file mode 100644
index 00000000000000..3a7e39e6ee60a2
--- /dev/null
+++ b/test/fixtures/keys/ca2-database.txt.attr.old
@@ -0,0 +1 @@
+unique_subject = no
diff --git a/test/fixtures/keys/ca2-key.pem b/test/fixtures/keys/ca2-key.pem
index 2e48b87636f1b3..2efd44d78c3b6a 100644
--- a/test/fixtures/keys/ca2-key.pem
+++ b/test/fixtures/keys/ca2-key.pem
@@ -1,18 +1,18 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICzzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQI4wcMSIZ9VYYCAggA
-MB0GCWCGSAFlAwQBKgQQrdlE/1g1dUWjPXe+cDF3hgSCAoBXqokDLdhUcEMNy6mp
-S+yixHeWaS35QF8ESaqMa+Qc+l/ZJxLLUQRf52TimO+sz51TXfQFJtWTsZVaGyii
-94uoniHVtaSirpzuQVUEPx9/o4XVRc9MtEf78z8DUwOJ6dHlVganU9BZesS0+TZc
-E5apDKhWhjbrjWWhwNMUb2jYHQvaZoDjlvyhy5qUG9MQn65KbrK2WLT8Jsq9RE4y
-38fxdV1S2OetDc29hSp54DWkXegjrX7iDOWLSGhG0GmjS6rggDQ71/CN7fbOAwf/
-ztniGUqriPNO2gaaivHiT9yuzYyA58FyGLCnVg6+jkQ8znhOfO9DwSWEaRWCsv2n
-v1Ep4HzSopt2CogBUsJxg5Xzls7qq0e232+gndMlT4tEOfK194aOuXCReESA+yll
-YRcdsjQzFUyCUrGv+RGmQmiK8QcLI9jIPa6Mi0R6VnUMyHGB3i7oY1UaKKS5+6zB
-4ftXEOfx141siDymRTTALrmQd6jHqpXbbou2idbKGMNn/G6GSl/5fXmPSUOs0H2l
-HdhvPJEfyYsWhS12jXRKtlWIAb+A7BKZac+y+kyhcJG2OLz2cCqmTXIZDdEMr3aE
-aoz8rP2vloyKFx9LMDdK8/ec9b02cU/XctZ3XepL+0+WYfk2JKulhJsvsAyQX93l
-Wdb16NzGE0X909+9N26VZzCVVeY2Ti2Xo40dLkQthMmGytz8h0sro8gTcHlasQv/
-4rQJ7nb4FL29Vv8TBLwAO0ivDSy/lDayi+eY3dOMBjHlXP4ZqBd5bybkpZNisG5f
-C/p6R7czFrFZ/MMhU39O5GBZhD0Y3BfI+ih6ly0/jfqFnETNyG18jNrUOgJ8ZeEz
-sVpU
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI0/0Q5tLDQW0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHCRfosVTaMUBIICgHq2VKpOxq8W
++KZ7bVFuWx/gJvE1FAJokIZogK52LH3oEk9kMlEujwYAMovEew4lPMgAnyQh5Mbx
+BXIm8Arww9hUZlRPuHmeQQuikbz/Sy5LVFbrzRsM0xGZxeWkpq3iKj3Z4W1OneRd
+HAtBADAlID1a4r5f/BxiuNBGn5X54x66qbC94mJ2b02zHJJaRVd6OQM5iZURlcbi
+N1E/LtQ3/I9qWqGYfiVCZf39ItxbrBkIEk65BbCackpDpVxzOfEbvC8RdBZcHxZm
+8g4XZ6p1rCmzLi22l7usgEhd4QSMQyT9JTnMfM1QFzaqAVTqWr4ZFP108a2vH574
+T/HFKBkI+DEUsKQTLmYqZ05mg0wx80KGP/+1jOB1yx0tGnxCihGJVhqqGoFqgBSm
+aqC5arQIZSUt2eN4OamakgU4iLzrKFb6bWGwTNUoHZNh4TsYz4CvFkPcM5tOyX+l
+RoUyPAyfu348Z2IKBzUwYUfXJ5WFW2xq+RiOmlt4zF1Lym+aktEP6REQZYTGZZZx
+l1YsvIUDd0pj5AJ3/PSTZN+VzkKz5lJdKEDEqpoOkEZnE/FL5VJHnRLOANyNf1zl
+qZFgLGRZgZQwGkwj2hAF3auRJWJyvjuQW57v86F3U6XKKKejgBVb2ohMk7U6WW8B
+wPtYyEa2zW1hSCLWhMEaek5Y2/2NX/dPryHNZ5XJ1UD0SGrPumN4lbErKDWGmAoK
+jH6bpX/xVdmur2BwgGdqt6S1BW9B2F+cXz46UNiFKPYL49iBe13xM5EFKk9N9DL3
+HWPWrExlmi+p4PASL6cR5t9sDw8wUYp5cyC/M1RHDJPvjgBX987F17fI6GkNNToE
+ZIbM6M/EuKg=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca3-cert.pem b/test/fixtures/keys/ca3-cert.pem
index 99dbbc3096b3e3..7cc283053da2be 100644
--- a/test/fixtures/keys/ca3-cert.pem
+++ b/test/fixtures/keys/ca3-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIChDCCAe2gAwIBAgIJAPrVDMagf1FtMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIIChDCCAe2gAwIBAgIJAOzJuFYnDamnMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
 dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2ExMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTdaGA8yMjkyMDUyMjAx
-MTY1N1owejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgzMDE4
+NDIyMVowejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
 MA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANjYTMx
 IDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDIVigurX3u6qjhxxWERDRINbd8jc9VD1GD1T5SCt1oBjeK
-qyUSEV4f6KFvHuh3oKjmiJy4OvuiNMkzNxI3v32yoJHkQUchB4tlBVLec4gz+ZfO
-9RpM10gPBes9nSh6LUx4myZ8Rpungw0UcZaGvrwPNZYbFWvCqUSuea4GVF20fwID
-AQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBACbwa28NeiUG
-mqw14fpmT/ZDpc/BAR8gKO8OutMZO5oKjlFjplhujFlie3Zza/hxIlztF8IdYCE/
-/BZruPB+ed9ls5I7ODH1dFw8YAhxsa4y/lNP7Cq721SH49oFZJslqj1PYmhy1q4m
-XrNdd447SPkWlB1D1s9NYINmqzNEsJyU
+AQUAA4GNADCBiQKBgQCZ9fF/1UcYaurFIX0QIyAJdojn9+bfsTcjEIoGbsAnQLz2
+bsZ4pqRNhZbYJApxqc+oDzZOqJOaxe8mlB5jUZ/sUA9Sp+wfWly95tkEHBMSse4x
+UNJVM4vFPfOG4fv9fYGH3pcmAU1QnST4Fh+qZRzrh9wa99ltmB/U2mJEF6NriwID
+AQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAM3CFiDdGEcx
+07J6pm4zGX399VxPr50PID110jmX7BRAfqva+wBRhwweSxZ/QRcKe1v/FK3GE87y
+RbaXhFfnPRUHoUHQMtGwmZuZcdK65Pim9RPGb7qrEJ2wlPt/C1Q6VjL/fBGqjtJM
+Bq/2GR2GoBsE85jGM287hcvXV0eG5OwM
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca3-cert.srl b/test/fixtures/keys/ca3-cert.srl
index b3b7875005c3dd..c7fc41df3cd491 100644
--- a/test/fixtures/keys/ca3-cert.srl
+++ b/test/fixtures/keys/ca3-cert.srl
@@ -1 +1 @@
-E987DB4B683F4181
+D0082F458B6EFBE8
diff --git a/test/fixtures/keys/ca3-csr.pem b/test/fixtures/keys/ca3-csr.pem
index ceeab96806a53c..2c0358727f46f7 100644
--- a/test/fixtures/keys/ca3-csr.pem
+++ b/test/fixtures/keys/ca3-csr.pem
@@ -2,12 +2,12 @@
 MIIB3zCCAUgCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQH
 DAJTRjEPMA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQD
 DANjYTMxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQDIVigurX3u6qjhxxWERDRINbd8jc9VD1GD1T5S
-Ct1oBjeKqyUSEV4f6KFvHuh3oKjmiJy4OvuiNMkzNxI3v32yoJHkQUchB4tlBVLe
-c4gz+ZfO9RpM10gPBes9nSh6LUx4myZ8Rpungw0UcZaGvrwPNZYbFWvCqUSuea4G
-VF20fwIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3b3Jk
-MA0GCSqGSIb3DQEBCwUAA4GBAIDV1hoEgicY9C07qhcJi1QiI0dw6IGOGANgUbXX
-HCVYqQDNGfm+wuclaqp7kcMcTvZ0WY/soNeX+wsEyTGPxcjs5qQMWZoqclZqaseR
-mQZ6IdITdYSngdqwL6/CyfIkHjTSyXzBikkHuM+cFpY9f6CekoZzDavyieUVcTEm
-OMIp
+SIb3DQEBAQUAA4GNADCBiQKBgQCZ9fF/1UcYaurFIX0QIyAJdojn9+bfsTcjEIoG
+bsAnQLz2bsZ4pqRNhZbYJApxqc+oDzZOqJOaxe8mlB5jUZ/sUA9Sp+wfWly95tkE
+HBMSse4xUNJVM4vFPfOG4fv9fYGH3pcmAU1QnST4Fh+qZRzrh9wa99ltmB/U2mJE
+F6NriwIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hhbGxlbmdlIHBhc3N3b3Jk
+MA0GCSqGSIb3DQEBCwUAA4GBACeDmANyVHX/zFlz0OhqXzFw2C76/AjoNsR7cY6b
+Mdl8R27MexPxkhD2IOzESxDkxFTzv+aVAz4gQIxDmdea307/P5LvRQXucAtNkAWi
+2j6hB0Oq1BNKyBnevRTv28X7rhUp5OGDhRPP5lt1+PPA0zTurw+zJIaInePM//sT
+7Ckh
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/ca3-key.pem b/test/fixtures/keys/ca3-key.pem
index f8be36b68e9a65..b1fe69b712fc85 100644
--- a/test/fixtures/keys/ca3-key.pem
+++ b/test/fixtures/keys/ca3-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQDIVigurX3u6qjhxxWERDRINbd8jc9VD1GD1T5SCt1oBjeKqyUS
-EV4f6KFvHuh3oKjmiJy4OvuiNMkzNxI3v32yoJHkQUchB4tlBVLec4gz+ZfO9RpM
-10gPBes9nSh6LUx4myZ8Rpungw0UcZaGvrwPNZYbFWvCqUSuea4GVF20fwIDAQAB
-AoGBAIm1/+UmSV0EXZbl/Tpwj+fbVQf/izgTUZtn6HEJGu046NEfmFn1KliQ1vfF
-rVMeUzw1SFWz5em4k13rS1CbB1GczDcfRh03kFJrkGn8bI+3P1PXBJLjOWVC8dAE
-r/guBreMN1K6O3FydQr8I9sZrYKiPB8ChoXj8pd4nRmwAbURAkEA8qSdoCTHbgZV
-3O1x5CshLhD4wQAwOuEvEsTnTSW8MfULQMzlXJ7XofyqqL8GZGSRynp2GaS0Kwf3
-grSgM/XBFQJBANNdWRywZnSbvn/+eD//Y8LtwNuZZuf0rM4AmXGScxL51msetnGH
-ALFrKsfh4c/MD3wYN2t3LhL+LPNsz3DufEMCQQCtMKZ5ugbHF6qNyMW0MLy8Hs0P
-JU1HmZd59CWMwVR07A0eMaG83HvZWXmOfNrZKZeOSJ6naxJWbJdUKgz3SYCJAkEA
-rEku1f/Dw9Efmt0lz6SxALcjuNx10STTpqc+bCDfw9v6Nx61wBw3KGceXAd3NRY0
-mQZ0RhjDaZ/drB5JiNgcWQJBAO39OvJf9L5AxnBNJ4Fvq+0OQTe51T90TG6+LG/Z
-ipKhigb+V8dN6Xhwb7lGWFip1sfPmCJ0ehw9/uqGUJHLuGA=
+MIICXAIBAAKBgQCZ9fF/1UcYaurFIX0QIyAJdojn9+bfsTcjEIoGbsAnQLz2bsZ4
+pqRNhZbYJApxqc+oDzZOqJOaxe8mlB5jUZ/sUA9Sp+wfWly95tkEHBMSse4xUNJV
+M4vFPfOG4fv9fYGH3pcmAU1QnST4Fh+qZRzrh9wa99ltmB/U2mJEF6NriwIDAQAB
+AoGAOfsmdNb0TFzPh2fiOnaP9SBf1MRGfU23DwyGfn+s+9tkjoYPVpajX9KEiWeh
+S0cBPjBkamEQHYSXWPcFLrApwnaS8A3Tkp1Voas1dg9Bu3WmDzIIsmBseMgMW00C
+6yETeYFtZ8/2nnpK/G7+N8eeseA63LUqg6ANw+BMH3o3dcECQQDNKW6ZfhDtn94+
+PWeXmxJWU6bm30U4othIo3iZKIswDhxVnlZhZ0mrgs0mc9c4CzTmyogvLKN0/nJF
+gknvEcdrAkEAwByJR63E5Wg8OR/d0HgZAkrXVZGkGz33ZddGygrdUGvk4dfYYALB
+A6/aCDc99gn4cUkzcOGOUGGEn3m38BeUYQJAUfyytChK/4sZt2m2kkFoTJNVaYHk
+GcQKBs09DofDR8r7y8Ng5b/vEtlMvocghMcFtw1M6v09vS1J4Tk17pH+TQJBAJYZ
+dbU4cv+e6nbjjAam3ztoSEjGK0dRqiu7AMc5p+N++WzvnVKetDnyOtNyfgnvjlrN
+C9ElmnD5UIrdqjZ/5eECQHhcQsKgsWGRKPKxyf7f/sFHpkSeAEZSAPdh8ouzIdUS
+xSRbK9UF+ckIop5cYjnBbmFa/BjWr4m9NcEKE8rXYxk=
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca4-cert.pem b/test/fixtures/keys/ca4-cert.pem
new file mode 100644
index 00000000000000..4a94c99f0c3a3b
--- /dev/null
+++ b/test/fixtures/keys/ca4-cert.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICkzCCAfygAwIBAgIJAJHwBmNgafKbMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
+dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2EyMSAwHgYJKoZIhvcNAQkB
+FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgzMDE4
+NDIyMVowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0Yx
+HzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAOBgNVBAsMB05vZGUu
+anMxDDAKBgNVBAMMA2NhNDEeMBwGCSqGSIb3DQEJARYPY2E0QGV4YW1wbGUub3Jn
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDC1M2aGVYsmrBiut1n0nfTU+9v
+TNVdAmKQBjnNsv3IIch/PPaEOIEm7dFhgdk86Z+wVCN3sAKu54Bz4JDKdPsFGvDy
+18JGuGH1vIVW5285IW7fMrzvAdZtETeBAiPM10Q69ddB4M6FbLiF273ZqCJ+vSsw
+kl5Dkas8YTZ0uwqKjQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4GBAGDMGSbPg/B4OripSxT2scXFIwoej47PW1byJgWaGoMJ8zgKUoKE7Z7A
+aWQbD22In05F0kBllqpSJWEZpTuVFsyyLeb3R7cuGQWs/puaaPul7sx+PRGhwxYe
+nrNIGtsaBf8TO/kb5lMiXWbhM5gZbBtbMMv3xWA4FxqU0AgfO3jM
+-----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca4-cert.srl b/test/fixtures/keys/ca4-cert.srl
new file mode 100644
index 00000000000000..328d9048a36464
--- /dev/null
+++ b/test/fixtures/keys/ca4-cert.srl
@@ -0,0 +1 @@
+ECAF33A18C6435BA
diff --git a/test/fixtures/keys/ca4-csr.pem b/test/fixtures/keys/ca4-csr.pem
new file mode 100644
index 00000000000000..0e6a0393843b27
--- /dev/null
+++ b/test/fixtures/keys/ca4-csr.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIB7jCCAVcCAQAwgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UE
+BwwCU0YxHzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAOBgNVBAsM
+B05vZGUuanMxDDAKBgNVBAMMA2NhNDEeMBwGCSqGSIb3DQEJARYPY2E0QGV4YW1w
+bGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDC1M2aGVYsmrBiut1n
+0nfTU+9vTNVdAmKQBjnNsv3IIch/PPaEOIEm7dFhgdk86Z+wVCN3sAKu54Bz4JDK
+dPsFGvDy18JGuGH1vIVW5285IW7fMrzvAdZtETeBAiPM10Q69ddB4M6FbLiF273Z
+qCJ+vSswkl5Dkas8YTZ0uwqKjQIDAQABoCUwIwYJKoZIhvcNAQkHMRYMFEEgY2hh
+bGxlbmdlIHBhc3N3b3JkMA0GCSqGSIb3DQEBCwUAA4GBAJoKIMOK0sCoXAa/cCaJ
+oTYLHee1aJBWmt8XTUqREdFIIAjjrgY0/ZGEeA9OEczbFgSTMPXemir4Ks3ib3kr
+MeJkOWSUgKL2gdV4jPZIUEdeTYaMQ5utiTvL2oKN4R51mSNg5ZEFIf+vZpK6UTpR
+LCERUC79Hsj13NrHK2Lf8jhy
+-----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/ca4-key.pem b/test/fixtures/keys/ca4-key.pem
new file mode 100644
index 00000000000000..90d595bce5b50e
--- /dev/null
+++ b/test/fixtures/keys/ca4-key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDC1M2aGVYsmrBiut1n0nfTU+9vTNVdAmKQBjnNsv3IIch/PPaE
+OIEm7dFhgdk86Z+wVCN3sAKu54Bz4JDKdPsFGvDy18JGuGH1vIVW5285IW7fMrzv
+AdZtETeBAiPM10Q69ddB4M6FbLiF273ZqCJ+vSswkl5Dkas8YTZ0uwqKjQIDAQAB
+AoGALnr8Tf4ra9q/p94ywfkZMyZ8Ic5vvI+8GeYSVjuUhfFhVtGhcivUzAfCgwOq
+YvjNaxC3oW8xRK7gG0UA5fwAgm24RkwazqYgcT2OTqoffRhd3lmyOUcR7fWB6FAN
+p7mx9ctW83HBPCwc7SIFaWxMULi3O38A7jXMMJrjIzhEsVUCQQDiKJF8sE6Ep7cr
+ARDcWxKP5INa7+UdsPdpR+wKxdrReQuhIF5V0hA6QbyCsNpqhqrO7e4El194qCMk
+NfYnz1nPAkEA3IoHlwMOquisd6/KcurFbUHguKH6CWzpxRU6QfLqUkNf+MPPozU1
+qYOm7nukWyJq+dDt5hrmaSuZny6I9zWY4wJBALcq8kJRrRZFm9VppJVD8bG2+ygw
+uZkllgyf4q4K9yHG7sNOKvlJDDmSujIDOLMkZLz5+VegngNj8ipGxhoSFwMCQGwv
+VdvRhx919izcUk6fNmwLVgachsCa6e5hJGv3ktT58hlhTPk9/+4BBCGXC6AdOScF
+Q76OUZsj5T8+H7hNVYsCQCahB/XNbok2MgfB8ABdqVPcAOMLtaGZH4gbE2M3p/Fh
+Y6BHQ25FT3LPKEzU89XJuyRoxea3CXqioJngt3JxN1I=
+-----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca4.cnf b/test/fixtures/keys/ca4.cnf
new file mode 100644
index 00000000000000..9081594e5c69bd
--- /dev/null
+++ b/test/fixtures/keys/ca4.cnf
@@ -0,0 +1,23 @@
+[ req ]
+default_bits           = 1024
+days                   = 9999
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+prompt                 = no
+output_password        = password
+x509_extensions        = v3_ca
+
+[ req_distinguished_name ]
+C                      = US
+ST                     = CA
+L                      = SF
+O                      = The Node.js Foundation
+OU                     = Node.js
+CN                     = ca4
+emailAddress           = ca4@example.org
+
+[ req_attributes ]
+challengePassword              = A challenge password
+
+[ v3_ca ]
+basicConstraints = CA:TRUE
diff --git a/test/fixtures/keys/ca5-cert.pem b/test/fixtures/keys/ca5-cert.pem
new file mode 100644
index 00000000000000..ef42f5bf92f668
--- /dev/null
+++ b/test/fixtures/keys/ca5-cert.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICHDCCAcGgAwIBAgIJANUB/0ZUgBZhMAoGCCqGSM49BAMCMIGIMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMR8wHQYDVQQKDBZUaGUgTm9k
+ZS5qcyBGb3VuZGF0aW9uMRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANjYTUx
+HjAcBgkqhkiG9w0BCQEWD2NhNUBleGFtcGxlLm9yZzAgFw0xODExMTYxODQyMjFa
+GA8yMjkyMDgzMDE4NDIyMVowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEL
+MAkGA1UEBwwCU0YxHzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAO
+BgNVBAsMB05vZGUuanMxDDAKBgNVBAMMA2NhNTEeMBwGCSqGSIb3DQEJARYPY2E1
+QGV4YW1wbGUub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6qDnQ6qm6hN+
+zbym76EK+spOKstEmqj9WzdA/tRBHhzZijXq1l90yQmRfmgclAKZw843qzMfj8Vj
+RMRXdZyyYKMQMA4wDAYDVR0TBAUwAwEB/zAKBggqhkjOPQQDAgNJADBGAiEA4nCM
+yQUkViSEvBeL3cLzRnak68tXTIkdRMekRFgdsOMCIQDFnkeCyB4S9u2gz1u/syEq
+usBaxJpZkN5nyTLapTQGqA==
+-----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca5-cert.srl b/test/fixtures/keys/ca5-cert.srl
new file mode 100644
index 00000000000000..345399f1fb6859
--- /dev/null
+++ b/test/fixtures/keys/ca5-cert.srl
@@ -0,0 +1 @@
+C4C2054438388E3E
diff --git a/test/fixtures/keys/ca5-csr.pem b/test/fixtures/keys/ca5-csr.pem
new file mode 100644
index 00000000000000..a1f77c72a4e1a0
--- /dev/null
+++ b/test/fixtures/keys/ca5-csr.pem
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBaTCCARACAQAwgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UE
+BwwCU0YxHzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAOBgNVBAsM
+B05vZGUuanMxDDAKBgNVBAMMA2NhNTEeMBwGCSqGSIb3DQEJARYPY2E1QGV4YW1w
+bGUub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6qDnQ6qm6hN+zbym76EK
++spOKstEmqj9WzdA/tRBHhzZijXq1l90yQmRfmgclAKZw843qzMfj8VjRMRXdZyy
+YKAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBwYXNzd29yZDAKBggqhkjO
+PQQDAgNHADBEAiABtQaxoQqAdrK8rjMh4wPB14/+uxMtJ7mY+QwJ411XywIgERcz
+HrcyJDqk2CS8B9mHwzD+ERUZ1CgThc15bnBleN0=
+-----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/ca5-key.pem b/test/fixtures/keys/ca5-key.pem
new file mode 100644
index 00000000000000..c213e03beadcf4
--- /dev/null
+++ b/test/fixtures/keys/ca5-key.pem
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINQRYMZO9+WwFZsKDa03DHkQfraKyJ3EcAfYkgtyYtX3oAoGCCqGSM49
+AwEHoUQDQgAE6qDnQ6qm6hN+zbym76EK+spOKstEmqj9WzdA/tRBHhzZijXq1l90
+yQmRfmgclAKZw843qzMfj8VjRMRXdZyyYA==
+-----END EC PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca5.cnf b/test/fixtures/keys/ca5.cnf
new file mode 100644
index 00000000000000..f1efb3311a0abd
--- /dev/null
+++ b/test/fixtures/keys/ca5.cnf
@@ -0,0 +1,35 @@
+[ ca ]
+default_ca      = CA_default
+
+[ CA_default ]
+serial = ca5-serial
+crl = ca5-crl.pem
+database = ca5-database.txt
+name_opt = CA_default
+cert_opt = CA_default
+default_crl_days = 999
+default_md = sha512
+x509_extensions        = v3_ca
+
+
+[ req ]
+days                   = 9999
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+prompt                 = no
+output_password        = password
+
+[ req_distinguished_name ]
+C                      = US
+ST                     = CA
+L                      = SF
+O                      = The Node.js Foundation
+OU                     = Node.js
+CN                     = ca5
+emailAddress           = ca5@example.org
+
+[ req_attributes ]
+challengePassword              = A challenge password
+
+[ v3_ca ]
+basicConstraints = CA:TRUE
diff --git a/test/fixtures/keys/ca6-cert.pem b/test/fixtures/keys/ca6-cert.pem
new file mode 100644
index 00000000000000..a6d2c1fbd2978b
--- /dev/null
+++ b/test/fixtures/keys/ca6-cert.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICGzCCAcGgAwIBAgIJAMTCBUQ4OI4+MAoGCCqGSM49BAMCMIGIMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMR8wHQYDVQQKDBZUaGUgTm9k
+ZS5qcyBGb3VuZGF0aW9uMRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANjYTUx
+HjAcBgkqhkiG9w0BCQEWD2NhNUBleGFtcGxlLm9yZzAgFw0xODExMTYxODQyMjFa
+GA8yMjkyMDgzMDE4NDIyMVowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEL
+MAkGA1UEBwwCU0YxHzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAO
+BgNVBAsMB05vZGUuanMxDDAKBgNVBAMMA2NhNjEeMBwGCSqGSIb3DQEJARYPY2E2
+QGV4YW1wbGUub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEa7HfEgyVTPWY
+ku9cWGRSym5OdB7zqFihL8+k93EfWViJph72fJH3sOZypUgDXS/sEyUaLhbxtLYz
+sMbECzEDwaMQMA4wDAYDVR0TBAUwAwEB/zAKBggqhkjOPQQDAgNIADBFAiEA+NIP
+zuqh2e3/59QndyPqRH2CZ4V4ipU6rf6ZZmwPApUCIBMABWesJfwdrETIjN6dT8gc
+STrYyR4ovD8Aofubqjd0
+-----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca6-cert.srl b/test/fixtures/keys/ca6-cert.srl
new file mode 100644
index 00000000000000..422681ae4a1a4b
--- /dev/null
+++ b/test/fixtures/keys/ca6-cert.srl
@@ -0,0 +1 @@
+A97535039C5E962B
diff --git a/test/fixtures/keys/ca6-csr.pem b/test/fixtures/keys/ca6-csr.pem
new file mode 100644
index 00000000000000..c12e008f533a87
--- /dev/null
+++ b/test/fixtures/keys/ca6-csr.pem
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBaTCCARACAQAwgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UE
+BwwCU0YxHzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAOBgNVBAsM
+B05vZGUuanMxDDAKBgNVBAMMA2NhNjEeMBwGCSqGSIb3DQEJARYPY2E2QGV4YW1w
+bGUub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEa7HfEgyVTPWYku9cWGRS
+ym5OdB7zqFihL8+k93EfWViJph72fJH3sOZypUgDXS/sEyUaLhbxtLYzsMbECzED
+waAlMCMGCSqGSIb3DQEJBzEWDBRBIGNoYWxsZW5nZSBwYXNzd29yZDAKBggqhkjO
+PQQDAgNHADBEAiAH69eeaDguTPAqGhWJbhFPEw7zXyZl6TgxoMIeZOouRgIge+Ft
+kXO05md30kbq6s559B45rYoH4iHxFOJZqHso7Yc=
+-----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/ca6-key.pem b/test/fixtures/keys/ca6-key.pem
new file mode 100644
index 00000000000000..bb80dd3af4990b
--- /dev/null
+++ b/test/fixtures/keys/ca6-key.pem
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFbxtF4Zc09n/2w7z5SMQLFNTdxg4QPSm1WgyffHtJFIoAoGCCqGSM49
+AwEHoUQDQgAEa7HfEgyVTPWYku9cWGRSym5OdB7zqFihL8+k93EfWViJph72fJH3
+sOZypUgDXS/sEyUaLhbxtLYzsMbECzEDwQ==
+-----END EC PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca6.cnf b/test/fixtures/keys/ca6.cnf
new file mode 100644
index 00000000000000..314761509600a0
--- /dev/null
+++ b/test/fixtures/keys/ca6.cnf
@@ -0,0 +1,22 @@
+[ req ]
+days                   = 9999
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+prompt                 = no
+output_password        = password
+x509_extensions        = v3_ca
+
+[ req_distinguished_name ]
+C                      = US
+ST                     = CA
+L                      = SF
+O                      = The Node.js Foundation
+OU                     = Node.js
+CN                     = ca6
+emailAddress           = ca6@example.org
+
+[ req_attributes ]
+challengePassword              = A challenge password
+
+[ v3_ca ]
+basicConstraints = CA:TRUE
diff --git a/test/fixtures/keys/dh1024.pem b/test/fixtures/keys/dh1024.pem
index 2ceb5d97765800..67c8cbc9231718 100644
--- a/test/fixtures/keys/dh1024.pem
+++ b/test/fixtures/keys/dh1024.pem
@@ -1,5 +1,5 @@
 -----BEGIN DH PARAMETERS-----
-MIGHAoGBANbhtynvkH1sZ2K9dLEyZ3keteaBUab1GvFeCgJV9akoxmtjSuD9o6bS
-pD+y+GstQb1WqiPICSraJs+uX1NNzxYQTFz3Ur0vR20RN6i3aJaldnWl+HitRlfa
-iEA2DUoPISmOFsrzPQdfdRh6tTYZYGbjElA5KukUsMtMRaTIDSIjAgEC
+MIGHAoGBAOJ2igPYPdXULPSXaeR40pdGRdQmiWchzxDbzExdaJ4Q/landa7K9jfj
+KNV2heMpFoXa6+GkCxXSli+99j0W/ARK1nnZ9YaB42sp3g2oTmMevWyk9hfZTTUC
+Pc3AyioJGTQV/5wqYPdSNAu5KdHFZkP26EhbGgnDZ2hg5vFQT6EjAgEC
 -----END DH PARAMETERS-----
diff --git a/test/fixtures/keys/dh2048.pem b/test/fixtures/keys/dh2048.pem
index baeb28f3a168c9..cece692e241b28 100644
--- a/test/fixtures/keys/dh2048.pem
+++ b/test/fixtures/keys/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAoKS3RTOlvieMbectTsczMWgZwvO6frAZkIXR+GLI8SKfsr21Xyr6
-5p8YqT5wWpEUhpEAasOxEaOhqQ6qUGWOrxtacqE+HiuM5wTuZs31UGslgLdBDwqx
-XF3rRV9DBiNNRhzUlytuVnBNoh2F4YgXxl0OZ4EhldN3VAhQy+3bbI9hCt36uuwE
-iGV1i1PEMk0UTZrYKKuZwpaahqznmLQN6Dbg3E5RtmvSjlgQQ8WAse37/CAUiGTx
-QLFl2CKUJfEYMQKjlasZ2fPSTTM4VDJByixynzzHQ/YxPRAYCQ/HejbjegaI0b3F
-pcMjtKtKYghGRnIo2cb/yj8p9RQyB0TluwIBAg==
+MIIBCAKCAQEA+/OlXG2eqOsd9oA6Rg9KDbU22adIXuuwSaVLiUFNIc4WYnzPuyd0
+WcLajZzhXoUpN6GCLqXE+jBphHTh+xx6Y0ztlMldx0mnrLzacd236LCrTX5smojO
+CQ3BFmbDn7naG2famOZXF3gLRkcAmUtHrn2hYRbEk+1+GD3yXUm/JgFcnAX2HUQa
+b4sDL5NHMJ61+qE65qIIht9jOVovl4b7yOoyDu+JrheV0XBrc8WU03AGKcJnjW6i
+YqKXQlpamVvL/QqWfhg3SztBxYADAURePTUmS1H1FTnxSdRoUK9ZwKoTeZFL6krT
+3HK76Y0HXhwtjk3aXKTJyEDDLdYaltOCOwIBAg==
 -----END DH PARAMETERS-----
diff --git a/test/fixtures/keys/dh512.pem b/test/fixtures/keys/dh512.pem
index de17bcc3c796df..713076ee2ffba6 100644
--- a/test/fixtures/keys/dh512.pem
+++ b/test/fixtures/keys/dh512.pem
@@ -1,4 +1,4 @@
 -----BEGIN DH PARAMETERS-----
-MEYCQQCyJYaQNCz0LyNQXKPNKZMq4pcvSNlxZvNLLtdixaA2SYj4nbIxOSths0Nu
-ao2AsGzSfAAtMUn1WEKE4VIxzW0rAgEC
+MEYCQQDItkdipTrinQp7aKt0GtwY7QE6tMKpg+r1zeucMrq9uNp8uLhHkF1OtqnL
+StFTzxQIkjN2s8exIvoWZWiy/9DTAgEC
 -----END DH PARAMETERS-----
diff --git a/test/fixtures/keys/dns-cert1.cnf b/test/fixtures/keys/dns-cert1.cnf
new file mode 100644
index 0000000000000000000000000000000000000000..44ce3992f4b7933ea13facd4172a6cb56bd29947
GIT binary patch
literal 565
zcmY*V%WlIU5bT++*dM5shbuJ)q+02v7b{YaQG{^3wTUpeW}PN~U%-#VaDd&J-JP8y
z>@!i~kL)$UiJfhG7kDEyPFdrCL&z|8gbsf_J~Bn2$id@qSg$rIE9Lz;JK-F5{;*Ox
zQl{#atFaVDHW&#!v=*)}E_kMxW|F8=MNhcwHZUI`YdhPtG>w^G4#u+E+iLf`$%t~e
zZiOGn!qBHhr{WnOR$l1x`|tCKxOh3>Rq5nxo6#!qP#IjUrPgRFJV@vMY*#Ldy~!EO
z6lh0I=rm~c9Y%XHO?mK*!-v#^S<dt3|A~F(-^tqJm9>?|py(x;wFPkF!AtMxRT@h*
dc2V@#Ar`$S@iHF<S_sl4jXk$M*3wa={{yv{r49f9

literal 0
HcmV?d00001

diff --git a/test/fixtures/keys/dsa1025.pem b/test/fixtures/keys/dsa1025.pem
index ba5cab4548a201..bd83e734c688e8 100644
--- a/test/fixtures/keys/dsa1025.pem
+++ b/test/fixtures/keys/dsa1025.pem
@@ -1,9 +1,9 @@
 -----BEGIN DSA PARAMETERS-----
-MIIBLgKBiQC2r/KfMa0uMf8PoW7ClzmYn41i33sJvaZnzJ376hkreEmYSov5Nn1H
-s0Sgbkl/RRSXO6USVcWixIDjAkrfBFMBEQAmduy/RVLKFTm0VfOjwmgI5KswpGi6
-pMlf2gpCIjGfLNjX2D3t2fKFgNV1dHr4I2nHROnLpgXcr+2LVUijm8WdGc/uwY2b
-AhUA/tubPhgw2Vo2C6uFx+4wkXc/vX8CgYh9NIz7YeCvZEFqPiHcC8HhYk0ERo4u
-ynprB27vSYszw7124Mo0zQt7Je3hIq2IfltmbWXwZNBp0MHFK93VzBX4Ytbov3KA
-KGdigUSZi4OsJLuZpLUFLt4Nx3kSHb7LSCflXlfk7esdd0R/3SdhUGcuvz17sCjV
-p57mAYTFNoolrLZaKb+dQprw
+MIIBLgKBiQDp3xGIsNcKZWSpur2Ab2f5rirhu5AsYGLI/XZvzueoO4kLPp3szKHX
+abBObdxU07kRFkfpV9lftdXT3a6E/Wxb+w2d7g0F7pWTdwpmmofcRtwgbynmJKvq
+Wt/OwfVFsdUvvpVci9AxY/5rdM/K54Srp6iSpfteBYKGqCpPnswikND0GxKM1Mbz
+AhUAqAPKCZ4hxromirUu33tn3Nhsq20CgYgf0tH2nwzWlPLoN4OJvC5dVLPvMRyJ
+TQekW8tR0oY6PeshmZOaoI0L3e/M4KeZ/4qiY7IRNksP2YGJxjfS6W+h+MNjPO5r
+0aYYFYCPQ8JbhBO7l0hdXmkTY3FcdyRHeh2gwe3bBX6Auev2MGgL616Cgd/KH8PA
+X9EHmrNPcQOWHem4KcfJXqou
 -----END DSA PARAMETERS-----
diff --git a/test/fixtures/keys/dsa_private_1025.pem b/test/fixtures/keys/dsa_private_1025.pem
index e2927f0097ff73..038b0c36bb9947 100644
--- a/test/fixtures/keys/dsa_private_1025.pem
+++ b/test/fixtures/keys/dsa_private_1025.pem
@@ -1,12 +1,12 @@
 -----BEGIN DSA PRIVATE KEY-----
-MIIB0wIBAAKBiQC2r/KfMa0uMf8PoW7ClzmYn41i33sJvaZnzJ376hkreEmYSov5
-Nn1Hs0Sgbkl/RRSXO6USVcWixIDjAkrfBFMBEQAmduy/RVLKFTm0VfOjwmgI5Ksw
-pGi6pMlf2gpCIjGfLNjX2D3t2fKFgNV1dHr4I2nHROnLpgXcr+2LVUijm8WdGc/u
-wY2bAhUA/tubPhgw2Vo2C6uFx+4wkXc/vX8CgYh9NIz7YeCvZEFqPiHcC8HhYk0E
-Ro4uynprB27vSYszw7124Mo0zQt7Je3hIq2IfltmbWXwZNBp0MHFK93VzBX4Ytbo
-v3KAKGdigUSZi4OsJLuZpLUFLt4Nx3kSHb7LSCflXlfk7esdd0R/3SdhUGcuvz17
-sCjVp57mAYTFNoolrLZaKb+dQprwAoGIXuEQl13kgZSS01f5GZ5h+vIBlmIpx4xw
-lcsDZgrhIjaDHONd1ENQ6iHlDAotO+TCaPhmC6u8/FkecCkhccbbMzTTMq2qCxKS
-k3Xw1TvlBvBwc+Wy03GqGkiJjHProtWx1T5Ix/Ry+G8RxEucLSlh8xJcCrL/yueZ
-KgdXLKMLKLP3t9DJcHd7WAIVAMBoRtLSze63Y7aC49Q2iFZhy9+u
+MIIB0gIBAAKBiQDp3xGIsNcKZWSpur2Ab2f5rirhu5AsYGLI/XZvzueoO4kLPp3s
+zKHXabBObdxU07kRFkfpV9lftdXT3a6E/Wxb+w2d7g0F7pWTdwpmmofcRtwgbynm
+JKvqWt/OwfVFsdUvvpVci9AxY/5rdM/K54Srp6iSpfteBYKGqCpPnswikND0GxKM
+1MbzAhUAqAPKCZ4hxromirUu33tn3Nhsq20CgYgf0tH2nwzWlPLoN4OJvC5dVLPv
+MRyJTQekW8tR0oY6PeshmZOaoI0L3e/M4KeZ/4qiY7IRNksP2YGJxjfS6W+h+MNj
+PO5r0aYYFYCPQ8JbhBO7l0hdXmkTY3FcdyRHeh2gwe3bBX6Auev2MGgL616Cgd/K
+H8PAX9EHmrNPcQOWHem4KcfJXqouAoGIcZ/4bJurOAw5OL4+5BsE4jfSVFq4nmNl
++m6Iy6ls3hOHOZ9sJlw0Fi+ZtdeddOTYnIngW/kH09XGoF5JJOaLQv2O4GmZfDfn
+la+vfHZPsOxmYqeEbSwA2pqlhOn/dCshBOymhwNLXp1FJ3JUEyh8i605X06XmWoj
+4ZIu/tr1xbnZDLHuFjBmXAIURbB5/IDf2h0sW+qL5gHFO8bgr+E=
 -----END DSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/dsa_public_1025.pem b/test/fixtures/keys/dsa_public_1025.pem
index c439e5713e04b0..1b4f083817eaa3 100644
--- a/test/fixtures/keys/dsa_public_1025.pem
+++ b/test/fixtures/keys/dsa_public_1025.pem
@@ -1,12 +1,12 @@
 -----BEGIN PUBLIC KEY-----
-MIIBzjCCATsGByqGSM44BAEwggEuAoGJALav8p8xrS4x/w+hbsKXOZifjWLfewm9
-pmfMnfvqGSt4SZhKi/k2fUezRKBuSX9FFJc7pRJVxaLEgOMCSt8EUwERACZ27L9F
-UsoVObRV86PCaAjkqzCkaLqkyV/aCkIiMZ8s2NfYPe3Z8oWA1XV0evgjacdE6cum
-Bdyv7YtVSKObxZ0Zz+7BjZsCFQD+25s+GDDZWjYLq4XH7jCRdz+9fwKBiH00jPth
-4K9kQWo+IdwLweFiTQRGji7KemsHbu9JizPDvXbgyjTNC3sl7eEirYh+W2ZtZfBk
-0GnQwcUr3dXMFfhi1ui/coAoZ2KBRJmLg6wku5mktQUu3g3HeRIdvstIJ+VeV+Tt
-6x13RH/dJ2FQZy6/PXuwKNWnnuYBhMU2iiWstlopv51CmvADgYwAAoGIXuEQl13k
-gZSS01f5GZ5h+vIBlmIpx4xwlcsDZgrhIjaDHONd1ENQ6iHlDAotO+TCaPhmC6u8
-/FkecCkhccbbMzTTMq2qCxKSk3Xw1TvlBvBwc+Wy03GqGkiJjHProtWx1T5Ix/Ry
-+G8RxEucLSlh8xJcCrL/yueZKgdXLKMLKLP3t9DJcHd7WA==
+MIIBzjCCATsGByqGSM44BAEwggEuAoGJAOnfEYiw1wplZKm6vYBvZ/muKuG7kCxg
+Ysj9dm/O56g7iQs+nezModdpsE5t3FTTuREWR+lX2V+11dPdroT9bFv7DZ3uDQXu
+lZN3Cmaah9xG3CBvKeYkq+pa387B9UWx1S++lVyL0DFj/mt0z8rnhKunqJKl+14F
+goaoKk+ezCKQ0PQbEozUxvMCFQCoA8oJniHGuiaKtS7fe2fc2GyrbQKBiB/S0faf
+DNaU8ug3g4m8Ll1Us+8xHIlNB6Rby1HShjo96yGZk5qgjQvd78zgp5n/iqJjshE2
+Sw/ZgYnGN9Lpb6H4w2M87mvRphgVgI9DwluEE7uXSF1eaRNjcVx3JEd6HaDB7dsF
+foC56/YwaAvrXoKB38ofw8Bf0Qeas09xA5Yd6bgpx8leqi4DgYwAAoGIcZ/4bJur
+OAw5OL4+5BsE4jfSVFq4nmNl+m6Iy6ls3hOHOZ9sJlw0Fi+ZtdeddOTYnIngW/kH
+09XGoF5JJOaLQv2O4GmZfDfnla+vfHZPsOxmYqeEbSwA2pqlhOn/dCshBOymhwNL
+Xp1FJ3JUEyh8i605X06XmWoj4ZIu/tr1xbnZDLHuFjBmXA==
 -----END PUBLIC KEY-----
diff --git a/test/fixtures/keys/ec-cert.pem b/test/fixtures/keys/ec-cert.pem
index ad92a1da65fc01..1fd84b2fe88d5e 100644
--- a/test/fixtures/keys/ec-cert.pem
+++ b/test/fixtures/keys/ec-cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB6zCCAZECCQCBokj/YZyrgDAJBgcqhkjOPQQBMH0xCzAJBgNVBAYTAlVTMQsw
-CQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVudDEQMA4GA1UE
-CwwHTm9kZS5qczEPMA0GA1UEAwwGYWdlbnQyMSAwHgYJKoZIhvcNAQkBFhFyeUB0
-aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE3MDJaGA8yMjkyMDUyMjAxMTcwMlow
-fTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEPMA0GA1UE
-CgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQDDAZhZ2VudDIxIDAe
-BgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAE66yptjRZ8bbNf8udG9JEI8pyCit8csm+uKqBfZPUpzo2nygLSMkr
-nGYnDbMXnGGolWnxORWqVMDwh0kP2riJojAJBgcqhkjOPQQBA0kAMEYCIQCNYxzf
-kN+8CF7ueZEZrQnTmefGvQBFU6x0xP6jTlzTYgIhAOfXl9lbCACFKu8jrIlH1euw
-NL+pX0A4665uHg17kZqW
+MIIB6zCCAZICCQDB6nsD1ZVtUjAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJVUzEL
+MAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZKb3llbnQxEDAOBgNV
+BAsMB05vZGUuanMxDzANBgNVBAMMBmFnZW50MjEgMB4GCSqGSIb3DQEJARYRcnlA
+dGlueWNsb3Vkcy5vcmcwIBcNMTgxMTE2MTg0MzE0WhgPMjI5MjA4MzAxODQzMTRa
+MH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNV
+BAoMBkpveWVudDEQMA4GA1UECwwHTm9kZS5qczEPMA0GA1UEAwwGYWdlbnQyMSAw
+HgYJKoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzBZMBMGByqGSM49AgEGCCqG
+SM49AwEHA0IABEppwUcxZQc2qbTxko8VEYAtKhMPbzzkhMlC3iqv+DJG9gXRJ3Kt
+8vz3/HuBV6gGDjuaTObou//p7sBjOdvcTXAwCgYIKoZIzj0EAwIDRwAwRAIgAmC2
+Xfpv1zjKePs3xAAWGP3Xp9+1lOdHpA3mTjlAFOoCIAJagVrpr8rWOf73fdN31xrs
+8IdbV8S1DDlqYzANVPnA
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ec-csr.pem b/test/fixtures/keys/ec-csr.pem
index 629c42aa37a8a7..ab9e2085aef58e 100644
--- a/test/fixtures/keys/ec-csr.pem
+++ b/test/fixtures/keys/ec-csr.pem
@@ -2,8 +2,8 @@
 MIIBODCB3wIBADB9MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcM
 AlNGMQ8wDQYDVQQKDAZKb3llbnQxEDAOBgNVBAsMB05vZGUuanMxDzANBgNVBAMM
 BmFnZW50MjEgMB4GCSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAATrrKm2NFnxts1/y50b0kQjynIKK3xyyb64qoF9
-k9SnOjafKAtIySucZicNsxecYaiVafE5FapUwPCHSQ/auImioAAwCgYIKoZIzj0E
-AwIDSAAwRQIgIggV/82bb/c0MQEOkfZKdOcsexsit3LpEs+qzF7BSsoCIQCti/XZ
-EQUMIPdE1qfPnrxSRqQKbNANDVtlkLkfAP/IRw==
+hkjOPQIBBggqhkjOPQMBBwNCAARKacFHMWUHNqm08ZKPFRGALSoTD2885ITJQt4q
+r/gyRvYF0SdyrfL89/x7gVeoBg47mkzm6Lv/6e7AYznb3E1woAAwCgYIKoZIzj0E
+AwIDSAAwRQIhANc8OD4E9EhR8SBrvdgA6n0rg9x6cpWst4cMkR59wkSJAiAD+kOE
+X4RCKkmFxRysPaXrbwEQRCVYV/ynrCsYm5kbnA==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/ec-key.pem b/test/fixtures/keys/ec-key.pem
index bbabda235f5e32..f9e40a8ce2fae6 100644
--- a/test/fixtures/keys/ec-key.pem
+++ b/test/fixtures/keys/ec-key.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPwpJlqX3faXUjfVXbNJ+YeZszQOgNW2pLpI9jrWdsJ5oAoGCCqGSM49
-AwEHoUQDQgAE66yptjRZ8bbNf8udG9JEI8pyCit8csm+uKqBfZPUpzo2nygLSMkr
-nGYnDbMXnGGolWnxORWqVMDwh0kP2riJog==
+MHcCAQEEIBxOoTv4SYyESx2cM2ittkAS3z3YGQsPp38otS0PpkqhoAoGCCqGSM49
+AwEHoUQDQgAESmnBRzFlBzaptPGSjxURgC0qEw9vPOSEyULeKq/4Mkb2BdEncq3y
+/Pf8e4FXqAYOO5pM5ui7/+nuwGM529xNcA==
 -----END EC PRIVATE KEY-----
diff --git a/test/fixtures/keys/ec.pfx b/test/fixtures/keys/ec.pfx
index 3130860e9939309cb90c1ecae28ad88bd8ceb5e3..2d2f502c77324bd9ecbb6370e5c91b14fba2dc4f 100644
GIT binary patch
delta 866
zcmV-o1D*Wt2kr-uU4O2~B)ooksVo8l2mpYB0!T+JaDps<9uoO;-o+|Zc#8;f4uG^N
zR?MY#PtU);P3QVgTN+@4HQp*!n;u)z<GrVTMcDW}PZ<974!h>3j<o?nkTt5amh1ya
z1|TeWExdoACy)5C@u}OOMlb1QxS{mYuJUU@JLR)7nS3C4pnvi0SA{yZ|4e0CQ01b*
zM$>3NN0=j%#?*$DiuoG9ZQq(&OMwCEC!2p&@sAzswREQoHAc6og9SweJ<_S>Ihp;J
z{UoFNk4fp`0(!O;>-_4RBDrc#+5kt7V!t4Hi(wfP)aX)4a)<Rmls}u<iWh4P4-7c&
zl{I)q6g_qJrGI7^rYlr%7*5V_v;{U$NAuI>B7E((!(z!$=>BY8r{LTHEGZ<h#6`*Q
zM%2-_{qr{*rb6kaEz4r)9#e~XYF1{@Sn3H)T1t-u@oJ*3K$9vuC#h_A9Wh`tb7A7m
zxux>eOhR-Q<ge#?JY}mF3<HRi0sg4*asJIZCqeN^jeqOLRZmI<$*d$cENke<%aGVJ
z2q4>`UIMeeP#dQ3nBrIeWX$hEqx4`51dqv@LD@t51uG=R4KYzJ@EfA<a`J}h75V^&
z@*dDt0f%igkxdd(_>26Gavv$bwyb7|M%M260V4xi_P8LGaxNI$=dKRJrogd>^dL<K
zM2q}qeq7i>ET?<RMg$ND{+Z^5$`m*ZOVS6`moUW9OncC^zrOE+wJmtz0{DPFmot@q
zpkHWjS9_frK>ssfsaEN{fA*JLvX9CIDPBBBP-SOIS&T8r<oD8iAiRnaF?5r)0ziLI
zPf_nD@qLd10tf&EfsjNmkB*`ZO4L}R>9%{IR{Z5WH>RMNLc}3mcD@^LzS!dLNgU~J
ze?3IfCVH3`QI3?KDQyAon(G5c)!SkqzL9EFcgZx7UN}@Tt$II!d-w8Y)$sk#@UX=w
z$aGlt=LjHUooDoWxj_aLY#iR3Ws!PMrFLA5lGosDT6lgH7I-9|R!GlwikTv8Q=HJ*
z^EkCJB`_lf2`Yw2hW8Bt2^BFG1Qg%!(`&=$bbQD2`yMkAu567{Uvw}rFd;Ar1_dh)
s0|FWa00b0tQIU_%n%Je62`c7Z%EMaO6H^ET2(SH0gCSX5Gy(z$0DcCXJ^%m!

delta 866
zcmV-o1D*Wt2kr-uU4KrE>rc{y_%8wi2mpYB0!YSn1K?1R2!b%i?Be5Ew2mhbxT>eE
zjQ5rZaj9@XR{gbmcH+@e*h8>WI3V5>G=xxi%c*l1^e?UwO`<5K!RnG!zo)fp2gxK)
zsBPPY^~b00Np@Pse#@pZ<IDZ5)v<`DbE0kuEPY>;{@<6~`+v0w-j#JM-*JCfWh<l$
z!E;YJ*P&sY?yM_FL<?b&M}eXDYyTJ68|d)KUcMj41);wUDIu^N^MXAhD=rdsLg*~0
zTWbHsA|(BhL2$`KP<W|4^_ME2Pdh?8wOnfaIFcHGm|rE!@@b31y%dDOOq|+a6qC&R
zD;G>9^AJLp8h<;Y!s}0MiURsLV;Cj;D<0qal1nPp>GsRBD?l=f_L0(Ob8fWj!X5H2
zbS8EWQh+?ALm0e>91_ASvjd7!gHLb&a#LXHtTqq$QqcIDj^3l|#`m*{Y;aK`{0^Z&
zz0^tgIth!}<BzIEzV%o*s9N=A<6%$(kS#|qCd8(w5P#0*+IFXir&f3&CyH8ee%IU1
z<7#9~JCvxquj|$jY|u@ZdCtYu+zAu~?=ejasp&ngVg0hD5p_25*}atnNu@$JMVOgf
zN6xfwR6Omn(7A$c3{C-ngogXEmi~h20TC)IhH8(X&=7I$6V}D6RQs|)E)-danezt#
zJI9lW$y`W<X12NOCWIm{b|*Q$mJKO^9OR}0zn#3UF`IepD@Hh02HpNm#GEh$I6&&?
zWNzW6%Ca|Mdc4jc9515mf{q81e2W1kHFTLJP9NMaOU_yIk8iqr)lq=UaCMWl0ziL<
zzx`UBdYp^`0tf&EfspZ@m>YhrVmoZ<C}#H-P5QpXU)Y#(@d0_`=V$e0{&5dgXUyhG
zo>V`?uwsc0luuXgV8qN%s+;>=X^>~VxOOQUSEarz@3pYG39BLjZ5hi}-!>&-W-D~Q
zD_tX^weRBFlC#NkL6eO-Nvkg9H12w*b83#rZuYDYa{u&T;^GuzsyYuQoq`*sM>c>5
zbtgVCB`_lf2`Yw2hW8Bt2^BFG1QZboKZ~lGhBa-HkOtFH0?WH%Z!$13Fd;Ar1_dh)
s0|FWa00b1{6!<`zq9<Aw?Xqr)blWG4G<M<y2x*gof&mW<gaQHx0Fi;4IRF3v

diff --git a/test/fixtures/keys/ec10-cert.pem b/test/fixtures/keys/ec10-cert.pem
new file mode 100644
index 00000000000000..d6019ebce0cdee
--- /dev/null
+++ b/test/fixtures/keys/ec10-cert.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIB9zCCAZ6gAwIBAgIJAKl1NQOcXpYrMAoGCCqGSM49BAMCMIGIMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMR8wHQYDVQQKDBZUaGUgTm9k
+ZS5qcyBGb3VuZGF0aW9uMRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANjYTYx
+HjAcBgkqhkiG9w0BCQEWD2NhNkBleGFtcGxlLm9yZzAgFw0xODExMTYxODQyMjFa
+GA8yMjkyMDgzMDE4NDIyMVoweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQsw
+CQYDVQQHDAJTRjEfMB0GA1UECgwWVGhlIE5vZGUuanMgRm91bmRhdGlvbjEQMA4G
+A1UECwwHTm9kZS5qczEcMBoGA1UEAwwTYWdlbnQxMC5leGFtcGxlLmNvbTBZMBMG
+ByqGSM49AgEGCCqGSM49AwEHA0IABDuWsQNVJ8wPZjqFqkkVeuYfYrfgstcPO7Ai
+cGrgfQKeFvz+oLd6+U+OGFMFh0+LkI6oTADserWMFyuaiqDIFzAwCgYIKoZIzj0E
+AwIDRwAwRAIgM0oqALjQXRlxmJlje71j0AX22Dq732dH0/oBEHiTDBcCIBbOfILG
+vtveS9DMkz5VVlqQJ2TsDcSerhXHcLowXt5i
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICGzCCAcGgAwIBAgIJAMTCBUQ4OI4+MAoGCCqGSM49BAMCMIGIMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMR8wHQYDVQQKDBZUaGUgTm9k
+ZS5qcyBGb3VuZGF0aW9uMRAwDgYDVQQLDAdOb2RlLmpzMQwwCgYDVQQDDANjYTUx
+HjAcBgkqhkiG9w0BCQEWD2NhNUBleGFtcGxlLm9yZzAgFw0xODExMTYxODQyMjFa
+GA8yMjkyMDgzMDE4NDIyMVowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEL
+MAkGA1UEBwwCU0YxHzAdBgNVBAoMFlRoZSBOb2RlLmpzIEZvdW5kYXRpb24xEDAO
+BgNVBAsMB05vZGUuanMxDDAKBgNVBAMMA2NhNjEeMBwGCSqGSIb3DQEJARYPY2E2
+QGV4YW1wbGUub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEa7HfEgyVTPWY
+ku9cWGRSym5OdB7zqFihL8+k93EfWViJph72fJH3sOZypUgDXS/sEyUaLhbxtLYz
+sMbECzEDwaMQMA4wDAYDVR0TBAUwAwEB/zAKBggqhkjOPQQDAgNIADBFAiEA+NIP
+zuqh2e3/59QndyPqRH2CZ4V4ipU6rf6ZZmwPApUCIBMABWesJfwdrETIjN6dT8gc
+STrYyR4ovD8Aofubqjd0
+-----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ec10-csr.pem b/test/fixtures/keys/ec10-csr.pem
new file mode 100644
index 00000000000000..da92a5eea92523
--- /dev/null
+++ b/test/fixtures/keys/ec10-csr.pem
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBWDCB/wIBADB4MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcM
+AlNGMR8wHQYDVQQKDBZUaGUgTm9kZS5qcyBGb3VuZGF0aW9uMRAwDgYDVQQLDAdO
+b2RlLmpzMRwwGgYDVQQDDBNhZ2VudDEwLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0C
+AQYIKoZIzj0DAQcDQgAEO5axA1UnzA9mOoWqSRV65h9it+Cy1w87sCJwauB9Ap4W
+/P6gt3r5T44YUwWHT4uQjqhMAOx6tYwXK5qKoMgXMKAlMCMGCSqGSIb3DQEJBzEW
+DBRBIGNoYWxsZW5nZSBwYXNzd29yZDAKBggqhkjOPQQDAgNIADBFAiEAgyYiDWmr
+Ks1RAQAsxR91PFzxJRa7dgclWPmuDTGTxhcCIFLtalcAOlD+4Wa06SvgGWN/R4V2
+u/JZjWD+lWFZjOC5
+-----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/ec10-key.pem b/test/fixtures/keys/ec10-key.pem
new file mode 100644
index 00000000000000..eca56fc2d9e13e
--- /dev/null
+++ b/test/fixtures/keys/ec10-key.pem
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIAAaqQ4/ivoch4lwve3fjDLeycYlB3q15IoxsA3fEBA7oAoGCCqGSM49
+AwEHoUQDQgAEO5axA1UnzA9mOoWqSRV65h9it+Cy1w87sCJwauB9Ap4W/P6gt3r5
+T44YUwWHT4uQjqhMAOx6tYwXK5qKoMgXMA==
+-----END EC PRIVATE KEY-----
diff --git a/test/fixtures/keys/ec10.pfx b/test/fixtures/keys/ec10.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..59448e550d4aed2e9692794ca5d762faa97a685d
GIT binary patch
literal 2198
zcmV;H2x<2)f(ViV0Ru3C2v`OQDuzgg_YDCD0ic2iNd$rjMKFR0K`?>`HwFnRhDe6@
z4FLxRpn?Y|FoFjp0s#Opf(IQ22`Yw2hW8Bt2LUh~1_~;MNQU<f0So~HFb)I=kklvY
zz2Ssl0s;sCfPx0_!=#5{PHFdr{Rg}uz4S!xAsLfSp&@aHFV>S9cTbvm1VrU0>T<hd
zF={u635bSVez@K4z@DKmc8jAa3N-#tdO^RV8(<9sja<Uf>W6`LThKfR))q}W9CdVQ
zN{<y0Hm_=yQ_rF2<$s<xhBb;>^@cDbQ4LdkGmjzSTVNQiqmWe+HhL0;FHBo*kk64z
zawAbp!bH;mNHuUq9v@^NBjksAn9P`jf`I$F$#(iQGDA{U#N#fhWH%>Qww>S0RQkZ0
zkk%C~tI1m49606Cf53#%zsWbT7Lq<em|xl)S+uVoe#7{-U%@da!>xSS97A}d=Wh2D
zrloD(rBs(E72AbhFh%BzT8%E@CmPdjtytI9qNK_y0mh)Yt)4TV%9D<i>4CIM+)i(j
z-#I=4!<oovknUw)zJ!05-oyoiHfCMbUrU2dA0SON4qb$3hlnESkaAucTZC+by2*t=
z*_{GD_qjm~dFJUQl0`2)EI~Ufx5XVL7L-SKeIzic`Lmw`*22YlKmt1?sSRrL>f>t$
zhtV*JzDV&P8=Xx1g|aE0?@E{-KpM`Y&JDVA4v0uAvkM26XxBzXAN*Q5KPvFWN5V0?
zh45JBA-%dQ6(s*16W~QbmG|6Kg9Z}Bwy~>=CI|vh0q#8C19Ud0nj;rj<S6qE=2n1i
z$;Knomdl&f*ob%S`Q4TCAazUW5==vbrPB5<HePCuv4^8{z-9)?&XPIM=J}gNdR-5J
z+;TM@t%{&UlXgh@y7DjqRm>=~;#e@{a9DY12Tj3fSZq#dwFT~t!%!~_&zt;uRddfl
zSBZICT_W(R@$%>a4|#^Ub!~V2ra>fjis_Xc047n8p<S+FwLMz+N2hg${;pIBB%N($
z9-`oc<3mpQgIgMMq?ED{5Az|$4>+(Xh_5|b1@bIgPF7~7J*|%#GBy#B2_$I|mrC^l
z<{4}IhgvZU8CAN7SbcB_b*}XJ2Q0`r)7Oa4Ei!XQp&2x$2Zi_<sYMAed{&f1#8@Gy
zU)~k)HE9|$pE_P@S4LS*Gf>RgFQ0?gtboi?>MrL7tOkog#OObtK}4Mb1+IT&lgvKg
zkkuP_pWQd8&l|qJDb05k_oAjVHPm6si=&k1m^17L@{J7siVAeZ*N&@Ix6|_Twg&RY
zuf|9CCLb39R+CC_m4%!d$7GVrc_P!>Uz@c~R2gC_xOEt==%#21<rp4G-KOod?z;9r
zF%w}y4WaTy1*4q_iTfHSP&ea;Meqi59SJg44=<YEX7%2?M)7TIB2q#DCYH(kLS?PW
ziBaAy?p_CPAN~D5TXWaavBS;ccAGQYu_vM>en%GTsO#ihVy;|sx@E&l+2=_`rf$hz
z8ttj<(qCG*jT%9<r-=Rw#b_iQjNVeb5hiv;uU;&^O1}%b$=8%%m#qUvNc^d+Rm-QJ
zqU0st`wqL_pKlpG$O6G`z9$3WLov~(GnzO^(^ScYxO5P5*?iS_F+{=0K#rg@EEvEg
zr3qM-kqq6H;H&thLiU&5z9oGgP##jFvjkSh5kUa?QF|LQxeaXfeiWY6T(pJ!$Iu_U
z@68s(J%?7&DCir(@UnQnBaF@&g`JCh`Jq<O=t)gcP3|o`0<2*2lQ5qu;L4!UeRM&<
z%+KRYx2DeIf0vP1#s*OX3}tcaO$!CWO~4E`ZndKBV91A_uh<F@B2^TH<IUj@&|0n>
z?Uc!HYU2u1f$U~4R_O8#z*3Tz%eTfm>@%BdpQjbZ_Z6rZWGbp(Y^+_C0;wq&)L(hd
zd~;%N(6a(8XMc*qk@`67v@O8qoOd?R>2792GhRpP5m``S6Fi#n(mke;;8+E3<`pEF
zX~(?&cc9RwS9WDADKC7B(PHy;ZVKVTAeVKsS1qCD+eeN*EBD|tMuyY_hMdmS7$TGM
zkKP9O!s}m$u&5=pi*ZQaE}Dp|kQY&v5+%@ImWFf|QA^YhYrZ%tF=MSW0Ph02?=L_x
z|D2Im{d{P1Ri)Sw^(@X$%^${D`|GIFjo%fM>7n9~Pi-$j94i}25obBxV$y)#q*g=Y
z@?foXbpCmVV8M8ZV<Tmxp;xV<^4B$|AtQJHIn$>1dPt!Y@vy_wnv6_Ru*#n@UScx_
z<;`1*yO+|mSI~Ttx)K!uB1d8q(gx;f#wFuV=;5Ogdlxyf(N{uU)dj`bmJOl*6QbE|
z8|wqi+bAPZ8QkHc2ZS`3-z4QTi>(2qB~J|J23_6~F$qvaHC}d1WY@G#y@5XF12%@7
zvkcK~%cv(_IAktkuj3#s^J9M3gTeLlgKGSZXK{kBp-iHHexMohr|#Z13K$p_kDQGf
z9__VH2x=e)y*l_*k;L_@0IEjMFoFRB1_>&LNQU<f0S5t~f%F7{@i2kzFoEj^3o3?4
zhW8Bt3<?1Ppn<e7fw3?g1_~;MNQU<f0So~HFb)I=^aSO|@vFSU0s;sC1c8u!)1F{z
zO1!x_!V!kDXKHzR6jPS0XVYVi_#&EBEx`sc?%o=if!X9_fo{vj8JMKdSR+t*03}|f
zm9rHo!sm!|eg@s9w$YVO9|MfoYH4#JV#ywzu&c~<-sl+;0P6|2Lw;*MueU<TOSD8>
zK)=O9G_{fuJZWeUKSr$wJMCK#pGa5UhX=RmHx9~cIZUZBB`_lf2`Yw2hW8Bt2^BFG
z1Qe!OrCNQtr4d@PGE7T3B6%a*rSLE@Fd;Ar1_dh)0|FWa00a~XG=<MKzoMXXPcG{o
Yho2OT8KVUR2o88xkd?d$p#lO30IdY`r~m)}

literal 0
HcmV?d00001

diff --git a/test/fixtures/keys/fake-cnnic-root-cert.pem b/test/fixtures/keys/fake-cnnic-root-cert.pem
index a0867a4f2a81d8..da1b9d62a96db8 100644
--- a/test/fixtures/keys/fake-cnnic-root-cert.pem
+++ b/test/fixtures/keys/fake-cnnic-root-cert.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC+TCCAeGgAwIBAgIJAPPMd48PUuAYMA0GCSqGSIb3DQEBCwUAMDIxCzAJBgNV
+MIIC+TCCAeGgAwIBAgIJAJfD0pHVqYGkMA0GCSqGSIb3DQEBCwUAMDIxCzAJBgNV
 BAYTAkNOMQ4wDAYDVQQKDAVDTk5JQzETMBEGA1UEAwwKQ05OSUMgUk9PVDAgFw0x
-ODA4MDgwMTE2NThaGA8yMjkyMDUyMjAxMTY1OFowMjELMAkGA1UEBhMCQ04xDjAM
+ODExMTYxODQyMjFaGA8yMjkyMDgzMDE4NDIyMVowMjELMAkGA1UEBhMCQ04xDjAM
 BgNVBAoMBUNOTklDMRMwEQYDVQQDDApDTk5JQyBST09UMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsau37tmHO9PkSzC8VAv9XZux2nauZtczAH6lUPhT
-g/8Nu34qJscnCz3o1wMsloKrNFRPaXQTLBN9N+Cmc/F2dxMU4hO4Ww8iY8sDA6p0
-6CBj+F4gbj2HadKSpyd3LsEPAe1AwglqbL6MgVSHzghBoYKzlRPar1+P99ajJWJ2
-NY5quur5SbzrSJtywi3k0PlKYmdzxcCi6c+jUAvxnzWfXxGXPwRPsNttPu26yBGF
-YvDvVMIVjQyAVv5JOsAwnU+1eI2P2nvZYdM6T1Hkup+DowMP/cpSnZsiKztVh0aI
-85ED1iFt2oqntzcRsVMCBG6I2hBEeRCL8Z1XYC0MXr/OzwIDAQABoxAwDjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBPLbqRREhVnRPklxdTHqZWuLVg
-1HMkvk71tbccrVODDctpxMrXsVoqYGfk1Pz2Bcp8Vex2Ca6aUyjK8Pxvt3baEiln
-8pj0VD3cyLofvJf6cbMWkNQYkuy0pHUOoY1vGtF/N1VfTfC5d2VLhjo7uf+rulCD
-qJt7oDp6mTsIlg0ShSb+icQtfSXVhNnEVmWsAeIuITC7Zn8FNgp0MD/ye5G9CSPl
-HiAoMM3w53bON9DjYnAc84xwcjLaN0hJHxZkZBAQT2ui+vUbjBXrNU2vUy2qhxm4
-O/zneEqCkc2uwqtXZzv/+hsevyHdNs7cO6AkRrZH5Rehf5ECEvMtdXUrV2Hh
+AQEFAAOCAQ8AMIIBCgKCAQEA0nOFmJ4C0bUucql6YlXHPVyuxh5IxZ0heSjVCJXp
+Vk9JJRPxpU0Py1tSTW7GJSMRIsvFrrbVfb52YHOzaGwMiJ5OcR1cCVXWR5fci0lS
+0mTh8Rf+igHjKe/qrpOoqWzw7a0AHkFbcA5pGOZcB9qW2aMq3+mv4z+K8Jpw/b7G
+4QGeEfNx52xM/ygtW51GnmxFJp0eTrIQmJbPFKVrjjdAner+8v9fgmrYiFydFknf
+EqzFlsO1hcflw3caVD/usBpHq4VVvzy2fPqx6VJsloMYyNlCJIvrC0woHb/yj7Da
+JEnHu0MdEhrxzA+biw0/sgOH3au2FdtPoZlmloyReydiGQIDAQABoxAwDjAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAMz67MddcgXRPkTEiRhVFrTIqr
+rny80Smrz9byJx7KhK0ciaDm+KvJavm7e6rrzuedOmbOdhZ3oN5wVo55v1fZqhL1
+dpt1/BlzyCBADE4FM2pDyvLKxbGGcpCzFCbi2K5WsKFJspm6Zr43R1y9UtyInNXB
+GLYwcbGqUrhbtLgnGMBccS/rEgasN3RGbADnZulfzkoGSCTAHJP6B+pFIW6T3kyr
+Sa+Wuvs0UeoaicOzMz8vTySpJPF+8kW/7MSuW26XZyc966Ht1dUuosv9Umg2VNcF
+SxRoUuaQKyHkyh/p4JmrDu2I9J25VE3FNvH7YoJCyaVrF213LvVA92FtDqzp
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/fake-cnnic-root-cert.srl b/test/fixtures/keys/fake-cnnic-root-cert.srl
index 3bfb1fd297cf7e..6a7a03fb5b55a5 100644
--- a/test/fixtures/keys/fake-cnnic-root-cert.srl
+++ b/test/fixtures/keys/fake-cnnic-root-cert.srl
@@ -1 +1 @@
-BD454137A992130F
+9E13B420E1F5C718
diff --git a/test/fixtures/keys/fake-cnnic-root-key.pem b/test/fixtures/keys/fake-cnnic-root-key.pem
index 5ec98d472e1c92..918946953ae809 100644
--- a/test/fixtures/keys/fake-cnnic-root-key.pem
+++ b/test/fixtures/keys/fake-cnnic-root-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAsau37tmHO9PkSzC8VAv9XZux2nauZtczAH6lUPhTg/8Nu34q
-JscnCz3o1wMsloKrNFRPaXQTLBN9N+Cmc/F2dxMU4hO4Ww8iY8sDA6p06CBj+F4g
-bj2HadKSpyd3LsEPAe1AwglqbL6MgVSHzghBoYKzlRPar1+P99ajJWJ2NY5quur5
-SbzrSJtywi3k0PlKYmdzxcCi6c+jUAvxnzWfXxGXPwRPsNttPu26yBGFYvDvVMIV
-jQyAVv5JOsAwnU+1eI2P2nvZYdM6T1Hkup+DowMP/cpSnZsiKztVh0aI85ED1iFt
-2oqntzcRsVMCBG6I2hBEeRCL8Z1XYC0MXr/OzwIDAQABAoIBAB9q8zKcasqMlLEr
-JBJksGAOOSwdkoeDBHTQ8GDaGMKdposCK2gCDYhyYSssV4UiBC5TvlsyeHVx2NG5
-uxWDnGRADpBP1mjby0QEUTsjuFqX57Wyx19XKAvxfZdrZirxXrsDflERoy0poOT5
-0q3/TcPGvgTdpu0eI/I6lUz2FVsw0SuXf9rH6oTKylPo0sXGOFkRPQQpGNS2aTi7
-CWvwGyfgmmAt4MNQLsjiGqBBCr5nHqxzreUDg1TnxlCDNUvr/5p6wFOzaPfnAW+5
-1vGOZCf4M9Z4CuC+xNjbIzhr8tm0F369sNBkq/fcB+X+7nZgmLejrofsFgaCmWyG
-wBSajWECgYEA6yHiG/6NU/2Vu1zA9IcLVHe59yImWaNy01brtf/lKq/cU/pwhftf
-l7aL0D4YWMSykTmGaJw84YNaSdM08i50Z9vleSjDP3nbcKjF3Lna9xMqlxac520h
-kT5wXQSnfu1VAcRihNXoD7uvOmnZgFmaCvHSu05BsIljgAYMAMMOaBECgYEAwXBU
-iNwfdW+Htn9EdHCFUWgirAkD1P9tLrayIic4y6FzjPyaTkQp5oS30AXtWzIpIzO5
-GCwAw0m1d0ezaFWwkdZNrc0j9ymvnMq5Y5+K7D9Xj085OqmaBnOboWARorevF5at
-wZX0NTqY6/oTSU8iLhGsF5FKpmwfPxVhpRpoqN8CgYA+J5rJo6RgS2xFNuOawAfy
-sCNsfI5+q4Iy84sjdR1zB0HKwSz1fdlrFUooJgHxlS1OzlIFXSeKxVococQhML58
-pdgnCutx4Bht029aRZboMRzVC5k2Y9a3ujWhoRVVrA8IhI02aAUMA6TyYACquQTL
-V9lIwgsDS44NzYtmuCkawQKBgAjDZwEAP+iZEePhph9ETbXfatqyWdsXa0HXgwBr
-GHaZLNvxQahUDDXmQ1GIQzWDczumBzeiHrK6Lx9lPyp131bsB37dMUjsOYl34agy
-vR9wyy2x4BzZPCIYsK9B4+qkOalu6RZBDdwveGgQXzlN/XVq1YoHygL6GPxJoq/R
-H3avAoGBAImi0V0rvnSmfSwHcmc+VKwhYTuHUPwcEKCitT06fRJdBohh/HWu4zNr
-KDHZrqbZdoRKnnP/CNK82Bb0s9jB506b9dp5z3L0aBM5xfQyRVdgm3T7nUDeefsG
-wg/7hRHk8gZrwyE6LbOscYIQfh1yxl9xpisJqKF+CnKYXqI1/gzc
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/fake-startcom-root-cert.pem b/test/fixtures/keys/fake-startcom-root-cert.pem
index ef5efc63525b05..48e5713ccb3b1c 100644
--- a/test/fixtures/keys/fake-startcom-root-cert.pem
+++ b/test/fixtures/keys/fake-startcom-root-cert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDjzCCAnegAwIBAgIJAIrO+pnSbEnMMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
+MIIDjzCCAnegAwIBAgIJAIIPb0xPNcgKMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
 BAYTAklMMRYwFAYDVQQKDA1TdGFydENvbSBMdGQuMSswKQYDVQQLDCJTZWN1cmUg
 RGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMSkwJwYDVQQDDCBTdGFydENvbSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAgFw0xODA4MDgwMTE3MDFaGA8yMjkyMDUy
-MjAxMTcwMVowfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoMDVN0YXJ0Q29tIEx0ZC4x
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAgFw0xODExMTYxODQyMjFaGA8yMjkyMDgz
+MDE4NDIyMVowfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoMDVN0YXJ0Q29tIEx0ZC4x
 KzApBgNVBAsMIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxKTAn
 BgNVBAMMIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAFEAtP3FDgZFZbQdykco3OhEc7u7JjY
-oOQ8ivKAM26ldDV/WCC1ddFeVDQw6qhiPysCmFAJuz/m5xTwJTF22Gs6GcuBnhwQ
-Kqu8bBKHP8GRu7i/NxdiN5mPCvj6FfDKyOdgu6pQMxWSVBrgJPPJVpZTwrSK7xmk
-tjZty5MU8YY/Jw3KIZWEYuxu2UuyAm48bECCbR0hssIFL/Y0riFAgdDwslJugA1h
-mLa/ogpLAU3oixLlqIhDJ6o6RnAE9B52Os/kjjuxiW/eLZT7/1y3uuDGpqncCZ8F
-hZur8uAqr39m0tvdL9VZ2+0yU8EmbdQ2/GVxAfKUHFb1d67QlRAwbQIDAQABoxAw
-DjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA76XAf5U198X9aGOox
-CiT9UtE+qMUFikWg+sXevCh2WWdMfEQs9o8sariQpd9pIXDGxrqD2bSHEdMNQ4/Z
-LQ2ZudnJ0u0EOhEqagpU5F9MV97ScV4/IAfd3O/quphRhhJWSssIvO12I8IPzkL5
-O5K+K/RV4LiXiyOPK22TNpVZbQfrs6qFS1HX+x5Y2CEpIxk74354j1WHxe0EbkPf
-q3pEYtOrJwS3MHVBhx3rsoq/s7mIXi9cAGu1QyibTORMyuWXQE2W2rZkhs53vzqv
-OZcsg5NYHEFxYfluLYN0thQ5tA/dRizqXxrx72LZqBeVvnG9NK+DQVQIBelXQmQD
-rGui
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1mZ/bufFVPGxKagC8W7hpBephIFIZw9K
+bX6ska2PXZkyqRToU5UFgTYhdBwkCNJMwaYfTqLpc9y/goRpVlLSAFk/t4W6Z0w1
+b80T149XvmelAUQTBJR49kkYspN+Jw627pf8tmmSkG5qcHykB9gr/nvoTpXtlk2t
+um/SL3BQSqXmqffBM/6VpFvGAB2FNWGQUIxj55e/7p9Opjo8yS4s2lnbovV6OSJ/
+CnqEYt6Ur4kdLwVOLKlMKRG3H4q65UXfoVpE+XhFgKADAiMZySSGjBsbjF6ADPnP
+/zNklvYwcM0phtQivmkKEcSOvJNsZodszYhoiwie5OknOo7Mqz9jqQIDAQABoxAw
+DjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBrsLtF6MEMCWQF6YXP
+DLw4friQhYzoB7w1W+fgksOOIyLyRmUEEA9X0FSfNW2a6KLmMtSoNYn3y5cLkmGr
++JE4U3ovvXDU8C3r09dynuHywcib4oFRaG8NKNqldUryO3abk+kbdxMvxQlA/NHb
+33ABKPX7UTnTr6CexZ5Qr0ss62w0ELwxC3eVugJrVtDOmFt/yZF75lc0OgifK4Nj
+dii7g+sQvzymIgdWLAIbbrc3r/NfymFgmTEMPY/M17QEIdr9YS1qAHmqA6vGvmBz
+v2fCr+xrOQRzq+HO1atOmz8gOdtYJwDfUl2CWgJ2r8iMRsOTE7QgEl/+zpOM3fe+
+JU1b
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/fake-startcom-root-database.txt b/test/fixtures/keys/fake-startcom-root-database.txt
index e1adbae3b0afc8..3daded96b93073 100644
--- a/test/fixtures/keys/fake-startcom-root-database.txt
+++ b/test/fixtures/keys/fake-startcom-root-database.txt
@@ -1,2 +1,2 @@
-V	22920522011701Z		01	unknown	/C=US/ST=CA/L=SF/O=NODEJS/OU=agent8/CN=localhost
-V	22920522011702Z		02	unknown	/C=US/ST=CA/L=SF/O=NODEJS/OU=agent9/CN=localhost
+V	22920830184221Z		01	unknown	/C=US/ST=CA/L=SF/O=NODEJS/OU=agent8/CN=localhost
+V	22920830184221Z		02	unknown	/C=US/ST=CA/L=SF/O=NODEJS/OU=agent9/CN=localhost
diff --git a/test/fixtures/keys/fake-startcom-root-database.txt.attr b/test/fixtures/keys/fake-startcom-root-database.txt.attr
index 8f7e63a3475ce8..3a7e39e6ee60a2 100644
--- a/test/fixtures/keys/fake-startcom-root-database.txt.attr
+++ b/test/fixtures/keys/fake-startcom-root-database.txt.attr
@@ -1 +1 @@
-unique_subject = yes
+unique_subject = no
diff --git a/test/fixtures/keys/fake-startcom-root-database.txt.attr.old b/test/fixtures/keys/fake-startcom-root-database.txt.attr.old
index 8f7e63a3475ce8..3a7e39e6ee60a2 100644
--- a/test/fixtures/keys/fake-startcom-root-database.txt.attr.old
+++ b/test/fixtures/keys/fake-startcom-root-database.txt.attr.old
@@ -1 +1 @@
-unique_subject = yes
+unique_subject = no
diff --git a/test/fixtures/keys/fake-startcom-root-database.txt.old b/test/fixtures/keys/fake-startcom-root-database.txt.old
index 8afe3bcdf5ffd4..4cd5277dc5dfe0 100644
--- a/test/fixtures/keys/fake-startcom-root-database.txt.old
+++ b/test/fixtures/keys/fake-startcom-root-database.txt.old
@@ -1 +1 @@
-V	22920522011701Z		01	unknown	/C=US/ST=CA/L=SF/O=NODEJS/OU=agent8/CN=localhost
+V	22920830184221Z		01	unknown	/C=US/ST=CA/L=SF/O=NODEJS/OU=agent8/CN=localhost
diff --git a/test/fixtures/keys/fake-startcom-root-issued-certs/01.pem b/test/fixtures/keys/fake-startcom-root-issued-certs/01.pem
index eec8e13a85ccc9..7b9304d7448c15 100644
--- a/test/fixtures/keys/fake-startcom-root-issued-certs/01.pem
+++ b/test/fixtures/keys/fake-startcom-root-issued-certs/01.pem
@@ -2,19 +2,19 @@
 MIIDUDCCAjgCAQEwDQYJKoZIhvcNAQELBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNV
 BAoMDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsMIlNlY3VyZSBEaWdpdGFsIENlcnRp
 ZmljYXRlIFNpZ25pbmcxKTAnBgNVBAMMIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MCAXDTE2MTAyMDIzNTk1OVoYDzIyOTIwNTIyMDExNzAxWjBdMQsw
+QXV0aG9yaXR5MCAXDTE2MTAyMDIzNTk1OVoYDzIyOTIwODMwMTg0MjIxWjBdMQsw
 CQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZO
 T0RFSlMxDzANBgNVBAsMBmFnZW50ODESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwD0j4pL8gbhtpmcKdPo/Iq1HpuZi
-VOTjk16e/AfBXjvZoUg9lujr/Mw4X1+X56zfr05Y3+Pyr8euVf/2t81RwvqyjB84
-xFKrk3wBnciv3JodbzmL3aKqVeAwE2O3DSvcR/yaTJtW7EthnDfvaoUwSTN4zpZA
-c/PMVpPK0LWZ98vjIdQ7dTOFTLDmawtVxWouX7VPdo0vtYe3/DnzyTojhWQyCL68
-KS9AeWc1opYWmjLeHhOBC+8ovfPRBd9/kjZX0SsWRCC3bKqmJJ48/QTJe2jQnc1V
-ERgiWy8SCS9irPDJpqGeEXJiAhCEfZGqZzjW+G34803rBGZCW3t8BibtPwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQB1ixGtVRFWh3BGT096vdIhOjg/v1c8RZeIEgex
-/GKGxcTq7BnQTh4QCTIvcgj/x2Y3RVpKzjF6OCMgAxTeY8cq0uSxrJXAMtpEyOaQ
-izF0AwE0baehEY14VlYyuReZOcjVRoQOkNuDUa9lgmfLXQPMvC6rNnpRkD1mt/ot
-GBCdHEAGcQNzcRcGVsAFDf9X3Jq6misskbsq/m+If/XXaIiGvT71XsV3CQYp+RF+
-QjcI9bjOOKwb1V7iGl4BBIIDdqMAaLPdKLymYKGglmWAtwwm5n6F1ViOoDXi1VnH
-vai/7152egBZ0uoB/KumTa2LpuJUAGQ4b0QA6wb0v+JuOaOG
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCbXGqz553XQ+W9zsQEaBc1/mhd4
+TFjivwbK1hSdTuB8vWyOw6oZuqAJjctcIPmNXf01zV1+cAurpoU8k9SmtetwqaDV
+0K5ooKUuzgAefRoLJqU0XonW4VaK0ICQATkxSWdJzYET68NTukv5f9Fh0Jfi2Q6Y
+PKlgUIuoTPQJSErAMsdph4KWMP7zsaEZNJhmZ1Lprfm4DdVnwUfYvDhq5VmAHFLj
+Vor/z3DJS+pW9oORDta3CMvAY5oGcIYWWMxsoG9B9NtTTs58jjeFpJrw/RYJA/CM
+uRawLWKt/z1zPhzmvknTKfAIc6SjbBqu8Nx/Xvcd61c2V39U/nZDTs+H9QIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQBfy91+ceZDfZ0DnHHAlm8e+26V5sdrdOXZJtkc
+AacDcCX6AD1iMK+0axBgG6ZJs6m87cmFdaq23pLpBLQ+KHSdG5YgRCEuWW+RaJGj
+/vVn9AS4eB3EmX0RhhJgYyVbN7ye8qjfAv0NtHzUsdMS8ay3HbdUCtrcsHonGDR3
+t/0BGsYny9Kt2f2PNN32UEkx/jhcssXwnNGxyxR/04heJUe6LI5ErdQoxxvaZtrd
+u9ZgjSxix4dFH4nTYEYe3oXM1U7PakbzOzJvRMmDh8vYyK7/ih0w8/DcsK0d1Oej
+mgtTF/IyJqy8T9goFf9U2uSshia+sKJBfrrzRaUHZMx+ZobA
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/fake-startcom-root-issued-certs/02.pem b/test/fixtures/keys/fake-startcom-root-issued-certs/02.pem
index 520ae4fde95e35..7fdada43d59d7a 100644
--- a/test/fixtures/keys/fake-startcom-root-issued-certs/02.pem
+++ b/test/fixtures/keys/fake-startcom-root-issued-certs/02.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDUDCCAjgCAQIwDQYJKoZIhvcNAQELBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNV
+MIIDUjCCAjoCAQIwDQYJKoZIhvcNAQELBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNV
 BAoMDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsMIlNlY3VyZSBEaWdpdGFsIENlcnRp
 ZmljYXRlIFNpZ25pbmcxKTAnBgNVBAMMIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MCAXDTE2MTAyMTAwMDAwMVoYDzIyOTIwNTIyMDExNzAyWjBdMQsw
-CQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExCzAJBgNVBAcMAlNGMQ8wDQYDVQQKDAZO
-T0RFSlMxDzANBgNVBAsMBmFnZW50OTESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1RfsIHFH/58sMeDPPkKCj4sK4ujw
-jiSMLi/vuwBjK9h/LtnBZ0wd5kMq9J9mFtQe21dqb4f+z2G2ZthziJ7GHDpJ7WEf
-HQa6cEHrk7Tct3XpyGYMvLmSHD+y54U8cO/K66w0k9iZvTiQ1eJxdaPkoQsdqinC
-Z+fh2Icy9tWbGatwtddizcGFM71a2vJjcg8Fnb/X/D/fCbF9L8hl3EVqWSs8Y+BD
-gIiJqdnc/R9RW8T8W1QeCmkuX/Nm1dJqLF5fNXP8lMgdSMHASTgPE1v5OJqGpIvd
-wBYOuYCaGvjplsS+isBh2sDA98SgmL35GGHWiNhZIQkVMKzjgiDkKKU8hwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQBv4AYF2CfowizdqeL9vrDOSxMQAowxAZWLsixC
-RHfzkjPaaN0t0dApEIdttzmmif104LuK8lqQe9zvG/F7kh4Mhj1cfaJZraNbNprL
-QHnnV+sSL+flSJfkSmSkuu5Cn78g72qnERqzwYZKHIBnMQhUf6yUmHxmxQlJDtcP
-kNCX4vCkkC9MW91n3GDXpSQX8KkSIP+aP1kHqHkWr7mh7du9p/E7rnI2UfVcXg0C
-db3eSDVq94e41HK9uWQgYRLLMz9OSnMmOgfK21o+eBWaHb+07Wo87cSPzuGVBtj7
-0DueLUdvSpliM8wZBIf6xzTdF401VinLZfFGyg6pYM0ADfda
+QXV0aG9yaXR5MCIYDzIwMTYxMDIxMDAwMDAxWhgPMjI5MjA4MzAxODQyMjFaMF0x
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoM
+Bk5PREVKUzEPMA0GA1UECwwGYWdlbnQ5MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2oEMk2EKwIZrx4IPNcGjHw5DO
+u8A8yJrcWG4pThUadrvwMI7bQ4QwNgHm4PVpbjAPbSUsRPX98PWL6GcpoH0lmJ9+
+j9CCEIEkW+j5wM7hYBXUSGuAZZfkdrpbZHsvwpYj2U39sfmUyGT1gBbGBmaAzODh
+ZaqYSm9VdaKS56SRMey3Pbsx+ikylgiEyPFoRKA141Zuxz1MKiwszLHuyz6pCZKY
+K7x1dlEGi3h3dvkRAdMyeSXJkYCZGbS5Fbl2OuW4pSWP4no/M960vBwEYvuJPDtx
+qxGezE51oXp4W4l9k+TYPOfGJDVW0PAg+JpfbepLetgFaO9/eNWes34AhF6FAgMB
+AAEwDQYJKoZIhvcNAQELBQADggEBAD8ojlI4FdXLCyHVYwwTP6BncF4tfeGP82/i
+Zcr8U9k28T2vlsLwdCGu8UVqGWfYrSY5oZqZmHPcDfZmv6Uc39eQ72aweoyLedk3
+UF1Ucwq+MxEM98doLlqL4lnPO1+TcpdhtoHAgT28WkddbR3alfsu+GRU3br3s4lS
+DHcm6UzdA/lkgZtC8wFUSW04WhzSHB78gm8VOl+1JGY0pp/T+ae5swkfj45Q3jOd
+H6jdZiUrU+LJQwLlXYniF4qzmH0SN8Gd3djVNzWJtNF+LFKXzCOYSK8AFaQ6Ta+s
+Pd6Rqa8Hl6cMmlsDu1NLumstvGna5wsc7ks1VZwtWt6WfIyIN2k=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/fake-startcom-root-key.pem b/test/fixtures/keys/fake-startcom-root-key.pem
index 24e45004fb5ddc..748c3c10f73842 100644
--- a/test/fixtures/keys/fake-startcom-root-key.pem
+++ b/test/fixtures/keys/fake-startcom-root-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/rsa_private_1024.pem b/test/fixtures/keys/rsa_private_1024.pem
index e4858346aa6c63..a8a4830890cd9f 100644
--- a/test/fixtures/keys/rsa_private_1024.pem
+++ b/test/fixtures/keys/rsa_private_1024.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCarMIyITT3auLmJ6TnSmES908I25oHPzFK1W5YbMfs0XYbMk7Q
-HUkkKo/r9E+FQgodhkyPugZznZLEliO48DRc92UGh/7+WQwoAVXZwsxbvSEkPxrC
-wC/DGvHJRTG1WCF9MuAYm2bdkcV0Sm99D5e2JBAANUXy6uZAmbo96aGBJQIDAQAB
-AoGAFz4OkGndA7DUF7GtXfQXUjpHbhVRt/UO+yfHRRJTmIqBLOUKYsuDyiN7LQGx
-UVzzGCyuJIrXnVf4TgIhrBCsTXAuUe3ZtkUcTZkw82ISltHDGF7UWxRtk97hF1lv
-5mZ5AcIjNYKZefNwZhTKH02aaK8gxzg1/GtWxIn3aI0n/aECQQDLRBhc3qCqYKxJ
-Upkvzmf+828qOBUOM0Fnl5erMICpGyS4WJYtNpeGaNn4Ewxyw7ePs/Ekti31TJdH
-FXTAepEvAkEAws17rnaQChsWgcXI6wMgwd9AKE+ZteunbwMaqP9Wn6atc/QTBTHR
-qplJtLirDonMAUsMix+O2uX8fPcSqQi16wJAIVKwi8kTndrrY7ne0y+LbQiLmOhI
-y2MrvcfkXXQ+I3sHshETzaW9gZN+6GR3Dfl4Bl8BkXssXaKIymaCFWwCkQJAC5nv
-Nrmq5F8unPXpfE2IYuNnz77F2ba6FvtpWA003Hcxt0ke5N1NrkpIwHGLBmegdadB
-jPuJJ3Iw8kRIoTZ6lwJAeTkgkLsoBVXtGOf4lgfzHfd7e59d05clWLB3x9p3eNYe
-4JPSat6ULOSvqBdnoGQPRhGpzlhXcsGc+od9Oc8YxQ==
+MIICXQIBAAKBgQDRMGk0Tp+sGoU4FbTF76l7g3uOdSpqLBnP4UDKSdhv3p+lfr6F
+piJh8KnXIPKMq5b4EX+X4Ghz7PKDMEs24ihiqwUMl89exvFtW2bXwqq0XpMqdF6R
+CxbbBYy3DFPTCTvoHaoAfmwHzwBfelHt2PaYl4ZNxhpD4UcP3/lrUB5KhwIDAQAB
+AoGAYK4gIUWpNDB5m4ckqkpuqSAGbbum47UIJPR1Lkjc2C8q16DxSvGSeHNy+3NF
+xk/TkUj9EGNtww4isxER4ga6JLH5WNkF3k92ET2wSn6G9/CtPZRe6wRP593ZO5vd
+KXLCXRNprlRVHQbE6VysIQToZKVH2sqoFhIH62RDdhXvQNECQQDq8PQsLd1szeKf
+iaJSlPxfuPG9yEZO7YY3QygpTmzRjLfN5560SejEvctMiO4hlwnWNbQzGbgQfhfA
+JbgK6Z0fAkEA4/CKKcR8JJe/8vukfTLDlgnp3DPMa1HOVFnKWF6QeCPk5aOehDcf
+CFm4E+A6NAbtG0oor6e4Bsr4ASOpLxE9mQJBAK4oAYiCU0JleFm1CAvZfx9iFGkP
+ffbiIfzzHmFITmgjvNi4mq+gnhjBbGOGmadytAsDclny9bvcDLUWANCuDhcCQCNE
+aFwmBn8y64QQ41ZrsE9aoVBsw0gnlCEA84nQt9Ge3B+bvT7/uFF2cEDDBL5gA/eg
+9cKX1KVYah7jAZ5CsKECQQCJFqYwEewb3G7aKjtAzVCsNfQSC64xT2EnMg47va9t
+GK5DXshigVNpMHJ52N4QxWIRtUs5LOCeGaZP/vTkTQ+z
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/rsa_private_2048.pem b/test/fixtures/keys/rsa_private_2048.pem
index 19974540bba4da..0e5bde2e02c55d 100644
--- a/test/fixtures/keys/rsa_private_2048.pem
+++ b/test/fixtures/keys/rsa_private_2048.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/rsa_private_4096.pem b/test/fixtures/keys/rsa_private_4096.pem
index 811d74482237d6..4177b9ef956a37 100644
--- a/test/fixtures/keys/rsa_private_4096.pem
+++ b/test/fixtures/keys/rsa_private_4096.pem
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIJKAIBAAKCAgEA4uXPuhYg/4tlw7dIph6hz0H4eHMIX5VbS37kIl35YrlcwNJg
-TX4Rc9E/ywnmKI03k1Nb0wWh1rl+6CCeUiwgU9taZf/N+zp9ad1aKJ/BLZS/ctT6
-KvLbxt/BFGAr3QF5tAGS1xgLQ27hguRA4pBRW+1UHtFf0PGvGiIRF14/D+cL8LHC
-PHatAeqqrRErRocd/TJCxuPceKZtr7Ejb6q5BOw/AKvWnaxdc/xitiz9RHZ4IbAj
-1SF168SvFKZSl0YDhPNPzt/aO4//p22s8JEPRi5zN6cbP9gBb653hWB9D8FdqXjc
-/07jGtW2OIobnNbAe0xkwnbh07F9RMXsm5SV0EuLjR+1CgTkW9+OV7HFgVqqGayj
-VwLt0SpEUTJgtTHiz6lVvvbGILjoIZEUHXYAci8xmXwqjku8bzND5Xm5MA7ByK6X
-qppvTwmj8Z89GO3xevVwsSTA+bLDurzfqPKtp6bcAB8cA/eYXwsHWm1w2RgbmwmX
-MgGIxmgRnNy/GA0mgiudRCGMRFDmTngVDcyEJG4jO6phhcEqVEyt8FX8WLapX0li
-wycK2BjAMZdKwB2Dcd3/L8jvJQbUrKU1e0mWaokccURH+IBaARK88qY7X8nPvVkv
-fJrf3CfwP2tAsjHvaEdNPS4yBNF696VcZUyuaVPI/2AfkG1UrcPF6BMv33ECAwEA
-AQKCAgEArA+d4P2a9G6fMzWwL9kW13atl5mUBffbDXsiQTWGQmlSfx6JzPoG/g72
-E2BkWugL9vrFrVaeDZkJNbpWlPXFZhH3kVXUu+j05ezny9qpwYkFTW1YcG1OYJeZ
-cXwkhynxQqHW2qnvEKnq9TlmQukx6UYl/mDECkzcfjLLRy8/Hy4Ujege5X8RX1y3
-JRrZ+FfKVBFjNjPhItUCZLMtriaGu8bzV+z3iQYGsEf6CzA+t0Ynf1R1N9Bx/eJe
-6ofeJb0AOjfQk46JjZV7R1oSRTObo5rh4JgmP9nr7Oce19P9wo7eGf//htQpwFXE
-I0gH/H2V5WpfFmDUi5YS6q406R5aI/buOxoJYosM9v0LsChQD20ksOKCM9gAryWY
-qfQXJI+bs0GuYdlR2STGOUnPXaTjd79thmcHMtgNw1YU77fMVjxaSWWwjrxdHPKL
-VraXf9UVXjB8WsJOhCLtwQfM4maIaRlGx9V1w6zUgeKorbe454sTI+1AIqGkwpLa
-BvyPGXlaRhLhgBuW/icqfPdo5brm5qvv718zfyKxnHPbtg7DxkW+vid26O2Xl1Kt
-n477Kk9YNJRsdI1CmSdAnzNQ6RJwCFyR3Fo1OwMVZkCMI+968VkIw8viEBrS8hsf
-xPKK69TLYYyp+SMoY/AHKuhofVhjt7W7iwsnYWxZ/m6uBP6hDeECggEBAPsqHSHz
-aDBtVLvnAO83R1TcEgYfH2fEe+3q2yPq+8ltjpjdp1jlsllEqjGJOfoMCAs/Hugy
-dyke6lsYNLqMEjf/+soSIdxz/pjAx1IsWB2FTmw7FHa5Lk8L+22B9Ozc02VAOFtb
-dKCpftPuN5MRYy0UcB7E7JjlrqlWkwYEGUjXUGFosEJeS2Ycb98aRTNy2i2nW9i4
-rNspAeXgCebb0IdsR2yPgaHfMyubjIQww6KHn4aGGAkACH/xBMM5qW0zEnBmoVDI
-EzlhREmgBEgvYUv66VBD2ecdHFva4NEtpJy7+qlYS+4bDm9uQbF+NqbM3yQ3bcg2
-0hSiAw16YwPMNL0CggEBAOdEGLg+qC8lzhCclmWWULO0rQvnxq6uc8+xX1NteAQV
-BEDkNMtM/l1Vh5a3xzlQcOzK9doBdKxH49TsjzWRsm9EvI3cCiyuDROUIWEx5KxW
-hb5i/0oPtvFFWgKygpXY01dLmkoVwOPlw9Y+etJYIRRQ2BCUJjmcTW6TgnbrV+Y8
-YrWNNn9Cm+hnyqnNybOH3E1ebH1x14mfCwUrVNnT/cwVtVS/eUCtucl2L4sw2b0Z
-x+mgF4uP2DlTMhZhVf2DqxvXR4yiTx7k06A7VJvN3g9r/RC1rCz4p+00rXldk9KA
-0RWzuFMhccfpkKaC97OhBth3l8LGR5V0ATIgG50OEsUCggEAX/DEVBWwdN8ugOBK
-wRXyj33I/MGis3agiE8wClZWe6j30XjJ1fFX4TWTdXyfwt4ZrIIeAkBUuEZw6v8i
-FSgwRWfomou2l4lPdXYeLUt3FT+4pysiM/+kqtk+36PGtTvdHE4duPgEYuKb6cST
-QgBgS/YEphw+7GDACTtiyeeC6QomUC83NQLj9ktiiGx2hqKWqN3G/c/9Z3IQoYik
-/6Rz0WcRGWzv7a9e0oeGc3BVKp5312EdiUKT/JtKYHCEQYxCvODXOg5TGZYICb+w
-IwrGNcnQmbJxaBD8pjHDsuOmf6BmrY1m47s+Fl6dhXla0vhrPGBX9STLtsn0NI/N
-hsPYWQKCAQBRO44jSX7x8KmNFDOPw1jdhp0yDVuwh/6N+ZOuTklVxbwUvxP8RTMj
-vaM+wZbs/uBrjG8HAHPm/+l7JQy4mFDA3LgObDf2sbxOID4JUeksz8dytHtPnG16
-Gg4f3GwaDmtNwnSTiUiTxGUhoBisQeB8rlj2mdNDcS+Ro6az9r6NVLCnbM6zrMXu
-wGZjdrFeql4rnvskpRQ8duz8B9hqGxiO0yE6f3crzNnxdd4FWkdhMOkTmvQqRYCB
-wkNZsR7vSYyU3u127Jw2EdJz+eMiRxG1AQ2HDQlJUp5Jp7M3ajM+QZkvsk0QhjLd
-MaFpm58+LVWmO3vHIraKPJEe9kA8znCxAoIBAGwAm6H1oRetnD8bRiiBTf3xNMfl
-UZQpDRZBOzJeXRIt54E+DjOqWvi9ommBvz1V9A7H6kxkAaz9aLXJOPIdsvLZwvt+
-cjocJ2WOkurauHX1K/QYdZZN4aIg9XrHKVcTk5jnhw59QK2PQeV8awJ48So754tu
-YPUn0Q3Yj48FtOdr4LiG1miakSlceLlXf5Gf4i5N3cZ0pDBTBSD3Rv7WLa3AprKk
-s9FzVH5SEXnAjl/JFna2mndnRFF3s07UhRFv2XtR+e+zOpRefN33XE1EmfaAVeSP
-k5YORPc/fTKNoFodnXC2EFLFd1KvDGgvDDWJDaLGe+Hr9o3FgJHn18HyQAs=
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/rsa_public_1024.pem b/test/fixtures/keys/rsa_public_1024.pem
index e24933731cfc16..f5c71a8449ccf6 100644
--- a/test/fixtures/keys/rsa_public_1024.pem
+++ b/test/fixtures/keys/rsa_public_1024.pem
@@ -1,6 +1,6 @@
 -----BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCarMIyITT3auLmJ6TnSmES908I
-25oHPzFK1W5YbMfs0XYbMk7QHUkkKo/r9E+FQgodhkyPugZznZLEliO48DRc92UG
-h/7+WQwoAVXZwsxbvSEkPxrCwC/DGvHJRTG1WCF9MuAYm2bdkcV0Sm99D5e2JBAA
-NUXy6uZAmbo96aGBJQIDAQAB
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDRMGk0Tp+sGoU4FbTF76l7g3uO
+dSpqLBnP4UDKSdhv3p+lfr6FpiJh8KnXIPKMq5b4EX+X4Ghz7PKDMEs24ihiqwUM
+l89exvFtW2bXwqq0XpMqdF6RCxbbBYy3DFPTCTvoHaoAfmwHzwBfelHt2PaYl4ZN
+xhpD4UcP3/lrUB5KhwIDAQAB
 -----END PUBLIC KEY-----
diff --git a/test/fixtures/keys/rsa_public_2048.pem b/test/fixtures/keys/rsa_public_2048.pem
index 15fd34820cfd61..0c80ceb4d9a01b 100644
--- a/test/fixtures/keys/rsa_public_2048.pem
+++ b/test/fixtures/keys/rsa_public_2048.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9uN385/HznblztBMUT80
-szQdmldjwnGgH2A9blEAc4qlKD0plUWWHpgBnwrEh3qz/VF6uSmd7vKHUOxYhwNN
-1W/fp/AwOdXsUx5XiToVyMajJDdrZQoV5nJAnkdIVWMZllX2DTBqXcVefoNshE8C
-e6hKcO7tWDcWLNvW1NHVTuM3SYSSJARRriKNUvsmh2EKPqMgrfDgDvx4C1OzetUQ
-Trhi3+aROdJaL4cOPP5n5FKBTWo1yzSN/RGG7VJEaXyChbUYSn6TrPH3qC0DygMc
-HRSjVPZ4YCkbXTTe18/H7CRCE+aFO7/J+bjEC0sXXsWmMCp1UW84EkYjnmiFIll4
-KwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArk4OqxBqU5/k0FoUDU7C
+pZpjz6YJEXUpyqeJmFRVZPMUv/Rc7U4seLY+Qp6k26T/wlQ2WJWuyY+VJcbQNWLv
+jJWks5HWknwDuVs6sjuTM8CfHWn1960JkK5Ec2TjRhCQ1KJy+uc3GJLtWb4rWVgT
+bbaaC5fiR1/GeuJ8JH1Q50lB3mDsNGIk1U5jhNaYY82hYvlbErf6Ft5njHK0BOM5
+OTvQ6BBv7c363WNG7tYlNw1J40dup9OQPo5JmXN/h+sRbdgG8iUxrkRibuGv7loh
+52QQgq2snznuRMdKidRfUZjCDGgwbgK23Q7n8VZ9Y10j8PIvPTLJ83PX4lOEA37J
+lwIDAQAB
 -----END PUBLIC KEY-----
diff --git a/test/fixtures/keys/rsa_public_4096.pem b/test/fixtures/keys/rsa_public_4096.pem
index 30a2245c726663..4fd0bbc1c57b22 100644
--- a/test/fixtures/keys/rsa_public_4096.pem
+++ b/test/fixtures/keys/rsa_public_4096.pem
@@ -1,14 +1,14 @@
 -----BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4uXPuhYg/4tlw7dIph6h
-z0H4eHMIX5VbS37kIl35YrlcwNJgTX4Rc9E/ywnmKI03k1Nb0wWh1rl+6CCeUiwg
-U9taZf/N+zp9ad1aKJ/BLZS/ctT6KvLbxt/BFGAr3QF5tAGS1xgLQ27hguRA4pBR
-W+1UHtFf0PGvGiIRF14/D+cL8LHCPHatAeqqrRErRocd/TJCxuPceKZtr7Ejb6q5
-BOw/AKvWnaxdc/xitiz9RHZ4IbAj1SF168SvFKZSl0YDhPNPzt/aO4//p22s8JEP
-Ri5zN6cbP9gBb653hWB9D8FdqXjc/07jGtW2OIobnNbAe0xkwnbh07F9RMXsm5SV
-0EuLjR+1CgTkW9+OV7HFgVqqGayjVwLt0SpEUTJgtTHiz6lVvvbGILjoIZEUHXYA
-ci8xmXwqjku8bzND5Xm5MA7ByK6XqppvTwmj8Z89GO3xevVwsSTA+bLDurzfqPKt
-p6bcAB8cA/eYXwsHWm1w2RgbmwmXMgGIxmgRnNy/GA0mgiudRCGMRFDmTngVDcyE
-JG4jO6phhcEqVEyt8FX8WLapX0liwycK2BjAMZdKwB2Dcd3/L8jvJQbUrKU1e0mW
-aokccURH+IBaARK88qY7X8nPvVkvfJrf3CfwP2tAsjHvaEdNPS4yBNF696VcZUyu
-aVPI/2AfkG1UrcPF6BMv33ECAwEAAQ==
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxeStwofbjtZuol4lwKn1
+w08AzcSNLHfCqNFHa+W7er8is7LQsPljtPT4yn4lsao83ngHFvSC3tbMiRNDpUHY
+qH2wBuUkuOmCtYkZLi0307H0CwcVV6W5P3tNEt80IJ+PqlRxtTknezUtbOasbIi/
+aornVWG+psgqDGrFZ4oTsWtiE0Svi7sDqN5E2dijmH/YYnlnwqszgzHdtAnARp1b
+G34E64sqWCmLoGCfPdHtym/CSdxOLOsDV15jrwODZQ/TJZ5thkwKZRxu7g9fwlhA
+1PiI5WDP4reXNaqa2bSgrzpAljQExYs4N0L7okSVOJQX9BEaoWtq8NLU8MpMdGoH
+NDU0Xr60Lfr58Z5qn8RGEvlTxoCbPJzPV2zgzD/lmEqft6NnfTclveA3sd8xSrOB
+Un4o3S8hS0b9Su7PBukHjM96/e0ReoIshSwXlQTLr2Ft8KwupyPm1ltNcTDtjqHc
+IWU6Bg+kPy9mxSVtGGZYAPtqGzNBA/m+oOja/OSPxAblPdln691DaDuZs5nuZCGw
+GcLaJWgiyoqvXAcyXDZFyH4OZZh8rsBLKbnFXHZ/ziG0cAozEygZEPJappw8Lx/a
+dy7WL/SJjxooiKapc7Bnfy8eSLV3+XAKxhLW/MQ6ChJ+e/8ExAY02ca4MpCvqwIk
+9TfV6FM8pWGqHzQFj0v3NL0CAwEAAQ==
 -----END PUBLIC KEY-----
diff --git a/test/parallel/test-tls-cert-chains-concat.js b/test/parallel/test-tls-cert-chains-concat.js
index e9adc6c3161082..1fc25fd7e7cc69 100644
--- a/test/parallel/test-tls-cert-chains-concat.js
+++ b/test/parallel/test-tls-cert-chains-concat.js
@@ -27,7 +27,7 @@ connect({
   assert.strictEqual(peer.subject.emailAddress, 'adam.lippai@tresorit.com');
   assert.strictEqual(peer.subject.CN, 'Ádám Lippai'),
   assert.strictEqual(peer.issuer.CN, 'ca3');
-  assert.strictEqual(peer.serialNumber, 'E987DB4B683F4181');
+  assert.strictEqual(peer.serialNumber, 'D0082F458B6EFBE8');
 
   const next = pair.client.conn.getPeerCertificate(true).issuerCertificate;
   const root = next.issuerCertificate;
@@ -35,12 +35,12 @@ connect({
   debug('next:\n', next);
   assert.strictEqual(next.subject.CN, 'ca3');
   assert.strictEqual(next.issuer.CN, 'ca1');
-  assert.strictEqual(next.serialNumber, 'FAD50CC6A07F516D');
+  assert.strictEqual(next.serialNumber, 'ECC9B856270DA9A7');
 
   debug('root:\n', root);
   assert.strictEqual(root.subject.CN, 'ca1');
   assert.strictEqual(root.issuer.CN, 'ca1');
-  assert.strictEqual(root.serialNumber, 'EE586A7D0951D7B3');
+  assert.strictEqual(root.serialNumber, 'CB153AE212609FC6');
 
   // No client cert, so empty object returned.
   assert.deepStrictEqual(pair.server.conn.getPeerCertificate(), {});
diff --git a/test/parallel/test-tls-cert-chains-in-ca.js b/test/parallel/test-tls-cert-chains-in-ca.js
index b92b1df2573625..0e834cc9bd11a2 100644
--- a/test/parallel/test-tls-cert-chains-in-ca.js
+++ b/test/parallel/test-tls-cert-chains-in-ca.js
@@ -30,16 +30,16 @@ connect({
 
   const peer = pair.client.conn.getPeerCertificate();
   debug('peer:\n', peer);
-  assert.strictEqual(peer.serialNumber, 'E987DB4B683F4181');
+  assert.strictEqual(peer.serialNumber, 'D0082F458B6EFBE8');
 
   const next = pair.client.conn.getPeerCertificate(true).issuerCertificate;
   const root = next.issuerCertificate;
   delete next.issuerCertificate;
   debug('next:\n', next);
-  assert.strictEqual(next.serialNumber, 'FAD50CC6A07F516D');
+  assert.strictEqual(next.serialNumber, 'ECC9B856270DA9A7');
 
   debug('root:\n', root);
-  assert.strictEqual(root.serialNumber, 'EE586A7D0951D7B3');
+  assert.strictEqual(root.serialNumber, 'CB153AE212609FC6');
 
   return cleanup();
 });
diff --git a/test/parallel/test-tls-peer-certificate.js b/test/parallel/test-tls-peer-certificate.js
index 5eac36628d658e..0b820b93eb2ada 100644
--- a/test/parallel/test-tls-peer-certificate.js
+++ b/test/parallel/test-tls-peer-certificate.js
@@ -53,28 +53,28 @@ connect({
 
   assert.ok(peerCert.issuerCertificate);
   assert.strictEqual(peerCert.subject.emailAddress, 'ry@tinyclouds.org');
-  assert.strictEqual(peerCert.serialNumber, 'FAD50CC6A07F516C');
+  assert.strictEqual(peerCert.serialNumber, 'ECC9B856270DA9A8');
   assert.strictEqual(peerCert.exponent, '0x10001');
   assert.strictEqual(
     peerCert.fingerprint,
-    '6E:C0:F0:78:84:56:93:02:C9:07:AD:0C:6D:96:80:CC:85:6D:CE:3B'
+    'D7:FD:F6:42:92:A8:83:51:8E:80:48:62:66:DA:85:C2:EE:A6:A1:CD'
   );
   assert.strictEqual(
     peerCert.fingerprint256,
-    'CC:CC:38:43:CB:DF:CC:C6:DD:15:96:F3:3A:D2:44:F9:23:AE:43:C4:DF:A6:AC:E5:' +
-    '12:C8:9D:1C:8F:DE:41:ED'
+    'B0:BE:46:49:B8:29:63:E0:6F:63:C8:8A:57:9C:3F:9B:72:C6:F5:89:E3:0D:84:AC:' +
+    '5B:08:9A:20:89:B6:8F:D6'
   );
 
   // SHA256 fingerprint of the public key
   assert.strictEqual(
     sha256(peerCert.pubkey).digest('hex'),
-    '479b505833d21ee26565568def9b92b4771d052cdb2109db5ad6e3747075aa26'
+    '221fcc8593146e9eee65b2f7f9c1504993ece8de014657a4a1cde55c5e35d06e'
   );
 
   // HPKP / RFC7469 "pin-sha256" of the public key
   assert.strictEqual(
     sha256(peerCert.pubkey).digest('base64'),
-    'R5tQWDPSHuJlZVaN75uStHcdBSzbIQnbWtbjdHB1qiY='
+    'Ih/MhZMUbp7uZbL3+cFQSZPs6N4BRlekoc3lXF410G4='
   );
 
   assert.deepStrictEqual(peerCert.infoAccess['OCSP - URI'],
@@ -82,7 +82,7 @@ connect({
 
   const issuer = peerCert.issuerCertificate;
   assert.strictEqual(issuer.issuerCertificate, issuer);
-  assert.strictEqual(issuer.serialNumber, 'EE586A7D0951D7B3');
+  assert.strictEqual(issuer.serialNumber, 'CB153AE212609FC6');
 
   return cleanup();
 });
diff --git a/test/parallel/test-tls-pfx-authorizationerror.js b/test/parallel/test-tls-pfx-authorizationerror.js
index 9ba10e4bb84057..6daf89dff0d82f 100644
--- a/test/parallel/test-tls-pfx-authorizationerror.js
+++ b/test/parallel/test-tls-pfx-authorizationerror.js
@@ -23,7 +23,7 @@ const server = tls
     },
     common.mustCall(function(c) {
       assert.strictEqual(c.getPeerCertificate().serialNumber,
-                         'FAD50CC6A07F516C');
+                         'ECC9B856270DA9A8');
       assert.strictEqual(c.authorizationError, null);
       c.end();
     })
@@ -38,7 +38,7 @@ const server = tls
       },
       function() {
         assert.strictEqual(client.getCertificate().serialNumber,
-                           'FAD50CC6A07F516C');
+                           'ECC9B856270DA9A8');
         client.end();
         server.close();
       }

From d9cd4c7530910ad83542ed79539b4ec9986afdb5 Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Mon, 28 Nov 2016 11:55:29 -0800
Subject: [PATCH 3/4] test: cover tls multi-identity option mixtures

Prove that cert and key options do not have to be ordered, and that the
pfx option can be used at the same time as the cert/key option
(which was claimed to be impossible by some pre-existing documentation).
---
 test/parallel/test-tls-multi-key.js | 176 +++++++++++++++++++++++-----
 1 file changed, 146 insertions(+), 30 deletions(-)

diff --git a/test/parallel/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js
index 8c0722f858c748..8ccc0d32d93757 100644
--- a/test/parallel/test-tls-multi-key.js
+++ b/test/parallel/test-tls-multi-key.js
@@ -21,6 +21,9 @@
 
 'use strict';
 const common = require('../common');
+
+// Test multi-identity ('key')/multi-algorithm scenarios.
+
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
@@ -28,45 +31,158 @@ const fixtures = require('../common/fixtures');
 const assert = require('assert');
 const tls = require('tls');
 
-const options = {
+// Key is ordered as ec, rsa, cert is ordered as rsa, ec.
+test({
   key: [
-    fixtures.readKey('ec-key.pem'),
+    fixtures.readKey('ec10-key.pem'),
+    fixtures.readKey('agent1-key.pem'),
+  ],
+  cert: [
+    fixtures.readKey('agent1-cert.pem'),
+    fixtures.readKey('ec10-cert.pem'),
+  ],
+  eccCN: 'agent10.example.com',
+  client: { ca: [
+    fixtures.readKey('ca5-cert.pem'),
+    fixtures.readKey('ca1-cert.pem'),
+  ] },
+});
+
+// Key and cert are ordered as ec, rsa.
+test({
+  key: [
+    fixtures.readKey('ec10-key.pem'),
     fixtures.readKey('agent1-key.pem'),
   ],
   cert: [
     fixtures.readKey('agent1-cert.pem'),
+    fixtures.readKey('ec10-cert.pem'),
+  ],
+  eccCN: 'agent10.example.com',
+  client: { ca: [
+    fixtures.readKey('ca5-cert.pem'),
+    fixtures.readKey('ca1-cert.pem'),
+  ] },
+});
+
+// Key, cert, and pfx options can be used simultaneously.
+test({
+  key: [
+    fixtures.readKey('ec-key.pem'),
+  ],
+  cert: [
     fixtures.readKey('ec-cert.pem'),
-  ]
-};
+  ],
+  pfx: fixtures.readKey('agent1.pfx'),
+  passphrase: 'sample',
+  client: { ca: [
+    fixtures.readKey('ec-cert.pem'),
+    fixtures.readKey('ca1-cert.pem'),
+  ] },
+});
 
-const ciphers = [];
+// Key and cert with mixed algorithms, and cert chains with intermediate CAs
+test({
+  key: [
+    fixtures.readKey('ec10-key.pem'),
+    fixtures.readKey('agent10-key.pem'),
+  ],
+  cert: [
+    fixtures.readKey('agent10-cert.pem'),
+    fixtures.readKey('ec10-cert.pem'),
+  ],
+  rsaCN: 'agent10.example.com',
+  eccCN: 'agent10.example.com',
+  client: { ca: [
+    fixtures.readKey('ca2-cert.pem'),
+    fixtures.readKey('ca5-cert.pem'),
+  ] },
+});
+
+// Key and cert with mixed algorithms, and cert chains with intermediate CAs,
+// using PFX for EC.
+test({
+  key: [
+    fixtures.readKey('agent10-key.pem'),
+  ],
+  cert: [
+    fixtures.readKey('agent10-cert.pem'),
+  ],
+  pfx: fixtures.readKey('ec10.pfx'),
+  passphrase: 'sample',
+  rsaCN: 'agent10.example.com',
+  eccCN: 'agent10.example.com',
+  client: { ca: [
+    fixtures.readKey('ca2-cert.pem'),
+    fixtures.readKey('ca5-cert.pem'),
+  ] },
+});
+
+// Key and cert with mixed algorithms, and cert chains with intermediate CAs,
+// using PFX for RSA.
+test({
+  key: [
+    fixtures.readKey('ec10-key.pem'),
+  ],
+  cert: [
+    fixtures.readKey('ec10-cert.pem'),
+  ],
+  pfx: fixtures.readKey('agent10.pfx'),
+  passphrase: 'sample',
+  rsaCN: 'agent10.example.com',
+  eccCN: 'agent10.example.com',
+  client: { ca: [
+    fixtures.readKey('ca2-cert.pem'),
+    fixtures.readKey('ca5-cert.pem'),
+  ] },
+});
+
+function test(options) {
+  const rsaCN = options.rsaCN || 'agent1';
+  const eccCN = options.eccCN || 'agent2';
+  const clientTrustRoots = options.client.ca;
+  delete options.rsaCN;
+  delete options.eccCN;
+  delete options.client;
+  const server = tls.createServer(options, function(conn) {
+    conn.end('ok');
+  }).listen(0, common.mustCall(connectWithEcdsa));
 
-const server = tls.createServer(options, function(conn) {
-  conn.end('ok');
-}).listen(0, function() {
-  const ecdsa = tls.connect(this.address().port, {
-    ciphers: 'ECDHE-ECDSA-AES256-GCM-SHA384',
-    rejectUnauthorized: false
-  }, function() {
-    ciphers.push(ecdsa.getCipher());
+  function connectWithEcdsa() {
+    const ecdsa = tls.connect(this.address().port, {
+      ciphers: 'ECDHE-ECDSA-AES256-GCM-SHA384',
+      rejectUnauthorized: true,
+      ca: clientTrustRoots,
+      checkServerIdentity: (_, c) => assert.strictEqual(c.subject.CN, eccCN),
+    }, common.mustCall(function() {
+      assert.deepStrictEqual(ecdsa.getCipher(), {
+        name: 'ECDHE-ECDSA-AES256-GCM-SHA384',
+        version: 'TLSv1/SSLv3'
+      });
+      assert.strictEqual(ecdsa.getPeerCertificate().subject.CN, eccCN);
+      // XXX(sam) certs don't currently include EC key info, so depend on
+      // absence of RSA key info to indicate key is EC.
+      assert(!ecdsa.getPeerCertificate().exponent, 'not cert for an RSA key');
+      ecdsa.end();
+      connectWithRsa();
+    }));
+  }
+
+  function connectWithRsa() {
     const rsa = tls.connect(server.address().port, {
       ciphers: 'ECDHE-RSA-AES256-GCM-SHA384',
-      rejectUnauthorized: false
-    }, function() {
-      ciphers.push(rsa.getCipher());
-      ecdsa.end();
+      rejectUnauthorized: true,
+      ca: clientTrustRoots,
+      checkServerIdentity: (_, c) => assert.strictEqual(c.subject.CN, rsaCN),
+    }, common.mustCall(function() {
+      assert.deepStrictEqual(rsa.getCipher(), {
+        name: 'ECDHE-RSA-AES256-GCM-SHA384',
+        version: 'TLSv1/SSLv3'
+      });
+      assert.strictEqual(rsa.getPeerCertificate().subject.CN, rsaCN);
+      assert(rsa.getPeerCertificate().exponent, 'cert for an RSA key');
       rsa.end();
       server.close();
-    });
-  });
-});
-
-process.on('exit', function() {
-  assert.deepStrictEqual(ciphers, [{
-    name: 'ECDHE-ECDSA-AES256-GCM-SHA384',
-    version: 'TLSv1/SSLv3'
-  }, {
-    name: 'ECDHE-RSA-AES256-GCM-SHA384',
-    version: 'TLSv1/SSLv3'
-  }]);
-});
+    }));
+  }
+}

From 27af1b0ce783f3881bd45afa694c41ce2a4e6fe5 Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Mon, 28 Nov 2016 15:52:08 -0800
Subject: [PATCH 4/4] test: confirm tls server suite default is its own

When honorCipherOrder is not explicitly set, it defaults to true, cover
this condition in the test. Also, run all tests in parallel, instead of
sequentially.
---
 test/parallel/test-tls-honorcipherorder.js | 101 ++++++++++-----------
 1 file changed, 47 insertions(+), 54 deletions(-)

diff --git a/test/parallel/test-tls-honorcipherorder.js b/test/parallel/test-tls-honorcipherorder.js
index 60029bb4bd64b8..8e7c4badcb269d 100644
--- a/test/parallel/test-tls-honorcipherorder.js
+++ b/test/parallel/test-tls-honorcipherorder.js
@@ -1,41 +1,38 @@
 'use strict';
 const common = require('../common');
 const fixtures = require('../common/fixtures');
+
+// Test the honorCipherOrder property
+
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
 const assert = require('assert');
+const mustCall = common.mustCall;
 const tls = require('tls');
-
-let nconns = 0;
+const util = require('util');
 
 // We explicitly set TLS version to 1.2 so as to be safe when the
 // default method is updated in the future
 const SSL_Method = 'TLSv1_2_method';
 const localhost = '127.0.0.1';
 
-process.on('exit', function() {
-  assert.strictEqual(nconns, 6);
-});
-
-function test(honorCipherOrder, clientCipher, expectedCipher, cb) {
+function test(honorCipherOrder, clientCipher, expectedCipher, defaultCiphers) {
   const soptions = {
     secureProtocol: SSL_Method,
     key: fixtures.readKey('agent2-key.pem'),
     cert: fixtures.readKey('agent2-cert.pem'),
     ciphers: 'AES256-SHA256:AES128-GCM-SHA256:AES128-SHA256:' +
              'ECDHE-RSA-AES128-GCM-SHA256',
-    honorCipherOrder: !!honorCipherOrder
+    honorCipherOrder: honorCipherOrder,
   };
 
-  const server = tls.createServer(soptions, function(cleartextStream) {
-    nconns++;
-
+  const server = tls.createServer(soptions, mustCall(function(clearTextStream) {
     // End socket to send CLOSE_NOTIFY and TCP FIN packet, otherwise
     // it may hang for ~30 seconds in FIN_WAIT_1 state (at least on OSX).
-    cleartextStream.end();
-  });
-  server.listen(0, localhost, function() {
+    clearTextStream.end();
+  }));
+  server.listen(0, localhost, mustCall(function() {
     const coptions = {
       rejectUnauthorized: false,
       secureProtocol: SSL_Method
@@ -44,54 +41,50 @@ function test(honorCipherOrder, clientCipher, expectedCipher, cb) {
       coptions.ciphers = clientCipher;
     }
     const port = this.address().port;
-    const client = tls.connect(port, localhost, coptions, function() {
+    const savedDefaults = tls.DEFAULT_CIPHERS;
+    tls.DEFAULT_CIPHERS = defaultCiphers || savedDefaults;
+    const client = tls.connect(port, localhost, coptions, mustCall(function() {
       const cipher = client.getCipher();
       client.end();
       server.close();
-      assert.strictEqual(cipher.name, expectedCipher);
-      if (cb) cb();
-    });
-  });
+      const msg = util.format(
+        'honorCipherOrder=%j, clientCipher=%j, expect=%j, got=%j',
+        honorCipherOrder, clientCipher, expectedCipher, cipher.name);
+      assert.strictEqual(cipher.name, expectedCipher, msg);
+    }));
+    tls.DEFAULT_CIPHERS = savedDefaults;
+  }));
 }
 
-test1();
-
-function test1() {
-  // Client has the preference of cipher suites by default
-  test(false, 'AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256',
-       'AES128-GCM-SHA256', test2);
-}
+// Client explicitly has the preference of cipher suites, not the default.
+test(false, 'AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256',
+     'AES128-GCM-SHA256');
 
-function test2() {
-  // Server has the preference of cipher suites, and AES256-SHA256 is
-  // the server's top choice.
-  test(true, 'AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256',
-       'AES256-SHA256', test3);
-}
+// Server has the preference of cipher suites, and AES256-SHA256 is
+// the server's top choice.
+test(true, 'AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256',
+     'AES256-SHA256');
+test(undefined, 'AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256',
+     'AES256-SHA256');
 
-function test3() {
-  // Server has the preference of cipher suites. AES128-GCM-SHA256 is given
-  // higher priority over AES128-SHA256 among client cipher suites.
-  test(true, 'AES128-SHA256:AES128-GCM-SHA256', 'AES128-GCM-SHA256', test4);
+// Server has the preference of cipher suites. AES128-GCM-SHA256 is given
+// higher priority over AES128-SHA256 among client cipher suites.
+test(true, 'AES128-SHA256:AES128-GCM-SHA256', 'AES128-GCM-SHA256');
+test(undefined, 'AES128-SHA256:AES128-GCM-SHA256', 'AES128-GCM-SHA256');
 
-}
 
-function test4() {
-  // As client has only one cipher, server has no choice, irrespective
-  // of honorCipherOrder.
-  test(true, 'AES128-SHA256', 'AES128-SHA256', test5);
-}
+// As client has only one cipher, server has no choice, irrespective
+// of honorCipherOrder.
+test(true, 'AES128-SHA256', 'AES128-SHA256');
+test(undefined, 'AES128-SHA256', 'AES128-SHA256');
 
-function test5() {
-  // Client did not explicitly set ciphers and client offers
-  // tls.DEFAULT_CIPHERS. All ciphers of the server are included in the
-  // default list so the negotiated cipher is selected according to the
-  // server's top preference of AES256-SHA256.
-  test(true, null, 'AES256-SHA256', test6);
-}
+// Client did not explicitly set ciphers and client offers
+// tls.DEFAULT_CIPHERS. All ciphers of the server are included in the
+// default list so the negotiated cipher is selected according to the
+// server's top preference of AES256-SHA256.
+test(true, tls.DEFAULT_CIPHERS, 'AES256-SHA256');
+test(true, null, 'AES256-SHA256');
+test(undefined, null, 'AES256-SHA256');
 
-function test6() {
-  // Ensure that `tls.DEFAULT_CIPHERS` is used
-  tls.DEFAULT_CIPHERS = 'ECDHE-RSA-AES128-GCM-SHA256';
-  test(true, null, 'ECDHE-RSA-AES128-GCM-SHA256');
-}
+// Ensure that `tls.DEFAULT_CIPHERS` is used when its a limited cipher set.
+test(true, null, 'ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES128-GCM-SHA256');