Replace test certificatesHEADmaster

The cryptography library now requires certificates to be in X509v3
format and also requires certain X509v3 extensions to be present.

9 files changed, 128 insertions, 122 deletions

diff --git a/pskc/scripts/csv2pskc.py b/pskc/scripts/csv2pskc.py
index e1cf7b6..fdcc533 100644
--- a/pskc/scripts/csv2pskc.py
+++ b/pskc/scripts/csv2pskc.py
@@ -117,7 +117,7 @@ def main():
     columns = []
     if args.skip_rows > 0:
         columns = [x.lower().replace(' ', '_') for x in next(csvfile)]
-        for i in range(args.skip_rows - 1):
+        for _ in range(args.skip_rows - 1):
             next(csvfile)
     if args.columns:
         if ':' in args.columns:
diff --git a/tests/certificate/README b/tests/certificate/README
index 05184e0..100826d 100644
--- a/tests/certificate/README
+++ b/tests/certificate/README
@@ -6,7 +6,8 @@ The CA key and certificate were generated with:
 openssl req \
   -x509 -newkey rsa:2048 -nodes \
   -keyout ca-key.pem -out ca-certificate.pem \
-  -days 3650 -subj '/C=NL/O=python-pskc/CN=Test CA'
+  -days 3650 -subj '/C=NL/O=python-pskc/CN=Test CA' \
+  -addext 'keyUsage = critical, cRLSign, digitalSignature, keyCertSign'
 
 The key used for signing the PSKC files and corresponding self-signed
 certificate were generated with:
@@ -21,9 +22,11 @@ The certificate signed by the CA key was generated with:
 openssl req \
   -new \
   -key key.pem -out request.pem \
-  -subj '/C=NL/O=python-pskc/CN=Test signing'
+  -subj '/C=NL/O=python-pskc/CN=Test signing' \
+  -addext 'subjectAltName = email:test-signing@example.com'
 
 openssl x509 \
   -req \
   -in request.pem -CA ca-certificate.pem -CAkey ca-key.pem -out certificate.pem \
