Re-make expired test certificate chain.

4 files changed, 234 insertions, 207 deletions

diff --git a/test/data/certificate_chain b/test/data/certificate_chain
index 0aa88802..9b64804e 100644
--- a/test/data/certificate_chain
+++ b/test/data/certificate_chain
@@ -1,79 +1,79 @@
 -----BEGIN CERTIFICATE-----
-MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THHJUZUs3eCtu
-b3BGa3lwaGZsb296NnAyWk03QT0wHhcNMTIxMjI2MTAyMTE4WhcNMjIxMjI0MTAy
-MTE4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THHJUZUs3eCtub3BGa3lwaGZsb296NnAyWk03QT0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWxcyyhakSyyBDBznaA0di/TYQ49k+
-mwY7s3IsGDPEuP4JpQD7sqPwcBIe0LrJJioggWo92C8rpx4Sa2WP1h31gn7g9ceU
-juFcOS2AjX60srQC3Us17o/sewKfyt2F0Fe1iB1e0qptyhH7X8yn4Z7MrRSVY8KA
-TQ4Flo649EM4u27QnH2oavfTUEmj56ZsY37aULHvK/fyF1vYHKgf5/nmBj9Nfcue
-dUAPX/uztETBhGpljlqY8tLuPL6L5ToqxYX6SCtx28N6KpBuhnRl7VuYxs5JvrHn
-2CyjZ5BU6fLz9GsEJqU8p+RVS2cFHJeDLY0GgGACRnZ+0WvgBQC7bjQzAgMBAAGj
+MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UECgwLZXhh
+bXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUub3JnMS0wKwYDVQQDDCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THENiRS8wVy9u
+WTJlSFplQVpsR2ovSXp5MlM0QT0wHhcNMjIxMjIyMjAwMjU0WhcNMzIxMjE5MjAw
+MjU0WjCBgjEUMBIGA1UECgwLZXhhbXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUu
+b3JnMS0wKwYDVQQDDCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
+T04xJTAjBgNVBC4THENiRS8wVy9uWTJlSFplQVpsR2ovSXp5MlM0QT0wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbWZOdhP2gXvlIuQ3hshO+6rWLo6nw
+3lBZSWCk/cOo2kPx14hP6XGNtCKLlZ5EHOTl4WIcioZ0M1EpEiIv0qtLqvHE0xGA
+6oXTNk6dTBWWqewxZUabQzfvmlL6EjmupUcENjgXMX7ITOE7cJYRve2DqW7WZQdv
+tzQPUaMMFNBtbj3WbtMYpqFPGV97VTwTxNiz2eFufOTEghzyW0E0Tb4wOnmJde7x
+IBeLFCW84JQsHx2wvh/lw8KB7/BGMWndp/vcIgQPN+6DhXdgoqCp9LgSaVSAFsEW
+LFGcB2zWbuG0l0/TPbia9EQ1X6XyHK8AsMnzJ/OooFh3wU+WNQS5IVbtAgMBAAGj
 gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FK03iu8fp6KRZMqYX5aKM+qdmTOwMIGvBgNVHSMEgacwgaSAFK03iu8fp6KRZMqY
