Update test certs after expiry.v1.10.23

19 files changed, 296 insertions, 449 deletions

diff --git a/test/certificates_test.cc b/test/certificates_test.cc
index 7ac06428..32b2f95c 100644
--- a/test/certificates_test.cc
+++ b/test/certificates_test.cc
@@ -58,47 +58,47 @@ BOOST_AUTO_TEST_CASE (certificates1)
 
 	/* Leaf */
 	BOOST_CHECK_EQUAL (*i, c.leaf ());
-	BOOST_CHECK_EQUAL (i->thumbprint(), "EZg5wDcihccWqwdg59Y8D+IJpYM=");
+	BOOST_CHECK_EQUAL (i->thumbprint(), "ooMT95mSkhHzxx14ujbMSyQxFf8=");
 
 	BOOST_CHECK_EQUAL (
 		c.leaf().issuer(),
-		"dnQualifier=6eat8r33US71avuQEojmH\\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		"dnQualifier=rUEWSOEqt\\+7TvKTtNYzhRtrewRo=,CN=.dcpomatic.smpte-430-2.INTERMEDIATE,OU=dcpomatic.com,O=dcpomatic.com"
 		);
 
 	BOOST_CHECK_EQUAL (
 		c.leaf().subject(),
-		"dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		"dnQualifier=1u9TlD4x32jl1c\\+kSIKukb7ZZqA=,CN=CS.dcpomatic.smpte-430-2.LEAF,OU=dcpomatic.com,O=dcpomatic.com"
 		);
 
 	++i;
 
 	/* Intermediate */
-	BOOST_CHECK_EQUAL (i->thumbprint(), "GwM6ex2UVlWclH8f1uV7W1n0EEU=");
+	BOOST_CHECK_EQUAL (i->thumbprint(), "VoDClMHXh7G3B2lrH4ILh3tUpxA=");
 	BOOST_CHECK_EQUAL (
 		i->issuer(),
-		"dnQualifier=DCnRdHFbcv4ANVUq2\\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		"dnQualifier=V54yfuoIWYLT5YM\\+LabHTaiSAtI=,CN=.dcpomatic.smpte-430-2.ROOT,OU=dcpomatic.com,O=dcpomatic.com"
 		);
 
 	BOOST_CHECK_EQUAL (
 		i->subject(),
-		"dnQualifier=6eat8r33US71avuQEojmH\\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		"dnQualifier=rUEWSOEqt\\+7TvKTtNYzhRtrewRo=,CN=.dcpomatic.smpte-430-2.INTERMEDIATE,OU=dcpomatic.com,O=dcpomatic.com"
 		);
 
 	++i;
 
 	/* Root */
 	BOOST_CHECK_EQUAL (*i, c.root ());
-	BOOST_CHECK_EQUAL (i->thumbprint(), "zU8NVNwI2PYejmSYRntG7c6sdTw=");
+	BOOST_CHECK_EQUAL (i->thumbprint(), "ihrB25OpnYAC+/AXpM3ZVJYbRN0=");
 	BOOST_CHECK_EQUAL (
 		c.root().issuer(),
-		"dnQualifier=DCnRdHFbcv4ANVUq2\\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		"dnQualifier=V54yfuoIWYLT5YM\\+LabHTaiSAtI=,CN=.dcpomatic.smpte-430-2.ROOT,OU=dcpomatic.com,O=dcpomatic.com"
 		);
 
 	BOOST_CHECK_EQUAL (c.root().serial(), "5");
 
 	BOOST_CHECK_EQUAL (
 		c.root().subject(),
-		"dnQualifier=DCnRdHFbcv4ANVUq2\\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		"dnQualifier=V54yfuoIWYLT5YM\\+LabHTaiSAtI=,CN=.dcpomatic.smpte-430-2.ROOT,OU=dcpomatic.com,O=dcpomatic.com"
 		);
 
 	/* Check that reconstruction from a string works */