-  -days 3650 -set_serial 42
+  -days 3650 -set_serial 42 \
+  -copy_extensions copy
diff --git a/tests/certificate/ca-certificate.pem b/tests/certificate/ca-certificate.pem
index 4547ba3..380d9f0 100644
--- a/tests/certificate/ca-certificate.pem
+++ b/tests/certificate/ca-certificate.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDQDCCAiigAwIBAgIJAM7+vdiCdiCaMA0GCSqGSIb3DQEBCwUAMDUxCzAJBgNV
-BAYTAk5MMRQwEgYDVQQKDAtweXRob24tcHNrYzEQMA4GA1UEAwwHVGVzdCBDQTAe
-Fw0xNzEyMjMyMTQ5MDBaFw0yNzEyMjEyMTQ5MDBaMDUxCzAJBgNVBAYTAk5MMRQw
-EgYDVQQKDAtweXRob24tcHNrYzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANHVvzM2MKXJL7SXKddCl7jrs7FKNHGEUimq
-l1qLa+dF/dsEyqidqLBmmbMxKQcqMcsqovKPpTM7dWUmv7P7Cr8ZR0tVmD6JvQlQ
-4dmWngbR0zkVPKP9ZzZFLW1LEkHZUOvurdLeyo+33xomGnosFVLsDX1mo3h41OUT
-kJkCxnG1HZMudpQXzrOUmdCCMV9qsS5iVeLJItW6BzbjIYYx6vdAVgFELofPqMtn
-vPVmLkMCUyMPEKbqjWP23A93XgnwoFFppsSmhqK9JLRrHPVTaAV8UNvQhN8hdEn3
-biOBmtpH47tUG++RQMsV9E5kA9WoiisyMdTlutcdwnYo40L+Zs0CAwEAAaNTMFEw
-HQYDVR0OBBYEFNpXX0X0olR9QDVSBbyn44jP1wDmMB8GA1UdIwQYMBaAFNpXX0X0
-olR9QDVSBbyn44jP1wDmMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
-ggEBAGzWcea0i5H8MehTL35d8TMkjMp1R5Eoy6t1IhlYzZczphqzXSb76rA71oqX
-Ti17mEBH+SCwR3L+QL6uZYNK5JKHwQPbPmBErxwcymmJXK6Y5sOwliSTjeRaujcN
-r1h6qxKVshQFlMinS3VuQvT+fa2c1FMHnzBx0jN/4edsjJzBYChAs5dYgSKPLSua
-NQGSJKJucTq22JBhu1c2+DwhqM9MbycyvhwZjw4p0yfFSUyTmxFm6DMZaI3P6F+P
-YtIrwjaoZt8Hh+YaOUBM+3AJ4nSAkvgy7BsLPMxKFhCJqdAttQMDKpWmhgl+MtNQ
-ZAisAuYRkr0ZkgqE5+3bIERA70o=
+MIIDWzCCAkOgAwIBAgIULJ5QSDFKc/3MUsG9dyVDRsqmJtQwDQYJKoZIhvcNAQEL
+BQAwNTELMAkGA1UEBhMCTkwxFDASBgNVBAoMC3B5dGhvbi1wc2tjMRAwDgYDVQQD
+DAdUZXN0IENBMB4XDTI0MDgyNzIxMjgyNloXDTM0MDgyNTIxMjgyNlowNTELMAkG
+A1UEBhMCTkwxFDASBgNVBAoMC3B5dGhvbi1wc2tjMRAwDgYDVQQDDAdUZXN0IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6AkAhsmtf16TZEPykMA
+Ytkfztph8e+MK1LGzKbY2hBv4AUQwFeQO9n/otTM0w4EL/S9pUohuugNLMQlZ38N
+xa5ZAZxmkJEgNF/lG9xHqW65/c/Jqze+QFnyvGSUKB2rZnxQU9mYqiD6CV/VEWbJ
+XW5Ko5oSz+ojEa4AOG5HaDobRsbVX9GaoUs0KdkF2NIy+fmQowoLNwsjTjWACb7y
+YDKwaIu/KaqXnSC44TYWfkqYuizr3dBw1ZAgNoR8KwYDe/lXwPnNNTRFrz3R3wD5
+wLg+C1mLJMn/ZdWUjk+pPFDK4nF1jOH1Yp++1CUSJHjGCchYlpVqoO53EXQMp1zl
+IQIDAQABo2MwYTAdBgNVHQ4EFgQUE/dIsq12uv9UY9DYh57Dnt9GPAcwHwYDVR0j
+BBgwFoAUE/dIsq12uv9UY9DYh57Dnt9GPAcwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggEBADmC9GD0bGk4XSsjqktfzVJ1
+k3QrWEznxTfY6ZxwDS9NKd9kzngVuIqeCd7qyHn6DUV9RYpa6fMhdZi00RwnL0FF
+wbRIM2MT2r1N/Nyx9tAk0waQ5McmqCvtfuFI5eXw2dcrj1GR9iipcUfrGN0SrQN5
+QyMkbdfWszHl7Vp4IuWySKw2cNuCo8QnjWtq/WenVZRSpRvxvNDtQerpZPtHoSLh
+pohn/Z6zVOWyf+uCajytJBgl9l+RE1foLRWZl+GoBRoSSWrPUqn2EGQwrgqiofpx
+DSrPxJbvJY18qlgbAw4IzYfr15zVQyeTZCVUttWSE/yP2m53garunWR1JGQ9u4g=
 -----END CERTIFICATE-----
