adjust test certificate generation

11 files changed, 142 insertions, 190 deletions

diff --git a/test/data/verificationcerts/9da13359.0 b/test/data/verificationcerts/9da13359.0
index 7d91e288..b22e4d20 100644
--- a/test/data/verificationcerts/9da13359.0
+++ b/test/data/verificationcerts/9da13359.0
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDXTCCAkWgAwIBAgIJAPJ/OeIFZUrJMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+MIIDXTCCAkWgAwIBAgIJAPAfPQGCV/Z4MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTUxMDE2MTUwMjU4WhcNMTgwODA1MTUwMjU4WjBF
+aWRnaXRzIFB0eSBMdGQwHhcNMTUxMTAxMTY0ODAxWhcNMTgwODIxMTY0ODAxWjBF
 MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAs8EFHXjYTdmPf9J37wUuLcx5hi9HFmXfFEbJ0tSm/U8lajfsnr869LiO
-2App2JHgntreemHe/OZaaa/fPykDnDDiQBVb74H55YGHYCGphIPeyT78KEvInPOs
-m/CaYFxlXB/ao81SXeGKkKagcFq/D4FjFYjmjxDxzUJVxX67knjr5WwPK60NfJSq
-JzRIvFFXUtkByRv2VZmEAj56KRQx1W0+Ant51j52ryuD7pvCZ6P5TU4CdGlu34bu
-1DJ/7uRBCIGYffZs7vE2wMhCvbwQAPl0q+Kq9yZdPXY+sgoGgmkydB/INuXSv/Ce
-IgpBW+EjjeYD32YbnOTQ0Fi5yvxEjwIDAQABo1AwTjAdBgNVHQ4EFgQU8X+ohuC4
-QOemuutP/xX6ZCddKqowHwYDVR0jBBgwFoAU8X+ohuC4QOemuutP/xX6ZCddKqow
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAnD4fPo/ztU6g77BSf88o
-TtsQ1x2Cu3I7DNFEDBpBubooQpQZpwuLspMSgQfTnlPT4V7iBE/+3x7gJm8BcWEi
-QxjJhoiWVWDpDe0GdcgNvScPq+3kupzxEJrTGSY/SJjiftlTvI1oGRmto9VXhNlU
-6TeFEwieDWfm2waqJCYlGI86go47piqjh3E8ODPAT1SBRLvrfU6b3nvSPl3r1JvF
-iurGxMPUk3DHb/Y19MdkFiaUqu/P+c/rO6BDxhPfuJxhmw4OdMuPA7cY0H3bbXHE
-yoXqEvQ43ItEiYXVRoc9CCT1l9+ExC8cUsOTUqFi5Fwyr7K3ZDpAOqCpzaLZnss7
-mw==
+CgKCAQEArp8LD34JhKCwcQbwIYQMg4+eCgLVN8fwB7+/qOfJbArPs0djFBN+F7c6
+HGvMr24BKUk5u8pn4dPtNurm/vPC8ovNGmcXz62BQJpcMX2veVdRsF7yNwhNacNJ
+Arq+70zNMwYBznx0XUxMF6j6nVFf3AW6SU04ylT4Mp3SY/BUUDAdfl1eRo0mPLNS
+8rpsN+8YBw1Q7SCuBRVqpOgVIsL88svgQUSOlzvMZPBpG/cmB3BNKNrltwb5iFEI
+1jAV7uSj5IcIuNO/246kfsDVPTFMJIzav/CUoidd5UNw+SoFDlzh8sA7L1Bm7D1/
+3KHYSKswGsSR3kynAl10w/SJKDtn8wIDAQABo1AwTjAdBgNVHQ4EFgQUgOcrtxBX
+LxbpnOT65d+vpfyWUkgwHwYDVR0jBBgwFoAUgOcrtxBXLxbpnOT65d+vpfyWUkgw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEE9bFmUCA+6cvESKPoi2
+TGSpV652d0xd2U66LpEXeiWRJFLz8YGgoJCx3QFGBscJDXxrLxrBBBV/tCpEqypo
+pYIqsawH7M66jpOr83Us3M8JC2eFBZJocMpXxdytWqHik5VKZNx6VQFT8bS7+yVC
+VoUKePhlgcg+pmo41qjqieBNKRMh/1tXS77DI1lgO5wZLVrLXcdqWuDpmaQOKJeq
+G/nxytCW/YJA7bFn/8Gjy8DYypJSeeaKu7o3P3+ONJHdIMHb+MdcheDBS9AOFSeo
+xI0D5EbO9F873O77l7nbD7B0X34HFN0nGczC4poexIpbDFG3hAPekwZ5KC6VwJLc
+1Q==
 -----END CERTIFICATE-----