-X5aKM+qdmTOwoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcclRlSzd4K25vcEZreXBoZmxvb3o2cDJa
-TTdBPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAeXAk+HIPX2xyt/XSwwwHVPOKehQF
-pEX945nCYLum7LjiDvYy8fV14ByLuyjzrb369huSW75+efTvLhe7MwA3aDlD0TsX
-pf5yW/TRR0CFZ2xdkvvXF00zc4ZpESGjoIB6J3pMGsLg0PoSzG/5JHuS4S96WSrJ
-StApvNTISE+DEsaSV/MEi61ZKXieA3cZwaVzGlMlHfTs5O5ggJjwsAxS6Tw7/oAO
-yvclCVyPqXSygQcPjSZXtV4DRnjMx7xU4WC05aHlRVTMNJ8KRt8f/rktYA3MV5lm
-RczqMKOEn7cHQS7i5LZWL00HPiwn3TNATlE86t5YdKZWoALrX/wAncH9vA==
+FAmxP9Fv52Nnh2XgGZRo/yM8tkuAMIGvBgNVHSMEgacwgaSAFAmxP9Fv52Nnh2Xg
+GZRo/yM8tkuAoYGIpIGFMIGCMRQwEgYDVQQKDAtleGFtcGxlLm9yZzEUMBIGA1UE
+CwwLZXhhbXBsZS5vcmcxLTArBgNVBAMMJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
+T1JfUFJPRFVDVElPTjElMCMGA1UELhMcQ2JFLzBXL25ZMmVIWmVBWmxHai9Jenky
+UzRBPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAbjn7rg7MANHxF8TpMw6LfCK7p5qv
+sq5S0t7Uml+P/dawRcMnu22e2e9mgleYmZILYXv3pgUV51sxHeVJslHiDh/ni1B6
+CltNQ+v1DrIegEVeneMv1Ljr6WCYR3llN7p3RbandKbEB13tA5e6MajM7DXMVM8c
+rW9L1hJBkiWgWhOHUbtjBAA/SAfdyZ+lKWv6Hgc4qND9U6Vg1LcF1KfaZVdvoRJ7
+YAgdq3Y4SqKYWSl9wxBxYOIR0Lo6ZBo4hIabNAVdRdFNDVVJMa9nKl0lB0QNalbW
+YGYMYcyr5oaa349itnby6ejKQnyGL7agHtI5F6HkzK712MSF0tEVITu5pg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THHJUZUs3eCtu
-b3BGa3lwaGZsb296NnAyWk03QT0wHhcNMTIxMjI2MTAyMTE4WhcNMjIxMjIzMTAy
-MTE4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-UFJPRFVDVElPTjElMCMGA1UELhMcbG1xN0FJY1pvWWwyU3RJNkVvb2RnejRrR2s4
-PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwL+vvNvDZ78dsoF6Ov
-jgByKfsOFATQleNi5ZRWs39CLHdbYFycIjB2JXZbGZ/2GiPbHB82EOmMUN8NZFkt
-ksXttOPafYKGTFu1hQWW/b3D2v37X8QvmqMIZCBd1AFu3nDgjQjofDPrCTauPnuu
-jxH+0dBD2WLzi7a1nPDB7HaFkHegLpgOADD7XfFEvdsBXv0GjclRtnv3Sc7/6kYP
-/9vsjbzwF9CjbU/MAa/DnQvbUsW2TNAqs7nCUm+uFPqg4PKFnI0iLvnOjB18GX2u
-2U1yX2nGEF6P7LfhC9Sq1UO2e/H9bQ8H/aZRO4fl8jV457NEmNERbpmHQM8T83PF
-TMECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
-BgNVHQ4EFgQUlmq7AIcZoYl2StI6Eoodgz4kGk8wga8GA1UdIwSBpzCBpIAUrTeK
-7x+nopFkyphflooz6p2ZM7ChgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxyVGVLN3grbm9wRmt5cGhm
-bG9vejZwMlpNN0E9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQADsc9UuYZQRiqj1Raj
-9Z21b9KpIpqfOBcPuNK1E4bpCfKT4J9gNP+k33iG73QBL2C/7+XSfYRGwCDk4URt
-OAxK34A6SU2zyrPpaBKBc2OoyNiiA/GGhXe9X+9/HOO3OUpdqpSwAho6rFIjYjNP
-0MCoH7HXzCCM+Zl7lt9Nb4LHTjhi2OaSyj8yfxrNRjfHP2EbTSUTlwAJyfaVtLeF
-o8j8hXiGxx1tYlfDw74qdzFbymBjWNHatFm8W7j+MiT0awAqpKs6fTV3iqFA87rl
-nJN1rlcKYnmU9SDqwgivaUSViagQucgk9yzK7hof3NAITL01mHuc5huRea+ZVCRR
-68Ag
+MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UECgwLZXhh
+bXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUub3JnMS0wKwYDVQQDDCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THENiRS8wVy9u
+WTJlSFplQVpsR2ovSXp5MlM0QT0wHhcNMjIxMjIyMjAwMjU0WhcNMzIxMjE4MjAw
+MjU0WjCBijEUMBIGA1UECgwLZXhhbXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUu
+b3JnMTUwMwYDVQQDDCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
+UFJPRFVDVElPTjElMCMGA1UELhMcZW5qYktZaFo5SnN6QlZqeTcxTGc5UXJZbVY0
+PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALEsrMMpvcx0Hxj759vB
+Y156VXBRv2pgcwyKmtGSyFOleh3qoTqU6g2fM4T13sTFsc0EY7WQgvn0AmmM80Kh
+cT5uQpPt5Dcg21WfnKyfTxrf8kJI7MnmIETXcnAZ5FBng3quLReFQRE30D4nreFV
+FcBmwWe/aWFKymUep7sQYLtI8AZsM0qOo+Pa3ODbut2DD4ckr9h7mLxp2aJygCUV
+ZUarGtF9ZfqF9IZXoU6N7CqPl2+K6ENY1C5MPv6poTJ4bdfMhabW8/gBdRL4OXzV
+72ieW54Enb6vnfWDLRxkMfl+mmwivBRmHYGwtcj9DaJEYCs6BWJyMwna4uz9gE6K
+hV0CAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
+BgNVHQ4EFgQUenjbKYhZ9JszBVjy71Lg9QrYmV4wga8GA1UdIwSBpzCBpIAUCbE/
+0W/nY2eHZeAZlGj/Izy2S4ChgYikgYUwgYIxFDASBgNVBAoMC2V4YW1wbGUub3Jn
+MRQwEgYDVQQLDAtleGFtcGxlLm9yZzEtMCsGA1UEAwwkLnNtcHRlLTQzMC0yLlJP
+T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxDYkUvMFcvblkyZUhaZUFa
+bEdqL0l6eTJTNEE9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQALVLYESliIRMuT/Bus
+kzi/LLxK8s/7Veg6VPCBu/gVZz8ZqucAt45jkt+5EXOqb2ZlA4rrCOeisotYTC/F
+P5Bm+CKJVepBG6PMpCwNCzzw6nsfWjvtLh/F7Fqg+jCEK+Ka6PPCZkd+b3pd9MZL
+0xye6EF8M7XCrgqpERHOrmYe3S3fLXp9SEcXubdG0jcRWY71vX4BkNuGWMbbOX0w
+yuVUgZkoTq1ru9YuYcYvbCnDCugkdU3RFZkrVdu8kN511YBRuqvcILEOCsr8ZM0F
+02Th71I+8QyJnfrSmAp1TJ3I03ZxDTTXeKw1zaZqGWUQuIjbeUDDGo8uHoMtV60Q
+rKYh
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
+MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UECgwLZXhh
+bXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUub3JnMTUwMwYDVQQDDCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-bG1xN0FJY1pvWWwyU3RJNkVvb2RnejRrR2s4PTAeFw0xMjEyMjYxMDIxMThaFw0y
-MjEyMjIxMDIxMThaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxXT1ZYRkJxd1QwNXl2WUJzbzVCSHRVbjkr
-Vjg9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt6QreIDAQheQZVel
-n9+7z/M2ssr2iCTmcmFEJU2anRhuCUDACp9QFfT+5tcPNi7qO5mz0IoPQ8jzvYSa
-QysWGGofQiSbPMRP0J3fhP6wK4KCD4EST6zLzGQ84DaQOLJoncom4lNZrS56ugVJ
-rm3ekUoWGCZ9YfBHH1A8eWUm5yJiJN0FAuvhQojS0hBqcWbwfOJDogR2NvBSaL6k
-zVlTGPcgu+27SQ+AIMJT8V5hqmMixWc+etEYzsg7hFM8EQj3KoaPi70yJ8ELfK3y
-y1tpnOCkg9RtGWXS2eKEGR9AMI2424Z59dcbunZkE0sRzEXp+kBKyc/qIAWVrkEb
-liBXcwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
-DgQWBBRY5VcUGrBPTnK9gGyjkEe1Sf35XzCBrwYDVR0jBIGnMIGkgBSWarsAhxmh
-iXZK0joSih2DPiQaT6GBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
-BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THHJUZUs3eCtub3BGa3lwaGZsb296
-NnAyWk03QT2CAQYwDQYJKoZIhvcNAQELBQADggEBAGTvqRuLZp1fTGnAoKMeGzo3
-G+jRz26vNVKYa09RwifNLEI5V0MlAHWm4YWIj9Ml+AF7CEhYbw69/v0ygK9NXVPk
-Hl3+JBCoveaB0Fz73IQRHJVTDKlfH54aDoDFayQK6dZ1pfpvZa72ih3IXva9PsRT
-5xx4ILIatJb9JsE3zmW3fYk/93YMTq3ewUdWi7ldpwwLFVs89TNOQOcAMIwvPpYW
-kqmtwIG6as2SiV0fJ0PpcxYZN3jvsHB/wRy2f5pSlAw6NBeVZNoKX4Zxue77TrAC
-cmsEtjOEApFv+mKdmOPjB5qXurZEzgyzdm8xdKw4UnblGzA81/7xMchPK0P66To=
+ZW5qYktZaFo5SnN6QlZqeTcxTGc5UXJZbVY0PTAeFw0yMjEyMjIyMDAyNTRaFw0z
+MjEyMTcyMDAyNTRaMIGEMRQwEgYDVQQKDAtleGFtcGxlLm9yZzEUMBIGA1UECwwL
+ZXhhbXBsZS5vcmcxLzAtBgNVBAMMJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
+Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxNZWtJWEdCa1lkaDI4c2lNbm5GL1pzMkpl
+Szg9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqiO7aIeoji20MEZM
+SeLDxBSOlVqVazaFf8ERReoLrB89/ema6J3ilRKjf7hQXL7XqeUIlAjthrI5Y9P9
+qjw/ZxkYwysrqCTiHN0P/KMs4T7M9QwCWgI8LqTsflpHyoESgjnlDjmEs/RVrC8I
+DL5/8VtvLukJAQo1zMXGyQp7K8njjmSQ2x8t1MmvqDhiipuh6wwBmsgMPB0nkRL+
+xNHMNvdGWnGlgrcb2gP8vMpwoDzQncEmMTbeFaLNHjZGxiGVR8g+LA5kJ4wFIgWQ
+51d4pGJy30U9kBfHY6twUQoQB6FoLfCXObotai5OnGxnzGJk8jm3h+IcK8c+t53Q
+utDDawIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
+DgQWBBQx6QhcYGRh2HbyyIyecX9mzYl4rzCBrwYDVR0jBIGnMIGkgBR6eNspiFn0
+mzMFWPLvUuD1CtiZXqGBiKSBhTCBgjEUMBIGA1UECgwLZXhhbXBsZS5vcmcxFDAS
+BgNVBAsMC2V4YW1wbGUub3JnMS0wKwYDVQQDDCQuc21wdGUtNDMwLTIuUk9PVC5O
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THENiRS8wVy9uWTJlSFplQVpsR2ov
+SXp5MlM0QT2CAQYwDQYJKoZIhvcNAQELBQADggEBAH3PT0PVG2KPiDXnQz4Nv3fS
+oxkkMCn7oCBxLEvalpWgr7xOHZUfNOCjkavFwpLBI0OSlzGKirdAP49VWcuyeiRm
+9tK0dPkhUdmUuQVZvOR+G3T5H68CD5A0b7ApqPJuFQlbQ6xCnzSr8K6MQko0FbI7
+8BeBCACMETXRzlSHayjkGiGsMjUbfpCWJvkuiTlQ0WBADd9RJAcRRlzTWOy33Zgh
+DhLNg1/lNboDQ83ye7pxiCxcIBaNXKvHXNuBXetkCo5px/DXsKv3wiIxA7NqyqGB
+qeuOvbIqgxm2B9LdmuDyK9cPyWLdFYxNVnZ4zQCy8IDgqiFOshQNkiPLUXOrrY4=
 -----END CERTIFICATE-----
