Fix apparently broken test certificate chain (root certificate had wrong dnQualifier).

14 files changed, 188 insertions, 164 deletions

diff --git a/test/ref/crypt/ca.key b/test/ref/crypt/ca.key
index f42d466b..5553b1fa 100644
--- a/test/ref/crypt/ca.key
+++ b/test/ref/crypt/ca.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/ref/crypt/ca.key.public b/test/ref/crypt/ca.key.public
new file mode 100644
index 00000000..fde3750d
--- /dev/null
+++ b/test/ref/crypt/ca.key.public
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0HTS4tFNKfZJH7MwMppF
+uH1U6huCmajZTuN3hOPiLY069KgxL8sqveLadsNf+2moPOzc29/Oom6hc5XRLd7v
+McvQl2p1MhYNr0cwCfloJ4JivAHcx6nT82E7SHTDY9BkJBfs3tFSzNUHwBlL7Ec3
+KmCQAw/aJr7Dp2Yrm/dns2y+bMC2i6WatdIthxmKg2cSpXLJZmlVz4Ie2nJiPW95
+XnaS4zrb0TTyOrX8vI4Y7wmWPNfleYmasik3s6y06qoDQZRY8yHQk9QUZWzpUueY
+jpaESvKvRU16lejNY6jek+BZSs6K42FjRCqdVefAxwaLAAdBV7PknNdFlk7qi/UN
+1QIDAQAB
+-----END PUBLIC KEY-----
diff --git a/test/ref/crypt/ca.self-signed.pem b/test/ref/crypt/ca.self-signed.pem
index cc82b5d9..95d3aa19 100644
--- a/test/ref/crypt/ca.self-signed.pem
+++ b/test/ref/crypt/ca.self-signed.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j
-T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU4WhcNMjMwNzA2MDkz
-ODU4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
+MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
 b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THG5kTkQ5QS9jT0RvMnJUZHJiTFZtZlFub2FTYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTZ9Xu3AxKzsCf8haW7QtEZEauMUfo
-SkbzUmNZUYOwzuOvfhqSzO1BpRVI8/k3ZzkXR7XsWp8SbPsE17s5WPLwo4uDSro9
-XtRDOFFaZ023Ed9o2Zvoc6bwz8CpnKpiBB1XHMw9Bmi3q886f7Kk0SCsbX9OJeUC
-5/FUfwDSZUs8qjRkXYd2zjxgFGvYbokKSW1ZwkoLIRoJJhScjSnwTd/aAlcenfcw
-DV6ccjOJph4Dsru1NpCm50vi5/PRr00vBXMxdC2YgNyWONM5k8InBiU0uCmWmU5Y
-SRSc9A3cVtrKzP1WHE2978TNFqKpjEa8tgOYualSfI2pMtA23EVG14RJAgMBAAGj
+T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
+qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
+Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
+vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
+NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
+TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
 gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAO0IG2/7I/48h7I8PEygQewCJYoMIGvBgNVHSMEgacwgaSAFAO0IG2/7I/48h7I
-8PEygQewCJYooYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
+FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
+KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
 CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcbmRORDlBL2NPRG8yclRkcmJMVm1mUW5v
-YVNjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAp2V3npo0m7Vmdhpr6mk5UybM16Hx
-M99zoKGUpm6k9PYRk8ysEhD7M8hDuwiiFoRJj1+X8V4HLwNU3JTTQzSl88pMvLg8
-Tyl4ICELg9MN/Eyfnu6iyGDfPzcsuv8xZN53211LobqW+HGK8r+slf5GPDILka8r
-GB7sFRjvq3SEGpqupKI9sJFmvHyQplJ1ixrIkSnTEuBFBrDtQj+cjrqlvRw/dReo
-3uELGe5GyvBcP0hDgrvZQmTdCLQfo4998MMhLDyxvD9/D4jpRcCrLzs2uB3Tw3kT
-1KkAjDA/33J1XCZEkb1ArS2L/I12T0DoSQqb17NE3xccY+6iRFXRMFWDIQ==
+T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
+U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
+RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
+y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
+9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
+T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
+pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==
 -----END CERTIFICATE-----