diff --git a/tests/certificate/ca-key.pem b/tests/certificate/ca-key.pem
index 153ed54..a9a4fe8 100644
--- a/tests/certificate/ca-key.pem
+++ b/tests/certificate/ca-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDR1b8zNjClyS+0
-lynXQpe467OxSjRxhFIpqpdai2vnRf3bBMqonaiwZpmzMSkHKjHLKqLyj6UzO3Vl
-Jr+z+wq/GUdLVZg+ib0JUOHZlp4G0dM5FTyj/Wc2RS1tSxJB2VDr7q3S3sqPt98a
-Jhp6LBVS7A19ZqN4eNTlE5CZAsZxtR2TLnaUF86zlJnQgjFfarEuYlXiySLVugc2
-4yGGMer3QFYBRC6Hz6jLZ7z1Zi5DAlMjDxCm6o1j9twPd14J8KBRaabEpoaivSS0
-axz1U2gFfFDb0ITfIXRJ924jgZraR+O7VBvvkUDLFfROZAPVqIorMjHU5brXHcJ2
-KONC/mbNAgMBAAECggEAd1IXtrRi93MvGH85ALpScoo9lVw/9CktW5oxFQDhLBNF
-5oyT/Uwhx6WgUyBqVzOsOv6UyF/crgRqnklpi5v+oWprezBCMZW7lBeVRlj6paAd
-f4FPCWWokljGGzcsO5urA26nE5kzEISbblAqkDyPJ6cpiJyb6n6zeUwl1oyYccFn
-Vw7x0PN2QnFcTWzTxfhDAZpZeF/yYBzVR78BrYJ25HXf394MseiC0SWTbmUQlZzU
-0jwkGFEQQ3w+Q9i2GfiBp2801sRF69nFDcAin7RPAFajiKAIrmtaGWZbL8C+OIzO
-I32TPWOiA3swKolFFjsSA80DYFXAOYlHpd9j/FWutQKBgQDs5c6YukeZyq0scLRl
-jFtzeul4n1VOJrKT1xh5ivaMTdwOzNbuaOCpReNQoUsHoFUGdO6lxIQqMjjHNoiA
-/WnK7VHIC3Voc0U8HCvYN82jAuYpc7NswpvEefXB8Hq8jGwvvn/WNiGeqjvhbSdr
-8NZPBrGY3X3W2iUMZeGGWu1BVwKBgQDiwUsrjP3RVRXKTCESak8AoiwzrokutMN5
-zMdbIWPh5q5/yFMIfj6PkThOixI4jY0EedunL+7l5obKsTGs1ArwyU6jL9vtKHT4
-GiUtGN1emPA9TCiLFKEM+fDWtoU3aw2CC6Cy+0lZANpg4FV0wrM4mhBtPZpSTRJP
-3gP2O3TOewKBgQDJFFdEc/mKpOpRKmk1OOn3H4FFDZmO+HHj41O29ylG9l+vgFd/
-ji4EAHpuWjohgwoorOBUfHXiizZ+gd9j/bXqtX4RWwiRXCaMWy0sHlHB6BgNX1QR
-IS6umwbrU4AawuahsAU6gkAPOVgShGBN0uNVuMzOgFLsJ8YCvAetz0hLiQKBgEnn
-lghru44unRuCFIVcAMPEF4QArtV6NPvNsmwRReyqstUTBX0PKHTCcAepbBbii8OZ
-s+2ZwdNMf0Iw3m/l7GruMaMeRh/Vv8ndO6CnKf9a+XIBEHXEE3mXPNe+RUz6pzxr
-bcToAc/wZzyL4U5c5uzbyd7Q5StN01oUklX+quNhAoGAKLS5887ucfeFAjNxeNk4
-hsSFw7CDIHfuJbTpzitf8bTbqy1SqB8DSW1S5zCuz8yxBIO5HjF4rT2VT0F2FN0o
-7OrhXiqU9mAWxObvfObDlvOoLcnPvvayotUdlcboBqCxHAjF8jNBYAQuKXneSLFa
-IEo4FtswiJCmqC9tsMEy7Wo=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCfoCQCGya1/XpN
+kQ/KQwBi2R/O2mHx74wrUsbMptjaEG/gBRDAV5A72f+i1MzTDgQv9L2lSiG66A0s
+xCVnfw3FrlkBnGaQkSA0X+Ub3Eepbrn9z8mrN75AWfK8ZJQoHatmfFBT2ZiqIPoJ
+X9URZsldbkqjmhLP6iMRrgA4bkdoOhtGxtVf0ZqhSzQp2QXY0jL5+ZCjCgs3CyNO
+NYAJvvJgMrBoi78pqpedILjhNhZ+Spi6LOvd0HDVkCA2hHwrBgN7+VfA+c01NEWv
+PdHfAPnAuD4LWYskyf9l1ZSOT6k8UMricXWM4fVin77UJRIkeMYJyFiWlWqg7ncR
+dAynXOUhAgMBAAECggEAIEyaHKb7zUVuEvXwWP/3uwiuK//6Y6cSGM4WFeEI7g73
+ZEACJLlTIRk6ZetjSq2CYWXHXgPDEXvU9qL14pxN4BsoPXA1PLlw58gjpuCKy5jx
+H4+FAhU0dPb+a+p6JCfkv8cVxfG4t2wWzADNL0k6I6KmjbYmalW5JOGtf72oy0js
+3oW9wuIxjB4Ok/nFFMN9ZnNAy3Iqxrgl7yzxg6ljA55cDTkIVlW6IaYEMaRvKi0E
+TOYJ9+DulnXRGF2SsrDY9dm2lUiNiDHTS9fiRcFgQtJS6u8BPhHXosnTlNcHeuth
+PBaBsQQH7kV6SBiDRutHMRSuCqfwJqLPXeWKXTxxBQKBgQDLosHJq4fJcer3oMb5
+fLqO8gly0FSSc2kE1K3X2ebA5ZARjncP87772/sGWRIyiCMIZ7sZHLxxZBNNTkxi
+MN8xEeYZ8EcAXZWYXVtnOFag2EbmFrkUyMgjrldnHXjhc6vZ63MHdRXlNwmMO5NT
+JHFgV3QkjyhIKBlO283rBWBgowKBgQDIrDZiFLJwwH9IyxYBMPlPUrFLT5KVdAWk
+QA/lfK3iMcWgWK348pWO6NquqHuYd+D5+nxYzs5CmM2zL5hahu41OMb1yhMEu/zk
+2L5pOr1N4ZQKCWZyv3uebm9TNQ9MaIJr42eRXzXua3VKrV1OqFYK5kfJth18sPPG
+OXQqa7SLawKBgQC59X+ScxolU+qHCEOsQcL8FvuZ5bXVp58X0kCPBWY8cWcHIVqJ
+LsYRqemq+lwr2TZkzpWFcUCFLCaUShRm9spbPUUsGsg8BTo/UcHOmRxC9j6Ij+ek
+m1ZpfyRB/iANglxFPUZmYP4FvCTz8tOu8XC30iU13aWjfzrdUMzS+q3wkQKBgCSN
+AYbR4EKbPVPj8ckbw31IQZTHFJr2PATTylFxaTaW/DkdjeqXPNh/3z0K4SA/TZIa
+psWCPZ1xuZ3WoHh0tTSqd8rTGK23E/QW6m++TDbATLebSLbD299anBpawsOXEZJX
+JEkdP3SCzCVi+GjYTnvDv/WknzBUBsLnOhpz7bmrAoGBALLOebkWdxCUG9jj+l8l
+LzulZE0C7v6mVeWykAanhANP4HhbmQDFX0s8T1hkeut11ncg0E5MEMeCeYUP6DrX
+p5t/TmqfqasaUsuKcLHZyNr/8EzLZPQ5bJIbY/QwpngGOQthGirSpYXFGhZpFVGM
+tMfBc7ulh5NVxuQWCEB27/pS
 -----END PRIVATE KEY-----
