From a40a83a933b506a9b8ff818ff82f3f74136c61e4 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 12 Nov 2015 15:47:40 -0600 Subject: these functions were added in 1.0.0, while CMS was added in 0.9.8h We didn't catch this in our CI because all our 0.9.8 targets have CMS disabled or are older than 0.9.8h --- src/_cffi_src/openssl/cms.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/_cffi_src') diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py index f0da82dd..a1b0b15b 100644 --- a/src/_cffi_src/openssl/cms.py +++ b/src/_cffi_src/openssl/cms.py @@ -17,6 +17,7 @@ INCLUDES = """ TYPES = """ static const long Cryptography_HAS_CMS; +static const long Cryptography_HAS_MORE_CMS; typedef ... CMS_ContentInfo; typedef ... CMS_SignerInfo; @@ -115,4 +116,13 @@ int (*CMS_decrypt)(CMS_ContentInfo *, EVP_PKEY *, X509 *, BIO *, BIO *, CMS_SignerInfo *(*CMS_add1_signer)(CMS_ContentInfo *, X509 *, EVP_PKEY *, const EVP_MD *, unsigned int) = NULL; #endif +#if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER < 0x1000000fL +static const long Cryptography_HAS_MORE_CMS = 0; +/* These functions were added in 1.0.0 */ +BIO *(*BIO_new_CMS)(BIO *, CMS_ContentInfo *) = NULL; +int (*i2d_CMS_bio_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL; +int (*PEM_write_bio_CMS_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL; +#else +static const long Cryptography_HAS_MORE_CMS = 1; +#endif """ -- cgit v1.2.3 From 5653bde3e5b57e52d9be2cd284ee4855be55c50d Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 12 Nov 2015 16:20:23 -0600 Subject: reorganize and rename --- src/_cffi_src/openssl/cms.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/_cffi_src') diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py index a1b0b15b..2d9261aa 100644 --- a/src/_cffi_src/openssl/cms.py +++ b/src/_cffi_src/openssl/cms.py @@ -17,7 +17,7 @@ INCLUDES = """ TYPES = """ static const long Cryptography_HAS_CMS; -static const long Cryptography_HAS_MORE_CMS; +static const long Cryptography_HAS_CMS_BIO_FUNCTIONS; typedef ... CMS_ContentInfo; typedef ... CMS_SignerInfo; @@ -72,6 +72,15 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *, X509 *, EVP_PKEY *, CUSTOMIZATIONS = """ #if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER >= 0x0090808fL static const long Cryptography_HAS_CMS = 1; +#if OPENSSL_VERSION_NUMBER < 0x1000000fL +static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 0; +/* These functions were added in 1.0.0 */ +BIO *(*BIO_new_CMS)(BIO *, CMS_ContentInfo *) = NULL; +int (*i2d_CMS_bio_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL; +int (*PEM_write_bio_CMS_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL; +#else +static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 1; +#endif #else static const long Cryptography_HAS_CMS = 0; typedef void CMS_ContentInfo; @@ -116,13 +125,4 @@ int (*CMS_decrypt)(CMS_ContentInfo *, EVP_PKEY *, X509 *, BIO *, BIO *, CMS_SignerInfo *(*CMS_add1_signer)(CMS_ContentInfo *, X509 *, EVP_PKEY *, const EVP_MD *, unsigned int) = NULL; #endif -#if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER < 0x1000000fL -static const long Cryptography_HAS_MORE_CMS = 0; -/* These functions were added in 1.0.0 */ -BIO *(*BIO_new_CMS)(BIO *, CMS_ContentInfo *) = NULL; -int (*i2d_CMS_bio_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL; -int (*PEM_write_bio_CMS_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL; -#else -static const long Cryptography_HAS_MORE_CMS = 1; -#endif """ -- cgit v1.2.3 From 053bc7378e6c3eaeead16ddc3b9668a426121239 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 12 Nov 2015 17:43:38 -0600 Subject: whoops --- src/_cffi_src/openssl/cms.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/_cffi_src') diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py index 2d9261aa..4a019967 100644 --- a/src/_cffi_src/openssl/cms.py +++ b/src/_cffi_src/openssl/cms.py @@ -83,6 +83,7 @@ static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 1; #endif #else static const long Cryptography_HAS_CMS = 0; +static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 0; typedef void CMS_ContentInfo; typedef void CMS_SignerInfo; typedef void CMS_CertificateChoices; -- cgit v1.2.3 From 2176fb8fbceda6538d51900fbf6d349f48b9ea8b Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 12 Nov 2015 19:04:52 -0600 Subject: RHEL 6.4 and below don't even claim to be 1.0.0 final... --- src/_cffi_src/openssl/cms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/_cffi_src') diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py index 4a019967..fef7325c 100644 --- a/src/_cffi_src/openssl/cms.py +++ b/src/_cffi_src/openssl/cms.py @@ -72,7 +72,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *, X509 *, EVP_PKEY *, CUSTOMIZATIONS = """ #if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER >= 0x0090808fL static const long Cryptography_HAS_CMS = 1; -#if OPENSSL_VERSION_NUMBER < 0x1000000fL +#if OPENSSL_VERSION_NUMBER < 0x10000000L static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 0; /* These functions were added in 1.0.0 */ BIO *(*BIO_new_CMS)(BIO *, CMS_ContentInfo *) = NULL; -- cgit v1.2.3