diff --git a/test/ref/crypt/ca_dnq b/test/ref/crypt/ca_dnq
deleted file mode 100644
index 08d4dbd3..00000000
--- a/test/ref/crypt/ca_dnq
+++ /dev/null
@@ -1 +0,0 @@
-A7Qgbb/sj/jyHsjw8TKBB7AIlig=
diff --git a/test/ref/crypt/inter_dnq b/test/ref/crypt/inter_dnq
deleted file mode 100644
index 54220da8..00000000
--- a/test/ref/crypt/inter_dnq
+++ /dev/null
@@ -1 +0,0 @@
-bmtwThq3srgxIAeRMjX6BFhgLDw=
diff --git a/test/ref/crypt/intermediate.csr b/test/ref/crypt/intermediate.csr
index 674eb8f8..9d03fa30 100644
--- a/test/ref/crypt/intermediate.csr
+++ b/test/ref/crypt/intermediate.csr
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIC0DCCAbgCAQAwgYoxFDASBgNVBAoTC2V4YW1wbGUub3JnMRQwEgYDVQQLEwtl
 eGFtcGxlLm9yZzE1MDMGA1UEAxQsLnNtcHRlLTQzMC0yLklOVEVSTUVESUFURS5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THGJtdHdUaHEzc3JneElBZVJNalg2
-QkZoZ0xEdz0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKwqWoipez
-PzWLSjUAKB/s1HJwUzUOsYUSA8bzwIL3Bh+LX9JKV5mfKaU1P2WSmhWQfv6SFPvS
-X4grrqrr8OBEJywAa+tZumiZRNb/tMoM2bAsh8okZ6ejsjk6yZ8i+soJ4l/4IKfu
-85LoeLqQJUFGgg6jW1H7OlofQb5mgZZbyNz8X2qg5UFYGOdwK/fdQQNJHBTnXf+G
-S6mcIRIohGNbNwoWC08ZajzP1MTnkS1KYZhpk0igSnPaaUzftv9OLECdVMfkWeT5
-iePngBHFvAoyjORKmQDtxAN7vPA6N7mYy1zMUhnic7NykF/5VWZJRbDuXdXgEJvW
-Ys3wmzz6Cn9pAgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAQEAwznL6dOiiqrrXywI
-rBXqRWtm0Wve1d4U1L3e/YlEsXN9SZA3SMFIEhDubb9N/GbXrAABDzRuRPDrhhJH
-m8APTiuL8giLSsahNoODJX83dNpoDPCyZrfErLVMrHJbWIwevjaXQaXfA1hk+edQ
-sOk6XF84XwrjtSJ347fKjFkG64LBtnVUXEKmxCVJPz0GO1rfl52a8sx8eyMYBP/l
-6bK5AO04y9Zts1eM1vvhKaYmyHe6Usd1v3deEVPD7U6bYFdLKQovLyrzKthw0vhf
-1r000VzIICNGxktOz8L7MYTbX8NDKHZe3GHZnkEyNmXtKyUo9RtHUn2lbNHNDqay
-BBermQ==
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THDZlYXQ4cjMzVVM3MWF2dVFFb2pt
+SCtiams4ND0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI7++fB6z0
+3k4QE12hVCQslJRmy8REyUNpal8eWvVy/xQzbDDddSGfYYVH4/yldmjQ2Cdp7GiJ
+wHmdNJDYBjjjwKhdCmop6zuL5WEAddJ8HJn7yPwbaluBhVwQ2KSF78he7LOHuGae
+doflFZH02A8H9dFu7z/Bq9cCmiLxbLhmwd+Q9z31/uJWnBdnDTBUhy4/qIi7oObz
+qaKP0E0vqIAZdphnLUi2hARPcfxztdA8u1l61KaJDxnB4Sc8DpWwJ1bel+JADVQE
+3+X38tFEBLkToLElJvoSvx6plF0xOhsux4u7JLXSOl9xJwXc7Htb8TUE6ysumzF7
+MHIDpJJZ5OQBAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEACK39E+yttPBciOpv
+i8eVe8GvwMWguZAXFyll6Whd0NaborJWInZ/bqqYlXH0pAm2m7aK/JhFyYTL2HH/
+YEHwyGkeLdpGbX5XNENotCM4pFXsvamn/GpZGSM72TFAHk1HeFuTaRTcPossfDJP
+neLCBk9sGHcAGplZhlH1qLRgdrUM8VE/nUIEnnOb5az04LmY23BY1fkWbid8dcAw
+1VHnj4upHlGdzu3YWXye0hMOV9flH11gdVIJeMsegTg3rB4ql9UFG03UniD6BaZd
+sRmq8wKgePb5as1EAu2AKQEckLXP2z4601OV2j8FUMhX55up2iWjJgGwFB7D7ZTu
+jDOKtA==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/ref/crypt/intermediate.key b/test/ref/crypt/intermediate.key
index 37a51756..3321a845 100644
--- a/test/ref/crypt/intermediate.key
+++ b/test/ref/crypt/intermediate.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/ref/crypt/intermediate.key.public b/test/ref/crypt/intermediate.key.public
new file mode 100644
index 00000000..cf89493e
--- /dev/null
+++ b/test/ref/crypt/intermediate.key.public
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyO/vnwes9N5OEBNdoVQk
+LJSUZsvERMlDaWpfHlr1cv8UM2ww3XUhn2GFR+P8pXZo0NgnaexoicB5nTSQ2AY4
+48CoXQpqKes7i+VhAHXSfByZ+8j8G2pbgYVcENikhe/IXuyzh7hmnnaH5RWR9NgP
+B/XRbu8/wavXApoi8Wy4ZsHfkPc99f7iVpwXZw0wVIcuP6iIu6Dm86mij9BNL6iA
+GXaYZy1ItoQET3H8c7XQPLtZetSmiQ8ZweEnPA6VsCdW3pfiQA1UBN/l9/LRRAS5
+E6CxJSb6Er8eqZRdMTobLseLuyS10jpfcScF3Ox7W/E1BOsrLpsxezByA6SSWeTk
+AQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/test/ref/crypt/intermediate.signed.pem b/test/ref/crypt/intermediate.signed.pem
index 750d4cd7..c12a79e5 100644
--- a/test/ref/crypt/intermediate.signed.pem
+++ b/test/ref/crypt/intermediate.signed.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
 MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9j