diff --git a/test/data/failing-private.key b/test/data/failing-private.key
new file mode 100644
index 00000000..09991ac5
--- /dev/null
+++ b/test/data/failing-private.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA00J/nd2IUrU3B5c2E6FOs+zRP2BfhiSWpVNQR2ufGkPdu9qO
+Kf3NPtiiTr5eaXiGAEmWKbhkKb/NNh+HD+msQreOGujCcY/T+t56vN0ynXrrPOS6
+9wApNtuuOq5Q4dj6cTsVq877LxhNDwiNT2u5DxYPcbb4tsyxN8DyB7Wd9ulRL/AS
+MFlyj8BGKfxzlEL02X9qVrWU1x0GfU/JPFbat9nt7chLH4nAuKdWq2AE9QFllWia
+J07HC6M/B5XnVSMd8r/kDdACd8H+UHCUcebdk3XOzvaL5VM65fX84QH8z1LZiBtW
+gqGVWQkIGistPfkBTeo2cVk/PQ7kgcoGUxBykQIDAQABAoIBAQDEONfgAYxFhhv+
+6OxJf2JirGwOua0AI6vpE2FVdRjqhG7HtVCmoB6raPwYt6lpvZB5Y+AeEC64uHYa
+912z4g8mSOetBtTUNgtm0I6gLbR9oVYt0SX3liax1YoW5yIpJCg6U+7lDfMw4xlw
+BTl7s0rIQG1H6fNJlwZkCsrDbmWyl4PKcb6Kqfw4iafQmCRAJx9gvYW0QXigaxU5
+xSJRiA5Y4Ts0ZhH+RwKzNVap4IhWtKoIZS2Vvz+H1/iPavs9axdcyhfXg+9mOkT1
+4x3LQlNAmcYzUBByJN1d+yzoCVb3s8aP5vcWvR3t9TlnutBhKFGvJo0Jbfx1z5fx
+b45+rjihAoGBAOv3thZeyqfLjl3tG00EhkDDxVvlDYtCfuyhNT7w/tCWlyoS1Wsh
+iar0/yp/7wXMkasEaq0E/G2Srez39F9wd2GSuymmtMBzzXL8SXWIpfYlizgo/Zun
+fRNNMDxYsY4Gaq4/QU7YCOzmAs1iZPyk10s8RYkUuS49ZGbgC1fy1bUDAoGBAOUx
+z4/4R71mIlyr5/XGoWt7HDy7LD1AFlscBJ7bTFTzePuL8kawrm0P5Rg4zTTkJqZs
+/ukVng+PRD+gY0cPEdwrZH6CTxMjxps1TPSGrM7KFK6//J+ez5iYordVhMEB2vRC
+tIVN2tEcx9JdqCUb1k1esBlCZ1E1tyaFsAMzZTPbAoGBAJ+RbYMHKwf5MRb3JkUY
+0CivuqB/7n7Dws0F3tnnYolvrF15SvUdQtlmv77fsKU9Ryxc2j6SZpk6XX8n1gtM
+JI7JCOQLpaOXK9GcJZjjhUdE8DZUEdvWkVAiHIJSgA9I649VmzZUBQUeLbrx1NS8
+LBLmeSdP6kIIpgKjc0hQIJA9AoGAQAejaiA9wo73CJbKDeK5E/Ln15ue51mxJTD1
+pX+0moMOiI/3VoJjqHppUVQFGEKo/ZOzv2BXsRcgRPpE4gQ2xCCnSaST/M/g21mP
+rzy0qGzSTGO8aseOTZ5OzxMoLFedWOIN1rQCbqsws/eQUxWs0B6k6dmgTZLJIQz2
+OF6yZkMCgYArWYrcsefBFznwckK3S+EXZeYApyREmWywHtuC6NKmWfksRtDce8B6
+Hs6T7xClvbd99h4CNf4nywRBRAO85HfSTkjamLB42xoGrWizeN3XGou6NA5im9IO
+dRSNHaS084mEm9/HaxfvWHTLsUaArjDG/26ji236Dr6m3+ghDIUJMQ==
+-----END RSA PRIVATE KEY-----
diff --git a/test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml b/test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml
index d056351f..20905f4e 100644
--- a/test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml
+++ b/test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <DCinemaSecurityMessage xmlns="http://www.smpte-ra.org/schemas/430-3/2006/ETM" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:enc="http://www.w3.org/2001/04/xmlenc#">
-  <!-- cinemaslides v0.2013.04.27 smpte kdm t1 -->
   <AuthenticatedPublic Id="ID_AuthenticatedPublic">
-    <MessageId>urn:uuid:8971c838-d0c3-405d-bc57-43afa9d91242</MessageId>
+    <MessageId>urn:uuid:51389295-3fed-41a5-9cdf-7de42d7e32c7</MessageId>
     <MessageType>http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type</MessageType>
-    <AnnotationText>cinemaslides 2013-07-06T21:10:29+01:00</AnnotationText>
-    <IssueDate>2013-07-06T21:10:29+01:00</IssueDate>
+    <AnnotationText>cinemaslides 2022-12-22T21:02:54+01:00</AnnotationText>
+    <IssueDate>2022-12-22T21:02:54+01:00</IssueDate>
     <Signer>
