diff options
| author | David Reid <dreid@dreid.org> | 2013-12-12 14:11:05 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-12-12 14:11:05 -0800 |
| commit | c4f9b1db8b6848b78dd348e9f2ce32752a7b2e39 (patch) | |
| tree | 7bd9370365671a2126996c71141db2ae367884fd | |
| parent | 76ec34058a30026b62cc6f16a6c172fe5011798d (diff) | |
| download | cryptography-c4f9b1db8b6848b78dd348e9f2ce32752a7b2e39.tar.gz cryptography-c4f9b1db8b6848b78dd348e9f2ce32752a7b2e39.tar.bz2 cryptography-c4f9b1db8b6848b78dd348e9f2ce32752a7b2e39.zip | |
formatting more consistent with other cffi secitons.
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/backend.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/cryptography/hazmat/bindings/openssl/backend.py b/cryptography/hazmat/bindings/openssl/backend.py index 044e8cc9..d69fdc45 100644 --- a/cryptography/hazmat/bindings/openssl/backend.py +++ b/cryptography/hazmat/bindings/openssl/backend.py @@ -31,6 +31,24 @@ from cryptography.hazmat.primitives.ciphers.modes import ( CBC, CTR, ECB, OFB, CFB, GCM, ) +_OSX_PRE_INCLUDE = """ +#ifdef __APPLE__ +#include <AvailabilityMacros.h> +#define __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \ + DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER +#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER +#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER +#endif +""" + +_OSX_POST_INCLUDE = """ +#ifdef __APPLE__ +#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER +#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \ + __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER +#endif +""" + @utils.register_interface(CipherBackend) @utils.register_interface(HashBackend) @@ -112,28 +130,10 @@ class Backend(object): # int foo(int); # int foo(short); - pre_includes = [""" -#ifdef __APPLE__ -#include <AvailabilityMacros.h> -#define __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \ - DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#endif -"""] - - post_includes = [""" -#ifdef __APPLE__ -#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \ - __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#endif -"""] - lib = ffi.verify( - source="\n".join(pre_includes + + source="\n".join([_OSX_PRE_INCLUDE] + includes + - post_includes + + [_OSX_POST_INCLUDE] + functions + customizations), libraries=["crypto", "ssl"], |