-T0RvMnJUZHJiTFZtZlFub2FTYz0wHhcNMTMwNzA4MDkzODU5WhcNMjMwNzA1MDkz
-ODU5WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
+MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
 b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-UFJPRFVDVElPTjElMCMGA1UELhMcYm10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3
-PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMrCpaiKl7M/NYtKNQAo
-H+zUcnBTNQ6xhRIDxvPAgvcGH4tf0kpXmZ8ppTU/ZZKaFZB+/pIU+9JfiCuuquvw
-4EQnLABr61m6aJlE1v+0ygzZsCyHyiRnp6OyOTrJnyL6ygniX/ggp+7zkuh4upAl
-QUaCDqNbUfs6Wh9BvmaBllvI3PxfaqDlQVgY53Ar991BA0kcFOdd/4ZLqZwhEiiE
-Y1s3ChYLTxlqPM/UxOeRLUphmGmTSKBKc9ppTN+2/04sQJ1Ux+RZ5PmJ4+eAEcW8
-CjKM5EqZAO3EA3u88Do3uZjLXMxSGeJzs3KQX/lVZklFsO5d1eAQm9ZizfCbPPoK
-f2kCAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
-BgNVHQ4EFgQUbmtwThq3srgxIAeRMjX6BFhgLDwwga8GA1UdIwSBpzCBpIAUA7Qg
-bb/sj/jyHsjw8TKBB7AIliihgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
+PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
+JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
+OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
+Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
+gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
+uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
+5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
+BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
+dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
 MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxuZE5EOUEvY09EbzJyVGRy
-YkxWbWZRbm9hU2M9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBnlzVaMqhuenDQV7Zg
-aMa6IisupI3k9J6Z24fiEOGhCfAp0fiulx2oCSrXlYnJFGe6ndeWWer9UN1h+lAc
-ozKYwxsJx8jSkgwGYX5v8Cn2Sp2/gV5umCcmpZfIExEOZRmjgKzqyr658EyvmrYJ
-nqrig/N8wUWeS5EzMSiE1sVfyIZmUpKhuqmGQUXnftVMCKSrqAh+Au7ndlR77/dm
-ZBJzzX79nn4L9XqghdoFCPRt4rx1CMU26MmiuEzNcYJ3uSJc1SSz5tT69JQvp8Fj
-InhKTMv0wWysEsfE6+aARPtrqAUJBRAG83oP6L0gdJYWJagGFVoZLfjPf+v9JgYZ
-Wo+D
+T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
+Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
+AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
+YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
+Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
+vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
++YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
+xwd0
 -----END CERTIFICATE-----