-      <ds:X509IssuerName>dnQualifier=5\+kdb\+9R\+/FhxzwAJ71I2V2cxEM=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
+      <ds:X509IssuerName>dnQualifier=enjbKYhZ9JszBVjy71Lg9QrYmV4=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
       <ds:X509SerialNumber>7</ds:X509SerialNumber>
     </Signer>
     <RequiredExtensions>
       <KDMRequiredExtensions xmlns="http://www.smpte-ra.org/schemas/430-1/2006/KDM">
         <Recipient>
           <X509IssuerSerial>
-            <ds:X509IssuerName>dnQualifier=L7hRU1k0AaJM23TJg2PYWmflEVk=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
-            <ds:X509SerialNumber>5</ds:X509SerialNumber>
+            <ds:X509IssuerName>dnQualifier=enjbKYhZ9JszBVjy71Lg9QrYmV4=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
+            <ds:X509SerialNumber>7</ds:X509SerialNumber>
           </X509IssuerSerial>
-          <X509SubjectName>dnQualifier=L7hRU1k0AaJM23TJg2PYWmflEVk=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</X509SubjectName>
+          <X509SubjectName>dnQualifier=MekIXGBkYdh28siMnnF/Zs2JeK8=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</X509SubjectName>
         </Recipient>
         <CompositionPlaylistId>urn:uuid:eece17de-77e8-4a55-9347-b6bab5724b9f</CompositionPlaylistId>
         <ContentTitleText>TONEPLATES-SMPTE-ENCRYPTED_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV</ContentTitleText>
-        <ContentKeysNotValidBefore>2013-07-06T20:04:58+00:00</ContentKeysNotValidBefore>
-        <ContentKeysNotValidAfter>2023-07-02T20:04:56+00:00</ContentKeysNotValidAfter>
+        <ContentKeysNotValidBefore>2022-12-30T18:38:54+01:00</ContentKeysNotValidBefore>
+        <ContentKeysNotValidAfter>2023-01-19T21:02:54+01:00</ContentKeysNotValidAfter>
         <AuthorizedDeviceInfo>
-          <DeviceListIdentifier>urn:uuid:014d91e5-616d-4c21-8cfa-48da04b5b9d8</DeviceListIdentifier>
-          <DeviceListDescription>.smpte-430-2.ROOT.NOT_FOR_PRODUCTION</DeviceListDescription>
+          <DeviceListIdentifier>urn:uuid:a18090e5-a792-487c-8251-aa068814d89d</DeviceListIdentifier>
+          <DeviceListDescription>smpte-430-2.LEAF.NOT_FOR_PRODUCTION</DeviceListDescription>
           <DeviceList>
-            <CertificateThumbprint>/Pk3/NK4Quql1hKTLnASAi5xzL0=</CertificateThumbprint>
+            <CertificateThumbprint>2jmj7l5rSw0yVb/vlWAYkK/YBwk=</CertificateThumbprint>
           </DeviceList>
         </AuthorizedDeviceInfo>
         <KeyIdList>
@@ -51,28 +50,28 @@
   <AuthenticatedPrivate Id="ID_AuthenticatedPrivate">
     <enc:EncryptedKey xmlns:enc="http://www.w3.org/2001/04/xmlenc#">
       <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
-        <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
+        <ds:DigestMethod xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
       </enc:EncryptionMethod>
       <enc:CipherData>
-        <enc:CipherValue>BGMEgy18q3BwOD6jMrgxlwjI/FKUVTgcRe1gpTUxg52HZr9Iu3iQo+AhO6hg4ti1
-1maakj3gi6b++8qKbm5HkqA8hzjsh54NWf/cOGnHHsM/o+1fxLqPI5u37EHymxv0
-uC18F2Ad9g1wUf0BITDrtdjC19yTGoPYD+VHuUZvZrIHs5Otw4Buhg1+N3VDc0vz
-/n+udK9MkktRY+Z0LPyDARcXksjFPkTKkZBOw815StG7GXlGcg0ndMVVN7+9l4Xf
-97EWRTv3wEoMI140NA5vvcPWm8DjbaZgShlmOf9ZqM6N24eTRKut+62ljsupMGFB
-ffYMzb6hsGwaYKVzPw2W3A==</enc:CipherValue>
+        <enc:CipherValue>NwvJymoLyUrKx6xszk01ARg6d1oPq/QGB+5By85bfdMuYLeojMvmiCcthCTZ+QBM
+xDcMLQemWj1GNfpLtbrf0szHz2AOR+fr0W07eUzQM/qyt8tvUYVfIsv8XBIsnPFV
+erlBxWG3sB0tkrK2Rn7pqRa6n/iMPbFKLkhSRp+vLzWab+4EJizchE4CfsKrL037
+lN5ztT06Gvm8a2AIFgSlORzjpzMMEGw8+LfgHzuTq0i7r85sKY8WwQJWYTXXSbKy
+sAMPxhBg1bwM6v43OSTmN5dmFZ8jCr+bk8tD1RJ+4akqgTSWHbu7k87zQh2VL82c
+yLU0t0C9+2I/3ofKJxjISQ==</enc:CipherValue>
       </enc:CipherData>
     </enc:EncryptedKey>
     <enc:EncryptedKey xmlns:enc="http://www.w3.org/2001/04/xmlenc#">
       <enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
-        <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
+        <ds:DigestMethod xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
       </enc:EncryptionMethod>
       <enc:CipherData>
-        <enc:CipherValue>PAWbXs8QI1+opF9jrcuwqcM1QIl6/pB4zlzvBMpmidiwgqozox1DIMgTt5K9wqV5
-hYiLfEgyiXrJcO9IbUa1g7YeySP6In/FGu/JcdYe/dAe0II7F8xJhIxZHRT0l5PE
-ZmiLFZO3Ax5aluKX2PzIztrxdrIlGI3jAMLVACYiNQGAlwUCobhOFwmyXX/x+0iN
-ULJ459WCsY45AMkSAWzoztR8xY8DNa9K6zTOotxFemv+wjwFqSdzyHhaZOWvYHan
-0JtPuELBZnuMcqvMUsQ5TETYak2Pj2QCVWX2Ahcek73oyRWWK7gwKf5DRTMoOwtP
-gKhBADcETNFQligfz33wMA==</enc:CipherValue>
+        <enc:CipherValue>HuTaTYFJmJNo9z6+XbIiY6CwvAVDIRINP+Hodm68yCoPF64B5kuQ3NOq+6V2ejly
+EPK1Pr7MTBt/0LoUTCU0dquFp+GyIOPUk0FwCFQhvVZkS/ehyNSQx6jGL3tuDIM3
+Hp2GEp9T5uIyZzDyVho7KBuH0YIXvFOkB62qwBzSguKXQkvptGuRpH6UMp1F0yKy
+Cbej0FbVxg2i1JGEOzG3Y1DELsXVPX8+yexcw1V8/MGMdAWRKoWmtFnBIYvFMKyK
+0yQoTP5gcnR7vAN6BBBL3Q2gmqcSHU0IT2pTLGWNT7T4nwbhybtkjOKYXhVC6M4h
+ppjPZloHUIWAzx+wTVH3WQ==</enc:CipherValue>
       </enc:CipherData>
     </enc:EncryptedKey>
   </AuthenticatedPrivate>