diff --git a/test/data/verificationcerts/generate.py b/test/data/verificationcerts/generate.py
index 922cb95d..9203abbb 100644
--- a/test/data/verificationcerts/generate.py
+++ b/test/data/verificationcerts/generate.py
@@ -8,14 +8,13 @@ import shutil
 
 
 ROOT_CA = "trusted-root"
-SUBJECT = "/CN=127.0.0.1/"
+SUBJECT = "/CN=example.mitmproxy.org/"
 
 
 def do(args):
     print("> %s" % args)
     args = shlex.split(args)
     output = subprocess.check_output(args)
-    print(output)
     return output
 
 
@@ -51,15 +50,12 @@ do("openssl req -x509 -new -nodes -batch "
    "-days 1024 "
    "-out trusted-root.crt"
    )
-h = do("openssl x509 -hash -noout -in trusted-root.crt").strip()
+h = do("openssl x509 -hash -noout -in trusted-root.crt").decode("ascii").strip()
 shutil.copyfile("trusted-root.crt", "{}.0".format(h))
 
 # create trusted leaf cert.
 mkcert("trusted-leaf", "-subj {}".format(SUBJECT))
 
-# create wrong host leaf cert.
-mkcert("trusted-leaf-bad-host", "-subj /CN=wrong.host/")
-
 # create self-signed cert
 genrsa("self-signed")
 do("openssl req -x509 -new -nodes -batch "
diff --git a/test/data/verificationcerts/self-signed.crt b/test/data/verificationcerts/self-signed.crt
index d7f07214..dce2a7e0 100644
--- a/test/data/verificationcerts/self-signed.crt
+++ b/test/data/verificationcerts/self-signed.crt
@@ -1,18 +1,19 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+x6476tW/t8GJDZVD74+pNBcLifXxArE=
 -----END CERTIFICATE-----
diff --git a/test/data/verificationcerts/self-signed.key b/test/data/verificationcerts/self-signed.key
index 54111eca..71a6ad6a 100644
--- a/test/data/verificationcerts/self-signed.key
+++ b/test/data/verificationcerts/self-signed.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/data/verificationcerts/trusted-leaf-bad-host.crt b/test/data/verificationcerts/trusted-leaf-bad-host.crt
deleted file mode 100644
index bbf2fb0a..00000000
--- a/test/data/verificationcerts/trusted-leaf-bad-host.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC1jCCAb4CCQCzDwzVB+KILzANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB
-VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMB4XDTE1MTAxNjE1MDMwMVoXDTE4MDgwNTE1MDMwMVowFTETMBEG
-A1UEAwwKd3JvbmcuaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMnJESjt6YT6x2z4SBvsrZyhlwCZ0GwYdSpfJLSaQXmzDG60i9qeqrLKDHGSUfak
-W6RTl/Hh+EoJtVaVQirJyApkLOGkrMpS3HabWI/nFtShrCK5kcTDmbP52bfvhago
-YZiXWoYV1WzSWKK+WiAMsGc6cUmfaoWego7dc+E9BzCP8PJniEBctWNt1wBZwxAv
-G657CaHvlkEAIc6jIFIE0jL/Gi2T8J8jCAsboXYyP5AXIn+aEu/VJDGys7DnftU0
-uyK7l/qFwjTvkgs52ZqyUyoWVoM/7miXVe2D2HSzhLwXeVv+w3CtnwZ2BZA8WUIc
-KhGr2sjjOIwY9xguBwi1k8kCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktS8+9Jz
-c0WatiFpo1DbHVBpN9VjjWF6uQyCOFu6uKiJgXAgCc/YekPHy9auu+DtDBVlpncV
-NS/+aZlLYF7dGpbkh5Qx1q2zSf5kH1tzbH3+qJpmJcRgKXNasu5aPRFqJLRHu5Lu
-V7K9Q/vRTbRNdu0Axn6yZEK+3/2bO5x5nFfUmAV2HLxFFIa6DbQhaBQjLnVyYFxD
-I6+G00MAZ47rj4m+PrxsXTOq050mg519FK0t5X7ifaG56R96EKvUkfifQzZmpmgX
-gs/ZaFzRkRLdqvsxyYHICL8BEKfwZUQiyAAb6Shf09/xO05a3LHl3ZXm87UxJlwW
-9qWySdIdCc41RA==
------END CERTIFICATE-----
diff --git a/test/data/verificationcerts/trusted-leaf-bad-host.key b/test/data/verificationcerts/trusted-leaf-bad-host.key
deleted file mode 100644
index 30711ece..00000000
--- a/test/data/verificationcerts/trusted-leaf-bad-host.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAyckRKO3phPrHbPhIG+ytnKGXAJnQbBh1Kl8ktJpBebMMbrSL
-2p6qssoMcZJR9qRbpFOX8eH4Sgm1VpVCKsnICmQs4aSsylLcdptYj+cW1KGsIrmR
-xMOZs/nZt++FqChhmJdahhXVbNJYor5aIAywZzpxSZ9qhZ6Cjt1z4T0HMI/w8meI
-QFy1Y23XAFnDEC8brnsJoe+WQQAhzqMgUgTSMv8aLZPwnyMICxuhdjI/kBcif5oS
-79UkMbKzsOd+1TS7IruX+oXCNO+SCznZmrJTKhZWgz/uaJdV7YPYdLOEvBd5W/7D
-cK2fBnYFkDxZQhwqEavayOM4jBj3GC4HCLWTyQIDAQABAoIBAQCJzs3vW/w9m1+T
-ZkUo/Qzciecsu9+B03pBQ9U3mpnY2ZVGDfvthKsji6XP8pQTk9AafBSrVx5Qwiyc
-Qzd7LW922U9lkyeGzexO/G0RaktHUFrVJFMPRF62cY5ldimb3Gg65DMom8S0mzt5
-efLnLINVHK6+DyeatdSIaWl4jEtat9tsxp8UNtm0rnpa+jEy13wUsTcPe9f/pLXS
-KqFXdyq263R2FkKC7FaT2HHYDJmiDPwta/hHPGzc3A8/CfPDAr0SrFEuWmYRj5mW
-0QrcDh+BTIavs5I5cD+95lLtWnJvak03o5eQvvWw5K4PqWidZk6OQlSoQe82uQXw
-AWLVH1thAoGBAPrLy39ACxFTA7dOQnwnJJBPN1MVV4ZnUAjE49iCnZfzyr5mZWRZ
-nNGJLSekwOqBbBa1dfh8n5cnv2aBNXv1m1NFMsPsnwmcm7ugrr3UPiIT81ZnJgR0
-5SzBfHTQRcegzaWq2Je79BYsa4SB6mAwPkjmOlnn03aMQICsbeFRYy59AoGBAM34
-7qCxZkz6vGxx7L6jtxP6q96Jd0S22eZqB3cccai9EfPgpywAzbYcoXfhz07RtGEU
-JBf1975tKHtwxzE1YTFKtvDjkRtikI/sw8TpDVfy9fDts7RF4nNmlhQJwAXTtWAk
-3Ui5u25WFi2don4XvcIexmaQviz/sguvtx3vOYA9AoGBANnQIR6VKoeTR4jt6QQW
-osTKZ8w6ntdV5saW6SNi3SfZTd3q5GgxA+dfcd4aUonYeV2Hn7t90MTgenS2BxNv
-jcTWNm6+lKkuYHql5N1s9cF2/kGuN/Bq7ZbfPA3fzJrB55jYNmAhlq2jSoW8pyd+
-/rklaswmcRtmV6bpGk0z+CWpAoGBAI7aAD6I6uem2rnnxYduqlH7/+mGs6Z/nt60
-WNseaiHah7H59FeLcyDD+KTZgtsqjAzsWCAaIqn6sSHz1OLnH7J9HCYz3nb8xEBd
-uGVAMVX3FuXzJjh4Y5cf5iSdooUoENpOlv6SelEK+bTHaGRFeQFCMN3/szYoXMbI
-JptnSB0NAoGAT9vfD/GhokSCvNO99XQOSR/r9wkrv/AzXjFUkAyEFv00+DXoNoEw
-eT62HaUjdnBoIiwCc7whrYzk94BOoHGkMF5qUCNWEN9G3kOT4VWhsEYqXepdFy5Y
-x/Jt5UIXABtFMKS4ZE8VbjFTodpmdqUcdCP6Zb+ASDJCzbGlqHZofJA=
------END RSA PRIVATE KEY-----
diff --git a/test/data/verificationcerts/trusted-leaf.crt b/test/data/verificationcerts/trusted-leaf.crt
index 10432db8..6a92de92 100644
--- a/test/data/verificationcerts/trusted-leaf.crt
+++ b/test/data/verificationcerts/trusted-leaf.crt
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb0CCQCzDwzVB+KILjANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB
+MIIC4TCCAckCCQCj6D9oVylb8jANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB
 VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMB4XDTE1MTAxNjE1MDMwMFoXDTE4MDgwNTE1MDMwMFowFDESMBAG
-A1UEAwwJMTI3LjAuMC4xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-uDZ6dL1IxfAY8uxpzUScwTg1jHpktLk1Uwj7m+dsDGHCvEhmbLhllYdCiqpcEjxm
-2IGtzzKU5iAtN46WQsWApw5H6n+Ozw3k3Wf7KqwcSxn0pemGglj7lRg8PNTBWHLe
-aw3qQcZUKgmAwVly0ILYNmKbTBiRh1IpCjI1lqHM9gLY9GqrQ5N6D4iZPX3Snxq3
-IKVcpAvGShxjrRXyXwrVdk5vHdMRiNiMOLE+drpoK9ShmIz8OCCA2D+PvClaYGjz
-2GbvNzrHMcSiJzggeT8aRNv8HT5JEj8NOgt9NM2yzQSZsOCGc9r6scKV0A0n8PQH
-KiwBMulH9ums73MfM/NstQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA1pWmPnijh
-szj3hf7hBrk27jEO8VO87Y9rVlPlII2JAdSGU/5AbrgsiWIMKeLJM5eqftWjuELG
-ZGAJHNk/J74x16I/YlyZZZ1pzklGmVp3VYbHeabRCP77a+qLzBhhirdqPaZuFK3U
-3GTm/fsyAypHxDM5xsDJVqLolLgrasFgUxEoNuI3LRbMKhcGURAOKiJJpJIwBqGo
-xiZVdC5ZAOK70jU+8jNpNFrgo7gN1tinuQYFoZZ5fGIQObo5rgbqkF7U/fCknkLj
-N7ykvCkMqeax3gj7htkpfXYTvG0zRiX59D11hhRGoTs3XZS52+jFHAJau6netga2
-fT7jVsojtgw8
+cyBQdHkgTHRkMB4XDTE1MTEwMTE2NDgwMloXDTE4MDgyMTE2NDgwMlowIDEeMBwG
+A1UEAwwVZXhhbXBsZS5taXRtcHJveHkub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAy/L5JYHS7QFhSIsjmd6bJTgs2rdqEn6tsmPBVZKZ7SqCAVjW
+hPpEu7Q23akmU6Zm9Fp/vENc3jzxQLlEKhrv7eWmFYSOrCYtbJOz3RQorlwjjfdY
+LlNQh1wYUXQX3PN3r3dyYtt5vTtXKc8+aP4M4vX7qlbW+4j4LrQfmPjS0XOdYpu3
+wh+i1ZMIhZye3hpCjwnpjTf7/ff45ZFxtkoi1uzEC/+swr1RSvamY8Foe12Re17Z
+5ij8ZB0NIdoSk1tDkY3sJ8iNi35+qartl0UYeG9IUXRwDRrPsEKpF4RxY1+X2bdZ
+r6PKb/E4CA5JlMvS5SVmrvxjCVqTQBmTjXfxqwIDAQABMA0GCSqGSIb3DQEBCwUA
+A4IBAQBmpSZJrTDvzSlo6P7P7x1LoETzHyVjwgPeqGYw6ndGXeJMN9rhhsFvRsiB
+I/aHh58MIlSjti7paikDAoFHB3dBvFHR+JUa/ailWEbcZReWRSE3lV6wFiN3G3lU
+OyofR7MKnPW7bv8hSqOLqP1mbupXuQFB5M6vPLRwg5VgiCHI/XBiTvzMamzvNAR3
+UHHZtsJkRqzogYm6K9YJaga7jteSx2nNo+ujLwrxeXsLChTyFMJGnVkp5IyKeNfc
+qwlzNncb3y+4KnUdNkPEtuydgAxAfuyXufiFBYRcUWbQ5/9ycgF7131ySaj9f/Y2
+kMsv2jg+soKvwwVYCABsk1KSHtfz
 -----END CERTIFICATE-----
diff --git a/test/data/verificationcerts/trusted-leaf.key b/test/data/verificationcerts/trusted-leaf.key
index a6aba170..783ebf1c 100644
--- a/test/data/verificationcerts/trusted-leaf.key
+++ b/test/data/verificationcerts/trusted-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/data/verificationcerts/trusted-root.crt b/test/data/verificationcerts/trusted-root.crt
index 7d91e288..b22e4d20 100644
--- a/test/data/verificationcerts/trusted-root.crt
+++ b/test/data/verificationcerts/trusted-root.crt
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDXTCCAkWgAwIBAgIJAPJ/OeIFZUrJMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+MIIDXTCCAkWgAwIBAgIJAPAfPQGCV/Z4MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTUxMDE2MTUwMjU4WhcNMTgwODA1MTUwMjU4WjBF
+aWRnaXRzIFB0eSBMdGQwHhcNMTUxMTAxMTY0ODAxWhcNMTgwODIxMTY0ODAxWjBF
 MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAs8EFHXjYTdmPf9J37wUuLcx5hi9HFmXfFEbJ0tSm/U8lajfsnr869LiO
-2App2JHgntreemHe/OZaaa/fPykDnDDiQBVb74H55YGHYCGphIPeyT78KEvInPOs
-m/CaYFxlXB/ao81SXeGKkKagcFq/D4FjFYjmjxDxzUJVxX67knjr5WwPK60NfJSq
-JzRIvFFXUtkByRv2VZmEAj56KRQx1W0+Ant51j52ryuD7pvCZ6P5TU4CdGlu34bu
-1DJ/7uRBCIGYffZs7vE2wMhCvbwQAPl0q+Kq9yZdPXY+sgoGgmkydB/INuXSv/Ce
-IgpBW+EjjeYD32YbnOTQ0Fi5yvxEjwIDAQABo1AwTjAdBgNVHQ4EFgQU8X+ohuC4
-QOemuutP/xX6ZCddKqowHwYDVR0jBBgwFoAU8X+ohuC4QOemuutP/xX6ZCddKqow
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAnD4fPo/ztU6g77BSf88o
-TtsQ1x2Cu3I7DNFEDBpBubooQpQZpwuLspMSgQfTnlPT4V7iBE/+3x7gJm8BcWEi
-QxjJhoiWVWDpDe0GdcgNvScPq+3kupzxEJrTGSY/SJjiftlTvI1oGRmto9VXhNlU
-6TeFEwieDWfm2waqJCYlGI86go47piqjh3E8ODPAT1SBRLvrfU6b3nvSPl3r1JvF
-iurGxMPUk3DHb/Y19MdkFiaUqu/P+c/rO6BDxhPfuJxhmw4OdMuPA7cY0H3bbXHE
-yoXqEvQ43ItEiYXVRoc9CCT1l9+ExC8cUsOTUqFi5Fwyr7K3ZDpAOqCpzaLZnss7
-mw==
+CgKCAQEArp8LD34JhKCwcQbwIYQMg4+eCgLVN8fwB7+/qOfJbArPs0djFBN+F7c6
+HGvMr24BKUk5u8pn4dPtNurm/vPC8ovNGmcXz62BQJpcMX2veVdRsF7yNwhNacNJ
+Arq+70zNMwYBznx0XUxMF6j6nVFf3AW6SU04ylT4Mp3SY/BUUDAdfl1eRo0mPLNS
+8rpsN+8YBw1Q7SCuBRVqpOgVIsL88svgQUSOlzvMZPBpG/cmB3BNKNrltwb5iFEI
+1jAV7uSj5IcIuNO/246kfsDVPTFMJIzav/CUoidd5UNw+SoFDlzh8sA7L1Bm7D1/
+3KHYSKswGsSR3kynAl10w/SJKDtn8wIDAQABo1AwTjAdBgNVHQ4EFgQUgOcrtxBX
+LxbpnOT65d+vpfyWUkgwHwYDVR0jBBgwFoAUgOcrtxBXLxbpnOT65d+vpfyWUkgw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEE9bFmUCA+6cvESKPoi2
+TGSpV652d0xd2U66LpEXeiWRJFLz8YGgoJCx3QFGBscJDXxrLxrBBBV/tCpEqypo
+pYIqsawH7M66jpOr83Us3M8JC2eFBZJocMpXxdytWqHik5VKZNx6VQFT8bS7+yVC
+VoUKePhlgcg+pmo41qjqieBNKRMh/1tXS77DI1lgO5wZLVrLXcdqWuDpmaQOKJeq
+G/nxytCW/YJA7bFn/8Gjy8DYypJSeeaKu7o3P3+ONJHdIMHb+MdcheDBS9AOFSeo
+xI0D5EbO9F873O77l7nbD7B0X34HFN0nGczC4poexIpbDFG3hAPekwZ5KC6VwJLc
+1Q==
 -----END CERTIFICATE-----
diff --git a/test/data/verificationcerts/trusted-root.key b/test/data/verificationcerts/trusted-root.key
index 298e8bd9..05483f77 100644
--- a/test/data/verificationcerts/trusted-root.key
+++ b/test/data/verificationcerts/trusted-root.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEowIBAAKCAQEArp8LD34JhKCwcQbwIYQMg4+eCgLVN8fwB7+/qOfJbArPs0dj
+FBN+F7c6HGvMr24BKUk5u8pn4dPtNurm/vPC8ovNGmcXz62BQJpcMX2veVdRsF7y
+NwhNacNJArq+70zNMwYBznx0XUxMF6j6nVFf3AW6SU04ylT4Mp3SY/BUUDAdfl1e
+Ro0mPLNS8rpsN+8YBw1Q7SCuBRVqpOgVIsL88svgQUSOlzvMZPBpG/cmB3BNKNrl
+twb5iFEI1jAV7uSj5IcIuNO/246kfsDVPTFMJIzav/CUoidd5UNw+SoFDlzh8sA7
+L1Bm7D1/3KHYSKswGsSR3kynAl10w/SJKDtn8wIDAQABAoIBAFgMzjDzpqz/sbhs
+fS0JPp4gDtqRbx3/bSMbJvNuXPxjvzNxLZ5z7cLbmyu1l7Jlz6QXzkrI1vTiPdzR
+OcUY+RYANF252iHYJTKEIzS5YX/X7dL3LT9eqlpIJEqCC8Dygw3VW5fY3Xwl+sB7
+blNhMuro4HQRwi8UBUrQlcPa7Ui5BBi323Q6en+VjYctkqpJHzNKPSqPTbsdLaK+
+B0XuXxFatM09rmeRKZCL71Lk1T8N/l0hqEzej7zxgVD7vG/x1kMFN4T3yCmXCbPa
+izGHYr1EBHglm4qMNWveXCZiVJ+wmwCjdjqvggyHiZFXE2N0OCrWPhxQPdqFf5y7
+bUO9U2ECgYEA6GM1UzRnbVpjb20ezFy7dU7rlWM0nHBfG27M3bcXh4HnPpnvKp0/
+8a1WFi4kkRywrNXx8hFEd43vTbdObLpVXScXRKiY3MHmFk4k4hbWuTpmumCubQZO
+AWlX6TE0HRKn1wQahgpQcxcWaDN2xJJmRQ1zVmlnNkT48/4kFgRxyykCgYEAwF08
+ngrF35oYoU/x+KKq2NXGeNUzoZMj568dE1oWW0ZFpqCi+DGT+hAbG3yUOBSaPqy9
+zn1obGo0YRlrayvtebz118kG7a/rzY02VcAPlT/GpEhvkZlXTwEK17zRJc1nJrfP
+39QAZWZsaOru9NRIg/8HcdG3JPR2MhRD/De9GbsCgYAaiZnBUq6s8jGAu/lUZRKT
+JtwIRzfu1XZG77Q9bXcmZlM99t41A5gVxTGbftF2MMyMMDJc7lPfQzocqd4u1GiD
+Jr+le4tZSls4GNxlZS5IIL8ycW/5y0qFJr5/RrsoxsSb7UAKJothWTWZ2Karc/xx
+zkNpjsfWjrHPSypbyU4lYQKBgFh1R5/BgnatjO/5LGNSok/uFkOQfxqo6BTtYOh6
+P9efO/5A1lBdtBeE+oIsSphzWO7DTtE6uB9Kw2V3Y/83hw+5RjABoG8Cu+OdMURD
+eqb+WeFH8g45Pn31E8Bbcq34g5u5YR0jhz8Z13ZzuojZabNRPmIntxmGVSf4S78a
+/plrAoGBANMHNng2lyr03nqnHrOM6NXD+60af0YR/YJ+2d/H40RnXxGJ4DXn7F00
+a4vJFPa97uq+xpd0HE+TE+NIrOdVDXPePD2qzBzMTsctGtj30vLzojMOT+Yf/nvO
+WxTL5Q8GruJz2Dn0awSZO2z/3A8S1rmpuVZ/jT5NtRrvOSY6hmxF
 -----END RSA PRIVATE KEY-----
diff --git a/test/data/verificationcerts/trusted-root.srl b/test/data/verificationcerts/trusted-root.srl
index 22f0855d..4ad962ba 100644
--- a/test/data/verificationcerts/trusted-root.srl
+++ b/test/data/verificationcerts/trusted-root.srl
@@ -1 +1 @@
-B30F0CD507E2882F
+A3E83F6857295BF2