From 7d226526c6630eb3985a81dbfe83c0fabfa88100 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 28 Sep 2013 11:39:59 -0700 Subject: Dedent the C declarations to give us more space to work with --- cryptography/bindings/openssl/evp.py | 32 ++++++++++++++++--------------- cryptography/bindings/openssl/opensslv.py | 8 ++++---- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/cryptography/bindings/openssl/evp.py b/cryptography/bindings/openssl/evp.py index 7795e935..8d2230fd 100644 --- a/cryptography/bindings/openssl/evp.py +++ b/cryptography/bindings/openssl/evp.py @@ -12,25 +12,27 @@ # limitations under the License. INCLUDES = """ - #include +#include """ TYPES = """ - typedef struct { ...; } EVP_CIPHER_CTX; - typedef ... EVP_CIPHER; - typedef ... ENGINE; +typedef struct { + ...; +} EVP_CIPHER_CTX; +typedef ... EVP_CIPHER; +typedef ... ENGINE; """ FUNCTIONS = """ - void OpenSSL_add_all_algorithms(); - const EVP_CIPHER *EVP_get_cipherbyname(const char *); - int EVP_EncryptInit_ex(EVP_CIPHER_CTX *, const EVP_CIPHER *, - ENGINE *, unsigned char *, unsigned char *); - int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *, int); - int EVP_EncryptUpdate(EVP_CIPHER_CTX *, unsigned char *, int *, - unsigned char *, int); - int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *, unsigned char *, int *); - int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); - const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *); - int EVP_CIPHER_block_size(const EVP_CIPHER *); +void OpenSSL_add_all_algorithms(); +const EVP_CIPHER *EVP_get_cipherbyname(const char *); +int EVP_EncryptInit_ex(EVP_CIPHER_CTX *, const EVP_CIPHER *, ENGINE *, + unsigned char *, unsigned char *); +int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *, int); +int EVP_EncryptUpdate(EVP_CIPHER_CTX *, unsigned char *, int *, + unsigned char *, int); +int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *, unsigned char *, int *); +int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); +const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *); +int EVP_CIPHER_block_size(const EVP_CIPHER *); """ diff --git a/cryptography/bindings/openssl/opensslv.py b/cryptography/bindings/openssl/opensslv.py index a8f0b9b8..9b2db270 100644 --- a/cryptography/bindings/openssl/opensslv.py +++ b/cryptography/bindings/openssl/opensslv.py @@ -12,12 +12,12 @@ # limitations under the License. INCLUDES = """ - #include +#include """ TYPES = """ - static char *const OPENSSL_VERSION_TEXT; +static char *const OPENSSL_VERSION_TEXT; """ - -FUNCTIONS = "" +FUNCTIONS = """ +""" -- cgit v1.2.3