aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/bindings
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-07-11 17:03:13 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-07-11 21:03:13 +0000
commit3e3444fa96a3fa911e99e1c12f1a0d859563ce2c (patch)
tree0e31161fc63ceb82586c9fcd37851c77a41731a5 /tests/hazmat/bindings
parentdbb64bd2a4a63f6071b1ac982b96d5d07bbd8a63 (diff)
downloadcryptography-3e3444fa96a3fa911e99e1c12f1a0d859563ce2c.tar.gz
cryptography-3e3444fa96a3fa911e99e1c12f1a0d859563ce2c.tar.bz2
cryptography-3e3444fa96a3fa911e99e1c12f1a0d859563ce2c.zip
Use a series of constants for OpenSSL version checks (#3037)
* Use a series of constants for OpenSSL version checks. N.B. I removed several qualifiers that were being used to express beta vs. release in OpenSSL version numbers. Reviewers please look closely! * Convert some python as well, also add the file * flake8 * Simplify code, remove functionality that can be expressed more simply * clean up the tests as well * more constants * wrap long lines * reflect feedback * unused * add this back?
Diffstat (limited to 'tests/hazmat/bindings')
-rw-r--r--tests/hazmat/bindings/test_openssl.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py
index 41c653b9..f41bcf35 100644
--- a/tests/hazmat/bindings/test_openssl.py
+++ b/tests/hazmat/bindings/test_openssl.py
@@ -138,7 +138,7 @@ class TestOpenSSL(object):
def test_conditional_removal(self):
b = Binding()
- if b.lib.OPENSSL_VERSION_NUMBER >= 0x10001000:
+ if b.lib.CRYPTOGRAPHY_OPENSSL_101_OR_GREATER:
assert b.lib.CMAC_Init
else:
with pytest.raises(AttributeError):