@@ -82,110 +81,110 @@ gKhBADcETNFQligfz33wMA==</enc:CipherValue>
       <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
       <ds:Reference URI="#ID_AuthenticatedPublic">
         <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-        <ds:DigestValue>u/EsQFMekv8vXKn6glbc1vvNZptz18/UKkVBtdrgFOU=</ds:DigestValue>
+        <ds:DigestValue>hKFqmH8PJ2nee0PLcRlOnK3sVIULreOjzKenqvPz7zs=</ds:DigestValue>
       </ds:Reference>
       <ds:Reference URI="#ID_AuthenticatedPrivate">
         <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-        <ds:DigestValue>OaEm1HINvc6t9a/Z6ut1+C3JV+sOPDeRGv13TWVXsO8=</ds:DigestValue>
+        <ds:DigestValue>Dh0DvCH7qEThW1UEoueCkI8IyzsebQ8EpjtCLtRGEu0=</ds:DigestValue>
       </ds:Reference>
     </ds:SignedInfo>
-    <ds:SignatureValue>TMeBgzdDJxn4aNCJnaaXd91m4B91qmstqluYEC9e0TkX6YWeEmqeOCwcjy7aXk4P
-f66zGtvNsEFA9b0d6zpqX7XnlR7cgYS++jeIjgqzIHAoMQSu4GdjFo4WAutoHkab
-a6+LwzWbU2nPCcvZT0BSLxbfrczNEGwzlfY5IU0cUtCrI5KcdobI0jecgEhiZksR
-OzBP2CxWC2NfOZYsemSOxCzazjRpl7zY5c0Bm2yEzjVmoY2IQQIaoK7+MKyHxDxe
-JroVBnynlFLznjutTfQ7VIWiCUOkNuRstxlLb6xA7mijzMI8JaTjoLfHF7Hv/BDx
-cZg3PhW/dxLWw1v3u3RQmQ==</ds:SignatureValue>
+    <ds:SignatureValue>K8lSyNZN+sGaJrJiZ4W3o7np9kF/hb/eYSq/QOxbWZ5H6VhrHxdBRCRrvkLHfvbq
+QLy4w+bPcYQeuyL9x0YuS1DEKdt2YC+m0D0rQPyO2TCU3MWimO5qT2PHXrikDFvw
+2Mus9/q7xX/vntXuNy2mu39QtB9ZCqAK26UW8Y1/bLpbVDGdoS+Cw+F4hKONuZz4
+BYGQdFFf8aZFMH/D/dgk6w2q/e+cmKHz4BsdR4npvbydEtBpnxcLCZxNOA+h7PBN
+izZgYVDfWlFGbrdN5xeQySAvPnwUYWUm38cZk8glb+VwbB7Hk5OC5s58RrVGAOVq
+SG+Tyni9Yjkltt4OZmDBzg==</ds:SignatureValue>
     <ds:KeyInfo>
       <ds:X509Data>
         <ds:X509IssuerSerial>
-          <ds:X509IssuerName>dnQualifier=5\+kdb\+9R\+/FhxzwAJ71I2V2cxEM=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
+          <ds:X509IssuerName>dnQualifier=enjbKYhZ9JszBVjy71Lg9QrYmV4=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
           <ds:X509SerialNumber>7</ds:X509SerialNumber>
         </ds:X509IssuerSerial>
-        <ds:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
+        <ds:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UECgwLZXhh
+bXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUub3JnMTUwMwYDVQQDDCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-NStrZGIrOVIrL0ZoeHp3QUo3MUkyVjJjeEVNPTAeFw0xMzA3MDYyMDA0NTdaFw0y
-MzA3MDIyMDA0NTdaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxWMWJVOWRoZlBEZFdZNldydzlXQjdJYWR4
-QWc9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA22bL2XgFrlegWg1Y
-wA62mL4VOTAz7jY6s01JfdwxKIsYW+A7Tgg2LmasTKsCGiJnXcRHRN21s0I3dLV7
-kxtig9STnSFiIPdMbMk9f06xFvntshc8cYgEfPldA+hfkaiBkOxQ235kUpo/uN1o
-vL1xWr5PfdjJNz2/WcfEWeQddHy5mc4SFv/TvQsiaPuwr6iI/1vUEMIRkmiu6G7r
-Fs9kuL+KljF71eorwZagv+OFOd1+M7ejT+jlcWdqCMBBomcHvzduUgP8VpKHc89E
-hDxDQsFLqmmWaNenra4XHOFVrYcs+aGKjPCSaFTggTNOOMFI6qVXW/ZsE03zmgS/
-aNEq1wIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
-DgQWBBRXVtT12F88N1ZjpavD1YHshp3ECDCBrwYDVR0jBIGnMIGkgBTn6R1v71H7
-8WHHPAAnvUjZXZzEQ6GBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
-BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THEw3aFJVMWswQWFKTTIzVEpnMlBZ
-V21mbEVWaz2CAQYwDQYJKoZIhvcNAQELBQADggEBAHV2HYFW4PEWOYZq+Y6KnFcD
-bod8NCsCmTmO+L7zXi3yY4rtqqP3aKbr4nGINaC8+XqY6fYsgaNvPRInn+Nkh7xH
-FQbi8RUuFQ4R75O8VhXk3JYhwDoES/FPOqwtHN3MiOO15dbWwLkwqa/K2bkkZbpG
-5mFmuHHy8GomvZJkZQ6TNvlMQWj4+FgrBM0EFuJwm8LS+Ek7f98Gi4yxlBumMt4X
-N/s/8ejaChGueEGX9Akiu5KFBZrpEzneveLXHndaL56slmyTe38R07EbXwHK35Rk
-giGcueg9LxGmWfB7hS4ONx2R4oWYN4Naf9QRD3u37dpv8w3mHj2SihUPmCMxL1E=</ds:X509Certificate>
+ZW5qYktZaFo5SnN6QlZqeTcxTGc5UXJZbVY0PTAeFw0yMjEyMjIyMDAyNTRaFw0z
+MjEyMTcyMDAyNTRaMIGEMRQwEgYDVQQKDAtleGFtcGxlLm9yZzEUMBIGA1UECwwL
+ZXhhbXBsZS5vcmcxLzAtBgNVBAMMJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
+Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxNZWtJWEdCa1lkaDI4c2lNbm5GL1pzMkpl
+Szg9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqiO7aIeoji20MEZM
+SeLDxBSOlVqVazaFf8ERReoLrB89/ema6J3ilRKjf7hQXL7XqeUIlAjthrI5Y9P9
+qjw/ZxkYwysrqCTiHN0P/KMs4T7M9QwCWgI8LqTsflpHyoESgjnlDjmEs/RVrC8I
+DL5/8VtvLukJAQo1zMXGyQp7K8njjmSQ2x8t1MmvqDhiipuh6wwBmsgMPB0nkRL+
+xNHMNvdGWnGlgrcb2gP8vMpwoDzQncEmMTbeFaLNHjZGxiGVR8g+LA5kJ4wFIgWQ
+51d4pGJy30U9kBfHY6twUQoQB6FoLfCXObotai5OnGxnzGJk8jm3h+IcK8c+t53Q
+utDDawIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
+DgQWBBQx6QhcYGRh2HbyyIyecX9mzYl4rzCBrwYDVR0jBIGnMIGkgBR6eNspiFn0
+mzMFWPLvUuD1CtiZXqGBiKSBhTCBgjEUMBIGA1UECgwLZXhhbXBsZS5vcmcxFDAS
+BgNVBAsMC2V4YW1wbGUub3JnMS0wKwYDVQQDDCQuc21wdGUtNDMwLTIuUk9PVC5O
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THENiRS8wVy9uWTJlSFplQVpsR2ov
+SXp5MlM0QT2CAQYwDQYJKoZIhvcNAQELBQADggEBAH3PT0PVG2KPiDXnQz4Nv3fS
+oxkkMCn7oCBxLEvalpWgr7xOHZUfNOCjkavFwpLBI0OSlzGKirdAP49VWcuyeiRm
+9tK0dPkhUdmUuQVZvOR+G3T5H68CD5A0b7ApqPJuFQlbQ6xCnzSr8K6MQko0FbI7
+8BeBCACMETXRzlSHayjkGiGsMjUbfpCWJvkuiTlQ0WBADd9RJAcRRlzTWOy33Zgh
+DhLNg1/lNboDQ83ye7pxiCxcIBaNXKvHXNuBXetkCo5px/DXsKv3wiIxA7NqyqGB
+qeuOvbIqgxm2B9LdmuDyK9cPyWLdFYxNVnZ4zQCy8IDgqiFOshQNkiPLUXOrrY4=</ds:X509Certificate>
       </ds:X509Data>
       <ds:X509Data>
         <ds:X509IssuerSerial>