diff --git a/tests/certificate/certificate.pem b/tests/certificate/certificate.pem
index 2afff39..7e19000 100644
--- a/tests/certificate/certificate.pem
+++ b/tests/certificate/certificate.pem
@@ -1,18 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC4zCCAcsCASowDQYJKoZIhvcNAQELBQAwNTELMAkGA1UEBhMCTkwxFDASBgNV
-BAoMC3B5dGhvbi1wc2tjMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE3MTIyMzIxNDkx
-NVoXDTI3MTIyMTIxNDkxNVowOjELMAkGA1UEBhMCTkwxFDASBgNVBAoMC3B5dGhv
-bi1wc2tjMRUwEwYDVQQDDAxUZXN0IHNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDm2d2AodQmxQvK/pSr/6LAdj4U2RM3sUgd0P6f2lAcs5+O
-Tr2s+6SWkMEnpm4xzamfFr4hZrTi687Th404k16+VDgD2Fdlha1ic4ETH1WYAkA0
-01HLXejZ/Jc1tYYb/mGD9L1fm7TliTc+2mL7efTMyRFzIGTLmhC7vfcnoTBRzNBG
-g4uy0z0XK+KrDcnb8S1rbXLQWazsQAEi9FAB3ArYkvE8gYgDs666W3fg5EROb3Oh
-GHcKmqECNoPaw4ZeElHTqbETp6YCda3NGgstio8Yc17OCuNg/xL4NSxosJWZiBQ/
-aDDsXP1zBmF2xthaPAo1glBTACnaf0K37qgRE1XRAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBAHWvbyr/oip66z5tlQMxKCOqs6FVgYr3WxT8K3QsQeK2ELp64gfYKRLF
-GqM6r7VHVQIUa/5BdHDnd9B3axeSDRRVQzJC6FNjcWvS/Pu+KIvwtUkH8t5T713u
-q4VbdJwKMYRl3ge2cks4ydmMc7KmMMKVQ1W7EMEP2FPSohKTW9sJaWboRd4L5jMd
-2iwnsfLMQHZIhUOH1gQS4dlnJ4PZaLBjsukChe5AfnA+LPiAGji/aqvi9tTjLVWb
-z95OH5e6V/W1t0jtCp7O+h3ytNHmyIV8KYLn4Hu5tCnYGWTJ62NSYCtjhLkDpQrk
-AL5yqfYZRyOjmtjBaq2tYxDCF76e4ms=
+MIIDUTCCAjmgAwIBAgIBKjANBgkqhkiG9w0BAQsFADA1MQswCQYDVQQGEwJOTDEU
+MBIGA1UECgwLcHl0aG9uLXBza2MxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjQwODI3
+MjEyODM1WhcNMzQwODI1MjEyODM1WjA6MQswCQYDVQQGEwJOTDEUMBIGA1UECgwL
+cHl0aG9uLXBza2MxFTATBgNVBAMMDFRlc3Qgc2lnbmluZzCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMTn3YiNxlR1mxUJyGhU65yvvzsKhl/4HpDmiVQo
+UGq7daxYLddLx9bW/OSUQmIZS9NiebcmZGJF0B1+ru3Au962+Cso69F4+mPN+xKo
+fqyQpl9gzgo5IXvFzvgjlVQYuSGjf6B5J+NoQbeuR/latqIrjT7K1QtDSYZr4WSN
+0BVI1JpEmQ3ucmIgwt9ZtC1mZg8ApznDs/yf8dfN6Y5jFYjCaRt+Qzzv/Uqx3rgK
+/tl8Kr1fJXGWaDI0afPrja7syVCkTs1VhMaZt5nXzEmX17W4PzBz3M6ElBrO06S2
+B++DDe2Hjip0wJ+qCUVmUQuDCdC9o35Oi6cf0RIy8gZReaECAwEAAaNnMGUwIwYD
+VR0RBBwwGoEYdGVzdC1zaWduaW5nQGV4YW1wbGUuY29tMB0GA1UdDgQWBBQaU4Kp
+x4G2yysRZ4du/WRn7/aBFTAfBgNVHSMEGDAWgBQT90iyrXa6/1Rj0NiHnsOe30Y8
+BzANBgkqhkiG9w0BAQsFAAOCAQEAJzt19KlSPCP2RH5wMI7OiVf+Zbt9inC1pCPb
+vRebgz2GuDRZu+WMlXQ9WXFLwZze+j7VVdx9k84MKfasLmkarUt6xc5fhxIzopMs
+Of2swbIjxKssdO9GNIhjuVnC2d3ltwPqBb/Y+mpuxRwQ2zoahS1bFxTxTnhXLxQx
+qEzWeJ66dplYdKnYsCsnB7yDv1A7KPQTy/zHzFzD9DBk9WCluyLJQ6DASjQlKr8M
+Uu42tVkfhTaBJTBfEh+HlJApSJP94xE5uY5iE2cLAlEPJwZk4BCQYM8B5JR4PpHq
+0L4dJYLcE5Id0f9xdO0D9L5/kmO4RipBXImdoNZwDoeqRx8aEw==
 -----END CERTIFICATE-----
