diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-19 10:41:49 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-19 09:41:49 -0500 |
| commit | 69e0cb798eca2337bf86812ae5a745ccf9f1600c (patch) | |
| tree | f52e6b70b04f983ccd5565c5457df75eb1fd13ca | |
| parent | 741b2316b0bfaa107c009659dd4731602471f442 (diff) | |
| download | cryptography-69e0cb798eca2337bf86812ae5a745ccf9f1600c.tar.gz cryptography-69e0cb798eca2337bf86812ae5a745ccf9f1600c.tar.bz2 cryptography-69e0cb798eca2337bf86812ae5a745ccf9f1600c.zip | |
Remove 0.9.8isms from CMS code. (#2997)
CMS is 'cryptographic message syntax', and not 'centers for medicaid and medicare', fyi
| -rw-r--r-- | src/_cffi_src/openssl/cms.py | 12 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 5 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py index dbe276e9..fb87bd37 100644 --- a/src/_cffi_src/openssl/cms.py +++ b/src/_cffi_src/openssl/cms.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, division, print_function INCLUDES = """ -#if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER >= 0x0090808fL +#if !defined(OPENSSL_NO_CMS) #include <openssl/cms.h> #endif """ @@ -65,17 +65,9 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *, X509 *, EVP_PKEY *, """ CUSTOMIZATIONS = """ -#if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER >= 0x0090808fL +#if !defined(OPENSSL_NO_CMS) 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; diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 40ec98fe..90c57f18 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -48,11 +48,6 @@ 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", |