-          <ds:X509IssuerName>dnQualifier=L7hRU1k0AaJM23TJg2PYWmflEVk=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
+          <ds:X509IssuerName>dnQualifier=CbE/0W/nY2eHZeAZlGj/Izy2S4A=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
           <ds:X509SerialNumber>6</ds:X509SerialNumber>
         </ds:X509IssuerSerial>
-        <ds:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THEw3aFJVMWsw
-QWFKTTIzVEpnMlBZV21mbEVWaz0wHhcNMTMwNzA2MjAwNDU2WhcNMjMwNzAzMjAw
-NDU2WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-UFJPRFVDVElPTjElMCMGA1UELhMcNStrZGIrOVIrL0ZoeHp3QUo3MUkyVjJjeEVN
-PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPhsUkgBjWY4yTaegpvy
-cW/S3gVcBZN+GO1qBxMZADAlp87YKVGw5TRfHjIppC0wClq3zS5rSv07diAOcZd7
-pXqusCokrTHBsKG3S8u0JEXn2AWnNgX7dD8gxE1ZV41Mm+reI4eE9fpntgzqrV6E
-x8qlxkCAHrBPJNWVJHfpVifeKtjbb4/4K6GK9pZ/ejZ4tDBrYgS15S6s/7IZOyVb
-d/XckanEcCeNEv7KgW8nwbm5ryI27++ogJECCBzadGHcb/lcx/xSVqAlMuBK884c
-duz16+u+OC+1TLCb11B5VVWoVji5CGW1sOYVaMK+XZeyyIjk+fhF0P8DU9SOSa5f
-cZMCAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
-BgNVHQ4EFgQU5+kdb+9R+/FhxzwAJ71I2V2cxEMwga8GA1UdIwSBpzCBpIAUL7hR
-U1k0AaJM23TJg2PYWmflEVmhgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxMN2hSVTFrMEFhSk0yM1RK
-ZzJQWVdtZmxFVms9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQAHH9Wi9740Eh+BnpXf
-YztVm2x0Pzg9Xgr1O9iSNffQPf3C0GYA3WNFoWOnVfAUNpK8GU5vbFr8+CtdRPuW
-02dJJ3q0C0pi/21mxuYvQVX8vNFGbFK7C4AT7NdKgeMpFvPfGDapITd4iR/oQWw3
-lix+gb/CK0km5IWxNJN2YkzM3YUf9SHBr05gJqtBciXa0ZhIMqR4qXNokzvKotuH
-ZZZz9GsnHur4SmflEffbc5xZsMWFZWq5w0uSIvE4s9ZrugC1HKQWlS+1At8E0att
-33S8pGKbOdhSK62c/wXapxAouVzx0M8izJ2GEGh7BPpzAP4k5d3LYxw8MHXlem0H
-BGSw</ds:X509Certificate>
+        <ds:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UECgwLZXhh
+bXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUub3JnMS0wKwYDVQQDDCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THENiRS8wVy9u
+WTJlSFplQVpsR2ovSXp5MlM0QT0wHhcNMjIxMjIyMjAwMjU0WhcNMzIxMjE4MjAw
+MjU0WjCBijEUMBIGA1UECgwLZXhhbXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUu
+b3JnMTUwMwYDVQQDDCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
+UFJPRFVDVElPTjElMCMGA1UELhMcZW5qYktZaFo5SnN6QlZqeTcxTGc5UXJZbVY0
+PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALEsrMMpvcx0Hxj759vB
+Y156VXBRv2pgcwyKmtGSyFOleh3qoTqU6g2fM4T13sTFsc0EY7WQgvn0AmmM80Kh
+cT5uQpPt5Dcg21WfnKyfTxrf8kJI7MnmIETXcnAZ5FBng3quLReFQRE30D4nreFV
+FcBmwWe/aWFKymUep7sQYLtI8AZsM0qOo+Pa3ODbut2DD4ckr9h7mLxp2aJygCUV
+ZUarGtF9ZfqF9IZXoU6N7CqPl2+K6ENY1C5MPv6poTJ4bdfMhabW8/gBdRL4OXzV
+72ieW54Enb6vnfWDLRxkMfl+mmwivBRmHYGwtcj9DaJEYCs6BWJyMwna4uz9gE6K
+hV0CAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
+BgNVHQ4EFgQUenjbKYhZ9JszBVjy71Lg9QrYmV4wga8GA1UdIwSBpzCBpIAUCbE/
+0W/nY2eHZeAZlGj/Izy2S4ChgYikgYUwgYIxFDASBgNVBAoMC2V4YW1wbGUub3Jn
+MRQwEgYDVQQLDAtleGFtcGxlLm9yZzEtMCsGA1UEAwwkLnNtcHRlLTQzMC0yLlJP
+T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxDYkUvMFcvblkyZUhaZUFa
+bEdqL0l6eTJTNEE9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQALVLYESliIRMuT/Bus
+kzi/LLxK8s/7Veg6VPCBu/gVZz8ZqucAt45jkt+5EXOqb2ZlA4rrCOeisotYTC/F
+P5Bm+CKJVepBG6PMpCwNCzzw6nsfWjvtLh/F7Fqg+jCEK+Ka6PPCZkd+b3pd9MZL
+0xye6EF8M7XCrgqpERHOrmYe3S3fLXp9SEcXubdG0jcRWY71vX4BkNuGWMbbOX0w
+yuVUgZkoTq1ru9YuYcYvbCnDCugkdU3RFZkrVdu8kN511YBRuqvcILEOCsr8ZM0F
+02Th71I+8QyJnfrSmAp1TJ3I03ZxDTTXeKw1zaZqGWUQuIjbeUDDGo8uHoMtV60Q
+rKYh</ds:X509Certificate>
       </ds:X509Data>
       <ds:X509Data>
         <ds:X509IssuerSerial>
