From 07ea3cd3ea23608ad5dfea008674d89e03cb1d33 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 26 Aug 2016 21:48:24 +0800 Subject: 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 --- src/_cffi_src/openssl/cryptography.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/_cffi_src') diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py index c3b0a1dc..69824010 100644 --- a/src/_cffi_src/openssl/cryptography.py +++ b/src/_cffi_src/openssl/cryptography.py @@ -36,12 +36,22 @@ INCLUDES = """ (OPENSSL_VERSION_NUMBER < 0x10100000) #define CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5 \ (OPENSSL_VERSION_NUMBER < 0x10100005) + +#if defined(LIBRESSL_VERSION_NUMBER) +#define CRYPTOGRAPHY_IS_LIBRESSL 1 +#else +#define CRYPTOGRAPHY_IS_LIBRESSL 0 +#endif """ TYPES = """ static const int CRYPTOGRAPHY_OPENSSL_101_OR_GREATER; +static const int CRYPTOGRAPHY_OPENSSL_110_OR_GREATER; + static const int CRYPTOGRAPHY_OPENSSL_LESS_THAN_101; + +static const int CRYPTOGRAPHY_IS_LIBRESSL; """ FUNCTIONS = """ -- cgit v1.2.3