diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-07-11 17:03:13 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-07-11 21:03:13 +0000 |
| commit | 3e3444fa96a3fa911e99e1c12f1a0d859563ce2c (patch) | |
| tree | 0e31161fc63ceb82586c9fcd37851c77a41731a5 /src/_cffi_src/openssl/rsa.py | |
| parent | dbb64bd2a4a63f6071b1ac982b96d5d07bbd8a63 (diff) | |
| download | cryptography-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 'src/_cffi_src/openssl/rsa.py')
| -rw-r--r-- | src/_cffi_src/openssl/rsa.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/_cffi_src/openssl/rsa.py b/src/_cffi_src/openssl/rsa.py index 45e5379f..e920cf2d 100644 --- a/src/_cffi_src/openssl/rsa.py +++ b/src/_cffi_src/openssl/rsa.py @@ -73,7 +73,7 @@ int EVP_PKEY_CTX_set_rsa_oaep_md(EVP_PKEY_CTX *, EVP_MD *); CUSTOMIZATIONS = """ static const long Cryptography_HAS_PSS_PADDING = 1; -#if OPENSSL_VERSION_NUMBER >= 0x1000100f +#if CRYPTOGRAPHY_OPENSSL_101_OR_GREATER static const long Cryptography_HAS_MGF1_MD = 1; #else static const long Cryptography_HAS_MGF1_MD = 0; @@ -87,7 +87,7 @@ int (*EVP_PKEY_CTX_set_rsa_oaep_md)(EVP_PKEY_CTX *, EVP_MD *) = NULL; #endif /* These functions were added in OpenSSL 1.1.0-pre5 (beta2) */ -#if OPENSSL_VERSION_NUMBER < 0x10100005 || defined(LIBRESSL_VERSION_NUMBER) +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5 || defined(LIBRESSL_VERSION_NUMBER) int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { /* If the fields n and e in r are NULL, the corresponding input |