-          <ds:X509IssuerName>dnQualifier=L7hRU1k0AaJM23TJg2PYWmflEVk=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
+          <ds:X509IssuerName>dnQualifier=CbE/0W/nY2eHZeAZlGj/Izy2S4A=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</ds:X509IssuerName>
           <ds:X509SerialNumber>5</ds:X509SerialNumber>
         </ds:X509IssuerSerial>
-        <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THEw3aFJVMWsw
-QWFKTTIzVEpnMlBZV21mbEVWaz0wHhcNMTMwNzA2MjAwNDU2WhcNMjMwNzA0MjAw
-NDU2WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THEw3aFJVMWswQWFKTTIzVEpnMlBZV21mbEVWaz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTQn+d3YhStTcHlzYToU6z7NE/YF+G
-JJalU1BHa58aQ9272o4p/c0+2KJOvl5peIYASZYpuGQpv802H4cP6axCt44a6MJx
-j9P63nq83TKdeus85Lr3ACk22646rlDh2PpxOxWrzvsvGE0PCI1Pa7kPFg9xtvi2
-zLE3wPIHtZ326VEv8BIwWXKPwEYp/HOUQvTZf2pWtZTXHQZ9T8k8Vtq32e3tyEsf
-icC4p1arYAT1AWWVaJonTscLoz8HledVIx3yv+QN0AJ3wf5QcJRx5t2Tdc7O9ovl
-Uzrl9fzhAfzPUtmIG1aCoZVZCQgaKy09+QFN6jZxWT89DuSBygZTEHKRAgMBAAGj
+        <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UECgwLZXhh
+bXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUub3JnMS0wKwYDVQQDDCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THENiRS8wVy9u
+WTJlSFplQVpsR2ovSXp5MlM0QT0wHhcNMjIxMjIyMjAwMjU0WhcNMzIxMjE5MjAw
+MjU0WjCBgjEUMBIGA1UECgwLZXhhbXBsZS5vcmcxFDASBgNVBAsMC2V4YW1wbGUu
+b3JnMS0wKwYDVQQDDCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
+T04xJTAjBgNVBC4THENiRS8wVy9uWTJlSFplQVpsR2ovSXp5MlM0QT0wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbWZOdhP2gXvlIuQ3hshO+6rWLo6nw
+3lBZSWCk/cOo2kPx14hP6XGNtCKLlZ5EHOTl4WIcioZ0M1EpEiIv0qtLqvHE0xGA
+6oXTNk6dTBWWqewxZUabQzfvmlL6EjmupUcENjgXMX7ITOE7cJYRve2DqW7WZQdv
+tzQPUaMMFNBtbj3WbtMYpqFPGV97VTwTxNiz2eFufOTEghzyW0E0Tb4wOnmJde7x
+IBeLFCW84JQsHx2wvh/lw8KB7/BGMWndp/vcIgQPN+6DhXdgoqCp9LgSaVSAFsEW
+LFGcB2zWbuG0l0/TPbia9EQ1X6XyHK8AsMnzJ/OooFh3wU+WNQS5IVbtAgMBAAGj
 gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FC+4UVNZNAGiTNt0yYNj2Fpn5RFZMIGvBgNVHSMEgacwgaSAFC+4UVNZNAGiTNt0
-yYNj2Fpn5RFZoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcTDdoUlUxazBBYUpNMjNUSmcyUFlXbWZs
-RVZrPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAQYn1ySQE/cvAfy4g7m0w03mPKhbf
-rNI56HrZJebrJGvBItWafzVTlTiHY6AgepGQ/qdfXIK4EttSRIeXTDxlLA9Mf+mw
-kU9E6ZR4WBVGD+zLw5z/aFakNTyYDk0o/gxe3njNY6/KT+0fdmtnfnAVymqDE3z7
-Nm6UfDMVsrJ/wIZ7TKGmeo3IwAcPeF5+SminJ3OhpRDSeY+ZomwEtPvpi3N1tlHk
-vYZE7iB+onjFT+FOjtLCeGtRbePfJuh8YrSGzc6dCeCeK0CwUr3bvnVfqzhiZYRn
-6KGFx4EGJ//GOagj4VOKtftV0+SZeQtwBxhuzkBnx+wH48uuhNa7rwtslQ==</ds:X509Certificate>
+FAmxP9Fv52Nnh2XgGZRo/yM8tkuAMIGvBgNVHSMEgacwgaSAFAmxP9Fv52Nnh2Xg
+GZRo/yM8tkuAoYGIpIGFMIGCMRQwEgYDVQQKDAtleGFtcGxlLm9yZzEUMBIGA1UE
+CwwLZXhhbXBsZS5vcmcxLTArBgNVBAMMJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
+T1JfUFJPRFVDVElPTjElMCMGA1UELhMcQ2JFLzBXL25ZMmVIWmVBWmxHai9Jenky
+UzRBPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAbjn7rg7MANHxF8TpMw6LfCK7p5qv
+sq5S0t7Uml+P/dawRcMnu22e2e9mgleYmZILYXv3pgUV51sxHeVJslHiDh/ni1B6
+CltNQ+v1DrIegEVeneMv1Ljr6WCYR3llN7p3RbandKbEB13tA5e6MajM7DXMVM8c
+rW9L1hJBkiWgWhOHUbtjBAA/SAfdyZ+lKWv6Hgc4qND9U6Vg1LcF1KfaZVdvoRJ7
+YAgdq3Y4SqKYWSl9wxBxYOIR0Lo6ZBo4hIabNAVdRdFNDVVJMa9nKl0lB0QNalbW
+YGYMYcyr5oaa349itnby6ejKQnyGL7agHtI5F6HkzK712MSF0tEVITu5pg==</ds:X509Certificate>
       </ds:X509Data>
     </ds:KeyInfo>
   </ds:Signature>
