diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-11-12 16:20:23 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-11-12 16:20:23 -0600 |
| commit | 5653bde3e5b57e52d9be2cd284ee4855be55c50d (patch) | |
| tree | 2b79ed93af9d0920af36d2ea4bda2f5e502329a4 | |
| parent | a40a83a933b506a9b8ff818ff82f3f74136c61e4 (diff) | |
| download | cryptography-5653bde3e5b57e52d9be2cd284ee4855be55c50d.tar.gz cryptography-5653bde3e5b57e52d9be2cd284ee4855be55c50d.tar.bz2 cryptography-5653bde3e5b57e52d9be2cd284ee4855be55c50d.zip | |
reorganize and rename
| -rw-r--r-- | src/_cffi_src/openssl/cms.py | 20 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 2 |
2 files changed, 11 insertions, 11 deletions
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 """ diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 93f5898f..f0ad1d5e 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -52,7 +52,7 @@ CONDITIONAL_NAMES = { "CMS_USE_KEYID", "CMS_DEBUG_DECRYPT", ], - "Cryptography_HAS_MORE_CMS": [ + "Cryptography_HAS_CMS_BIO_FUNCTIONS": [ "BIO_new_CMS", "i2d_CMS_bio_stream", "PEM_write_bio_CMS_stream", |