diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-03-26 11:07:31 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-03-26 11:07:31 -0400 |
| commit | 8d85b9564284a66aa28a0cbb759090b777698e43 (patch) | |
| tree | 150f2e89467805934f9a0915fe11896b8dfd510c /tests | |
| parent | 9ef1d6fe96b897207739cd75ff283a0f061fd5a0 (diff) | |
| download | cryptography-8d85b9564284a66aa28a0cbb759090b777698e43.tar.gz cryptography-8d85b9564284a66aa28a0cbb759090b777698e43.tar.bz2 cryptography-8d85b9564284a66aa28a0cbb759090b777698e43.zip | |
Attempt to simplify the libressl checing (#3482)
* Attempt to simplify the libressl checing
* SHENANGINS
* Attempted fix
* More simplification
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 5 | ||||
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index f6b57964..20c073a4 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -576,10 +576,7 @@ class TestGOSTCertificate(object): x509.load_der_x509_certificate, backend ) - if ( - backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_102I or - backend._lib.CRYPTOGRAPHY_IS_LIBRESSL - ): + if backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_102I: with pytest.raises(ValueError) as exc: cert.subject diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index 449e581e..9b0da67c 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -21,10 +21,7 @@ class TestOpenSSL(object): def test_crypto_lock_init(self): b = Binding() - if ( - b.lib.CRYPTOGRAPHY_OPENSSL_110_OR_GREATER and - not b.lib.CRYPTOGRAPHY_IS_LIBRESSL - ): + if b.lib.CRYPTOGRAPHY_OPENSSL_110_OR_GREATER: pytest.skip("Requires an older OpenSSL. Must be < 1.1.0") b.init_static_locks() @@ -79,10 +76,7 @@ class TestOpenSSL(object): def test_conditional_removal(self): b = Binding() - if ( - b.lib.CRYPTOGRAPHY_OPENSSL_110_OR_GREATER and - not b.lib.CRYPTOGRAPHY_IS_LIBRESSL - ): + if b.lib.CRYPTOGRAPHY_OPENSSL_110_OR_GREATER: assert b.lib.TLS_ST_OK else: with pytest.raises(AttributeError): |