aboutsummaryrefslogtreecommitdiffstats
path: root/src/_cffi_src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-06-27 21:28:58 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-06-27 22:28:58 -0400
commitfa8ed29a9769ec67193d8f80208c20fecf4d39fc (patch)
treeb203d53c5a2dab8fd26917af4bc9941fd6a24113 /src/_cffi_src
parentdbeab5f04c5622d55db3bf116b377b08e5b616fb (diff)
downloadcryptography-fa8ed29a9769ec67193d8f80208c20fecf4d39fc.tar.gz
cryptography-fa8ed29a9769ec67193d8f80208c20fecf4d39fc.tar.bz2
cryptography-fa8ed29a9769ec67193d8f80208c20fecf4d39fc.zip
AES_ctr128_encrypt needs to be in macros as it's a conditional binding (#3023)
Diffstat (limited to 'src/_cffi_src')
-rw-r--r--src/_cffi_src/openssl/aes.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/_cffi_src/openssl/aes.py b/src/_cffi_src/openssl/aes.py
index 37e7e267..0841ea78 100644
--- a/src/_cffi_src/openssl/aes.py
+++ b/src/_cffi_src/openssl/aes.py
@@ -26,6 +26,9 @@ int AES_wrap_key(AES_KEY *, const unsigned char *, unsigned char *,
const unsigned char *, unsigned int);
int AES_unwrap_key(AES_KEY *, const unsigned char *, unsigned char *,
const unsigned char *, unsigned int);
+"""
+
+MACROS = """
/* The ctr128_encrypt function is only useful in 1.0.0. We can use EVP for
this in 1.0.1+. */
void AES_ctr128_encrypt(const unsigned char *, unsigned char *,
@@ -33,15 +36,12 @@ void AES_ctr128_encrypt(const unsigned char *, unsigned char *,
unsigned char[], unsigned int *);
"""
-MACROS = """
-"""
-
CUSTOMIZATIONS = """
static const long Cryptography_HAS_AES_WRAP = 1;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
static const int Cryptography_HAS_AES_CTR128_ENCRYPT = 0;
void (*AES_ctr128_encrypt)(const unsigned char *, unsigned char *,
- const size_t, const AES_KEY *,
+ size_t, const AES_KEY *,
unsigned char[], unsigned char[],
unsigned int *) = NULL;
#else