diff --git a/tests/certificate/key.pem b/tests/certificate/key.pem
index 4e18309..9197f01 100644
--- a/tests/certificate/key.pem
+++ b/tests/certificate/key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDm2d2AodQmxQvK
-/pSr/6LAdj4U2RM3sUgd0P6f2lAcs5+OTr2s+6SWkMEnpm4xzamfFr4hZrTi687T
-h404k16+VDgD2Fdlha1ic4ETH1WYAkA001HLXejZ/Jc1tYYb/mGD9L1fm7TliTc+
-2mL7efTMyRFzIGTLmhC7vfcnoTBRzNBGg4uy0z0XK+KrDcnb8S1rbXLQWazsQAEi
-9FAB3ArYkvE8gYgDs666W3fg5EROb3OhGHcKmqECNoPaw4ZeElHTqbETp6YCda3N
-Ggstio8Yc17OCuNg/xL4NSxosJWZiBQ/aDDsXP1zBmF2xthaPAo1glBTACnaf0K3
-7qgRE1XRAgMBAAECggEBANe+RIQyuVKCVMMhqVAVWMUFvH8/X/ZseDllWJGMNdKd
-DECy1hEUHH2aSuoDYHiq/Brx5j7Q/bwVJPYLeK+nCqRVkQQG66a1h5S63aZBYnzt
-nZPA6nBlE3il16saOntvATORRmpT2nuqATd8YYUkNOQuBWDSpWCiW4EZyCIBQmcu
-fAzdLtZ2opok/k1ZmAYANDU1pOvOEl0hfd+hTyTeop6HzOhjkm5G3+mgQ6xkkgv5
-bEeiddfM5RNN0jzyzlkS5qvuGH84oPLK/xH9/4iLLn1nNfPNSdhWVF1LWLv9ii3d
-AtNcXErQBDlYjEVg5nfrTU2vWZBP963cpO4EPOH8uQECgYEA9cXHrjR59XI5mawE
-EGanRhS/EDk4O/dYwgJiUBnFhLbJ8Nkq495I9b6XWer4TyzLCYdr4c+RUpnZy9eW
-CmS0uT/Zu9/hP3FjVACCbIrAOSZxDJH08w0DzaVFQbIsLd94PSUSIB5LN5p+NerP
-nC/+ZXL9FXg5rdKoHeL42LwdvhMCgYEA8HUgMlfwcqRhMlDLPXjutaCav4qcxIEg
-HJ1dGyqBOefTyZ24CKcMxRX7CIHsxD43ksGaq7mNu66ArLt3RI0n1DxAjtOrhBP2
-22qy1OldxGNW56fgLjs8n0GvOQ+AomVeA9dUh2mSHHpAMDyYn5J+FwNFIfpvPsgW
-/5q9dH0ciQsCgYEAgy73X0fJVTaMAjdrz+lLHcATH7C7EF79NEkbes/WuvjqHzF7
-kDdk0C7UEH233mL1WPe8oMIvOly+gOxovNF2GW84Y+yjCT8Xmo3PD+qboaWgL+p0
-SYtH3Wt65Q8aP74JKvHvk883rM080sCr4h1H95SB/AS5HMvVSmaNFvqKEZsCgYBT
-M+QJJ36u3Iw5UdWRlsfalxEU2Ay4vglzfUwbO1DtzXbuG6HzdIIprBpp7jMUEIdA
-Q7eWViVh3Nbvbgqt8L3oZVTdVwbRM+tGLxxkKb/lVY5bqC4dMSgf3yWXc/LJvpOS
-dq7sEC6bpf2R81XIWXNB2ULRqAtYSPoUReHqbeQy0wKBgQCA95LWgLzcKH7NxaWv
-4Av/jbA1htqm/XKKm1D0vH/7mAag9QJN2EdUeaHaRYLSUJM5g/pkrpf2WBbWhDQG
-3uJrw6kI4vYED4gNzE5KgoDDDuhxc0Ij7ocguTlz9nt2MMwMlWVSiabJvR41X9rn
-3VGCRC+qCeFYeXYmM60U5W4OuQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDE592IjcZUdZsV
+CchoVOucr787CoZf+B6Q5olUKFBqu3WsWC3XS8fW1vzklEJiGUvTYnm3JmRiRdAd
+fq7twLvetvgrKOvRePpjzfsSqH6skKZfYM4KOSF7xc74I5VUGLkho3+geSfjaEG3
+rkf5WraiK40+ytULQ0mGa+FkjdAVSNSaRJkN7nJiIMLfWbQtZmYPAKc5w7P8n/HX
+zemOYxWIwmkbfkM87/1Ksd64Cv7ZfCq9XyVxlmgyNGnz642u7MlQpE7NVYTGmbeZ
+18xJl9e1uD8wc9zOhJQaztOktgfvgw3th44qdMCfqglFZlELgwnQvaN+TounH9ES
+MvIGUXmhAgMBAAECggEABS+/Uda8K+LaJiR3Eypzd1HYxWcaUYJRWcs8wEr8jUcp
+SxQahwJ/vcy1Zhbypa9ZZDTClHyuJbmFiRVaabhLKotiv45JIeAgJktZau0lwwlf
+XIFKBBJrq50y/a3AQ/IPxE9QcAto7dBD9ODiE/Mb/usLQiVpFa4czG3ghrvGiJzx
+3eEKZNVvHhI4Q+j9+4rZGtgl9+p6GOVAiHDePQAzOd3WtyGErZehhBXc0ev+hdl7
+pBttOnE0THAdrOCYI+iXb7XhDKh5xDdoGl1DLOM2t+wqESnryzn4JnWKkJdwHPBo
+D1MFJVjh12zNhD1GMuu+Gtc9/rLrE9YRgB44h4ffMQKBgQD2NBkvoQg3jtPDqoxj
+06uwlft6e8mTMtPB9so9oJC9extyPBz7jUXRphKqucdBP7zxcr63Kw/ckRUxIOYx
+eIA4Hd6/vnzUjVBmf+oqiMd4o3kLoipCFNVaY07oybLclkJJmEk14s7zaqRkTfRJ
+oZgTSJf6HoB97uko5AexG6P5GQKBgQDMvZrtw2H98rohtBP09N/fcx/4a5r+JHeh
+aOhIsyRIP+ptjYWROcu+dqFeEVk3CwJLCXCEiijb/GmKKryLCZEI1I40erFTi8Bt
+WViDEfyV6+RexfAv0UMPY2LY7cWO4AQmb2gFZpnMa4mQfsL40IMKBUvo7ca++PYP
+Z8mAy8WtyQKBgQCPizyL+nVR/yIUWKFVqpnVcPyYIwgZnG6+DedIGw+IifgsmEPF
+nk5wt0T26S31KvY8R8xN+vtae/RBGo9blIgdL70pSiR5wJJ50GZ0uh6ihZ0TXU8K
+DB+AfZoKO17fIXQweGtm0YAbh7elC5Y8P8zsoUyKdbIwulSSlLCvYBAwMQKBgGHt
+8xP014MzPYpvavhIxGhJ1anqNkmHQd1no2tanGkegVADWDbdkTG55ndrDuRAFMm1
+aydKOj723bhjtqk+WywBFz/My9KtTs4+5RJUYR+IpEQco0UL7+qFXDtsh4lOZ03H
+Ddc/eyMG8Na3eySt/2+klumECgNAa9l0iDJdxWDZAoGBAJnrhhqCG+OR3PgW9yVn
+XWuYXQ4PjoDZtg/PnbeGr6rKFKK81TokY6VyQXUyd9f4XHwey8mZl7+jSkUY5J61
+9HOzwUQEzCFR3IqyDInmFvS3ujhgWypcLpbZfxpa046FCFUpXRKgZCTYIa47tkUB
+m1/YiQv2wqN4juzGmRzWmRUJ
 -----END PRIVATE KEY-----
