diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-16 15:29:01 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-16 15:29:01 -0400 |
| commit | 60437c370d079d55db2c284e2f241ecde3b61cbf (patch) | |
| tree | c47a6fa6c482785ce8c695a7ad9f89a8051a8669 | |
| parent | df432e39e614dbc4b77d6954800395ff620690b1 (diff) | |
| parent | 64edae7c28e6a9061b33cdf042df4e783389dc48 (diff) | |
| download | cryptography-60437c370d079d55db2c284e2f241ecde3b61cbf.tar.gz cryptography-60437c370d079d55db2c284e2f241ecde3b61cbf.tar.bz2 cryptography-60437c370d079d55db2c284e2f241ecde3b61cbf.zip | |
Merge pull request #1047 from reaperhulk/remove-cms-macro
remove the macro we just added
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/cms.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cryptography/hazmat/bindings/openssl/cms.py b/cryptography/hazmat/bindings/openssl/cms.py index 357c599f..a3760f2c 100644 --- a/cryptography/hazmat/bindings/openssl/cms.py +++ b/cryptography/hazmat/bindings/openssl/cms.py @@ -43,7 +43,6 @@ MACROS = """ BIO *BIO_new_CMS(BIO *, CMS_ContentInfo *); int i2d_CMS_bio_stream(BIO *, CMS_ContentInfo *, BIO *, int); int PEM_write_bio_CMS_stream(BIO *, CMS_ContentInfo *, BIO *, int); -int PEM_write_bio_CMS(BIO *, CMS_ContentInfo *); int CMS_final(CMS_ContentInfo *, BIO *, BIO *, unsigned int); CMS_ContentInfo *CMS_sign(X509 *, EVP_PKEY *, Cryptography_STACK_OF_X509 *, BIO *, unsigned int); @@ -72,7 +71,6 @@ typedef void CMS_Receipt; 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; -int (*PEM_write_bio_CMS)(BIO *, CMS_ContentInfo *) = NULL; int (*CMS_final)(CMS_ContentInfo *, BIO *, BIO *, unsigned int) = NULL; CMS_ContentInfo *(*CMS_sign)(X509 *, EVP_PKEY *, Cryptography_STACK_OF_X509 *, BIO *, unsigned int) = NULL; @@ -92,7 +90,6 @@ CONDITIONAL_NAMES = { "BIO_new_CMS", "i2d_CMS_bio_stream", "PEM_write_bio_CMS_stream", - "PEM_write_bio_CMS", "CMS_final", "CMS_sign", "CMS_verify", |