aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChirag Jog <chirag@clogeny.com>2014-06-16 08:02:26 +0000
committerChirag Jog <chirag@clogeny.com>2014-06-16 08:02:26 +0000
commit150154feb22fe7597b61a39438ce9e8c8b031aa0 (patch)
treea69093012874b21a2e2144d343fb18c6b507a4db
parenta73f1a1a137b941d4c86e2f18d81f586be273a7d (diff)
downloadcryptography-150154feb22fe7597b61a39438ce9e8c8b031aa0.tar.gz
cryptography-150154feb22fe7597b61a39438ce9e8c8b031aa0.tar.bz2
cryptography-150154feb22fe7597b61a39438ce9e8c8b031aa0.zip
Move function definition to MACROS section because the signature changed after 0.9.8
-rw-r--r--cryptography/hazmat/bindings/openssl/aes.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/cryptography/hazmat/bindings/openssl/aes.py b/cryptography/hazmat/bindings/openssl/aes.py
index 4f79cd07..dca9ffb3 100644
--- a/cryptography/hazmat/bindings/openssl/aes.py
+++ b/cryptography/hazmat/bindings/openssl/aes.py
@@ -29,12 +29,6 @@ typedef struct aes_key_st AES_KEY;
FUNCTIONS = """
int AES_set_encrypt_key(const unsigned char *, const int, AES_KEY *);
int AES_set_decrypt_key(const unsigned char *, const int, AES_KEY *);
-/* The ctr128_encrypt function is only useful in 0.9.8. You should use EVP for
- this in 1.0.0+. */
-void AES_ctr128_encrypt(const unsigned char *, unsigned char *,
- const unsigned size_t, const AES_KEY *,
- unsigned char[], unsigned char[], unsigned int *);
-
"""
MACROS = """
@@ -44,6 +38,14 @@ 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);
+
+/* The ctr128_encrypt function is only useful in 0.9.8. You should use EVP for
+ this in 1.0.0+. It is defined in macros because the function signature changed
+ after 0.9.8 */
+void AES_ctr128_encrypt(const unsigned char *, unsigned char *,
+ const unsigned size_t, const AES_KEY *,
+ unsigned char[], unsigned char[], unsigned int *);
+
"""
CUSTOMIZATIONS = """