diff --git a/tests/certificate/request.pem b/tests/certificate/request.pem
index a693ce2..8d3f4c2 100644
--- a/tests/certificate/request.pem
+++ b/tests/certificate/request.pem
@@ -1,16 +1,17 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICfzCCAWcCAQAwOjELMAkGA1UEBhMCTkwxFDASBgNVBAoMC3B5dGhvbi1wc2tj
+MIICtTCCAZ0CAQAwOjELMAkGA1UEBhMCTkwxFDASBgNVBAoMC3B5dGhvbi1wc2tj
 MRUwEwYDVQQDDAxUZXN0IHNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDm2d2AodQmxQvK/pSr/6LAdj4U2RM3sUgd0P6f2lAcs5+OTr2s+6SW
-kMEnpm4xzamfFr4hZrTi687Th404k16+VDgD2Fdlha1ic4ETH1WYAkA001HLXejZ
-/Jc1tYYb/mGD9L1fm7TliTc+2mL7efTMyRFzIGTLmhC7vfcnoTBRzNBGg4uy0z0X
-K+KrDcnb8S1rbXLQWazsQAEi9FAB3ArYkvE8gYgDs666W3fg5EROb3OhGHcKmqEC
-NoPaw4ZeElHTqbETp6YCda3NGgstio8Yc17OCuNg/xL4NSxosJWZiBQ/aDDsXP1z
-BmF2xthaPAo1glBTACnaf0K37qgRE1XRAgMBAAGgADANBgkqhkiG9w0BAQsFAAOC
-AQEAB3SpoRLjnd/lWTyi4KLAPr4uZEK17wwtKm2aFHhAEPbQSrzvFUdWI2OjVo9r
-nL9VgysozhmwWfWdVxc8kyYo6pNYWXqJtxFK8dItw06ptL8FETz0+ho+bcmeq6gv
-l3ZKzbY2QKdxW/wP5iLuNPUkVYknP1wWzt1lM3ffou3RL/Vf+/XB+HadCD3w+7TD
-XguTeU34alv050HvulO9gUpY35ZCC6rVO9ZefOFtTkT8zAhUqZFpWrnKxvcMXRSM
-6KK0TWyoP9FGfnGxkW8ij94yiq+Vzyi57ZVC766y1x0j4Qj9ZFxCHn+wpDzxhgVy
-clfeldkX2JtQL5C8IOJ7Kt4H1A==
+ggEKAoIBAQDE592IjcZUdZsVCchoVOucr787CoZf+B6Q5olUKFBqu3WsWC3XS8fW
+1vzklEJiGUvTYnm3JmRiRdAdfq7twLvetvgrKOvRePpjzfsSqH6skKZfYM4KOSF7
+xc74I5VUGLkho3+geSfjaEG3rkf5WraiK40+ytULQ0mGa+FkjdAVSNSaRJkN7nJi
+IMLfWbQtZmYPAKc5w7P8n/HXzemOYxWIwmkbfkM87/1Ksd64Cv7ZfCq9XyVxlmgy
+NGnz642u7MlQpE7NVYTGmbeZ18xJl9e1uD8wc9zOhJQaztOktgfvgw3th44qdMCf
+qglFZlELgwnQvaN+TounH9ESMvIGUXmhAgMBAAGgNjA0BgkqhkiG9w0BCQ4xJzAl
+MCMGA1UdEQQcMBqBGHRlc3Qtc2lnbmluZ0BleGFtcGxlLmNvbTANBgkqhkiG9w0B
+AQsFAAOCAQEAuVZnrqmn7SgQDAgzYI7dPLI2NeDwq4+1JOGOupEO4Iz9N4AEa5dt
+rj0FiFzLGRueskI0W6GgFW+FHxEiFVykGttY/oWXkjMziJWYu9QbV+JsmIHSi89y
+m4+zoSXEvZTDfmuj5D2FLTuDSLwIxbWLn+6c/3/hKsK1SdD7mJ/JA6gKcmuM+RAM
+mOOB5/ZJ5z/3heKoy68NR5kt3JdI1OJokoep0rb6hsImxf9j3gJXPFg8Rhg0spDh
+DOBzrlqTemokUc6n+2Xa3zY31rB7vaqfX47b4eLDZQ7Nj3Ap9Nu2wH0HXHQDiRI8
+G05Tf6c1fZNuIkEm42PqE072oWZcapnMfQ==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/certificate/ss-certificate.pem b/tests/certificate/ss-certificate.pem
index 2b90be3..115cf8f 100644
--- a/tests/certificate/ss-certificate.pem
+++ b/tests/certificate/ss-certificate.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/tox.ini b/tox.ini
index 480d1df..0c852b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ skip_install = true
 deps = flake8<6.0
        flake8-author
        flake8-blind-except
-       py{36,37,38,39,310,311}: flake8-bugbear
+       flake8-bugbear
        flake8-class-newline
        flake8-commas
        flake8-deprecated