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/cmac.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/cmac.py')
| -rw-r--r-- | src/_cffi_src/openssl/cmac.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/cmac.py b/src/_cffi_src/openssl/cmac.py index f4a36866..24aa4b31 100644 --- a/src/_cffi_src/openssl/cmac.py +++ b/src/_cffi_src/openssl/cmac.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, division, print_function INCLUDES = """ -#if OPENSSL_VERSION_NUMBER >= 0x10001000L +#if CRYPTOGRAPHY_OPENSSL_101_OR_GREATER #include <openssl/cmac.h> #endif """ @@ -28,8 +28,9 @@ void CMAC_CTX_free(CMAC_CTX *); """ CUSTOMIZATIONS = """ -#if OPENSSL_VERSION_NUMBER < 0x10001000L - +#if CRYPTOGRAPHY_OPENSSL_101_OR_GREATER +static const long Cryptography_HAS_CMAC = 1; +#else static const long Cryptography_HAS_CMAC = 0; typedef void CMAC_CTX; CMAC_CTX *(*CMAC_CTX_new)(void) = NULL; @@ -39,7 +40,5 @@ int (*CMAC_Update)(CMAC_CTX *, const void *, size_t) = NULL; int (*CMAC_Final)(CMAC_CTX *, unsigned char *, size_t *) = NULL; int (*CMAC_CTX_copy)(CMAC_CTX *, const CMAC_CTX *) = NULL; void (*CMAC_CTX_free)(CMAC_CTX *) = NULL; -#else -static const long Cryptography_HAS_CMAC = 1; #endif """ |