|
|
50e473 |
diff -up pyOpenSSL-0.13.1/OpenSSL/test/test_crypto.py.test-failure pyOpenSSL-0.13.1/OpenSSL/test/test_crypto.py
|
|
|
50e473 |
--- pyOpenSSL-0.13.1/OpenSSL/test/test_crypto.py.test-failure 2013-08-23 21:48:24.000000000 +0200
|
|
|
50e473 |
+++ pyOpenSSL-0.13.1/OpenSSL/test/test_crypto.py 2018-05-04 18:55:55.508551705 +0200
|
|
|
50e473 |
@@ -35,22 +35,22 @@ def normalize_privatekey_pem(pem):
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
root_cert_pem = b("""-----BEGIN CERTIFICATE-----
|
|
|
50e473 |
-MIIC7TCCAlagAwIBAgIIPQzE4MbeufQwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UE
|
|
|
50e473 |
+MIIC6TCCAlKgAwIBAgIIPQzE4MbeufQwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UE
|
|
|
50e473 |
BhMCVVMxCzAJBgNVBAgTAklMMRAwDgYDVQQHEwdDaGljYWdvMRAwDgYDVQQKEwdU
|
|
|
50e473 |
-ZXN0aW5nMRgwFgYDVQQDEw9UZXN0aW5nIFJvb3QgQ0EwIhgPMjAwOTAzMjUxMjM2
|
|
|
50e473 |
-NThaGA8yMDE3MDYxMTEyMzY1OFowWDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAklM
|
|
|
50e473 |
-MRAwDgYDVQQHEwdDaGljYWdvMRAwDgYDVQQKEwdUZXN0aW5nMRgwFgYDVQQDEw9U
|
|
|
50e473 |
-ZXN0aW5nIFJvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPmaQumL
|
|
|
50e473 |
-urpE527uSEHdL1pqcDRmWzu+98Y6YHzT/J7KWEamyMCNZ6fRW1JCR782UQ8a07fy
|
|
|
50e473 |
-2xXsKy4WdKaxyG8CcatwmXvpvRQ44dSANMihHELpANTdyVp6DCysED6wkQFurHlF
|
|
|
50e473 |
-1dshEaJw8b/ypDhmbVIo6Ci1xvCJqivbLFnbAgMBAAGjgbswgbgwHQYDVR0OBBYE
|
|
|
50e473 |
-FINVdy1eIfFJDAkk51QJEo3IfgSuMIGIBgNVHSMEgYAwfoAUg1V3LV4h8UkMCSTn
|
|
|
50e473 |
-VAkSjch+BK6hXKRaMFgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJJTDEQMA4GA1UE
|
|
|
50e473 |
-BxMHQ2hpY2FnbzEQMA4GA1UEChMHVGVzdGluZzEYMBYGA1UEAxMPVGVzdGluZyBS
|
|
|
50e473 |
-b290IENBggg9DMTgxt659DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GB
|
|
|
50e473 |
-AGGCDazMJGoWNBpc03u6+smc95dEead2KlZXBATOdFT1VesY3+nUOqZhEhTGlDMi
|
|
|
50e473 |
-hkgaZnzoIq/Uamidegk4hirsCT/R+6vsKAAxNTcBjUeZjlykCJWy5ojShGftXIKY
|
|
|
50e473 |
-w/njVbKMXrvc83qmTdGl3TAM0fxQIpqgcglFLveEBgzn
|
|
|
50e473 |
+ZXN0aW5nMRgwFgYDVQQDEw9UZXN0aW5nIFJvb3QgQ0EwHhcNMTcwNjExMjIzMjU5
|
|
|
50e473 |
+WhcNMzcwNjA2MjIzMjU5WjBYMQswCQYDVQQGEwJVUzELMAkGA1UECBMCSUwxEDAO
|
|
|
50e473 |
+BgNVBAcTB0NoaWNhZ28xEDAOBgNVBAoTB1Rlc3RpbmcxGDAWBgNVBAMTD1Rlc3Rp
|
|
|
50e473 |
+bmcgUm9vdCBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA+ZpC6Yu6ukTn
|
|
|
50e473 |
+bu5IQd0vWmpwNGZbO773xjpgfNP8nspYRqbIwI1np9FbUkJHvzZRDxrTt/LbFewr
|
|
|
50e473 |
+LhZ0prHIbwJxq3CZe+m9FDjh1IA0yKEcQukA1N3JWnoMLKwQPrCRAW6seUXV2yER
|
|
|
50e473 |
+onDxv/KkOGZtUijoKLXG8ImqK9ssWdsCAwEAAaOBuzCBuDAdBgNVHQ4EFgQUg1V3
|
|
|
50e473 |
+LV4h8UkMCSTnVAkSjch+BK4wgYgGA1UdIwSBgDB+gBSDVXctXiHxSQwJJOdUCRKN
|
|
|
50e473 |
+yH4ErqFcpFowWDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAklMMRAwDgYDVQQHEwdD
|
|
|
50e473 |
+aGljYWdvMRAwDgYDVQQKEwdUZXN0aW5nMRgwFgYDVQQDEw9UZXN0aW5nIFJvb3Qg
|
|
|
50e473 |
+Q0GCCD0MxODG3rn0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEANFYQ
|
|
|
50e473 |
+R+T70VcZ+SnvURnwviFgCXeedBzCr21meo+DNHbkp2gudB9W8Xrned/wtUBVymy9
|
|
|
50e473 |
+gjB5jINfU7Lci0H57Evsw96UJJVfhXdUMHpqt1RGCoEd9FWnrDyrSy0NysnBT2bH
|
|
|
50e473 |
+lEqxh3aFEUx9IOQ4sgnx1/NOFXBpkRtivl6O0Ec=
|
|
|
50e473 |
-----END CERTIFICATE-----
|
|
|
50e473 |
""")
|
|
|
50e473 |
|
|
|
50e473 |
@@ -72,18 +72,18 @@ cbvAhow217X9V0dVerEOKxnNYspXRrh36h7k4mQA
|
|
|
50e473 |
""")
|
|
|
50e473 |
|
|
|
50e473 |
server_cert_pem = b("""-----BEGIN CERTIFICATE-----
|
|
|
50e473 |
-MIICKDCCAZGgAwIBAgIJAJn/HpR21r/8MA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV
|
|
|
50e473 |
-BAYTAlVTMQswCQYDVQQIEwJJTDEQMA4GA1UEBxMHQ2hpY2FnbzEQMA4GA1UEChMH
|
|
|
50e473 |
-VGVzdGluZzEYMBYGA1UEAxMPVGVzdGluZyBSb290IENBMCIYDzIwMDkwMzI1MTIz
|
|
|
50e473 |
-NzUzWhgPMjAxNzA2MTExMjM3NTNaMBgxFjAUBgNVBAMTDWxvdmVseSBzZXJ2ZXIw
|
|
|
50e473 |
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6m+G653V0tpBC/OKl22VxOi2Cv
|
|
|
50e473 |
-lK4TYu9LHSDP9uDVTe7V5D5Tl6qzFoRRx5pfmnkqT5B+W9byp2NU3FC5hLm5zSAr
|
|
|
50e473 |
-b45meUhjEJ/ifkZgbNUjHdBIGP9MAQUHZa5WKdkGIJvGAvs8UzUqlr4TBWQIB24+
|
|
|
50e473 |
-lJ+Ukk/CRgasrYwdAgMBAAGjNjA0MB0GA1UdDgQWBBS4kC7Ij0W1TZXZqXQFAM2e
|
|
|
50e473 |
-gKEG2DATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOBgQBh30Li
|
|
|
50e473 |
-dJ+NlxIOx5343WqIBka3UbsOb2kxWrbkVCrvRapCMLCASO4FqiKWM+L0VDBprqIp
|
|
|
50e473 |
-2mgpFQ6FHpoIENGvJhdEKpptQ5i7KaGhnDNTfdy3x1+h852G99f1iyj0RmbuFcM8
|
|
|
50e473 |
-uzujnS8YXWvM7DM1Ilozk4MzPug8jzFp5uhKCQ==
|
|
|
50e473 |
+MIICJDCCAY2gAwIBAgIJAJn/HpR21r/8MA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV
|
|
|
50e473 |
+BAYTAlVTMQswCQYDVQQIDAJJTDEQMA4GA1UEBwwHQ2hpY2FnbzEQMA4GA1UECgwH
|
|
|
50e473 |
+VGVzdGluZzEYMBYGA1UEAwwPVGVzdGluZyBSb290IENBMB4XDTE3MDYxMjAwMTA1
|
|
|
50e473 |
+N1oXDTM3MDYwNzAwMTA1N1owGDEWMBQGA1UEAwwNbG92ZWx5IHNlcnZlcjCBnzAN
|
|
|
50e473 |
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvqb4brndXS2kEL84qXbZXE6LYK+UrhNi
|
|
|
50e473 |
+70sdIM/24NVN7tXkPlOXqrMWhFHHml+aeSpPkH5b1vKnY1TcULmEubnNICtvjmZ5
|
|
|
50e473 |
+SGMQn+J+RmBs1SMd0EgY/0wBBQdlrlYp2QYgm8YC+zxTNSqWvhMFZAgHbj6Un5SS
|
|
|
50e473 |
+T8JGBqytjB0CAwEAAaM2MDQwHQYDVR0OBBYEFINVdy1eIfFJDAkk51QJEo3IfgSu
|
|
|
50e473 |
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAGki1K6WgHHJ
|
|
|
50e473 |
+qC6aY2EowjaWOXLO6jUZIhGk7BA7vMRfNug429AOZ4m5F6OQhzmJmlw67Jyu2FeI
|
|
|
50e473 |
+h0VtBuQoHPtjqZXF59oX6hMMmGLMs9pV0UA3fJs5MYA4/V5ZcQy0Ie0QoJNejLzE
|
|
|
50e473 |
+6V1Qz1rRTYLUyEcpI7ZCmBg2KQQI8YZI
|
|
|
50e473 |
-----END CERTIFICATE-----
|
|
|
50e473 |
""")
|
|
|
50e473 |
|
|
|
50e473 |
@@ -105,18 +105,18 @@ r50+LF74iLXFwqysVCebPKMOpDWp/qQ1BbJQIPs7
|
|
|
50e473 |
"""))
|
|
|
50e473 |
|
|
|
50e473 |
client_cert_pem = b("""-----BEGIN CERTIFICATE-----
|
|
|
50e473 |
-MIICJjCCAY+gAwIBAgIJAKxpFI5lODkjMA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV
|
|
|
50e473 |
-BAYTAlVTMQswCQYDVQQIEwJJTDEQMA4GA1UEBxMHQ2hpY2FnbzEQMA4GA1UEChMH
|
|
|
50e473 |
-VGVzdGluZzEYMBYGA1UEAxMPVGVzdGluZyBSb290IENBMCIYDzIwMDkwMzI1MTIz
|
|
|
50e473 |
-ODA1WhgPMjAxNzA2MTExMjM4MDVaMBYxFDASBgNVBAMTC3VnbHkgY2xpZW50MIGf
|
|
|
50e473 |
-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAZh/SRtNm5ntMT4qb6YzEpTroMlq2
|
|
|
50e473 |
-rn+GrRHRiZ+xkCw/CGNhbtPir7/QxaUj26BSmQrHw1bGKEbPsWiW7bdXSespl+xK
|
|
|
50e473 |
-iku4G/KvnnmWdeJHqsiXeUZtqurMELcPQAw9xPHEuhqqUJvvEoMTsnCEqGM+7Dtb
|
|
|
50e473 |
-oCRajYyHfluARQIDAQABozYwNDAdBgNVHQ4EFgQUNQB+qkaOaEVecf1J3TTUtAff
|
|
|
50e473 |
-0fAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADgYEAyv/Jh7gM
|
|
|
50e473 |
-Q3OHvmsFEEvRI+hsW8y66zK4K5de239Y44iZrFYkt7Q5nBPMEWDj4F2hLYWL/qtI
|
|
|
50e473 |
-9Zdr0U4UDCU9SmmGYh4o7R4TZ5pGFvBYvjhHbkSFYFQXZxKUi+WUxplP6I0wr2KJ
|
|
|
50e473 |
-PSTJCjJOn3xo2NTKRgV1gaoTf2EhL+RG8TQ=
|
|
|
50e473 |
+MIICIjCCAYugAwIBAgIJAKxpFI5lODkjMA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV
|
|
|
50e473 |
+BAYTAlVTMQswCQYDVQQIDAJJTDEQMA4GA1UEBwwHQ2hpY2FnbzEQMA4GA1UECgwH
|
|
|
50e473 |
+VGVzdGluZzEYMBYGA1UEAwwPVGVzdGluZyBSb290IENBMB4XDTE3MDYxMjAwMDQx
|
|
|
50e473 |
+M1oXDTM3MDYwNzAwMDQxM1owFjEUMBIGA1UEAwwLdWdseSBjbGllbnQwgZ8wDQYJ
|
|
|
50e473 |
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAMBmH9JG02bme0xPipvpjMSlOugyWrauf4at
|
|
|
50e473 |
+EdGJn7GQLD8IY2Fu0+Kvv9DFpSPboFKZCsfDVsYoRs+xaJbtt1dJ6ymX7EqKS7gb
|
|
|
50e473 |
+8q+eeZZ14keqyJd5Rm2q6swQtw9ADD3E8cS6GqpQm+8SgxOycISoYz7sO1ugJFqN
|
|
|
50e473 |
+jId+W4BFAgMBAAGjNjA0MB0GA1UdDgQWBBSDVXctXiHxSQwJJOdUCRKNyH4ErjAT
|
|
|
50e473 |
+BgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQAMqcHyweaCOZNN
|
|
|
50e473 |
+dWQQOsBKQlL5wqVVZwucHPWqobjxpULKy9gS2ha2zbgkXcB/BnBOSwe0Fm+MJV0T
|
|
|
50e473 |
+NbnTghcGJNpEH7VKn4xSLvIGZmnZZWgxeIB16z4GhpkK2fShBJ+6GKZjsgjT0lSH
|
|
|
50e473 |
+JRgjHbWutZfZvbSHXr9n7PIphG1Ojg==
|
|
|
50e473 |
-----END CERTIFICATE-----
|
|
|
50e473 |
""")
|
|
|
50e473 |
|
|
|
50e473 |
@@ -138,22 +138,22 @@ f6GGcfNpip0Uk7q7udTKuX7Q/buZi/C4YW7u3VKA
|
|
|
50e473 |
"""))
|
|
|
50e473 |
|
|
|
50e473 |
cleartextCertificatePEM = b("""-----BEGIN CERTIFICATE-----
|
|
|
50e473 |
-MIIC7TCCAlagAwIBAgIIPQzE4MbeufQwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UE
|
|
|
50e473 |
+MIIC6TCCAlKgAwIBAgIIPQzE4MbeufQwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UE
|
|
|
50e473 |
BhMCVVMxCzAJBgNVBAgTAklMMRAwDgYDVQQHEwdDaGljYWdvMRAwDgYDVQQKEwdU
|
|
|
50e473 |
-ZXN0aW5nMRgwFgYDVQQDEw9UZXN0aW5nIFJvb3QgQ0EwIhgPMjAwOTAzMjUxMjM2
|
|
|
50e473 |
-NThaGA8yMDE3MDYxMTEyMzY1OFowWDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAklM
|
|
|
50e473 |
-MRAwDgYDVQQHEwdDaGljYWdvMRAwDgYDVQQKEwdUZXN0aW5nMRgwFgYDVQQDEw9U
|
|
|
50e473 |
-ZXN0aW5nIFJvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPmaQumL
|
|
|
50e473 |
-urpE527uSEHdL1pqcDRmWzu+98Y6YHzT/J7KWEamyMCNZ6fRW1JCR782UQ8a07fy
|
|
|
50e473 |
-2xXsKy4WdKaxyG8CcatwmXvpvRQ44dSANMihHELpANTdyVp6DCysED6wkQFurHlF
|
|
|
50e473 |
-1dshEaJw8b/ypDhmbVIo6Ci1xvCJqivbLFnbAgMBAAGjgbswgbgwHQYDVR0OBBYE
|
|
|
50e473 |
-FINVdy1eIfFJDAkk51QJEo3IfgSuMIGIBgNVHSMEgYAwfoAUg1V3LV4h8UkMCSTn
|
|
|
50e473 |
-VAkSjch+BK6hXKRaMFgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJJTDEQMA4GA1UE
|
|
|
50e473 |
-BxMHQ2hpY2FnbzEQMA4GA1UEChMHVGVzdGluZzEYMBYGA1UEAxMPVGVzdGluZyBS
|
|
|
50e473 |
-b290IENBggg9DMTgxt659DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GB
|
|
|
50e473 |
-AGGCDazMJGoWNBpc03u6+smc95dEead2KlZXBATOdFT1VesY3+nUOqZhEhTGlDMi
|
|
|
50e473 |
-hkgaZnzoIq/Uamidegk4hirsCT/R+6vsKAAxNTcBjUeZjlykCJWy5ojShGftXIKY
|
|
|
50e473 |
-w/njVbKMXrvc83qmTdGl3TAM0fxQIpqgcglFLveEBgzn
|
|
|
50e473 |
+ZXN0aW5nMRgwFgYDVQQDEw9UZXN0aW5nIFJvb3QgQ0EwHhcNMTcwNjExMjIzMjU5
|
|
|
50e473 |
+WhcNMzcwNjA2MjIzMjU5WjBYMQswCQYDVQQGEwJVUzELMAkGA1UECBMCSUwxEDAO
|
|
|
50e473 |
+BgNVBAcTB0NoaWNhZ28xEDAOBgNVBAoTB1Rlc3RpbmcxGDAWBgNVBAMTD1Rlc3Rp
|
|
|
50e473 |
+bmcgUm9vdCBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA+ZpC6Yu6ukTn
|
|
|
50e473 |
+bu5IQd0vWmpwNGZbO773xjpgfNP8nspYRqbIwI1np9FbUkJHvzZRDxrTt/LbFewr
|
|
|
50e473 |
+LhZ0prHIbwJxq3CZe+m9FDjh1IA0yKEcQukA1N3JWnoMLKwQPrCRAW6seUXV2yER
|
|
|
50e473 |
+onDxv/KkOGZtUijoKLXG8ImqK9ssWdsCAwEAAaOBuzCBuDAdBgNVHQ4EFgQUg1V3
|
|
|
50e473 |
+LV4h8UkMCSTnVAkSjch+BK4wgYgGA1UdIwSBgDB+gBSDVXctXiHxSQwJJOdUCRKN
|
|
|
50e473 |
+yH4ErqFcpFowWDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAklMMRAwDgYDVQQHEwdD
|
|
|
50e473 |
+aGljYWdvMRAwDgYDVQQKEwdUZXN0aW5nMRgwFgYDVQQDEw9UZXN0aW5nIFJvb3Qg
|
|
|
50e473 |
+Q0GCCD0MxODG3rn0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEANFYQ
|
|
|
50e473 |
+R+T70VcZ+SnvURnwviFgCXeedBzCr21meo+DNHbkp2gudB9W8Xrned/wtUBVymy9
|
|
|
50e473 |
+gjB5jINfU7Lci0H57Evsw96UJJVfhXdUMHpqt1RGCoEd9FWnrDyrSy0NysnBT2bH
|
|
|
50e473 |
+lEqxh3aFEUx9IOQ4sgnx1/NOFXBpkRtivl6O0Ec=
|
|
|
50e473 |
-----END CERTIFICATE-----
|
|
|
50e473 |
""")
|
|
|
50e473 |
|
|
|
50e473 |
@@ -309,7 +309,7 @@ class X509ExtTests(TestCase):
|
|
|
50e473 |
"""
|
|
|
50e473 |
# Basic setup stuff to generate a certificate
|
|
|
50e473 |
self.pkey = PKey()
|
|
|
50e473 |
- self.pkey.generate_key(TYPE_RSA, 384)
|
|
|
50e473 |
+ self.pkey.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
self.req = X509Req()
|
|
|
50e473 |
self.req.set_pubkey(self.pkey)
|
|
|
50e473 |
# Authority good you have.
|
|
|
50e473 |
@@ -608,7 +608,7 @@ class PKeyTests(TestCase):
|
|
|
50e473 |
L{PKeyType.generate_key} generates an RSA key when passed
|
|
|
50e473 |
L{TYPE_RSA} as a type and a reasonable number of bits.
|
|
|
50e473 |
"""
|
|
|
50e473 |
- bits = 128
|
|
|
50e473 |
+ bits = 2048
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
key.generate_key(TYPE_RSA, bits)
|
|
|
50e473 |
self.assertEqual(key.type(), TYPE_RSA)
|
|
|
50e473 |
@@ -624,7 +624,7 @@ class PKeyTests(TestCase):
|
|
|
50e473 |
# 512 is a magic number. The DSS (Digital Signature Standard)
|
|
|
50e473 |
# allows a minimum of 512 bits for DSA. DSA_generate_parameters
|
|
|
50e473 |
# will silently promote any value below 512 to 512.
|
|
|
50e473 |
- bits = 512
|
|
|
50e473 |
+ bits = 1024
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
key.generate_key(TYPE_DSA, bits)
|
|
|
50e473 |
self.assertEqual(key.type(), TYPE_DSA)
|
|
|
50e473 |
@@ -638,7 +638,7 @@ class PKeyTests(TestCase):
|
|
|
50e473 |
key to generate new keys.
|
|
|
50e473 |
"""
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- for type, bits in [(TYPE_RSA, 512), (TYPE_DSA, 576)]:
|
|
|
50e473 |
+ for type, bits in [(TYPE_RSA, 2048), (TYPE_DSA, 1024)]:
|
|
|
50e473 |
key.generate_key(type, bits)
|
|
|
50e473 |
self.assertEqual(key.type(), type)
|
|
|
50e473 |
self.assertEqual(key.bits(), bits)
|
|
|
50e473 |
@@ -869,7 +869,7 @@ class X509NameTests(TestCase):
|
|
|
50e473 |
self.assertEqual(
|
|
|
50e473 |
a.der(),
|
|
|
50e473 |
b('0\x1b1\x0b0\t\x06\x03U\x04\x06\x13\x02US'
|
|
|
50e473 |
- '1\x0c0\n\x06\x03U\x04\x03\x13\x03foo'))
|
|
|
50e473 |
+ '1\x0c0\n\x06\x03U\x04\x03\x0c\x03foo'))
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
def test_get_components(self):
|
|
|
50e473 |
@@ -926,7 +926,7 @@ class _PKeyInteractionTestsMixin:
|
|
|
50e473 |
"""
|
|
|
50e473 |
request = self.signable()
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- key.generate_key(TYPE_RSA, 512)
|
|
|
50e473 |
+ key.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
request.set_pubkey(key)
|
|
|
50e473 |
pub = request.get_pubkey()
|
|
|
50e473 |
self.assertRaises(ValueError, request.sign, pub, 'MD5')
|
|
|
50e473 |
@@ -939,7 +939,7 @@ class _PKeyInteractionTestsMixin:
|
|
|
50e473 |
"""
|
|
|
50e473 |
request = self.signable()
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- key.generate_key(TYPE_RSA, 512)
|
|
|
50e473 |
+ key.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
self.assertRaises(ValueError, request.sign, key, "monkeys")
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
@@ -950,16 +950,16 @@ class _PKeyInteractionTestsMixin:
|
|
|
50e473 |
"""
|
|
|
50e473 |
request = self.signable()
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- key.generate_key(TYPE_RSA, 512)
|
|
|
50e473 |
+ key.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
request.set_pubkey(key)
|
|
|
50e473 |
- request.sign(key, 'MD5')
|
|
|
50e473 |
+ request.sign(key, 'SHA256')
|
|
|
50e473 |
# If the type has a verify method, cover that too.
|
|
|
50e473 |
if getattr(request, 'verify', None) is not None:
|
|
|
50e473 |
pub = request.get_pubkey()
|
|
|
50e473 |
self.assertTrue(request.verify(pub))
|
|
|
50e473 |
# Make another key that won't verify.
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- key.generate_key(TYPE_RSA, 512)
|
|
|
50e473 |
+ key.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
self.assertRaises(Error, request.verify, key)
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
@@ -1257,7 +1257,7 @@ WpOdIpB8KksUTCzV591Nr1wd
|
|
|
50e473 |
internally.
|
|
|
50e473 |
"""
|
|
|
50e473 |
cert = load_certificate(FILETYPE_PEM, self.pemData)
|
|
|
50e473 |
- self.assertEqual(cert.get_notBefore(), b("20090325123658Z"))
|
|
|
50e473 |
+ self.assertEqual(cert.get_notBefore(), b("20170611223259Z"))
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
def test_get_notAfter(self):
|
|
|
50e473 |
@@ -1267,7 +1267,7 @@ WpOdIpB8KksUTCzV591Nr1wd
|
|
|
50e473 |
internally.
|
|
|
50e473 |
"""
|
|
|
50e473 |
cert = load_certificate(FILETYPE_PEM, self.pemData)
|
|
|
50e473 |
- self.assertEqual(cert.get_notAfter(), b("20170611123658Z"))
|
|
|
50e473 |
+ self.assertEqual(cert.get_notAfter(), b("20370606223259Z"))
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
def test_gmtime_adj_notBefore_wrong_args(self):
|
|
|
50e473 |
@@ -1348,10 +1348,10 @@ WpOdIpB8KksUTCzV591Nr1wd
|
|
|
50e473 |
L{X509.digest} returns a string giving ":"-separated hex-encoded words
|
|
|
50e473 |
of the digest of the certificate.
|
|
|
50e473 |
"""
|
|
|
50e473 |
- cert = X509()
|
|
|
50e473 |
+ cert = load_certificate(FILETYPE_PEM, self.pemData)
|
|
|
50e473 |
self.assertEqual(
|
|
|
50e473 |
- cert.digest("md5"),
|
|
|
50e473 |
- b("A8:EB:07:F8:53:25:0A:F2:56:05:C5:A5:C4:C4:C7:15"))
|
|
|
50e473 |
+ cert.digest("SHA256"),
|
|
|
50e473 |
+ b('65:D6:61:2C:C2:2D:5F:A6:08:76:9A:03:01:B3:71:FF:FD:48:9B:A3:F2:19:B3:84:CF:3F:D0:9E:57:39:6A:7E'))
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
def _extcert(self, pkey, extensions):
|
|
|
50e473 |
@@ -1364,6 +1364,7 @@ WpOdIpB8KksUTCzV591Nr1wd
|
|
|
50e473 |
cert.set_notAfter(when)
|
|
|
50e473 |
|
|
|
50e473 |
cert.add_extensions(extensions)
|
|
|
50e473 |
+ cert.sign(pkey, 'SHA256')
|
|
|
50e473 |
return load_certificate(
|
|
|
50e473 |
FILETYPE_PEM, dump_certificate(FILETYPE_PEM, cert))
|
|
|
50e473 |
|
|
|
50e473 |
@@ -2109,7 +2110,7 @@ class FunctionTests(TestCase):
|
|
|
50e473 |
cipher name.
|
|
|
50e473 |
"""
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- key.generate_key(TYPE_RSA, 512)
|
|
|
50e473 |
+ key.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
self.assertRaises(
|
|
|
50e473 |
ValueError, dump_privatekey,
|
|
|
50e473 |
FILETYPE_PEM, key, "zippers", "passphrase")
|
|
|
50e473 |
@@ -2121,7 +2122,7 @@ class FunctionTests(TestCase):
|
|
|
50e473 |
is neither a C{str} nor a callable.
|
|
|
50e473 |
"""
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- key.generate_key(TYPE_RSA, 512)
|
|
|
50e473 |
+ key.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
self.assertRaises(
|
|
|
50e473 |
TypeError,
|
|
|
50e473 |
dump_privatekey, FILETYPE_PEM, key, "blowfish", object())
|
|
|
50e473 |
@@ -2133,7 +2134,7 @@ class FunctionTests(TestCase):
|
|
|
50e473 |
filetype.
|
|
|
50e473 |
"""
|
|
|
50e473 |
key = PKey()
|
|
|
50e473 |
- key.generate_key(TYPE_RSA, 512)
|
|
|
50e473 |
+ key.generate_key(TYPE_RSA, 2048)
|
|
|
50e473 |
self.assertRaises(ValueError, dump_privatekey, 100, key)
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
@@ -2580,6 +2581,8 @@ class CRLTests(TestCase):
|
|
|
50e473 |
"""
|
|
|
50e473 |
crl = CRL()
|
|
|
50e473 |
revoked = Revoked()
|
|
|
50e473 |
+ revoked.set_serial(b"01")
|
|
|
50e473 |
+ revoked.set_rev_date(b"20160310020145Z")
|
|
|
50e473 |
crl.add_revoked(revoked=revoked)
|
|
|
50e473 |
self.assertTrue(isinstance(crl.get_revoked()[0], Revoked))
|
|
|
50e473 |
|
|
|
50e473 |
diff -up pyOpenSSL-0.13.1/OpenSSL/test/test_ssl.py.test-failure pyOpenSSL-0.13.1/OpenSSL/test/test_ssl.py
|
|
|
50e473 |
--- pyOpenSSL-0.13.1/OpenSSL/test/test_ssl.py.test-failure 2011-08-15 00:06:11.000000000 +0200
|
|
|
50e473 |
+++ pyOpenSSL-0.13.1/OpenSSL/test/test_ssl.py 2018-05-04 18:53:26.670109705 +0200
|
|
|
50e473 |
@@ -282,7 +282,7 @@ class ContextTests(TestCase, _LoopbackMi
|
|
|
50e473 |
|
|
|
50e473 |
try:
|
|
|
50e473 |
Context(SSLv2_METHOD)
|
|
|
50e473 |
- except ValueError:
|
|
|
50e473 |
+ except (ValueError, Error):
|
|
|
50e473 |
# Some versions of OpenSSL have SSLv2, some don't.
|
|
|
50e473 |
# Difficult to say in advance.
|
|
|
50e473 |
pass
|
|
|
50e473 |
@@ -645,7 +645,7 @@ class ContextTests(TestCase, _LoopbackMi
|
|
|
50e473 |
self.assertRaises(TypeError, context.load_verify_locations, None, None, None)
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
- if platform == "win32":
|
|
|
50e473 |
+ if True:
|
|
|
50e473 |
"set_default_verify_paths appears not to work on Windows. "
|
|
|
50e473 |
"See LP#404343 and LP#404344."
|
|
|
50e473 |
else:
|
|
|
50e473 |
@@ -869,9 +869,9 @@ class ContextTests(TestCase, _LoopbackMi
|
|
|
50e473 |
connections created with the context object will be able to choose from.
|
|
|
50e473 |
"""
|
|
|
50e473 |
context = Context(TLSv1_METHOD)
|
|
|
50e473 |
- context.set_cipher_list("hello world:EXP-RC4-MD5")
|
|
|
50e473 |
+ context.set_cipher_list("hello world:AES128-SHA256")
|
|
|
50e473 |
conn = Connection(context, None)
|
|
|
50e473 |
- self.assertEquals(conn.get_cipher_list(), ["EXP-RC4-MD5"])
|
|
|
50e473 |
+ self.assertEquals(conn.get_cipher_list(), ["AES128-SHA256"])
|
|
|
50e473 |
|
|
|
50e473 |
|
|
|
50e473 |
|