aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2019-01-24 10:48:19 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2019-01-24 09:48:19 -0600
commitd2e85573d6bcdd23a9c719dacf182165bafa22c9 (patch)
tree40218173ef68bdddcaa8b1a27cdb057c25f7be07 /src
parent5c07d7a87c54a8532b49ba41febe8d526e5734d8 (diff)
downloadcryptography-d2e85573d6bcdd23a9c719dacf182165bafa22c9.tar.gz
cryptography-d2e85573d6bcdd23a9c719dacf182165bafa22c9.tar.bz2
cryptography-d2e85573d6bcdd23a9c719dacf182165bafa22c9.zip
Run wycheproof RSA tests on LibreSSL>=2.8 (#4737)
* Run wycheproof RSA tests on LibreSSL>=2.8 * Define it this way * These are errors on libressl
Diffstat (limited to 'src')
-rw-r--r--src/_cffi_src/openssl/cryptography.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py
index e16fc57d..23ce87cf 100644
--- a/src/_cffi_src/openssl/cryptography.py
+++ b/src/_cffi_src/openssl/cryptography.py
@@ -33,8 +33,15 @@ INCLUDES = """
#include <Winsock2.h>
#endif
+#if CRYPTOGRAPHY_IS_LIBRESSL
#define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER \
- (CRYPTOGRAPHY_IS_LIBRESSL && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+ (LIBRESSL_VERSION_NUMBER >= 0x2070000f)
+#define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \
+ (LIBRESSL_VERSION_NUMBER >= 0x2080000f)
+#else
+#define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0)
+#define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0)
+#endif
#define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
(OPENSSL_VERSION_NUMBER >= 0x10002000 && !CRYPTOGRAPHY_IS_LIBRESSL)
@@ -67,6 +74,8 @@ static const int CRYPTOGRAPHY_OPENSSL_LESS_THAN_102;
static const int CRYPTOGRAPHY_OPENSSL_LESS_THAN_111;
static const int CRYPTOGRAPHY_IS_LIBRESSL;
+
+static const int CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER;
"""
FUNCTIONS = """