diff --git a/test/data/private.key b/test/data/private.key
index 09991ac5..0e512223 100644
--- a/test/data/private.key
+++ b/test/data/private.key
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA00J/nd2IUrU3B5c2E6FOs+zRP2BfhiSWpVNQR2ufGkPdu9qO
-Kf3NPtiiTr5eaXiGAEmWKbhkKb/NNh+HD+msQreOGujCcY/T+t56vN0ynXrrPOS6
-9wApNtuuOq5Q4dj6cTsVq877LxhNDwiNT2u5DxYPcbb4tsyxN8DyB7Wd9ulRL/AS
-MFlyj8BGKfxzlEL02X9qVrWU1x0GfU/JPFbat9nt7chLH4nAuKdWq2AE9QFllWia
-J07HC6M/B5XnVSMd8r/kDdACd8H+UHCUcebdk3XOzvaL5VM65fX84QH8z1LZiBtW
-gqGVWQkIGistPfkBTeo2cVk/PQ7kgcoGUxBykQIDAQABAoIBAQDEONfgAYxFhhv+
-6OxJf2JirGwOua0AI6vpE2FVdRjqhG7HtVCmoB6raPwYt6lpvZB5Y+AeEC64uHYa
-912z4g8mSOetBtTUNgtm0I6gLbR9oVYt0SX3liax1YoW5yIpJCg6U+7lDfMw4xlw
-BTl7s0rIQG1H6fNJlwZkCsrDbmWyl4PKcb6Kqfw4iafQmCRAJx9gvYW0QXigaxU5
-xSJRiA5Y4Ts0ZhH+RwKzNVap4IhWtKoIZS2Vvz+H1/iPavs9axdcyhfXg+9mOkT1
-4x3LQlNAmcYzUBByJN1d+yzoCVb3s8aP5vcWvR3t9TlnutBhKFGvJo0Jbfx1z5fx
-b45+rjihAoGBAOv3thZeyqfLjl3tG00EhkDDxVvlDYtCfuyhNT7w/tCWlyoS1Wsh
-iar0/yp/7wXMkasEaq0E/G2Srez39F9wd2GSuymmtMBzzXL8SXWIpfYlizgo/Zun
-fRNNMDxYsY4Gaq4/QU7YCOzmAs1iZPyk10s8RYkUuS49ZGbgC1fy1bUDAoGBAOUx
-z4/4R71mIlyr5/XGoWt7HDy7LD1AFlscBJ7bTFTzePuL8kawrm0P5Rg4zTTkJqZs
-/ukVng+PRD+gY0cPEdwrZH6CTxMjxps1TPSGrM7KFK6//J+ez5iYordVhMEB2vRC
-tIVN2tEcx9JdqCUb1k1esBlCZ1E1tyaFsAMzZTPbAoGBAJ+RbYMHKwf5MRb3JkUY
-0CivuqB/7n7Dws0F3tnnYolvrF15SvUdQtlmv77fsKU9Ryxc2j6SZpk6XX8n1gtM
-JI7JCOQLpaOXK9GcJZjjhUdE8DZUEdvWkVAiHIJSgA9I649VmzZUBQUeLbrx1NS8
-LBLmeSdP6kIIpgKjc0hQIJA9AoGAQAejaiA9wo73CJbKDeK5E/Ln15ue51mxJTD1
-pX+0moMOiI/3VoJjqHppUVQFGEKo/ZOzv2BXsRcgRPpE4gQ2xCCnSaST/M/g21mP
-rzy0qGzSTGO8aseOTZ5OzxMoLFedWOIN1rQCbqsws/eQUxWs0B6k6dmgTZLJIQz2
-OF6yZkMCgYArWYrcsefBFznwckK3S+EXZeYApyREmWywHtuC6NKmWfksRtDce8B6
-Hs6T7xClvbd99h4CNf4nywRBRAO85HfSTkjamLB42xoGrWizeN3XGou6NA5im9IO
-dRSNHaS084mEm9/HaxfvWHTLsUaArjDG/26ji236Dr6m3+ghDIUJMQ==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCqI7toh6iOLbQw
+RkxJ4sPEFI6VWpVrNoV/wRFF6gusHz396ZroneKVEqN/uFBcvtep5QiUCO2Gsjlj
+0/2qPD9nGRjDKyuoJOIc3Q/8oyzhPsz1DAJaAjwupOx+WkfKgRKCOeUOOYSz9FWs
+LwgMvn/xW28u6QkBCjXMxcbJCnsryeOOZJDbHy3Uya+oOGKKm6HrDAGayAw8HSeR
+Ev7E0cw290ZacaWCtxvaA/y8ynCgPNCdwSYxNt4Vos0eNkbGIZVHyD4sDmQnjAUi
+BZDnV3ikYnLfRT2QF8djq3BRChAHoWgt8Jc5ui1qLk6cbGfMYmTyObeH4hwrxz63
+ndC60MNrAgMBAAECggEABQbh6PhmdNpJgkpMGLwYIqP6Ln7VqVbxYiaXLGSk4aSu
+qouLZdIRuWvVOYHS8K/mzqs+B08C4uxDIShIog3+UD0qlnb2ZupoD92W36pb5MUm
+kxrpZYq+snYcUq4M2aEvUHpbbSx/4j1BhsErpgy+2lJkROjiY43PVx8vfLh649Pv
+1LPiy0UVfAL3h/6Ew/vVAh6b1q001cVc+W60e9cnC0w5ga3+ifisnp/QyeetImyW
+YJ3MNyNxGDaupM3viuw00hnJOL3TeY+fz5FUpmUh5df/rm0XLQp3JgIOCoH2m8SM
+CgtAQnjRY10ryPFXbH0e5Zo7IIaqpzHiNMvIP2kg4QKBgQC9r1NlGS3Lsl2+9sz8
+9AB8SSzIHEap8lYP+r1V9cBTfsJOZQRaP1VIx9Hel0cBecf4p3CdH+YPvi/Fqjr9
+QZhEepGYnUpRhjWn++kYLVAGVK7BJtZi1a9M6PJAtrfLEm4RodLkw/c2dVKBdcuu
+SSu5n2YY/aWS67DV9CQpvWBSkQKBgQDlnx2TsnJRulubVeFnG7/QXTfanmfjXvLu
+UjOPh2pJdie6wj1zG0tyeahYiBRfqyR8qszguvwS08FFe5K1VJ81Qvmn6Wkg8hqO
+b/P8qcCLQgKNqNGI36Z1kbNoBo47j/8NlAKZKBnM2JSFb0gj9oQBHpZatHt84pbR
+pbrTTGf8OwKBgGshWIJi5CCFjrjJ/yBmVtfbJDWo8qgNPFouDT09XPBLSUapevnV
+hz9hy8BhxDKrKyvetZWobHE7wxNqf4KFx4/1gcGmJFFC8Y78kbub6/SHY2OnobGU
+ajuP3TJ7f/ZrZEsFEG0v2LGjNYP0maLHpLBjvHAk4ZzHDMrp5nrEgGBhAoGAIetU
+QiodCwedWp/gEQwfVJdAlfHKZOL0vdG0viIByGJE0ii5TRSeG4XvIUzQvaUZWbUd
+WKEmdV2EclAjxtd+QS7olC49kllRJPNStmMZBzk0CVsDwNVQ0JM6TkaRoijOQ2I2
+1AsBbKodnmxm2rEipMuw6Cs7BqKuJr/1jhr+TVsCgYAc4wEWVKqwgMjxYG8+QmXq
+MjGEppuD9Vl17mcTUvn+T/P9YDJoBx0vOLFF+75f2hhME98ptNEWm1bLUVsqlZvm
+tHOpwVGS/Od/3ASTqm+xP4N2PkmFLdNrOqg/WnKUNQCgafvDEv92kGij+G3YnEwM
+nwnztJBcAqG76564Qjb7SA==
+-----END PRIVATE KEY-----