diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-12 20:41:45 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-12 20:41:45 -0500 |
| commit | 0da7432bbbb4ad0a603529281f75672f475b06b2 (patch) | |
| tree | 8200124a62994943281fce23506a0f9832a5cb54 /src | |
| parent | 747ef464bf87a70a12ce2236c5408a7a0440cc44 (diff) | |
| parent | 2176fb8fbceda6538d51900fbf6d349f48b9ea8b (diff) | |
| download | cryptography-0da7432bbbb4ad0a603529281f75672f475b06b2.tar.gz cryptography-0da7432bbbb4ad0a603529281f75672f475b06b2.tar.bz2 cryptography-0da7432bbbb4ad0a603529281f75672f475b06b2.zip | |
Merge pull request #2475 from reaperhulk/cms-098hplus
these functions were added in 1.0.0, while CMS was added in 0.9.8h
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/cms.py | 11 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py index f0da82dd..fef7325c 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_CMS_BIO_FUNCTIONS; typedef ... CMS_ContentInfo; typedef ... CMS_SignerInfo; @@ -71,8 +72,18 @@ 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 < 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; +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; +static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 0; typedef void CMS_ContentInfo; typedef void CMS_SignerInfo; typedef void CMS_CertificateChoices; diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 670710b1..f0ad1d5e 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -52,6 +52,11 @@ CONDITIONAL_NAMES = { "CMS_USE_KEYID", "CMS_DEBUG_DECRYPT", ], + "Cryptography_HAS_CMS_BIO_FUNCTIONS": [ + "BIO_new_CMS", + "i2d_CMS_bio_stream", + "PEM_write_bio_CMS_stream", + ], "Cryptography_HAS_EC": [ "OPENSSL_EC_NAMED_CURVE", "EC_GROUP_new", |