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/openssl/cms.py') 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