diff --git a/test/ref/crypt/leaf.csr b/test/ref/crypt/leaf.csr
index 46fa505a..ff4d3e82 100644
--- a/test/ref/crypt/leaf.csr
+++ b/test/ref/crypt/leaf.csr
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICyjCCAbICAQAwgYQxFDASBgNVBAoTC2V4YW1wbGUub3JnMRQwEgYDVQQLEwtl
 eGFtcGxlLm9yZzEvMC0GA1UEAxQmQ1Muc21wdGUtNDMwLTIuTEVBRi5OT1RfRk9S
-X1BST0RVQ1RJT04xJTAjBgNVBC4THGQ5NWZHRHpFUk5keGZZUGdwaHZBUjhBMThM
-ND0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgCLvRhPtqZZK9dY7Y
-sv0euQ0RCRHQc07iRlL7a/cKduuVKdKQuADiuCyZI82EceCySveWPPEf8y6Aq/e0
-uVIfLByo/GPTpJQK93tpZ9QogZHfdfFnAUH0dzqEIoxw5jEUkhJ8XFySdKByZCNE
-+ctNtoJz+L+w4dCIudleZNUh7jdWsT7PNgk7sEGdTteePUwZPPPtxyigvd2nyJK3
-gTsTeYYZUzJOd0gQTd/HzLW08WKA0p08oGjV9cPukWQvuJ0f4M7k+HB/85KNLhl6
-AEKtv3p9Gla/OGHrPtRI57yIpjnEOKvlzhQpjXkmxXDYRLGQ8X3AWkUcLJe3ZhKQ
-NhsdAgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAQEAoAe5Zidlanz+94iNrjgr/sUE
-OPRWWl/9rnAMU8Y8kVk//WcNG5V3ShlzNUwT7SF64tDd54M5PT0TLb9oQnHArsyH
-QuWYa9C+IwttxwRH90u3gMqolkxhob4V75YYcaHtGDrgawjZ/ZrBePMX5lJThexX
-HBlwWfjlDiIu9tgHxRBn334uwTLJ40T6hw+Hc+E6UzREQ5rdH5bgzMu0FVrX0LVu
-+AnjSXjU1KDi3s3o4IjQncAExE6tsdIIGN03oGGeMYwgxR1RKxYqAfT0Tf021ePn
-2SmEAsiDSnmTX+3ienNJ/ZW2AGHFjwlqSgvOCpAVxFuNaQLNUkeU5lYJA0LGjw==
+X1BST0RVQ1RJT04xJTAjBgNVBC4THFFGVmx5bTdmdXFsNmJQT25ZMzhhYU8xWlBX
+ND0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTy9F1G9SHfU6L3oQY
+ep+ZizYaHEpLtjUAmlUaM9ZDJkViTCynMb2+grqsxudcRDkdEMnSNnkNrFLvOuZg
+g6xfoNCmXaRjwxMdeZZkWDrbccgP5cCjAWqRMbtS1Slexn++P6A4q7Q9A+Z1EsxG
+DkezbJDFJLv9KLO4bnYKsCawh5pv278A4vXS4tGZQHMsxpe3i4/PaL7c9eL65W6V
+/Le0RDf5BE02wfYbo7qxRFH7idgHRwsuUg2kdN0GLF8ZT8Rv2D/CkPfOsZwBXple
+/FQs13hFzEfxizXlC6+10wbBb/wtbX/TdY7ld5BGRyg8XjjJXhdR5MTnB5dgBoxk
+fuEzAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAK00A1YJvujYHfqShrrkn8dUd
+Od7epX1VF1IoHI2aetwZnw9fHu1/O70pHFsKHxGQgC8uagMNVMJ/p+sgCQCisPEp
+uPE4bkmh2zVlAo9Z//fEle5uqtvjmlO3PcTfZy4P/idu5l8YFolGoRXxetlia3Oq
+dJgUONWDSKo8+lMTsmrc/XUwtkRqol/Z/h2ZwrwHKvL6dA6H5H6XHRme7eTNU6Do
+uTRFBK0KVc/X8y2cX+aAbnsrVAfJ1xjHP9WbrUWzbr/ToALf7laTz1BdTo1EPpnt
+O2tr5j6onqcQs09vT+1mMdi85ahIXFftk5OOZxO54bJpVqoX3aw1jEZ1nrrk9Q==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/ref/crypt/leaf.key b/test/ref/crypt/leaf.key
index 1d690452..68b52292 100644
--- a/test/ref/crypt/leaf.key
+++ b/test/ref/crypt/leaf.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/ref/crypt/leaf.key.public b/test/ref/crypt/leaf.key.public
new file mode 100644
index 00000000..e0bb11d0
--- /dev/null
+++ b/test/ref/crypt/leaf.key.public
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96EGHqf
+mYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrmYIOs
+X6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLMRg5H
+s2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVulfy3
+tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6ZXvxU
+LNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaMZH7h
+MwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/test/ref/crypt/leaf.signed.pem b/test/ref/crypt/leaf.signed.pem
index 637d2062..29a438ea 100644
--- a/test/ref/crypt/leaf.signed.pem
+++ b/test/ref/crypt/leaf.signed.pem
@@ -2,25 +2,25 @@
 MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-Ym10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3PTAeFw0xMzA3MDgwOTM5MDBaFw0y
