From 313ef329c098af0a1767db5b599f1be74a5cb41f Mon Sep 17 00:00:00 2001 From: Mahmoud Hashemi Date: Wed, 8 Apr 2015 19:09:51 -0700 Subject: after closer review, it would appear that PKCS7_NOSMIMECAP was added in 0.9.6. Removing conditional logic and making it a normal constant. (source: http://marc.info/?l=openssl-cvs&m=96816036412988&w=2 ) --- src/cryptography/hazmat/bindings/openssl/pkcs7.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/cryptography/hazmat/bindings/openssl/pkcs7.py b/src/cryptography/hazmat/bindings/openssl/pkcs7.py index 0efce613..df82afef 100644 --- a/src/cryptography/hazmat/bindings/openssl/pkcs7.py +++ b/src/cryptography/hazmat/bindings/openssl/pkcs7.py @@ -21,12 +21,10 @@ static const int PKCS7_NOCERTS; static const int PKCS7_NOCHAIN; static const int PKCS7_NOINTERN; static const int PKCS7_NOSIGS; +static const int PKCS7_NOSMIMECAP; static const int PKCS7_NOVERIFY; static const int PKCS7_STREAM; static const int PKCS7_TEXT; - -static const int Cryptography_HAS_PKCS7_NOSMIMECAP; -static const int PKCS7_NOSMIMECAP; """ FUNCTIONS = """ @@ -55,17 +53,6 @@ int PKCS7_type_is_signedAndEnveloped(PKCS7 *); int PKCS7_type_is_data(PKCS7 *); """ -CUSTOMIZATIONS = """ -#ifdef PKCS7_NOSMIMECAP -static const int Cryptography_HAS_PKCS7_NOSMIMECAP = 1; -#else -static const int Cryptography_HAS_PKCS7_NOSMIMECAP = 0; -static const int PKCS7_NOSMIMECAP = 0; -#endif -""" +CUSTOMIZATIONS = "" -CONDITIONAL_NAMES = { - 'Cryptography_HAS_PKCS7_NOSMIMECAP': [ - 'PKCS7_NOSMIMECAP', - ] -} +CONDITIONAL_NAMES = {} -- cgit v1.2.3