diff --git a/setup.py b/setup.py
index 629fe7586..d26974ac4 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ setup(
         "Brotli>=1.0,<1.1",
         "certifi>=2019.9.11",  # no semver here - this should always be on the last release!
         "click>=7.0,<8",
-        "cryptography>=3.0,<3.1.1",
+        "cryptography>=3.2,<3.3",
         "flask>=1.1.1,<1.2",
         "h2>=4.0,<5; python_version>='3.6.0'",  # python_version only needed to make "py36+ required" message work
         "hyperframe>=6.0,<7; python_version>='3.6.0'",  # python_version only needed to make "py36+ required" message work
diff --git a/test/mitmproxy/data/servercert/9da13359.0 b/test/mitmproxy/data/servercert/9da13359.0
index 88ed4145c..07f98c8ac 100644
--- a/test/mitmproxy/data/servercert/9da13359.0
+++ b/test/mitmproxy/data/servercert/9da13359.0
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUTE2oFYATbkkytGOt0+CIAOPpaeEwDQYJKoZIhvcNAQEL
+MIIDazCCAlOgAwIBAgIUN1abbPeW/FETKzGlISahLuBhKEwwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xOTExMjMwMDA1MDlaFw0zOTEx
-MTgwMDA1MDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ7fqv4iC6738OvOC/ONFmhOVmMNe2SrGtk+7KIv/M
-d7MJJKpIygwc99EfL3m6WFjvSQ8CABO9GnLIeoB6RzX5X904dPQzIekMkE27J4D5
-wzYWAmYsu9md//9rjadaA01zHvxtpc30AsToOrRa2Rv7Lwotvcop2bBCXXZMdgvD
-BpCuCOl3cQ346LZBmED41q77P7SgnI98gCPuyyMVAFTZE4NnFUloVERTcMMo5Vwv
-tXFT41B6FOqtyhZFY89W1SeNKlm+n8zu+/aUF5c9usxwvQzj79pzBFYS9xMZzbxl
-BmU91GbLFNU32O+wp0jX6c1MfluGvRjcHQpK+gHRRJdZAgMBAAGjUzBRMB0GA1Ud
-DgQWBBSTmtfFP/zQDiCbte3AG3vchjSekjAfBgNVHSMEGDAWgBSTmtfFP/zQDiCb
-te3AG3vchjSekjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB6
-CnGmyJKVdD41Qs8QbyZ5VvrAkSq7DkL4CAIDy0pClOYjx51R16g4/dXPd8nuDjVB
-GbRuO/ZHlKeO+RAVbV4s74KeBmQ4uyuZMvuiJGCDtTgu+fbgp1l41vj21bkDnz/X
-0aVrwC4clh6O1/AFCY7cYygp22QJ0zGpIb9d0ly6QDMEocHJKasuQ8/0GPvv6wkY
-hwNub2ScsVFHPrFzzufZblBk3Ks0YZw+IsCMTY7QtGb1TZhGeX9xAydqNMnmIxNj
-XOE2FKx4ISQNFwf/U1LEAruO7PjbbsWx5FHr4oYV9TCLoERZFofwcGGM9o/cPc4P
-CH8fGvFYoU30PG+xX0Pc
+AQUAA4IBDwAwggEKAoIBAQDOyhGCoQjxdBmDKcU8NDyilLm33sKMhVMaKiv44n+s
+UovY92Ie/GQ5C63H0LPyctQfCDXatx2SzGRXy4ii5QsD0Jz0mva9M/Y15iW8+9Ng
+wjYXQBBRkin0ll2QXrxnqvRExiVnRZ5mJsUHyTG/6krFkA+O0kOwP40vkD0joKp1
+L0mN5jFHUJcnidwBujyt832zFgRnKZejMBOm1t5ihwtdQDzCtLvfmm6C/+4jyypJ
+7HW+yjGQXj7uM5hD72azf5PXmfNZ+WrGHXsSXoJSPAYHQnH1gLhYIfcMa4yH+HIr
+/BCk2BNggqKnyOWIKAYo5e3H8JYatGIpzoisU9Pm//cjAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRwRGTY59eiUG6soqnj4ZyjIAYwaDAfBgNVHSMEGDAWgBRwRGTY59eiUG6s
+oqnj4ZyjIAYwaDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI
+cyriRs4fySXNG3SP/od3BbUulKHC37DvV8r/0vMPD6r5znjX08KvjIEiSNQkGpyN
+G06/Jt1p1mucPwVf2VrSmC7RV4/5NpzOIUNfjMaA3EASl+Mtz8Cinp0e/MECi7Tz
+VtBtmia1pbPIjr8/GSZP74kbysNccz06c8OyrI+91vq3isa+xJgjXYcyLnY5rNok
+bet7QHb1QE2oDPTZlrmZ9Rsh6K6xcwfKtXbsjMDFrdROKwdP1zGpQQIqOelaOixO
+9qGk0Y9Tq/T4ItTdQJYvCSxOvU8LDVDeYfOYwW3kbvclyyZ7CnieWxlzCY41As1u
+2OuNWUhfNcoqamAkv0nH
 -----END CERTIFICATE-----
diff --git a/test/mitmproxy/data/servercert/self-signed.pem b/test/mitmproxy/data/servercert/self-signed.pem
index 55145c523..a36ec73c3 100644
--- a/test/mitmproxy/data/servercert/self-signed.pem
+++ b/test/mitmproxy/data/servercert/self-signed.pem
@@ -1,49 +1,49 @@
 -----BEGIN CERTIFICATE-----
-MIIDjTCCAnWgAwIBAgIUb0mIVHKB+bu2PGObggokU3Re7xMwDQYJKoZIhvcNAQEL
+MIIDjTCCAnWgAwIBAgIUR5bIx5hi9BsJ9j2CF4yeWvQrHQEwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xOTExMjMwMDA1MDlaFw0zOTEx
-MTgwMDA1MDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDF6eqyZD2z83buUF4T+6AY0Zoe925a2AHOhGtHJMLo
-9AD7FF1Xi1iksEvxbOI6mreHtvYKzUpfNsA3DkFdSO91HMSkdvWcDcExpW62sNK9
-gQQrpcCx7DogOrFiGSIHI1LIy1y6YEJma3G71SgGbw7g1QF64dTX9+BzVQJsloT2
-H3ZxTi8Fb6APJq6d/Tp67GTM8U82vM+FjLKzfH7RMSEPvSyvWSibw3AZP6owFaxz
-DJtXpR7evOZbiZxqXmGOBl5OQPu9GdDA3Fyi9Drp7xa234loqd1a8PYyL8qWV/2G
-HM3IJOzG8Y5PUJhL8CkDbx4LJ9LfzeSuBnQPUf2ZNalZAgMBAAGjdTBzMB0GA1Ud
-DgQWBBQbkS0mAGPD4XjOv9GKzGMyR9ix3TAfBgNVHSMEGDAWgBQbkS0mAGPD4XjO
-v9GKzGMyR9ix3TAPBgNVHRMBAf8EBTADAQH/MCAGA1UdEQQZMBeCFWV4YW1wbGUu
-bWl0bXByb3h5Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAqZ64xpu3qrTlCc555OoP
-GgobUFP3qv07d0/r48cOyYdAdlEHhvmDPlqWTB9e4ZYtWZMlocY9DpCywzKTa7F7
-Ad8BwS0a/No3wVdl1UEkIGYxuD//jbd77Mrpf5URvQco85o/bicn+H0GAOchYt1P
-jP1VShqsRv6WiTs5kn1/JwVoafddl1jBlMDmCqDv4loAZJYHzie0CqdjjSeorFfE
-8FG8OLwmEnmIW6VnanRH8coH9MBbZ+dRtCavS+Q8s0R77dJM1sCp5/4yKcr5D/PD
-+dQN9f+iugLxDdBQjiRyadWX9/l4n/h8ezabZ4cNsiWbRXrp5VS0nGNmAK3XvPAu
-ow==
+AQUAA4IBDwAwggEKAoIBAQDLpkN07c5l5Llw3fSkLcsb0VoGTVMa7Z7YiU2Dpdnv
+gQoI6JzUDXHuXsItaUk/V5nqiLQaNto/Hfsx7q/NmPAHoLFVxxgQc6Z9t0fE6Ko2
+X6TLXNwRtUM38OIdMSobJgwWZaa5HmBZlO+WcvfCCp01gsx69HhVzAWHtX+HEl+j
+XXCujerj6bOHUYhItbkUD8EqVmEyyyrzitTd7xN4HLsECI2yAaC+laNWpAoYKSVD
+P+G6kyzV3UlpqN/h6sOxWFVcmgxZrIwCpRKxYciO9OrOPPW/VCggXNfX2R6JT6Bi
+TwjdhChWmpyOg196Vyz/fTNMECNBA9S1YXvYX4SW3CxXAgMBAAGjdTBzMB0GA1Ud
+DgQWBBSYrvmp80kdLiIeEw3LzI8caaAIGDAfBgNVHSMEGDAWgBSYrvmp80kdLiIe
+Ew3LzI8caaAIGDAPBgNVHRMBAf8EBTADAQH/MCAGA1UdEQQZMBeCFWV4YW1wbGUu
+bWl0bXByb3h5Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAtgnRA72vhXqoarlFNhbv
+ghkEEi5f6auAkfZmITMOdXE3oI4QuPvZRtjYxtRM8cu17wf8W/h2lOsXDyg0Ndx0
+56XO7K17lV/HA73is85ikchk4KnbOxyrMKD/ssOO8eUWz07vnzM+nfWny8xeeAmV
+DT2tC/l6gG3SYYZKfp/wkHw503OJS8ZtWQviTeRJCDFcOzrI8OVBdb/lybNJ7uEi
+aPEqViFlPnMFYLqquej5D/pRo4B664++6f4UVXqudGPYXy9TSTjw+R0mdaQKNX70
+Jz8HH31q3puDMUgP9X3LTxNhbvvK1JJDOuOCBJdY3ayr8MHzn43f6CYwfEirGJ4u
+Ng==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/mitmproxy/data/servercert/trusted-leaf.pem b/test/mitmproxy/data/servercert/trusted-leaf.pem
index 29bd38f78..56b2ee251 100644
--- a/test/mitmproxy/data/servercert/trusted-leaf.pem
+++ b/test/mitmproxy/data/servercert/trusted-leaf.pem
@@ -1,48 +1,47 @@
 -----BEGIN CERTIFICATE-----
-MIIDajCCAlKgAwIBAgIJAKPoP2hXKVv4MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTkxMTIzMDAwNTA5WhcNMzkxMTE4MDAwNTA5WjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA4BZUGKkf52583Kps2SinCzRtGFaGIqtP1YfjaN1H21c08hEERRWf0GqW
-PIbZz0NRyqOVM0O+4A9cxKrdqDpALBNXdgB62Ven1NNE31ZjsbFgwbORPTiOQo+6
-Xsu+2KHQdqAGOXSqOdNSoZV/HqAKa41iweg6lUf3yrO/hpfnlXTFbuM/oYFARrr9
-YWY7qH5BEvcZBf4Sg3cWGjdbzYg8S6hnFBBkHPDMbS3xra7H8uru8aG9L70aiq0C
-3WsGf1/Qctz3cccB6BdnbiXji0QlP0miT+b52hEzDvNjdXvoObgbOZsUUcLrbz8q
-LqaQPj6TA2PYpKcxEdJLDcbN++tglQIDAQABo10wWzAfBgNVHSMEGDAWgBSTmtfF
-P/zQDiCbte3AG3vchjSekjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAgBgNVHREE
-GTAXghVleGFtcGxlLm1pdG1wcm94eS5vcmcwDQYJKoZIhvcNAQELBQADggEBAMoK
-8+KTYF10dbQ8Hl3Fq4Iux7eutAPuKUXUz9dnCfDRhZukdl+gahRoNvkyMBdXOvvx
-R9Z2+Guo8NOYKgT1mJtS/c8IxTkjZj9doujJOVD2wTowSfoaT9z+/EJa+6Fp9+xd
-YVsO3E/2Vxai8PCNx8JTXr2axcnBDvpHPRXF21hOI8N94SPAcmLTZsdsTELjrGGa
-/BA0y+pCEwW6cY9mMHVAAvRoMoqfocBVI7nrYBaQfFoKuwxscxO679eEv+lbSjul
-z/VNdWfqrDhFFSzwRSVchapQ9q1EeTzv++wZRwI5bT0Ib6DFTJB3J5+9RihlFYfU
-GI17CI0D//DsFic7QJ0=
+MIIDUDCCAjigAwIBAgIUSWoLwl7Rc//TKPwKwv25Vhb6uE8wDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMCAxHjAcBgNVBAMMFWV4YW1wbGUubWl0bXByb3h5Lm9yZzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVyHPsi0UUkdv94efFUihuDpJt+
+6+AmwM/QCXiQz6c042oqEeAFfuANWqJiJKrWBP4+waezPT48iKtn597lV09R3gDH
+hLGzEDHoDKY7+2gxT0ETYc6UcrYlRkDOYy+twMcj8I4xdU1Qt0TZhHlLxvDvO/jS
+BLQke7xymJr29YPUpRLtvigyihT/zRx1zKKSG9nObUoRq+I73i46baC55fWL3aS7
+u1W+/auqnPLVKAlGS/kgGScuk/SnwMrhfcSLizEjYUt1JzRfyHg88tGY6pzJEnUh
+UGYHBxetRlD7Rt2pChrkHHngNbgDkh7gSD4Qm/PwcQEzmWuYP6fcO60o9RkCAwEA
+AaNdMFswHwYDVR0jBBgwFoAUcERk2OfXolBurKKp4+GcoyAGMGgwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBaAwIAYDVR0RBBkwF4IVZXhhbXBsZS5taXRtcHJveHkub3Jn
+MA0GCSqGSIb3DQEBCwUAA4IBAQCAD7jv+dTx4Dr5jqtIPFjKmeuUiqti6mx1bpY9
+/e9J923+7xWU50DHxDnwnPKNqYS4jr2Hmht9PRYE+ZxgkxKZzHDzHX+zBMph5TUr
+8H84pbV1WuLjWpOC2hBobNHS1Rq707M7wtL+RV6EDKW3T9Foo/F+AUficubOmBF6
+XFD+oXcxRYYGdUaMBzd3tpJMRrUYlGRL+7aFKCM+gMKqFzJwZdcfENjIw/jj40SM
+pyTauRIxouwPTxpAYeKZ9JGLgzoJviuq+he7S1m6eiN/NAvK6M+E22FZcYMHsEOV
+sTsNwqivVdb0eFVjsAIFgAwJ2BMO6ye13/6QJ3WI6RJOKEDG
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/mitmproxy/data/servercert/trusted-root.pem b/test/mitmproxy/data/servercert/trusted-root.pem
index 2248d9f3a..dea702f2b 100644
--- a/test/mitmproxy/data/servercert/trusted-root.pem
+++ b/test/mitmproxy/data/servercert/trusted-root.pem
@@ -1,48 +1,48 @@
 -----BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUTE2oFYATbkkytGOt0+CIAOPpaeEwDQYJKoZIhvcNAQEL
+MIIDazCCAlOgAwIBAgIUN1abbPeW/FETKzGlISahLuBhKEwwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xOTExMjMwMDA1MDlaFw0zOTEx
-MTgwMDA1MDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ7fqv4iC6738OvOC/ONFmhOVmMNe2SrGtk+7KIv/M
-d7MJJKpIygwc99EfL3m6WFjvSQ8CABO9GnLIeoB6RzX5X904dPQzIekMkE27J4D5
-wzYWAmYsu9md//9rjadaA01zHvxtpc30AsToOrRa2Rv7Lwotvcop2bBCXXZMdgvD
-BpCuCOl3cQ346LZBmED41q77P7SgnI98gCPuyyMVAFTZE4NnFUloVERTcMMo5Vwv
-tXFT41B6FOqtyhZFY89W1SeNKlm+n8zu+/aUF5c9usxwvQzj79pzBFYS9xMZzbxl
-BmU91GbLFNU32O+wp0jX6c1MfluGvRjcHQpK+gHRRJdZAgMBAAGjUzBRMB0GA1Ud
-DgQWBBSTmtfFP/zQDiCbte3AG3vchjSekjAfBgNVHSMEGDAWgBSTmtfFP/zQDiCb
-te3AG3vchjSekjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB6
-CnGmyJKVdD41Qs8QbyZ5VvrAkSq7DkL4CAIDy0pClOYjx51R16g4/dXPd8nuDjVB
-GbRuO/ZHlKeO+RAVbV4s74KeBmQ4uyuZMvuiJGCDtTgu+fbgp1l41vj21bkDnz/X
-0aVrwC4clh6O1/AFCY7cYygp22QJ0zGpIb9d0ly6QDMEocHJKasuQ8/0GPvv6wkY
-hwNub2ScsVFHPrFzzufZblBk3Ks0YZw+IsCMTY7QtGb1TZhGeX9xAydqNMnmIxNj
-XOE2FKx4ISQNFwf/U1LEAruO7PjbbsWx5FHr4oYV9TCLoERZFofwcGGM9o/cPc4P
-CH8fGvFYoU30PG+xX0Pc
+AQUAA4IBDwAwggEKAoIBAQDOyhGCoQjxdBmDKcU8NDyilLm33sKMhVMaKiv44n+s
+UovY92Ie/GQ5C63H0LPyctQfCDXatx2SzGRXy4ii5QsD0Jz0mva9M/Y15iW8+9Ng
+wjYXQBBRkin0ll2QXrxnqvRExiVnRZ5mJsUHyTG/6krFkA+O0kOwP40vkD0joKp1
+L0mN5jFHUJcnidwBujyt832zFgRnKZejMBOm1t5ihwtdQDzCtLvfmm6C/+4jyypJ
+7HW+yjGQXj7uM5hD72azf5PXmfNZ+WrGHXsSXoJSPAYHQnH1gLhYIfcMa4yH+HIr
+/BCk2BNggqKnyOWIKAYo5e3H8JYatGIpzoisU9Pm//cjAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRwRGTY59eiUG6soqnj4ZyjIAYwaDAfBgNVHSMEGDAWgBRwRGTY59eiUG6s
+oqnj4ZyjIAYwaDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI
+cyriRs4fySXNG3SP/od3BbUulKHC37DvV8r/0vMPD6r5znjX08KvjIEiSNQkGpyN
+G06/Jt1p1mucPwVf2VrSmC7RV4/5NpzOIUNfjMaA3EASl+Mtz8Cinp0e/MECi7Tz
+VtBtmia1pbPIjr8/GSZP74kbysNccz06c8OyrI+91vq3isa+xJgjXYcyLnY5rNok
+bet7QHb1QE2oDPTZlrmZ9Rsh6K6xcwfKtXbsjMDFrdROKwdP1zGpQQIqOelaOixO
+9qGk0Y9Tq/T4ItTdQJYvCSxOvU8LDVDeYfOYwW3kbvclyyZ7CnieWxlzCY41As1u
+2OuNWUhfNcoqamAkv0nH
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/mitmproxy/net/data/verificationcerts/9da13359.0 b/test/mitmproxy/net/data/verificationcerts/9da13359.0
index 88ed4145c..07f98c8ac 100644
--- a/test/mitmproxy/net/data/verificationcerts/9da13359.0
+++ b/test/mitmproxy/net/data/verificationcerts/9da13359.0
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUTE2oFYATbkkytGOt0+CIAOPpaeEwDQYJKoZIhvcNAQEL
+MIIDazCCAlOgAwIBAgIUN1abbPeW/FETKzGlISahLuBhKEwwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xOTExMjMwMDA1MDlaFw0zOTEx
-MTgwMDA1MDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ7fqv4iC6738OvOC/ONFmhOVmMNe2SrGtk+7KIv/M
-d7MJJKpIygwc99EfL3m6WFjvSQ8CABO9GnLIeoB6RzX5X904dPQzIekMkE27J4D5
-wzYWAmYsu9md//9rjadaA01zHvxtpc30AsToOrRa2Rv7Lwotvcop2bBCXXZMdgvD
-BpCuCOl3cQ346LZBmED41q77P7SgnI98gCPuyyMVAFTZE4NnFUloVERTcMMo5Vwv
-tXFT41B6FOqtyhZFY89W1SeNKlm+n8zu+/aUF5c9usxwvQzj79pzBFYS9xMZzbxl
-BmU91GbLFNU32O+wp0jX6c1MfluGvRjcHQpK+gHRRJdZAgMBAAGjUzBRMB0GA1Ud
-DgQWBBSTmtfFP/zQDiCbte3AG3vchjSekjAfBgNVHSMEGDAWgBSTmtfFP/zQDiCb
-te3AG3vchjSekjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB6
-CnGmyJKVdD41Qs8QbyZ5VvrAkSq7DkL4CAIDy0pClOYjx51R16g4/dXPd8nuDjVB
-GbRuO/ZHlKeO+RAVbV4s74KeBmQ4uyuZMvuiJGCDtTgu+fbgp1l41vj21bkDnz/X
-0aVrwC4clh6O1/AFCY7cYygp22QJ0zGpIb9d0ly6QDMEocHJKasuQ8/0GPvv6wkY
-hwNub2ScsVFHPrFzzufZblBk3Ks0YZw+IsCMTY7QtGb1TZhGeX9xAydqNMnmIxNj
-XOE2FKx4ISQNFwf/U1LEAruO7PjbbsWx5FHr4oYV9TCLoERZFofwcGGM9o/cPc4P
-CH8fGvFYoU30PG+xX0Pc
+AQUAA4IBDwAwggEKAoIBAQDOyhGCoQjxdBmDKcU8NDyilLm33sKMhVMaKiv44n+s
+UovY92Ie/GQ5C63H0LPyctQfCDXatx2SzGRXy4ii5QsD0Jz0mva9M/Y15iW8+9Ng
+wjYXQBBRkin0ll2QXrxnqvRExiVnRZ5mJsUHyTG/6krFkA+O0kOwP40vkD0joKp1
+L0mN5jFHUJcnidwBujyt832zFgRnKZejMBOm1t5ihwtdQDzCtLvfmm6C/+4jyypJ
+7HW+yjGQXj7uM5hD72azf5PXmfNZ+WrGHXsSXoJSPAYHQnH1gLhYIfcMa4yH+HIr
+/BCk2BNggqKnyOWIKAYo5e3H8JYatGIpzoisU9Pm//cjAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRwRGTY59eiUG6soqnj4ZyjIAYwaDAfBgNVHSMEGDAWgBRwRGTY59eiUG6s
+oqnj4ZyjIAYwaDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI
+cyriRs4fySXNG3SP/od3BbUulKHC37DvV8r/0vMPD6r5znjX08KvjIEiSNQkGpyN
+G06/Jt1p1mucPwVf2VrSmC7RV4/5NpzOIUNfjMaA3EASl+Mtz8Cinp0e/MECi7Tz
+VtBtmia1pbPIjr8/GSZP74kbysNccz06c8OyrI+91vq3isa+xJgjXYcyLnY5rNok
+bet7QHb1QE2oDPTZlrmZ9Rsh6K6xcwfKtXbsjMDFrdROKwdP1zGpQQIqOelaOixO
+9qGk0Y9Tq/T4ItTdQJYvCSxOvU8LDVDeYfOYwW3kbvclyyZ7CnieWxlzCY41As1u
+2OuNWUhfNcoqamAkv0nH
 -----END CERTIFICATE-----
diff --git a/test/mitmproxy/net/data/verificationcerts/generate.py b/test/mitmproxy/net/data/verificationcerts/generate.py
index 1e09138d7..edb379910 100644
--- a/test/mitmproxy/net/data/verificationcerts/generate.py
+++ b/test/mitmproxy/net/data/verificationcerts/generate.py
@@ -28,7 +28,7 @@ def sign(cert: str, subject: str):
         authorityKeyIdentifier=keyid,issuer
         basicConstraints=CA:FALSE
         keyUsage = digitalSignature, keyEncipherment
-        subjectAltName = {subject}
+        subjectAltName = DNS:{subject}
         """))
     do(f"openssl x509 -req -in {cert}.csr "
        f"-CA {ROOT_CA}.crt "
@@ -46,7 +46,8 @@ def mkcert(cert, subject):
     genrsa(cert)
     do(f"openssl req -new -nodes -batch "
        f"-key {cert}.key "
-       f"-addext \"subjectAltName = {subject}\" "
+       f"-subj /CN={subject} "
+       f"-addext \"subjectAltName = DNS:{subject}\" "
        f"-out {cert}.csr"
        )
     sign(cert, subject)
@@ -64,7 +65,7 @@ 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", f'DNS:{SUBJECT}')
+mkcert("trusted-leaf", SUBJECT)
 
 # create self-signed cert
 genrsa("self-signed")
diff --git a/test/mitmproxy/net/data/verificationcerts/self-signed.crt b/test/mitmproxy/net/data/verificationcerts/self-signed.crt
index a02d9f32b..da956beea 100644
--- a/test/mitmproxy/net/data/verificationcerts/self-signed.crt
+++ b/test/mitmproxy/net/data/verificationcerts/self-signed.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDjTCCAnWgAwIBAgIUb0mIVHKB+bu2PGObggokU3Re7xMwDQYJKoZIhvcNAQEL
+MIIDjTCCAnWgAwIBAgIUR5bIx5hi9BsJ9j2CF4yeWvQrHQEwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xOTExMjMwMDA1MDlaFw0zOTEx
-MTgwMDA1MDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDF6eqyZD2z83buUF4T+6AY0Zoe925a2AHOhGtHJMLo
-9AD7FF1Xi1iksEvxbOI6mreHtvYKzUpfNsA3DkFdSO91HMSkdvWcDcExpW62sNK9
-gQQrpcCx7DogOrFiGSIHI1LIy1y6YEJma3G71SgGbw7g1QF64dTX9+BzVQJsloT2
-H3ZxTi8Fb6APJq6d/Tp67GTM8U82vM+FjLKzfH7RMSEPvSyvWSibw3AZP6owFaxz
-DJtXpR7evOZbiZxqXmGOBl5OQPu9GdDA3Fyi9Drp7xa234loqd1a8PYyL8qWV/2G
-HM3IJOzG8Y5PUJhL8CkDbx4LJ9LfzeSuBnQPUf2ZNalZAgMBAAGjdTBzMB0GA1Ud
-DgQWBBQbkS0mAGPD4XjOv9GKzGMyR9ix3TAfBgNVHSMEGDAWgBQbkS0mAGPD4XjO
-v9GKzGMyR9ix3TAPBgNVHRMBAf8EBTADAQH/MCAGA1UdEQQZMBeCFWV4YW1wbGUu
-bWl0bXByb3h5Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAqZ64xpu3qrTlCc555OoP
-GgobUFP3qv07d0/r48cOyYdAdlEHhvmDPlqWTB9e4ZYtWZMlocY9DpCywzKTa7F7
-Ad8BwS0a/No3wVdl1UEkIGYxuD//jbd77Mrpf5URvQco85o/bicn+H0GAOchYt1P
-jP1VShqsRv6WiTs5kn1/JwVoafddl1jBlMDmCqDv4loAZJYHzie0CqdjjSeorFfE
-8FG8OLwmEnmIW6VnanRH8coH9MBbZ+dRtCavS+Q8s0R77dJM1sCp5/4yKcr5D/PD
-+dQN9f+iugLxDdBQjiRyadWX9/l4n/h8ezabZ4cNsiWbRXrp5VS0nGNmAK3XvPAu
-ow==
+AQUAA4IBDwAwggEKAoIBAQDLpkN07c5l5Llw3fSkLcsb0VoGTVMa7Z7YiU2Dpdnv
+gQoI6JzUDXHuXsItaUk/V5nqiLQaNto/Hfsx7q/NmPAHoLFVxxgQc6Z9t0fE6Ko2
+X6TLXNwRtUM38OIdMSobJgwWZaa5HmBZlO+WcvfCCp01gsx69HhVzAWHtX+HEl+j
+XXCujerj6bOHUYhItbkUD8EqVmEyyyrzitTd7xN4HLsECI2yAaC+laNWpAoYKSVD
+P+G6kyzV3UlpqN/h6sOxWFVcmgxZrIwCpRKxYciO9OrOPPW/VCggXNfX2R6JT6Bi
+TwjdhChWmpyOg196Vyz/fTNMECNBA9S1YXvYX4SW3CxXAgMBAAGjdTBzMB0GA1Ud
+DgQWBBSYrvmp80kdLiIeEw3LzI8caaAIGDAfBgNVHSMEGDAWgBSYrvmp80kdLiIe
+Ew3LzI8caaAIGDAPBgNVHRMBAf8EBTADAQH/MCAGA1UdEQQZMBeCFWV4YW1wbGUu
+bWl0bXByb3h5Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAtgnRA72vhXqoarlFNhbv
+ghkEEi5f6auAkfZmITMOdXE3oI4QuPvZRtjYxtRM8cu17wf8W/h2lOsXDyg0Ndx0
+56XO7K17lV/HA73is85ikchk4KnbOxyrMKD/ssOO8eUWz07vnzM+nfWny8xeeAmV
+DT2tC/l6gG3SYYZKfp/wkHw503OJS8ZtWQviTeRJCDFcOzrI8OVBdb/lybNJ7uEi
+aPEqViFlPnMFYLqquej5D/pRo4B664++6f4UVXqudGPYXy9TSTjw+R0mdaQKNX70
+Jz8HH31q3puDMUgP9X3LTxNhbvvK1JJDOuOCBJdY3ayr8MHzn43f6CYwfEirGJ4u
+Ng==
 -----END CERTIFICATE-----
diff --git a/test/mitmproxy/net/data/verificationcerts/self-signed.key b/test/mitmproxy/net/data/verificationcerts/self-signed.key
index b6da998fa..4aede1d3c 100644
--- a/test/mitmproxy/net/data/verificationcerts/self-signed.key
+++ b/test/mitmproxy/net/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/mitmproxy/net/data/verificationcerts/trusted-leaf.crt b/test/mitmproxy/net/data/verificationcerts/trusted-leaf.crt
index d71cbd07f..65acced4d 100644
--- a/test/mitmproxy/net/data/verificationcerts/trusted-leaf.crt
+++ b/test/mitmproxy/net/data/verificationcerts/trusted-leaf.crt
@@ -1,21 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDajCCAlKgAwIBAgIJAKPoP2hXKVv4MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTkxMTIzMDAwNTA5WhcNMzkxMTE4MDAwNTA5WjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA4BZUGKkf52583Kps2SinCzRtGFaGIqtP1YfjaN1H21c08hEERRWf0GqW
-PIbZz0NRyqOVM0O+4A9cxKrdqDpALBNXdgB62Ven1NNE31ZjsbFgwbORPTiOQo+6
-Xsu+2KHQdqAGOXSqOdNSoZV/HqAKa41iweg6lUf3yrO/hpfnlXTFbuM/oYFARrr9
-YWY7qH5BEvcZBf4Sg3cWGjdbzYg8S6hnFBBkHPDMbS3xra7H8uru8aG9L70aiq0C
-3WsGf1/Qctz3cccB6BdnbiXji0QlP0miT+b52hEzDvNjdXvoObgbOZsUUcLrbz8q
-LqaQPj6TA2PYpKcxEdJLDcbN++tglQIDAQABo10wWzAfBgNVHSMEGDAWgBSTmtfF
-P/zQDiCbte3AG3vchjSekjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAgBgNVHREE
-GTAXghVleGFtcGxlLm1pdG1wcm94eS5vcmcwDQYJKoZIhvcNAQELBQADggEBAMoK
-8+KTYF10dbQ8Hl3Fq4Iux7eutAPuKUXUz9dnCfDRhZukdl+gahRoNvkyMBdXOvvx
-R9Z2+Guo8NOYKgT1mJtS/c8IxTkjZj9doujJOVD2wTowSfoaT9z+/EJa+6Fp9+xd
-YVsO3E/2Vxai8PCNx8JTXr2axcnBDvpHPRXF21hOI8N94SPAcmLTZsdsTELjrGGa
-/BA0y+pCEwW6cY9mMHVAAvRoMoqfocBVI7nrYBaQfFoKuwxscxO679eEv+lbSjul
-z/VNdWfqrDhFFSzwRSVchapQ9q1EeTzv++wZRwI5bT0Ib6DFTJB3J5+9RihlFYfU
-GI17CI0D//DsFic7QJ0=
+MIIDUDCCAjigAwIBAgIUSWoLwl7Rc//TKPwKwv25Vhb6uE8wDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMCAxHjAcBgNVBAMMFWV4YW1wbGUubWl0bXByb3h5Lm9yZzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVyHPsi0UUkdv94efFUihuDpJt+
+6+AmwM/QCXiQz6c042oqEeAFfuANWqJiJKrWBP4+waezPT48iKtn597lV09R3gDH
+hLGzEDHoDKY7+2gxT0ETYc6UcrYlRkDOYy+twMcj8I4xdU1Qt0TZhHlLxvDvO/jS
+BLQke7xymJr29YPUpRLtvigyihT/zRx1zKKSG9nObUoRq+I73i46baC55fWL3aS7
+u1W+/auqnPLVKAlGS/kgGScuk/SnwMrhfcSLizEjYUt1JzRfyHg88tGY6pzJEnUh
+UGYHBxetRlD7Rt2pChrkHHngNbgDkh7gSD4Qm/PwcQEzmWuYP6fcO60o9RkCAwEA
+AaNdMFswHwYDVR0jBBgwFoAUcERk2OfXolBurKKp4+GcoyAGMGgwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBaAwIAYDVR0RBBkwF4IVZXhhbXBsZS5taXRtcHJveHkub3Jn
+MA0GCSqGSIb3DQEBCwUAA4IBAQCAD7jv+dTx4Dr5jqtIPFjKmeuUiqti6mx1bpY9
+/e9J923+7xWU50DHxDnwnPKNqYS4jr2Hmht9PRYE+ZxgkxKZzHDzHX+zBMph5TUr
+8H84pbV1WuLjWpOC2hBobNHS1Rq707M7wtL+RV6EDKW3T9Foo/F+AUficubOmBF6
+XFD+oXcxRYYGdUaMBzd3tpJMRrUYlGRL+7aFKCM+gMKqFzJwZdcfENjIw/jj40SM
+pyTauRIxouwPTxpAYeKZ9JGLgzoJviuq+he7S1m6eiN/NAvK6M+E22FZcYMHsEOV
+sTsNwqivVdb0eFVjsAIFgAwJ2BMO6ye13/6QJ3WI6RJOKEDG
 -----END CERTIFICATE-----
diff --git a/test/mitmproxy/net/data/verificationcerts/trusted-leaf.key b/test/mitmproxy/net/data/verificationcerts/trusted-leaf.key
index e62ee61f6..11f706220 100644
--- a/test/mitmproxy/net/data/verificationcerts/trusted-leaf.key
+++ b/test/mitmproxy/net/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/mitmproxy/net/data/verificationcerts/trusted-root.crt b/test/mitmproxy/net/data/verificationcerts/trusted-root.crt
index 88ed4145c..07f98c8ac 100644
--- a/test/mitmproxy/net/data/verificationcerts/trusted-root.crt
+++ b/test/mitmproxy/net/data/verificationcerts/trusted-root.crt
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUTE2oFYATbkkytGOt0+CIAOPpaeEwDQYJKoZIhvcNAQEL
+MIIDazCCAlOgAwIBAgIUN1abbPeW/FETKzGlISahLuBhKEwwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xOTExMjMwMDA1MDlaFw0zOTEx
-MTgwMDA1MDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw
+MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ7fqv4iC6738OvOC/ONFmhOVmMNe2SrGtk+7KIv/M
-d7MJJKpIygwc99EfL3m6WFjvSQ8CABO9GnLIeoB6RzX5X904dPQzIekMkE27J4D5
-wzYWAmYsu9md//9rjadaA01zHvxtpc30AsToOrRa2Rv7Lwotvcop2bBCXXZMdgvD
-BpCuCOl3cQ346LZBmED41q77P7SgnI98gCPuyyMVAFTZE4NnFUloVERTcMMo5Vwv
-tXFT41B6FOqtyhZFY89W1SeNKlm+n8zu+/aUF5c9usxwvQzj79pzBFYS9xMZzbxl
-BmU91GbLFNU32O+wp0jX6c1MfluGvRjcHQpK+gHRRJdZAgMBAAGjUzBRMB0GA1Ud
-DgQWBBSTmtfFP/zQDiCbte3AG3vchjSekjAfBgNVHSMEGDAWgBSTmtfFP/zQDiCb
-te3AG3vchjSekjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB6
-CnGmyJKVdD41Qs8QbyZ5VvrAkSq7DkL4CAIDy0pClOYjx51R16g4/dXPd8nuDjVB
-GbRuO/ZHlKeO+RAVbV4s74KeBmQ4uyuZMvuiJGCDtTgu+fbgp1l41vj21bkDnz/X
-0aVrwC4clh6O1/AFCY7cYygp22QJ0zGpIb9d0ly6QDMEocHJKasuQ8/0GPvv6wkY
-hwNub2ScsVFHPrFzzufZblBk3Ks0YZw+IsCMTY7QtGb1TZhGeX9xAydqNMnmIxNj
-XOE2FKx4ISQNFwf/U1LEAruO7PjbbsWx5FHr4oYV9TCLoERZFofwcGGM9o/cPc4P
-CH8fGvFYoU30PG+xX0Pc
+AQUAA4IBDwAwggEKAoIBAQDOyhGCoQjxdBmDKcU8NDyilLm33sKMhVMaKiv44n+s
+UovY92Ie/GQ5C63H0LPyctQfCDXatx2SzGRXy4ii5QsD0Jz0mva9M/Y15iW8+9Ng
+wjYXQBBRkin0ll2QXrxnqvRExiVnRZ5mJsUHyTG/6krFkA+O0kOwP40vkD0joKp1
+L0mN5jFHUJcnidwBujyt832zFgRnKZejMBOm1t5ihwtdQDzCtLvfmm6C/+4jyypJ
+7HW+yjGQXj7uM5hD72azf5PXmfNZ+WrGHXsSXoJSPAYHQnH1gLhYIfcMa4yH+HIr
+/BCk2BNggqKnyOWIKAYo5e3H8JYatGIpzoisU9Pm//cjAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRwRGTY59eiUG6soqnj4ZyjIAYwaDAfBgNVHSMEGDAWgBRwRGTY59eiUG6s
+oqnj4ZyjIAYwaDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI
+cyriRs4fySXNG3SP/od3BbUulKHC37DvV8r/0vMPD6r5znjX08KvjIEiSNQkGpyN
+G06/Jt1p1mucPwVf2VrSmC7RV4/5NpzOIUNfjMaA3EASl+Mtz8Cinp0e/MECi7Tz
+VtBtmia1pbPIjr8/GSZP74kbysNccz06c8OyrI+91vq3isa+xJgjXYcyLnY5rNok
+bet7QHb1QE2oDPTZlrmZ9Rsh6K6xcwfKtXbsjMDFrdROKwdP1zGpQQIqOelaOixO
+9qGk0Y9Tq/T4ItTdQJYvCSxOvU8LDVDeYfOYwW3kbvclyyZ7CnieWxlzCY41As1u
+2OuNWUhfNcoqamAkv0nH
 -----END CERTIFICATE-----
diff --git a/test/mitmproxy/net/data/verificationcerts/trusted-root.key b/test/mitmproxy/net/data/verificationcerts/trusted-root.key
index 11a4d5a6b..5be1c316e 100644
--- a/test/mitmproxy/net/data/verificationcerts/trusted-root.key
+++ b/test/mitmproxy/net/data/verificationcerts/trusted-root.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA2e36r+Iguu9/DrzgvzjRZoTlZjDXtkqxrZPuyiL/zHezCSSq
-SMoMHPfRHy95ulhY70kPAgATvRpyyHqAekc1+V/dOHT0MyHpDJBNuyeA+cM2FgJm
-LLvZnf//a42nWgNNcx78baXN9ALE6Dq0Wtkb+y8KLb3KKdmwQl12THYLwwaQrgjp
-d3EN+Oi2QZhA+Nau+z+0oJyPfIAj7ssjFQBU2RODZxVJaFREU3DDKOVcL7VxU+NQ
-ehTqrcoWRWPPVtUnjSpZvp/M7vv2lBeXPbrMcL0M4+/acwRWEvcTGc28ZQZlPdRm
-yxTVN9jvsKdI1+nNTH5bhr0Y3B0KSvoB0USXWQIDAQABAoIBAQCWWYbgHSPzlBOW
-eVyc0Hg3QGx7aisIStP2Kt9NeYP87oAISNFqUmq0+Yu+9iQHGbiRrVe7S45SopKa
-GVnWApcMKsUWlCl9tWFxF4VpH0HuDm2cFZ+kMR1b0ifHbf0NLsYaLEB+7Sr/s4Fh
-rk6LdsnFK5jcIdn9sX/W6WAaND69Ft45sMXuAKPeqwySm7t77nlIEp4lJy/F/rvS
-UUV77UVL/5GqC1HOP1kXXEJDxHtNrDPh0fF49Qo/6JPRmLIOia0yKUS5+8lKHh6V
-J7nWTucyvviKoYvdJHpi9w2+DTI7mT33Go1Ss4QgHihzcURTtfjsn7yOelS6z8XM
-YOxURwoZAoGBAPZpod0Zpjm9trf547reFPLfAJUiKDj1wYXnlpSFAzOf7pSXDrfW
-L5dc3c5x2DiBXUlBu03ZWo7wVOKv7d9ByTrvXEqT1/KTqmHoI6Mzy0rn9wU0FmL4
-ASPcpPMnNStOSmRfe9HITDVvgLYo2wQEu1MXf5rGs5HjTRpEGVdWRkRPAoGBAOJo
-pQ9uRtaLlCF3KXoRr8HCBKI64IWDki7pbbLTglOBbmptQLfE2GPc/FPBsQwR3KBX
-m18A2pc7CRUKzsDavb7SyXTqtP3NF/AguTjGXIv/45QD6A96SStaYR0ZXSA3/uhZ
-rAaSSXxaI3mDTc32pXoXJDp7K+CPc5w00I8u1/fXAoGAe1UPoPyPiGL+K0M1yngR
-gCZBwmMgQrIutHjfk2Kn4ZTw8wpQYY8grt/aXNP6Zv3I1TvDJgneG6EKu5NWueHR
-eGAJj4JEGbPzGaH5BFyOKeXEa6RQeCStXWe4X8OGBzDeZzKrZKqeCjjO8V2tkWtU
-3xfp1GwTwLdGBhmDnYUfEl0CgYEA1vzVF6T4gQtDGtADQ5V91je8nKvZvQ4lhoRD
-lVZAX7j8tvSNSrMRYypZM9Mtoi9n1524vGqcJpR5WFDN6NUM7iFMCMhCGupgO7Vn
-DCFXidzvJgLbna7Zwd/tbWtDQa/KTqmvrwHD49/X5a+n9tapZRiKXznMfUzaU87W
-589sZjsCgYBQvtZpNQRqTDNOSuIJGsloMNp1HG2Keoj/nBQ9idkw29rUqhae7ZAa
-Csk91ix+AMR8nzQSkpHWOk2+RjdVAQ7m87bnQM6mmAJTcipikDfFxNqOWt7JkM2h
-Ydk36LHBIBVLOeqMXrhCHvai3h6efUz7wjGhNxRJ2OGrzWFfLgVsqA==
+MIIEpQIBAAKCAQEAzsoRgqEI8XQZgynFPDQ8opS5t97CjIVTGior+OJ/rFKL2Pdi
+HvxkOQutx9Cz8nLUHwg12rcdksxkV8uIouULA9Cc9Jr2vTP2NeYlvPvTYMI2F0AQ
+UZIp9JZdkF68Z6r0RMYlZ0WeZibFB8kxv+pKxZAPjtJDsD+NL5A9I6CqdS9JjeYx
+R1CXJ4ncAbo8rfN9sxYEZymXozATptbeYocLXUA8wrS735pugv/uI8sqSex1vsox
+kF4+7jOYQ+9ms3+T15nzWflqxh17El6CUjwGB0Jx9YC4WCH3DGuMh/hyK/wQpNgT
+YIKip8jliCgGKOXtx/CWGrRiKc6IrFPT5v/3IwIDAQABAoIBAEawNqoj6E25tVrr
+9XtuE+gz1QSwxmqIzO6dyehLbP94PEwPzN/wwUXq4x3yDwFrFW4CPX6lqBtdeVO1
+xOCCUXCdaHoJWx00XQ7xvKbMouZpnVn3UVzBDUyJ9jP63obFnri/z1ttJgefay0N
+Ls9/BM5iP58/61mdb+L5eJzsODjUMjaxvgJ8DPQWEuticz3s5sEE6TPCoIZH9Vc2
+Ri8kWy2/tpCLZpJbrrKZNdAFnc8zgSSXwwu97m8KpXNnhRFA1Qu0y3U3NP6oFYnL
+57qR+Kqdi7QG7GcvUXsHhsYYTiusJu9PaEomuBqyYFuhyFtHtLPX65nWZMQSK3pu
+Eu9Hk9ECgYEA/z8eTD+uMqC7Hz+YUWPMENynAy5KVOSqkBzHg8ePuW/gyTRrT2rQ
+wXp6l/nTO5A5jzrAdvMIqnEmyhdnB1AoRM4OtA2/wblsNFykWecVQyD3uplafVtS
+D3JgAN3FId/x2fZ8U2rSvHW2gTbel9HS3yhGtHN9giMKVtHTUs4FLlsCgYEAz2ZV
+HQf5+deYr/da/XFkkEA9i8deiCcy+wqVlTW6TrEzBPwczLtV36bgubDZLy0NHO4j
+oHPMGWtn343MzcOx6/hZGoCoBTLkZghipMMexWgldeBgOqqWGV+7mq8uhc9j2g9E
+aLJKUkGhRmPXvlcS396P9bjKCX1nFLgZqw26xNkCgYEArzrl0fLl5Fv0Gr/OEhIx
+RmI1RjnBTgauEcGwNwgJ44SrDXavNRZfunQbNbqNCZc57NqoxwCSMnD78EGguaSO
+AK516aaGvrhNUKVJL281aaB4ceJV/Tl0XKZowi995oOXxcsyDxKHGlq1sH+60P97
+hThhUgD3aSAlOPVT3sURSYECgYEAkJKQ+i+5PUPgl6khsFH++98MCAfuCZLpor16
+EAzn1jsHiY4EtWJRNhopxMdWXeBVp7kI9KxDteR9AATkovqraAYydpsAhL85Hzbx
+LFEnfgxfMJA8BCktgHqPWACNuZEb1cGWujSuQjClr1+h4HjqG0wVpgAuNfdIh9Td
+b7OeYeECgYEAjLrVoYhgqiG6qW+UNgzhr2EM4my0Q9dda4DjVIWZW+19XCmqPkEd
+ryaqBpolHKzD0GCiutI5S68W9wil3MBgV05qTbFhnTqWGJ3twGNykpYXx6F0aBTa
+6hwH9Q/IQ5AONkmSipMRnVWAuDwvdutX/knhEULe8TdGl5CmGkJ/OZs=
 -----END RSA PRIVATE KEY-----
diff --git a/test/mitmproxy/net/data/verificationcerts/trusted-root.srl b/test/mitmproxy/net/data/verificationcerts/trusted-root.srl
index ee465f9d7..069f913c6 100644
--- a/test/mitmproxy/net/data/verificationcerts/trusted-root.srl
+++ b/test/mitmproxy/net/data/verificationcerts/trusted-root.srl
@@ -1 +1 @@
-A3E83F6857295BF8
+496A0BC25ED173FFD328FC0AC2FDB95616FAB84F