-MzA3MDQwOTM5MDBaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
+NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
+NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
 ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxkOTVmR0R6RVJOZHhmWVBncGh2QVI4QTE4
-TDQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Ai70YT7amWSvXWO
-2LL9HrkNEQkR0HNO4kZS+2v3CnbrlSnSkLgA4rgsmSPNhHHgskr3ljzxH/MugKv3
-tLlSHywcqPxj06SUCvd7aWfUKIGR33XxZwFB9Hc6hCKMcOYxFJISfFxcknSgcmQj
-RPnLTbaCc/i/sOHQiLnZXmTVIe43VrE+zzYJO7BBnU7Xnj1MGTzz7ccooL3dp8iS
-t4E7E3mGGVMyTndIEE3fx8y1tPFigNKdPKBo1fXD7pFkL7idH+DO5Phwf/OSjS4Z
-egBCrb96fRpWvzhh6z7USOe8iKY5xDir5c4UKY15JsVw2ESxkPF9wFpFHCyXt2YS
-kDYbHQIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
-DgQWBBR33l8YPMRE13F9g+CmG8BHwDXwvjCBrwYDVR0jBIGnMIGkgBRua3BOGrey
-uDEgB5EyNfoEWGAsPKGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
+Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
+VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
+GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
+YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
+Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
+lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
+XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
+ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
+DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
+LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
 BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THG5kTkQ5QS9jT0RvMnJUZHJiTFZt
-ZlFub2FTYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAKTd8vC9j06NL727VdnYZEwa
-D4MUTnv1UW5d/FdQR87WpGV+17CKblWGJtLTfFmV9LwcGlys6ZzrLRYpBf+81vYq
-VUhl7rrU7askIiacSlfYx4riv9KH5JLmyLdo7sjX4dhfj5IH/ilan7le1shjEl0P
-UrEgYX1dt5OOnMpzaIRHU+GWVlkY3M5VDdDfMPstuPJ+MeAP1fH0Ylajhc4O5nmu
-hWfXc9qa5bxOLzNDBOsXS8hbnTpUS1qpqzea5NSogdxGIiyk/OluU1ZJJPQhf0iK
-K6U6e4+TpHKVvqUwQcPUw9TcBGIDkwJTtLF48ZhFI9Gv016SmSwUobgcDA9e97o=
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
+VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
+ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
+JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
+sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
+jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
+cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=
 -----END CERTIFICATE-----
diff --git a/test/ref/crypt/leaf_dnq b/test/ref/crypt/leaf_dnq
deleted file mode 100644
index c99bca4d..00000000
--- a/test/ref/crypt/leaf_dnq
+++ /dev/null
@@ -1 +0,0 @@
-d95fGDzERNdxfYPgphvAR8A18L4=