@@ -265,19 +265,19 @@ BOOST_AUTO_TEST_CASE (certificate_not_before_after)
 {
 	dcp::Certificate c (dcp::file_to_string("test/ref/crypt/ca.self-signed.pem"));
 	auto not_before = c.not_before();
-	BOOST_CHECK_EQUAL (not_before.second(), 8);
-	BOOST_CHECK_EQUAL (not_before.minute(), 20);
-	BOOST_CHECK_EQUAL (not_before.hour(), 13);
-	BOOST_CHECK_EQUAL (not_before.day(), 5);
-	BOOST_CHECK_EQUAL (not_before.month(), 6);
-	BOOST_CHECK_EQUAL (not_before.year(), 2015);
+	BOOST_CHECK_EQUAL(not_before.second(), 53);
+	BOOST_CHECK_EQUAL(not_before.minute(), 10);
+	BOOST_CHECK_EQUAL(not_before.hour(), 12);
+	BOOST_CHECK_EQUAL(not_before.day(), 10);
+	BOOST_CHECK_EQUAL(not_before.month(), 6);
+	BOOST_CHECK_EQUAL(not_before.year(), 2025);
 	auto not_after = c.not_after();
-	BOOST_CHECK_EQUAL (not_after.second(), 8);
-	BOOST_CHECK_EQUAL (not_after.minute(), 20);
-	BOOST_CHECK_EQUAL (not_after.hour(), 13);
-	BOOST_CHECK_EQUAL (not_after.day(), 2);
-	BOOST_CHECK_EQUAL (not_after.month(), 6);
-	BOOST_CHECK_EQUAL (not_after.year(), 2025);
+	BOOST_CHECK_EQUAL(not_after.second(), 53);
+	BOOST_CHECK_EQUAL(not_after.minute(), 10);
+	BOOST_CHECK_EQUAL(not_after.hour(), 12);
+	BOOST_CHECK_EQUAL(not_after.day(), 8);
+	BOOST_CHECK_EQUAL(not_after.month(), 6);
+	BOOST_CHECK_EQUAL(not_after.year(), 2035);
 }
 
 
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 3af0e24d..f2da4322 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -148,8 +148,8 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	dcp::DecryptedKDM kdm (
 		cpl,
 		key,
-		dcp::LocalTime ("2016-01-01T00:00:00+00:00"),
-		dcp::LocalTime ("2017-01-08T00:00:00+00:00"),
+		dcp::LocalTime ("2028-01-01T00:00:00+00:00"),
+		dcp::LocalTime ("2029-01-08T00:00:00+00:00"),
 		"libdcp",
 		"test",
 		"2012-07-17T04:45:18+00:00"
diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml
index 9abf60a6..28301761 100644
--- a/test/ref/DCP/encryption_test/ASSETMAP.xml
+++ b/test/ref/DCP/encryption_test/ASSETMAP.xml
@@ -15,7 +15,7 @@
           <Path>pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>8902</Length>
+          <Length>8801</Length>
         </Chunk>
       </ChunkList>
     </Asset>
@@ -26,7 +26,7 @@
           <Path>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>9226</Length>
+          <Length>9125</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index 6203c884..d13085f8 100644
--- a/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -42,10 +42,10 @@
   <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
     <dsig:X509Data>
       <dsig:X509IssuerSerial>
-        <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+        <dsig:X509IssuerName>dnQualifier=rUEWSOEqt\+7TvKTtNYzhRtrewRo=,CN=.dcpomatic.smpte-430-2.INTERMEDIATE,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
         <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
       </dsig:X509IssuerSerial>
-      <dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName>
+      <dsig:X509SubjectName>dnQualifier=1u9TlD4x32jl1c\+kSIKukb7ZZqA=,CN=CS.dcpomatic.smpte-430-2.LEAF,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509SubjectName>
     </dsig:X509Data>
   </Signer>
   <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
@@ -57,106 +57,105 @@
           <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <dsig:DigestValue>DBBENxFb5Qv377fb86n0KgUQ7go=</dsig:DigestValue>
+        <dsig:DigestValue>g/F5ffdTpDDZy8jYTirwvu6Gvic=</dsig:DigestValue>
       </dsig:Reference>
     </dsig:SignedInfo>
-    <dsig:SignatureValue>rhF1QacGUhxm1jfcgyBjAo2BmD4QxBl7c6Bzt8rjXXhR+NVT4ITeyxi39+94WwBx
-Yp8iQhF46bE2QGZAr+HnZZJGVG3ajeaQ4uvPp2KRC8sHpBlZ2rGGtyjXAflYjepw
-c1cLvRoAKbxOMW+ESxjyYOKgT0Bke0GhbzZ8+w+hGZLHxK9oTokIG9YDnRNUKN5W
-n6avbxuaT8wtZgVwD4qfKzMeJlYW3yDFo/2apQA5K+oCj/gfrS1habYqBoNo9kO1
-fWkQ7LIeRrYuzNlr5K4e/LyIm7SHwb9EGcA7K8WbDrHKvaJmTs/T01QhU9f+huk2
-ZGJMMCGHhiwcbVtqVhgJSQ==</dsig:SignatureValue>
+    <dsig:SignatureValue>EQdQJdkwpoj5BloaVdftQyzVJs2JQDjhBPecICfu6IQVpfV61hGQEKdmYmrvyZ90
+xphFjvPAnuLLuP/3yi0mNQbXwm1Wbeh5RwUsjb2z3I5KjAgtNfL4uFSfJWxKa7mt
+yp/LNsLekV0VxnJ5nr1r+21ujMWA8i1LFH+A7zrvv2b9JWg0HpCaHQU2q21rzRPD
+yoLhkjtXOe0PJdZg0aUXI/2QUH6l+V7sRIisDJHOyi+Y+T4skHCY1LsPUWStpukl
+3ir7jTOm/xgtH8p/gp8yb/5GikYqLFmNz3jSiVLshD6MJE45LA5v4DftmYGlMaX9
+R/ohfV1u4s42CaJXwTRT5w==</dsig:SignatureValue>
     <dsig:KeyInfo>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509IssuerName>dnQualifier=rUEWSOEqt\+7TvKTtNYzhRtrewRo=,CN=.dcpomatic.smpte-430-2.INTERMEDIATE,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
           <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
         </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
-NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
-NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-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
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
-VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
-ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
-JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
-sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
-jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
-cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
+        <dsig:X509Certificate>MIIEaTCCA1GgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhTEWMBQGA1UEChMNZGNw
+b21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGljLmNvbTEsMCoGA1UEAxMjLmRj
+cG9tYXRpYy5zbXB0ZS00MzAtMi5JTlRFUk1FRElBVEUxJTAjBgNVBC4THHJVRVdT
+T0VxdCs3VHZLVHROWXpoUnRyZXdSbz0wHhcNMjUwNjEwMTIxMDU0WhcNMzUwNjA2
+MTIxMDU0WjB/MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3Bv
+bWF0aWMuY29tMSYwJAYDVQQDEx1DUy5kY3BvbWF0aWMuc21wdGUtNDMwLTIuTEVB
+RjElMCMGA1UELhMcMXU5VGxENHgzMmpsMWMra1NJS3VrYjdaWnFBPTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALx2GgUITZBQScCp3FQsU2FWDKXPyR2r
+05xDl54QI3hhtcN+sUGM8uM8CQTHCfdgFdBwOQrdNyeKbJNO7ix2vW2d5h9taSNG
+cpP7WeDBSTUAFvat/RXhwZeElPdl6r1/njTJMhI5kBgqO6YHTJw9VrLVxaVG3pcW
+wb4iOQqTNHpZq+jf6PntujHZ8iDKnEtEZLocPB8OLz7HemRho4Vkk+kvu7p/tLBR
+XmvjPS4Z6eElxRH3p9kXfmIa8af/WXzWWVYeqx+JmtimKpJJG7op7oYwdPdXeqEI
+Qbq1RBs3ra8xPI7DCMi1MSz+HlItSiQQSHu3WGSKU6nby0PTFsT3mm0CAwEAAaOB
+6DCB5TAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFoDAdBgNVHQ4EFgQU1u9TlD4x
+32jl1c+kSIKukb7ZZqAwgagGA1UdIwSBoDCBnYAUrUEWSOEqt+7TvKTtNYzhRtre
+wRqhgYGkfzB9MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3Bv
+bWF0aWMuY29tMSQwIgYDVQQDExsuZGNwb21hdGljLnNtcHRlLTQzMC0yLlJPT1Qx
+JTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZTStMYWJIVGFpU0F0ST2CAQYwDQYJKoZI
+hvcNAQELBQADggEBACrsxZ2eTQJ3vrtMMmAADskYFi+o/TBq1rfecc5NsGhEzOeB
+AjrpqxR5hXD9vrwGEp3FTBeQcYZwtK/yw71dxeGzXCXq4aboSy8tbEjjNIOHkntI
+bMhbAzq4NGWBKp19a59c8zuCzjAvX5/r88lt4O7yGhErZ6neEXRGrLQj1js/4j5y
+O346Sj1GyYm/FTgGJc8JXnTg/IV+VQwdwjHLUN5ZNIJU23RLjNvIBdoNmKJ63l2O
+UxTAblqYQRjQndNn0s639hrYxSdVo53WiVMsp0TosAymrGF/aNSnBQnkVPECJXY4
+Oi7ZJjinl51Zw9U+afQAua6sWHDbTwJZx0Z17cI=</dsig:X509Certificate>
       </dsig:X509Data>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509IssuerName>dnQualifier=V54yfuoIWYLT5YM\+LabHTaiSAtI=,CN=.dcpomatic.smpte-430-2.ROOT,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
           <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
         </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
-MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-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
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
-Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
-AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
-YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
-Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
-vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
-+YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
-xwd0</dsig:X509Certificate>
+        <dsig:X509Certificate>MIIEbTCCA1WgAwIBAgIBBjANBgkqhkiG9w0BAQsFADB9MRYwFAYDVQQKEw1kY3Bv
+bWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29tMSQwIgYDVQQDExsuZGNw
+b21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZ
+TStMYWJIVGFpU0F0ST0wHhcNMjUwNjEwMTIxMDU0WhcNMzUwNjA3MTIxMDU0WjCB
+hTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGljLmNv
+bTEsMCoGA1UEAxMjLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5JTlRFUk1FRElBVEUx
+JTAjBgNVBC4THHJVRVdTT0VxdCs3VHZLVHROWXpoUnRyZXdSbz0wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8r486crE58LOPZw8GKFM8juyIlWuG8l+v
+zAfw8UUn6ncdm10aHGg6fVThyU5azezfi0X8vaSXW4DKIvSHe97Od33eEJu2JeLv
+u+zofIaS/Aj8aMWx6UxJsLEVL/vHg8cZjyhniCm5oOAuqzVFU+PwCsAq3ddh3xc9
+lqmSzHWqxxsc9Ekh5RQowRpqI+LdI5LmmNzdr8A4+fgTTsYlJwI5RVpvQqjWUH5O
+liLIYFJkNtI/V5hvKeL5+dbx5NQq1DibsgA0Rtst4qIhieRtF8ijfYf5cVQutj8z
+oNxi+zxhCLKdHz8EQxpDccrGySxXifGpji+7SyGytvfQecyLM1wfAgMBAAGjge4w
+geswEgYDVR0TAQH/BAgwBgEB/wIBAjALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFK1B
+FkjhKrfu07yk7TWM4Uba3sEaMIGoBgNVHSMEgaAwgZ2AFFeeMn7qCFmC0+WDPi2m
+x02okgLSoYGBpH8wfTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMN
+ZGNwb21hdGljLmNvbTEkMCIGA1UEAxMbLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5S
+T09UMSUwIwYDVQQuExxWNTR5ZnVvSVdZTFQ1WU0rTGFiSFRhaVNBdEk9ggEFMA0G
+CSqGSIb3DQEBCwUAA4IBAQAQwVPs/LtNkMw0RMKx8Zy5EfiUQwnrfd126IXtpBlK
+PEubaY9LYPMuPavWmCYIAv6wpVuBWosFxZtv77cIe8Pqir4g/1eBoLMEgFBB6mid
+1nJ5HEerEQS7Itg6GmgZ24vb4Ne9nZkN8iysh6VLQI6Iz7HIr3I/dNJwi6M7jai8
+C1zuzzTJ/qXMZhIMjovXOfUxKZqRA5bpJl0ogB/byqhOcGjcvvkom6cWYCWfXjSg
+KSm0704ImezwoFdHO18jo2u4ghgeXUBCyLcew5aVaVsSktuUtEgaYXgm0tX1HfEg
+aSqfFDSdb0Z4mbUrVHGE58wckEG1TQCQ2Ypi0qSaV+v5</dsig:X509Certificate>
       </dsig:X509Data>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509IssuerName>dnQualifier=V54yfuoIWYLT5YM\+LabHTaiSAtI=,CN=.dcpomatic.smpte-430-2.ROOT,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
           <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
         </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
-MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
-qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
-Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
-vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
-NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
-TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
-gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
-KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
-U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
-RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
-y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
-9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
-T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
-pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
+        <dsig:X509Certificate>MIIEZDCCA0ygAwIBAgIBBTANBgkqhkiG9w0BAQsFADB9MRYwFAYDVQQKEw1kY3Bv
+bWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29tMSQwIgYDVQQDExsuZGNw
+b21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZ
+TStMYWJIVGFpU0F0ST0wHhcNMjUwNjEwMTIxMDUzWhcNMzUwNjA4MTIxMDUzWjB9
+MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29t
+MSQwIgYDVQQDExsuZGNwb21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4T
+HFY1NHlmdW9JV1lMVDVZTStMYWJIVGFpU0F0ST0wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDRPVUHo+tpzG6/0L3nPVxi1MVrzWfviVujj9FTSFqNqi6Y
+gnY0/iBwhj+NPZuiQr7P/dm3PjE8X3SZc1LP36YGC3ypYnrVolQoolb4hl/1MpGG
+k8XWVRhp9aWALNfkekqLBGIJQN0kuq2lAVQRa2n44ysGv5lbJDnt68YSD0iTlg9n
+Oa6HHDDM5uRX0NjX7U0LWT3RjWk/Pp4REXIFHxtccYOB3d6oqJbYy5DlvJrLoufO
+BX6pE0nA/Vq6LK3+xLudspAwv3Hiag3hBey3fVevXqfLTQcqvjp8MNkLwNdvHo/s
+i7vubKWkMDzfuDrxM9ncyT7/juzqGKASB1u6J+xHAgMBAAGjge4wgeswEgYDVR0T
+AQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFFeeMn7qCFmC0+WD
+Pi2mx02okgLSMIGoBgNVHSMEgaAwgZ2AFFeeMn7qCFmC0+WDPi2mx02okgLSoYGB
+pH8wfTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGlj
+LmNvbTEkMCIGA1UEAxMbLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5ST09UMSUwIwYD
+VQQuExxWNTR5ZnVvSVdZTFQ1WU0rTGFiSFRhaVNBdEk9ggEFMA0GCSqGSIb3DQEB
+CwUAA4IBAQCjZGrGc3tw6NDIpx5BIT7mIPYUJD6IXAr2lSPnL8/QSLkBBS7WTwz2
+sj/TaSs6Z60znum9NpX+Mzq1QmjKFUzuARyrBmCh1GqpDF7sL37QmT/2FzQ3kIGM
+9PAqilm4mgWrUSRn9iBCDhvmwa0/H++3u83ABtBCUF5+QoxL8FZPNW9+jMWnNycL
+GUpT5rG85TY8r4IZxqwcm+d5rskA+3TC6NCD1GJ2dl6rnup/IBsA1dzyGOZzEfyi
+7N4PDSrVvvdECk6aAnUqHjQ2JCF3rArJIIQKYX5jyQ43hBBChPqcjF0+B1nqU9ms
+30d2cpb8jTa2bVtsakWM0ynocDa+RPoj</dsig:X509Certificate>
       </dsig:X509Data>
     </dsig:KeyInfo>
   </dsig:Signature>
diff --git a/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml
index fb0313ab..992c739a 100644
--- a/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml
+++ b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml
@@ -9,8 +9,8 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>sLWF9OcgdkvBUH1VcNiwseLA3sA=</Hash>
-      <Size>9226</Size>
+      <Hash>CIW518Gg3m2fuJ9edrloerwS6Ns=</Hash>
+      <Size>9125</Size>
       <Type>text/xml</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
     </Asset>
@@ -34,10 +34,10 @@
   <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
     <dsig:X509Data>
       <dsig:X509IssuerSerial>
-        <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+        <dsig:X509IssuerName>dnQualifier=rUEWSOEqt\+7TvKTtNYzhRtrewRo=,CN=.dcpomatic.smpte-430-2.INTERMEDIATE,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
         <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
       </dsig:X509IssuerSerial>
-      <dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName>
+      <dsig:X509SubjectName>dnQualifier=1u9TlD4x32jl1c\+kSIKukb7ZZqA=,CN=CS.dcpomatic.smpte-430-2.LEAF,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509SubjectName>
     </dsig:X509Data>
   </Signer>
   <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
@@ -49,106 +49,105 @@
           <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <dsig:DigestValue>OU1UpJxBmpxK8SE5yfe8aJsqoIw=</dsig:DigestValue>
+        <dsig:DigestValue>OqQD2nVqnEVJ35ZzgsVpGr0MAoE=</dsig:DigestValue>
       </dsig:Reference>
     </dsig:SignedInfo>
-    <dsig:SignatureValue>ypg6tt5iJi7YEUJQfEQmZeigXzcm2xn/J59tqqYBqwmAch1ia//Khyo6m7/HpQJl
-2Y5swUI8MtmzdV3gj3urd8WuQsDWFLflIHHiIanYE/XCdFZ8lV/nvyCkAaf/AH2V
-W7bWD8/fYXJD2G9a2tRiWTjzfgpsTk+ox+C12Y/SebWAQ97sSLIMwwmQIYK2kTnh
-nbKSuhk+v+V2ObpYl48zXu3za3Yt77rCdcGgPwYr/NUI47ascpnueNw48clDtjp+
-775jeA5ZG5lBR3VGTLwvoOXT3CH/FgG0DPSLmYbRnOzEShVUt7xFgbxMgNTYOGQJ
-3ipS6qmHgWHjX3/fo6isgg==</dsig:SignatureValue>
+    <dsig:SignatureValue>PeYFOuY1taBEZ8qq4H/84Q0PWLp44pkIyZvurgek0HSHby/OetkV5ioKnUNKgMw4
+b0alsD6Uq51Og2aQdl+o6TsigMt6GQ8mumKQE9GwcN9VxVxWCK6LH5wLMl1m9PbF
+OT/RbZTsrDIINx/Cn+2Q3SR22ddQ0AYdUqG+fVs5j/lUDcyria9vrdGTZblooI1J
+69lI/VZbczvrH8Qgq+aQpMdQV6GRDzabpLme/6o5fFDKcYtOeEi81pA3veVIi0Dx
+H/gbTJg/YieH2lfwGB1hx70vRWZo0yDbAXpB4iY5quoSQmrTbQtLOwqjEf988Pbv
+VZuaYwLWao4PNSQQ6UDBaA==</dsig:SignatureValue>
     <dsig:KeyInfo>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509IssuerName>dnQualifier=rUEWSOEqt\+7TvKTtNYzhRtrewRo=,CN=.dcpomatic.smpte-430-2.INTERMEDIATE,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
           <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
         </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
-NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
-NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-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
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
-VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
-ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
-JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
-sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
-jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
-cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
+        <dsig:X509Certificate>MIIEaTCCA1GgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhTEWMBQGA1UEChMNZGNw
+b21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGljLmNvbTEsMCoGA1UEAxMjLmRj
+cG9tYXRpYy5zbXB0ZS00MzAtMi5JTlRFUk1FRElBVEUxJTAjBgNVBC4THHJVRVdT
+T0VxdCs3VHZLVHROWXpoUnRyZXdSbz0wHhcNMjUwNjEwMTIxMDU0WhcNMzUwNjA2
+MTIxMDU0WjB/MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3Bv
+bWF0aWMuY29tMSYwJAYDVQQDEx1DUy5kY3BvbWF0aWMuc21wdGUtNDMwLTIuTEVB
+RjElMCMGA1UELhMcMXU5VGxENHgzMmpsMWMra1NJS3VrYjdaWnFBPTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALx2GgUITZBQScCp3FQsU2FWDKXPyR2r
+05xDl54QI3hhtcN+sUGM8uM8CQTHCfdgFdBwOQrdNyeKbJNO7ix2vW2d5h9taSNG
+cpP7WeDBSTUAFvat/RXhwZeElPdl6r1/njTJMhI5kBgqO6YHTJw9VrLVxaVG3pcW
+wb4iOQqTNHpZq+jf6PntujHZ8iDKnEtEZLocPB8OLz7HemRho4Vkk+kvu7p/tLBR
+XmvjPS4Z6eElxRH3p9kXfmIa8af/WXzWWVYeqx+JmtimKpJJG7op7oYwdPdXeqEI
+Qbq1RBs3ra8xPI7DCMi1MSz+HlItSiQQSHu3WGSKU6nby0PTFsT3mm0CAwEAAaOB
+6DCB5TAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFoDAdBgNVHQ4EFgQU1u9TlD4x
+32jl1c+kSIKukb7ZZqAwgagGA1UdIwSBoDCBnYAUrUEWSOEqt+7TvKTtNYzhRtre
+wRqhgYGkfzB9MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3Bv
+bWF0aWMuY29tMSQwIgYDVQQDExsuZGNwb21hdGljLnNtcHRlLTQzMC0yLlJPT1Qx
+JTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZTStMYWJIVGFpU0F0ST2CAQYwDQYJKoZI
+hvcNAQELBQADggEBACrsxZ2eTQJ3vrtMMmAADskYFi+o/TBq1rfecc5NsGhEzOeB
+AjrpqxR5hXD9vrwGEp3FTBeQcYZwtK/yw71dxeGzXCXq4aboSy8tbEjjNIOHkntI
+bMhbAzq4NGWBKp19a59c8zuCzjAvX5/r88lt4O7yGhErZ6neEXRGrLQj1js/4j5y
+O346Sj1GyYm/FTgGJc8JXnTg/IV+VQwdwjHLUN5ZNIJU23RLjNvIBdoNmKJ63l2O
+UxTAblqYQRjQndNn0s639hrYxSdVo53WiVMsp0TosAymrGF/aNSnBQnkVPECJXY4
+Oi7ZJjinl51Zw9U+afQAua6sWHDbTwJZx0Z17cI=</dsig:X509Certificate>
       </dsig:X509Data>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509IssuerName>dnQualifier=V54yfuoIWYLT5YM\+LabHTaiSAtI=,CN=.dcpomatic.smpte-430-2.ROOT,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
           <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
         </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
-MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-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
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
-Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
-AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
-YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
-Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
-vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
-+YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
-xwd0</dsig:X509Certificate>
+        <dsig:X509Certificate>MIIEbTCCA1WgAwIBAgIBBjANBgkqhkiG9w0BAQsFADB9MRYwFAYDVQQKEw1kY3Bv
+bWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29tMSQwIgYDVQQDExsuZGNw
+b21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZ
+TStMYWJIVGFpU0F0ST0wHhcNMjUwNjEwMTIxMDU0WhcNMzUwNjA3MTIxMDU0WjCB
+hTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGljLmNv
+bTEsMCoGA1UEAxMjLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5JTlRFUk1FRElBVEUx
+JTAjBgNVBC4THHJVRVdTT0VxdCs3VHZLVHROWXpoUnRyZXdSbz0wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8r486crE58LOPZw8GKFM8juyIlWuG8l+v
+zAfw8UUn6ncdm10aHGg6fVThyU5azezfi0X8vaSXW4DKIvSHe97Od33eEJu2JeLv
+u+zofIaS/Aj8aMWx6UxJsLEVL/vHg8cZjyhniCm5oOAuqzVFU+PwCsAq3ddh3xc9
+lqmSzHWqxxsc9Ekh5RQowRpqI+LdI5LmmNzdr8A4+fgTTsYlJwI5RVpvQqjWUH5O
+liLIYFJkNtI/V5hvKeL5+dbx5NQq1DibsgA0Rtst4qIhieRtF8ijfYf5cVQutj8z
+oNxi+zxhCLKdHz8EQxpDccrGySxXifGpji+7SyGytvfQecyLM1wfAgMBAAGjge4w
+geswEgYDVR0TAQH/BAgwBgEB/wIBAjALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFK1B
+FkjhKrfu07yk7TWM4Uba3sEaMIGoBgNVHSMEgaAwgZ2AFFeeMn7qCFmC0+WDPi2m
+x02okgLSoYGBpH8wfTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMN
+ZGNwb21hdGljLmNvbTEkMCIGA1UEAxMbLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5S
+T09UMSUwIwYDVQQuExxWNTR5ZnVvSVdZTFQ1WU0rTGFiSFRhaVNBdEk9ggEFMA0G
+CSqGSIb3DQEBCwUAA4IBAQAQwVPs/LtNkMw0RMKx8Zy5EfiUQwnrfd126IXtpBlK
+PEubaY9LYPMuPavWmCYIAv6wpVuBWosFxZtv77cIe8Pqir4g/1eBoLMEgFBB6mid
+1nJ5HEerEQS7Itg6GmgZ24vb4Ne9nZkN8iysh6VLQI6Iz7HIr3I/dNJwi6M7jai8
+C1zuzzTJ/qXMZhIMjovXOfUxKZqRA5bpJl0ogB/byqhOcGjcvvkom6cWYCWfXjSg
+KSm0704ImezwoFdHO18jo2u4ghgeXUBCyLcew5aVaVsSktuUtEgaYXgm0tX1HfEg
+aSqfFDSdb0Z4mbUrVHGE58wckEG1TQCQ2Ypi0qSaV+v5</dsig:X509Certificate>
       </dsig:X509Data>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509IssuerName>dnQualifier=V54yfuoIWYLT5YM\+LabHTaiSAtI=,CN=.dcpomatic.smpte-430-2.ROOT,OU=dcpomatic.com,O=dcpomatic.com</dsig:X509IssuerName>
           <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
         </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
-MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
-qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
-Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
-vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
-NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
-TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
-gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
-KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
-U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
-RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
-y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
-9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
-T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
-pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
+        <dsig:X509Certificate>MIIEZDCCA0ygAwIBAgIBBTANBgkqhkiG9w0BAQsFADB9MRYwFAYDVQQKEw1kY3Bv
+bWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29tMSQwIgYDVQQDExsuZGNw
+b21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZ
+TStMYWJIVGFpU0F0ST0wHhcNMjUwNjEwMTIxMDUzWhcNMzUwNjA4MTIxMDUzWjB9
+MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29t
+MSQwIgYDVQQDExsuZGNwb21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4T
+HFY1NHlmdW9JV1lMVDVZTStMYWJIVGFpU0F0ST0wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDRPVUHo+tpzG6/0L3nPVxi1MVrzWfviVujj9FTSFqNqi6Y
+gnY0/iBwhj+NPZuiQr7P/dm3PjE8X3SZc1LP36YGC3ypYnrVolQoolb4hl/1MpGG
+k8XWVRhp9aWALNfkekqLBGIJQN0kuq2lAVQRa2n44ysGv5lbJDnt68YSD0iTlg9n
+Oa6HHDDM5uRX0NjX7U0LWT3RjWk/Pp4REXIFHxtccYOB3d6oqJbYy5DlvJrLoufO
+BX6pE0nA/Vq6LK3+xLudspAwv3Hiag3hBey3fVevXqfLTQcqvjp8MNkLwNdvHo/s
+i7vubKWkMDzfuDrxM9ncyT7/juzqGKASB1u6J+xHAgMBAAGjge4wgeswEgYDVR0T
+AQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFFeeMn7qCFmC0+WD
+Pi2mx02okgLSMIGoBgNVHSMEgaAwgZ2AFFeeMn7qCFmC0+WDPi2mx02okgLSoYGB
+pH8wfTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGlj
+LmNvbTEkMCIGA1UEAxMbLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5ST09UMSUwIwYD
+VQQuExxWNTR5ZnVvSVdZTFQ1WU0rTGFiSFRhaVNBdEk9ggEFMA0GCSqGSIb3DQEB
+CwUAA4IBAQCjZGrGc3tw6NDIpx5BIT7mIPYUJD6IXAr2lSPnL8/QSLkBBS7WTwz2
+sj/TaSs6Z60znum9NpX+Mzq1QmjKFUzuARyrBmCh1GqpDF7sL37QmT/2FzQ3kIGM
+9PAqilm4mgWrUSRn9iBCDhvmwa0/H++3u83ABtBCUF5+QoxL8FZPNW9+jMWnNycL
+GUpT5rG85TY8r4IZxqwcm+d5rskA+3TC6NCD1GJ2dl6rnup/IBsA1dzyGOZzEfyi
+7N4PDSrVvvdECk6aAnUqHjQ2JCF3rArJIIQKYX5jyQ43hBBChPqcjF0+B1nqU9ms
+30d2cpb8jTa2bVtsakWM0ynocDa+RPoj</dsig:X509Certificate>
       </dsig:X509Data>
     </dsig:KeyInfo>
   </dsig:Signature>
diff --git a/test/ref/crypt/ca.cnf b/test/ref/crypt/ca.cnf
deleted file mode 100644
index 99a31f65..00000000
--- a/test/ref/crypt/ca.cnf
+++ /dev/null
@@ -1,12 +0,0 @@
-[ req ]
-distinguished_name = req_distinguished_name
-x509_extensions	= v3_ca
-[ v3_ca ]
-basicConstraints = critical,CA:true,pathlen:3
-keyUsage = keyCertSign,cRLSign
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer:always
-[ req_distinguished_name ]
-O = Unique organization name
-OU = Organization unit
-CN = Entity and dnQualifier
diff --git a/test/ref/crypt/ca.key b/test/ref/crypt/ca.key
deleted file mode 100644
index 5553b1fa..00000000
--- a/test/ref/crypt/ca.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA0HTS4tFNKfZJH7MwMppFuH1U6huCmajZTuN3hOPiLY069Kgx
-L8sqveLadsNf+2moPOzc29/Oom6hc5XRLd7vMcvQl2p1MhYNr0cwCfloJ4JivAHc
-x6nT82E7SHTDY9BkJBfs3tFSzNUHwBlL7Ec3KmCQAw/aJr7Dp2Yrm/dns2y+bMC2
-i6WatdIthxmKg2cSpXLJZmlVz4Ie2nJiPW95XnaS4zrb0TTyOrX8vI4Y7wmWPNfl
-eYmasik3s6y06qoDQZRY8yHQk9QUZWzpUueYjpaESvKvRU16lejNY6jek+BZSs6K
-42FjRCqdVefAxwaLAAdBV7PknNdFlk7qi/UN1QIDAQABAoIBAH4bXoTG9/Z9vwkF
-XxAN0kXk1Fz4HY8V3bji1Sg4sFi8SsE9itwN/aJ4PY+BbGxtI9EPviDqCVisstF4
-/d3RM0UdtugTCCkvvEGgQEiYcFEOiOqR+d10OPvQg4u2z4lvxVUsgCjf20Z9Tb4B
-z7N19cKWPikMCv5Lg5OetJ0bE8ov1IcXBnMn82/uM/8eRuCJjs6MJmJBBjfNDW2I
-I5jScUNGbRJgSZtFXypUfWfBS6nMnfvznTzAIUyx6r0vTwK3RvnMYbA2hLZUwRp8
-VhgiThEuderU0z4ltHAnLXZEP0ljKzHqtBs8r15KcSOhBxf+nutLQY6KHAyh/Ctx
-SCAJrbUCgYEA69iqvLyicguqwM5gVmqZu+jKEtf+JqYfGDPMB2RyYycmXPJNRIK2
-DuKbeInnVFKZV2F0x6AJvetN4W0Jv3LbDlQUTr+LBYbCetaAk9rGSQuCBwrvH+Ax
-Fk2IZAFqMvTIalTSNVUydNucc0LX9Yu2p4JjspCCU3B/CnWCkcD4kvMCgYEA4kT6
-T4R4aEk8rNMNopITCIQxaGrypg/KItT5mpqnFEfiSo8+mbfKMWreqxfYDtO4qXiU
-HGhHxTDIPayV5s3VPCQs8sCbs3H+rZYYE4BuZIu1qU+EzyAk6ulnQIi1/5IwguwO
-NPycq5XTkvsIwEfO5D8t6z5QbyI4Sh/7Uv4TPhcCgYEA6aXG0CAY1t8UFNrfufz1
-vKFMwApXcLaWi4WVFaW/ZNd+PAqX3c2Yy3pYB7ym/nSuEVEtPi8gN5SLnU5Gn/IL
-blCBpdpAwgLVXJhw3QmZ8veBo7SDXZLfTncVLe3w5fZ3LlBFyCxVRkvi3JVWGZ6G
-H8EfP+HGGx+R3Cy6Y+dG210CgYBJ60Li62Hyn8pko2ZW7+Wr6JPDivzOZ2Yfzvfk
-HBXtODajKPzIdxRk5Ibt2hJJdb1kD/JC/YZE01T3YQRvrFq3FRJiE65KBzmuN9SR
-umlWC5ZDQ6kdiWDGJY4HtSHP5lBW1QsnIEeGfqHp6HzJZCwgwMsdiPP5+nHtNVmD
-mWFr7QKBgF9JEieU2P1DOVlqhTndEUm26y2TzRFf9M7PPNHoGMd/VRfI7nP7kXJa
-YcjF6xISxbSYtQlaxQW2CX8sf24r02Qo1aSKdBiJBN/xHyB57gOeUEvF86SKffEk
-FBtvXV3MEtAqpwBqb/KxegdsoYu4dN/dg6Ck2Ms2sqHpXXAd8a+5
------END RSA PRIVATE KEY-----
diff --git a/test/ref/crypt/ca.key.public b/test/ref/crypt/ca.key.public
deleted file mode 100644
index fde3750d..00000000
--- a/test/ref/crypt/ca.key.public
+++ /dev/null
@@ -1,9 +0,0 @@
------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 95d3aa19..26985d6f 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
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
-MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
-qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
-Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
-vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
-NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
-TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
-gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
-KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
-U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
-RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
-y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
-9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
-T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
-pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==
+MIIEZDCCA0ygAwIBAgIBBTANBgkqhkiG9w0BAQsFADB9MRYwFAYDVQQKEw1kY3Bv
+bWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29tMSQwIgYDVQQDExsuZGNw
+b21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZ
+TStMYWJIVGFpU0F0ST0wHhcNMjUwNjEwMTIxMDUzWhcNMzUwNjA4MTIxMDUzWjB9
+MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29t
+MSQwIgYDVQQDExsuZGNwb21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4T
+HFY1NHlmdW9JV1lMVDVZTStMYWJIVGFpU0F0ST0wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDRPVUHo+tpzG6/0L3nPVxi1MVrzWfviVujj9FTSFqNqi6Y
+gnY0/iBwhj+NPZuiQr7P/dm3PjE8X3SZc1LP36YGC3ypYnrVolQoolb4hl/1MpGG
+k8XWVRhp9aWALNfkekqLBGIJQN0kuq2lAVQRa2n44ysGv5lbJDnt68YSD0iTlg9n
+Oa6HHDDM5uRX0NjX7U0LWT3RjWk/Pp4REXIFHxtccYOB3d6oqJbYy5DlvJrLoufO
+BX6pE0nA/Vq6LK3+xLudspAwv3Hiag3hBey3fVevXqfLTQcqvjp8MNkLwNdvHo/s
+i7vubKWkMDzfuDrxM9ncyT7/juzqGKASB1u6J+xHAgMBAAGjge4wgeswEgYDVR0T
+AQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFFeeMn7qCFmC0+WD
+Pi2mx02okgLSMIGoBgNVHSMEgaAwgZ2AFFeeMn7qCFmC0+WDPi2mx02okgLSoYGB
+pH8wfTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGlj
+LmNvbTEkMCIGA1UEAxMbLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5ST09UMSUwIwYD
+VQQuExxWNTR5ZnVvSVdZTFQ1WU0rTGFiSFRhaVNBdEk9ggEFMA0GCSqGSIb3DQEB
+CwUAA4IBAQCjZGrGc3tw6NDIpx5BIT7mIPYUJD6IXAr2lSPnL8/QSLkBBS7WTwz2
+sj/TaSs6Z60znum9NpX+Mzq1QmjKFUzuARyrBmCh1GqpDF7sL37QmT/2FzQ3kIGM
+9PAqilm4mgWrUSRn9iBCDhvmwa0/H++3u83ABtBCUF5+QoxL8FZPNW9+jMWnNycL
+GUpT5rG85TY8r4IZxqwcm+d5rskA+3TC6NCD1GJ2dl6rnup/IBsA1dzyGOZzEfyi
+7N4PDSrVvvdECk6aAnUqHjQ2JCF3rArJIIQKYX5jyQ43hBBChPqcjF0+B1nqU9ms
+30d2cpb8jTa2bVtsakWM0ynocDa+RPoj
 -----END CERTIFICATE-----
diff --git a/test/ref/crypt/intermediate.cnf b/test/ref/crypt/intermediate.cnf
deleted file mode 100644
index 82473c50..00000000
--- a/test/ref/crypt/intermediate.cnf
+++ /dev/null
@@ -1,12 +0,0 @@
-[ default ]
-distinguished_name = req_distinguished_name
-x509_extensions = v3_ca
-[ v3_ca ]
-basicConstraints = critical,CA:true,pathlen:2
-keyUsage = keyCertSign,cRLSign
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer:always
-[ req_distinguished_name ]
-O = Unique organization name
-OU = Organization unit
-CN = Entity and dnQualifier
diff --git a/test/ref/crypt/intermediate.csr b/test/ref/crypt/intermediate.csr
deleted file mode 100644
index 9d03fa30..00000000
--- a/test/ref/crypt/intermediate.csr
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIC0DCCAbgCAQAwgYoxFDASBgNVBAoTC2V4YW1wbGUub3JnMRQwEgYDVQQLEwtl
-eGFtcGxlLm9yZzE1MDMGA1UEAxQsLnNtcHRlLTQzMC0yLklOVEVSTUVESUFURS5O
-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
deleted file mode 100644
index 3321a845..00000000
--- a/test/ref/crypt/intermediate.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAyO/vnwes9N5OEBNdoVQkLJSUZsvERMlDaWpfHlr1cv8UM2ww
-3XUhn2GFR+P8pXZo0NgnaexoicB5nTSQ2AY448CoXQpqKes7i+VhAHXSfByZ+8j8
-G2pbgYVcENikhe/IXuyzh7hmnnaH5RWR9NgPB/XRbu8/wavXApoi8Wy4ZsHfkPc9
-9f7iVpwXZw0wVIcuP6iIu6Dm86mij9BNL6iAGXaYZy1ItoQET3H8c7XQPLtZetSm
-iQ8ZweEnPA6VsCdW3pfiQA1UBN/l9/LRRAS5E6CxJSb6Er8eqZRdMTobLseLuyS1
-0jpfcScF3Ox7W/E1BOsrLpsxezByA6SSWeTkAQIDAQABAoIBAANgLIliaqBuf6c7
-fA4yyKzLDjcv4ys4ql5CADkVVBxLdr5qaeO+jQMNc1zC0sLA23/usbLQ2uy9hA2F
-DY3jhN8mpG1zuFbd8dEm2FtWn2OgY2HcfYfEYKcrY2GREiqB3b7igR2dlnPBEAVk
-OGCBpLcAhTU05cBOL72Gc2HU7sAjKAmPuCAJ95WoI5OxQXR+0EVoBgdWK0+Kl5l7
-BGrfcxQX1DfNc3q5BTKjMOTl2w9ZTjFZNWUdV/+pIHkj2zJTYAE1qGTRHseSdFU/
-aUxlngNzLk3ZsE6KEBONaIfORVB1EGodusqXzkUbbYlKvQEe/hOgh3wqTlG2gT5k
-E5rwWsECgYEA75GkCYObhroi9bE1qAieVbTTL7sImwZk+vfQNJzqe+M8VxyFoiqe
-p0g4uILKn1YMqZFH9N7yeC6mvq2Aos2fiVgGG86i5WQlMloCjtkgylKc4hXB2G+s
-s7JekXhPLScoS3FP0c2TlJPvcj1nq1cAkVCUBwOzMSvJOHiHVN5pVskCgYEA1rf/
-zfarD2723lHmJYj/r80IKuFkS4dy5H76ToreHW4NiiefNuX+9WfcIquv6MYLkUz5
-GybNFZl6Fi8leIoKoejFBVgvPALL7gw14yFvWMP+DZmC2107Mo3EipFvqyDg2bT8
-56nU3MnBip7B5TYAZ5JAj6k2A4+eV1RmBL6wZ3kCgYEAkLpDhxvi0TmR9SvhZmoO
-fWiITMWJJV5vks4zEhXZ8o4M3fN1J8rnndebrJwXHLs3WxlRhzVI9iH4yii3FaNz
-Rd3Pkuz6q+ocLpcCBJpXnOLbtBnAyahthQG079zmuDh3t1v1BKJVDeVxOmquPmyJ
-A0DSrIonrwTswxjNaRAUQ0ECgYBK9ISKA9gHVTc8uN5csAyB9FMrlO8MJsaG2YTL
-slKDd42mctpzsaplRNJmEAUifzA+kt5LCiqBpcgmwmKUR6wahUVx7izfCCLkgMK2
-/U7/b7vaR4KUzWEC7tZzgP24gYu8tB+tR24VfSDhITaSq11MypNbEzjV2WbvGXlb
-oq22EQKBgQC/5J92YLDBP3cNQhlHj1j0AqNbCWBxaHSfG9pWPTgL4ccPDhFQngJd
-QCz7Lt7l5W1JOmRqMzKjS4f/r6KdG952I6/S46qZSpf/fIjIAEFCwtRY37D3pjQV
-5cbwkQdGIHOXQ5SAtwgi8TbYzFRbl9noeTz+JNTIPVTQKeAXxauLrQ==
------END RSA PRIVATE KEY-----
diff --git a/test/ref/crypt/intermediate.key.public b/test/ref/crypt/intermediate.key.public
deleted file mode 100644
index cf89493e..00000000
--- a/test/ref/crypt/intermediate.key.public
+++ /dev/null
@@ -1,9 +0,0 @@
------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 c12a79e5..856478e5 100644
--- a/test/ref/crypt/intermediate.signed.pem
+++ b/test/ref/crypt/intermediate.signed.pem
@@ -1,27 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
-MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-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
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
-Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
-AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
-YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
-Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
-vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
-+YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
-xwd0
+MIIEbTCCA1WgAwIBAgIBBjANBgkqhkiG9w0BAQsFADB9MRYwFAYDVQQKEw1kY3Bv
+bWF0aWMuY29tMRYwFAYDVQQLEw1kY3BvbWF0aWMuY29tMSQwIgYDVQQDExsuZGNw
+b21hdGljLnNtcHRlLTQzMC0yLlJPT1QxJTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZ
+TStMYWJIVGFpU0F0ST0wHhcNMjUwNjEwMTIxMDU0WhcNMzUwNjA3MTIxMDU0WjCB
+hTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGljLmNv
+bTEsMCoGA1UEAxMjLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5JTlRFUk1FRElBVEUx
+JTAjBgNVBC4THHJVRVdTT0VxdCs3VHZLVHROWXpoUnRyZXdSbz0wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8r486crE58LOPZw8GKFM8juyIlWuG8l+v
+zAfw8UUn6ncdm10aHGg6fVThyU5azezfi0X8vaSXW4DKIvSHe97Od33eEJu2JeLv
+u+zofIaS/Aj8aMWx6UxJsLEVL/vHg8cZjyhniCm5oOAuqzVFU+PwCsAq3ddh3xc9
+lqmSzHWqxxsc9Ekh5RQowRpqI+LdI5LmmNzdr8A4+fgTTsYlJwI5RVpvQqjWUH5O
+liLIYFJkNtI/V5hvKeL5+dbx5NQq1DibsgA0Rtst4qIhieRtF8ijfYf5cVQutj8z
+oNxi+zxhCLKdHz8EQxpDccrGySxXifGpji+7SyGytvfQecyLM1wfAgMBAAGjge4w
+geswEgYDVR0TAQH/BAgwBgEB/wIBAjALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFK1B
+FkjhKrfu07yk7TWM4Uba3sEaMIGoBgNVHSMEgaAwgZ2AFFeeMn7qCFmC0+WDPi2m
+x02okgLSoYGBpH8wfTEWMBQGA1UEChMNZGNwb21hdGljLmNvbTEWMBQGA1UECxMN
+ZGNwb21hdGljLmNvbTEkMCIGA1UEAxMbLmRjcG9tYXRpYy5zbXB0ZS00MzAtMi5S
+T09UMSUwIwYDVQQuExxWNTR5ZnVvSVdZTFQ1WU0rTGFiSFRhaVNBdEk9ggEFMA0G
+CSqGSIb3DQEBCwUAA4IBAQAQwVPs/LtNkMw0RMKx8Zy5EfiUQwnrfd126IXtpBlK
+PEubaY9LYPMuPavWmCYIAv6wpVuBWosFxZtv77cIe8Pqir4g/1eBoLMEgFBB6mid
+1nJ5HEerEQS7Itg6GmgZ24vb4Ne9nZkN8iysh6VLQI6Iz7HIr3I/dNJwi6M7jai8
+C1zuzzTJ/qXMZhIMjovXOfUxKZqRA5bpJl0ogB/byqhOcGjcvvkom6cWYCWfXjSg
+KSm0704ImezwoFdHO18jo2u4ghgeXUBCyLcew5aVaVsSktuUtEgaYXgm0tX1HfEg
+aSqfFDSdb0Z4mbUrVHGE58wckEG1TQCQ2Ypi0qSaV+v5
 -----END CERTIFICATE-----
diff --git a/test/ref/crypt/leaf.cnf b/test/ref/crypt/leaf.cnf
deleted file mode 100644
index 6b4ebcf8..00000000
--- a/test/ref/crypt/leaf.cnf
+++ /dev/null
@@ -1,12 +0,0 @@
-[ default ]
-distinguished_name = req_distinguished_name
-x509_extensions	= v3_ca
-[ v3_ca ]
-basicConstraints = critical,CA:false
-keyUsage = digitalSignature,keyEncipherment
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer:always
-[ req_distinguished_name ]
-O = Unique organization name
-OU = Organization unit
-CN = Entity and dnQualifier
diff --git a/test/ref/crypt/leaf.csr b/test/ref/crypt/leaf.csr
deleted file mode 100644
index ff4d3e82..00000000
--- a/test/ref/crypt/leaf.csr
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICyjCCAbICAQAwgYQxFDASBgNVBAoTC2V4YW1wbGUub3JnMRQwEgYDVQQLEwtl
-eGFtcGxlLm9yZzEvMC0GA1UEAxQmQ1Muc21wdGUtNDMwLTIuTEVBRi5OT1RfRk9S
-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 68b52292..a8873d42 100644
--- a/test/ref/crypt/leaf.key
+++ b/test/ref/crypt/leaf.key
@@ -1,27 +1,29 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA08vRdRvUh31Oi96EGHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkws
-pzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrmYIOsX6DQpl2kY8MTHXmWZFg623HID+XA
-owFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLMRg5Hs2yQxSS7/SizuG52CrAmsIeab9u/
-AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVulfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cL
-LlINpHTdBixfGU/Eb9g/wpD3zrGcAV6ZXvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/
-03WO5XeQRkcoPF44yV4XUeTE5weXYAaMZH7hMwIDAQABAoIBAQCexTcCzFcZLrV4
-Itnxo9MK/pITJswHT9MR3aAYYW2orwLqemIrAB3WuBeKuBzuTPJnuJMi89TxjBIr
-5oKXLX5Fvb9MR/yZEL6+pMw58u5EXVp1mG09hS1HJPnhUYyO0M0oaHgKo6Uc7FSR
-xQK/LatQdP1d3HjUgfOgOaZhwsVuJQxPKZ/MZFsQH7hkTiFVteRwlsRiUshKuHKL
-rOniTcsr792BaHxwuFYMqOtnnF5Jakeol98Iq1T3+jYz5tfHX/pnU/tn48SKN+m+
-Q6YUAY0VNqilq9avozVYzcw3IiOqipa8/k83hfj6+16pWzqPh8C8KuBXBAifsJeJ
-HZRw90HRAoGBAO3J939vKhYobOPXSDDQIw4JJ3Skp3HADib0/TZ7SGA5Npyp/hf+
-ov43k+dM9Wi8x7Q3W1QRFk9tS536VOg/7a+r6zyqbFAJCf+rBDULhH3bJvHoLqBz
-pPCJkh35quIcQEM7rmHLSXSZpBV5TEvdUDVDWixer0B+pVCqNxW2MqdJAoGBAOQE
-Pk5oz8R35X5vRFKezH5jECPPq4BZCfPEa8Mdu80S1RKc843adra1l6I9tpcii1Z7
-fjp+6vUFUF4owDMnpnKVbEKxRBmh+rut3wUXL8bm0rv7mUPSqJCnJRuXbe/wocDl
-7E3UybHWCjyAjISY3IU9qRoPqcLQOm2i3Qo7PtibAoGATH/ZW+oLhC1lOrebxfhw
-DqfrRZ9jLzk2VFokzE5FLo+5fhVCZb3J+jcvIg6kNRnmtZfJjfYhU1Q6K4zJnB5U
-/Vs1xsKdLfJ6gQInzFj0OvkyQkkMFxqdSbU4iOQ1kaC9G+QradLYwuZa332yigWd
-NEWC0Rt1Di6wSI86QYXoLeECgYBiao52C3k6BMISa3Yi7xW2q41o15bfpA7On4Yf
-xnKr1igPi5z4KkY5IHIdfeOUoj1gC5d1KhjBvxRsP8yNh9yo8mOy+Y46PhbZ8Pck
-3Fgr0q88oiEKDB/jp7E1kovKF6PJfbQb9+9Cie8LJDUCenQcMnwNmpscUgIWFkiv
-xNigZwKBgEJbPDGO+pEKyWass6R2v5nbNV4PBj0Iqydn6YPOR3+1Uy9f+S34BTgz
-EwOo7Tjm9MOA1IlRAcMVgaEO2jKLMZula8Bc3ulcr/KJXB3Y0gmhuxH51dknS24w
-ZzwkjLYiY1kZC0G6a8D4194xE1YO/sR+4UgILw4RIoWVtrjkdS/F
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8dhoFCE2QUEnA
+qdxULFNhVgylz8kdq9OcQ5eeECN4YbXDfrFBjPLjPAkExwn3YBXQcDkK3TcnimyT
+Tu4sdr1tneYfbWkjRnKT+1ngwUk1ABb2rf0V4cGXhJT3Zeq9f540yTISOZAYKjum
+B0ycPVay1cWlRt6XFsG+IjkKkzR6Wavo3+j57box2fIgypxLRGS6HDwfDi8+x3pk
+YaOFZJPpL7u6f7SwUV5r4z0uGenhJcUR96fZF35iGvGn/1l81llWHqsfiZrYpiqS
+SRu6Ke6GMHT3V3qhCEG6tUQbN62vMTyOwwjItTEs/h5SLUokEEh7t1hkilOp28tD
+0xbE95ptAgMBAAECggEAKvIVvVJWTH3DRLxgaSz9pidj8+/84j5K1yfe98WxM4g+
+kYlADtI18hq26mgJ6R1z8x7znLpqzF+inNHme+rmAUHzU/OMex2dVAP5x/n7uvBl
+izp8Ov2KLkMn6BWJL7wSWvCDMLx9zcfn9k5hApSGunN02dQjupXUugVV7sc7NOrv
+vW5Z+ZEyO7dE6mypOJQIIHUXhSxiffA/oj10MOhyFLI8biPV9qeznlUAmyk0mutS
+GY6S8DmAgreYukZPfcJWKLBMckaE04V9rbc8iW6hyp9ik0Jf4zkFRrONlIecTqLx
+dd+UAfO5cxqO4kU2cBQ/d2C480tNgkG1QJ1m00UyKQKBgQD7DcIWlmUYXbMDsMY3
+4AYS375yA6Ubwo6h9cInOGYdThpvvE//rgTxdBjXHm8GCzeyO1tp+nx80++4Lv9p
+CxpyHwj1RHqLIRqyduXoLuBwl9sWfFv/KITes45gQIHLQC0wIO2EuFDqAD8uVil1
+QtlssdQyO+NZLDCNzvgcNbCwKQKBgQDALKVIQvPpy7oR8qHR8li112FD7wGYxj2T
+SVwHiZVqCu6sl+jVHrmzMWtXAOyuEXkqiOC5KChf8n1KtgCkS35bYE2RpHIVZP41
+bRUf6fD0d2wKPSK1dJ1zcivPKJHP97rzL8Rm3eI5jv505F7Xp++hGOLoYSOEXrc1
+jG5pgueQpQKBgQDCEGyL0U3se+G5ZJiU8JNBW7t3nuGuh8KB59thPfORi6Jb5RFh
+7z7a9oeNInVoEpvHJqMPVRWN2LZhhdLhfDfBJ8Rg88JWcgyVD9vAkxvjbT9qLk9e
++g9bpyjTtomed8l2fr2b7m59tBsi0m/RuQ8hOoVxH2IquEIAHJEmHUqroQKBgA77
+7C9EOSyDnBCGMKPkF5KmJolbe25kFq0DTU+xJJtOGuoONjNX3/be5ZW1Fr9D0YTF
+g3Asd2lzyN0ob8hfsoyBZ8rxXYvZghC8XqdMYGNPZHcv6SLo4tX7kvrmGOh0Unlf
+whqbNmZyhdirbdG24HJZNGgWGuTZVcOxHXLQqCmZAoGBAOdGQe7CZfLqfp23R7Z/
+hVlgjysuf04kuphLrddWyvWN6Ko8pDWGL3puf9PDOFRCVHPiCoxb9r61ozyOpHPT
+UC0pEiVtVq0u/7U25yaJ3vfULWCDu0XmraGKcC+4bZcyHd6Rm/Ha7z2I+mOI/OJw
+k9P3RBYWseA/d3/x+0Z2usNP
+-----END PRIVATE KEY-----
+
diff --git a/test/ref/crypt/leaf.key.public b/test/ref/crypt/leaf.key.public
deleted file mode 100644
index e0bb11d0..00000000
--- a/test/ref/crypt/leaf.key.public
+++ /dev/null
@@ -1,9 +0,0 @@
------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 29a438ea..1df8e467 100644
--- a/test/ref/crypt/leaf.signed.pem
+++ b/test/ref/crypt/leaf.signed.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
-NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
-NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-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
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
-VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
-ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
-JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
-sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
-jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
-cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=
+MIIEaTCCA1GgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhTEWMBQGA1UEChMNZGNw
+b21hdGljLmNvbTEWMBQGA1UECxMNZGNwb21hdGljLmNvbTEsMCoGA1UEAxMjLmRj
+cG9tYXRpYy5zbXB0ZS00MzAtMi5JTlRFUk1FRElBVEUxJTAjBgNVBC4THHJVRVdT
+T0VxdCs3VHZLVHROWXpoUnRyZXdSbz0wHhcNMjUwNjEwMTIxMDU0WhcNMzUwNjA2
+MTIxMDU0WjB/MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3Bv
+bWF0aWMuY29tMSYwJAYDVQQDEx1DUy5kY3BvbWF0aWMuc21wdGUtNDMwLTIuTEVB
+RjElMCMGA1UELhMcMXU5VGxENHgzMmpsMWMra1NJS3VrYjdaWnFBPTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALx2GgUITZBQScCp3FQsU2FWDKXPyR2r
+05xDl54QI3hhtcN+sUGM8uM8CQTHCfdgFdBwOQrdNyeKbJNO7ix2vW2d5h9taSNG
+cpP7WeDBSTUAFvat/RXhwZeElPdl6r1/njTJMhI5kBgqO6YHTJw9VrLVxaVG3pcW
+wb4iOQqTNHpZq+jf6PntujHZ8iDKnEtEZLocPB8OLz7HemRho4Vkk+kvu7p/tLBR
+XmvjPS4Z6eElxRH3p9kXfmIa8af/WXzWWVYeqx+JmtimKpJJG7op7oYwdPdXeqEI
+Qbq1RBs3ra8xPI7DCMi1MSz+HlItSiQQSHu3WGSKU6nby0PTFsT3mm0CAwEAAaOB
+6DCB5TAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFoDAdBgNVHQ4EFgQU1u9TlD4x
+32jl1c+kSIKukb7ZZqAwgagGA1UdIwSBoDCBnYAUrUEWSOEqt+7TvKTtNYzhRtre
+wRqhgYGkfzB9MRYwFAYDVQQKEw1kY3BvbWF0aWMuY29tMRYwFAYDVQQLEw1kY3Bv
+bWF0aWMuY29tMSQwIgYDVQQDExsuZGNwb21hdGljLnNtcHRlLTQzMC0yLlJPT1Qx
+JTAjBgNVBC4THFY1NHlmdW9JV1lMVDVZTStMYWJIVGFpU0F0ST2CAQYwDQYJKoZI
+hvcNAQELBQADggEBACrsxZ2eTQJ3vrtMMmAADskYFi+o/TBq1rfecc5NsGhEzOeB
+AjrpqxR5hXD9vrwGEp3FTBeQcYZwtK/yw71dxeGzXCXq4aboSy8tbEjjNIOHkntI
+bMhbAzq4NGWBKp19a59c8zuCzjAvX5/r88lt4O7yGhErZ6neEXRGrLQj1js/4j5y
+O346Sj1GyYm/FTgGJc8JXnTg/IV+VQwdwjHLUN5ZNIJU23RLjNvIBdoNmKJ63l2O
+UxTAblqYQRjQndNn0s639hrYxSdVo53WiVMsp0TosAymrGF/aNSnBQnkVPECJXY4
+Oi7ZJjinl51Zw9U+afQAua6sWHDbTwJZx0Z17cI=
 -----END CERTIFICATE-----