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/build_openssl.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/build_openssl.py')
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index 14ba5b35..3dcece58 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -37,25 +37,13 @@ def _osx_libraries(build_static): return ["ssl", "crypto"] -_PRE_INCLUDE = """ -#include <openssl/opensslv.h> -/* - LibreSSL removed e_os2.h from the public headers so we'll only include it - if we're using vanilla OpenSSL. -*/ -#if !defined(LIBRESSL_VERSION_NUMBER) -#include <openssl/e_os2.h> -#endif -#if defined(_WIN32) -#include <windows.h> -#endif -""" - - ffi = build_ffi_for_binding( module_name="_openssl", module_prefix="_cffi_src.openssl.", modules=[ + # This goes first so we can define some cryptography-wide symbols. + "cryptography", + "aes", "asn1", "bignum", @@ -88,7 +76,6 @@ ffi = build_ffi_for_binding( "pkcs7", "callbacks", ], - pre_include=_PRE_INCLUDE, libraries=_get_openssl_libraries(sys.platform), extra_link_args=extra_link_args(compiler_type()), ) |