diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2020-07-24 20:16:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 19:16:44 -0500 |
| commit | 73b128d7550ee95cec33b9587cddf8ad21d2f02d (patch) | |
| tree | 7c014ab8daea74fcf14ade7bd68a9d2d2fc68be1 /tests | |
| parent | c3a5e082c5473d82682f02a37c9d58607f718a3b (diff) | |
| download | cryptography-73b128d7550ee95cec33b9587cddf8ad21d2f02d.tar.gz | |
Refs #5113 -- build against openssl with no ct (#5343)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/x509/test_ocsp.py | 24 | ||||
| -rw-r--r-- | tests/x509/test_x509_ext.py | 42 |
2 files changed, 22 insertions, 44 deletions
diff --git a/tests/x509/test_ocsp.py b/tests/x509/test_ocsp.py index 5816718a0..b64940242 100644 --- a/tests/x509/test_ocsp.py +++ b/tests/x509/test_ocsp.py @@ -710,10 +710,8 @@ class TestSignedCertificateTimestampsExtension(object): ) @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_eq(self, backend): sct1 = ( @@ -739,10 +737,8 @@ class TestSignedCertificateTimestampsExtension(object): assert sct1 == sct2 @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_ne(self, backend): sct1 = ( @@ -760,10 +756,8 @@ class TestSignedCertificateTimestampsExtension(object): assert sct1 != object() @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_hash(self, backend): sct1 = ( @@ -992,10 +986,8 @@ class TestOCSPResponse(object): resp.public_bytes(serialization.Encoding.PEM) @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_single_extensions_sct(self, backend): resp = _load_data( diff --git a/tests/x509/test_x509_ext.py b/tests/x509/test_x509_ext.py index 850a8b1a2..b50a73895 100644 --- a/tests/x509/test_x509_ext.py +++ b/tests/x509/test_x509_ext.py @@ -5482,10 +5482,8 @@ class TestPrecertPoisonExtension(object): @pytest.mark.requires_backend_interface(interface=X509Backend) class TestSignedCertificateTimestamps(object): @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_eq(self, backend): sct = ( @@ -5513,10 +5511,8 @@ class TestSignedCertificateTimestamps(object): assert sct == sct2 @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_ne(self, backend): sct = ( @@ -5545,10 +5541,8 @@ class TestSignedCertificateTimestamps(object): assert sct != object() @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_hash(self, backend): sct = ( @@ -5601,10 +5595,8 @@ class TestPrecertificateSignedCertificateTimestampsExtension(object): ) @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_eq(self, backend): psct1 = ( @@ -5632,10 +5624,8 @@ class TestPrecertificateSignedCertificateTimestampsExtension(object): assert psct1 == psct2 @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_ne(self, backend): psct1 = ( @@ -5664,10 +5654,8 @@ class TestPrecertificateSignedCertificateTimestampsExtension(object): assert psct1 != object() @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_hash(self, backend): psct1 = ( @@ -5707,10 +5695,8 @@ class TestPrecertificateSignedCertificateTimestampsExtension(object): assert hash(psct1) != hash(psct3) @pytest.mark.supported( - only_if=lambda backend: ( - backend._lib.CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER - ), - skip_message="Requires OpenSSL 1.1.0f+", + only_if=lambda backend: (backend._lib.Cryptography_HAS_SCT), + skip_message="Requires CT support", ) def test_simple(self, backend): cert = _load_cert( |