diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-08-26 21:48:24 +0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-08-26 09:48:24 -0400 |
| commit | 07ea3cd3ea23608ad5dfea008674d89e03cb1d33 (patch) | |
| tree | 244ccf4ac6c001fad0e7036ce01615c92b7f643a /tests/hazmat/bindings | |
| parent | 9736716017aac1d9da14b858903b20bb65b426e6 (diff) | |
| download | cryptography-07ea3cd3ea23608ad5dfea008674d89e03cb1d33.tar.gz cryptography-07ea3cd3ea23608ad5dfea008674d89e03cb1d33.tar.bz2 cryptography-07ea3cd3ea23608ad5dfea008674d89e03cb1d33.zip | |
OpenSSL 1.1.0 support (#2826)
* make pre5 work
* add a blank line to make the diff happier
* 1.1.0-pre6 working
* support the changes since 1.1.0-pre6
* fixes
* add 1.1.0 to travis
* expose the symbol
* better testing for numericstring
* handle libre...
* actually use the 1.1.0 we compile
* cache the ossl-110 dir on travis
* add some newlines
* changelog entry for 1.1.0 support
* note that we test on 1.1.0
* proper skip on this test
* reorder
Diffstat (limited to 'tests/hazmat/bindings')
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index f41bcf35..1c395c25 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -21,6 +21,12 @@ 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 + ): + pytest.skip("Requires an older OpenSSL. Must be < 1.1.0") + b.init_static_locks() lock_cb = b.lib.CRYPTO_get_locking_callback() assert lock_cb != b.ffi.NULL |