diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-16 14:50:53 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-16 14:50:53 -0400 |
| commit | df432e39e614dbc4b77d6954800395ff620690b1 (patch) | |
| tree | 1416e60ba8c493e328e66af6f59495924548fbf4 | |
| parent | ba7eae590fd5f6937c1f8fd8ef6ea0288eb4dd8b (diff) | |
| parent | 01e9a390bc9343148f264fbe75f0edd9a8c08299 (diff) | |
| download | cryptography-df432e39e614dbc4b77d6954800395ff620690b1.tar.gz cryptography-df432e39e614dbc4b77d6954800395ff620690b1.tar.bz2 cryptography-df432e39e614dbc4b77d6954800395ff620690b1.zip | |
Merge pull request #1046 from reaperhulk/add-cms-macro
add a CMS macro
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/cms.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cryptography/hazmat/bindings/openssl/cms.py b/cryptography/hazmat/bindings/openssl/cms.py index a3760f2c..357c599f 100644 --- a/cryptography/hazmat/bindings/openssl/cms.py +++ b/cryptography/hazmat/bindings/openssl/cms.py @@ -43,6 +43,7 @@ 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); @@ -71,6 +72,7 @@ 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; @@ -90,6 +92,7 @@ CONDITIONAL_NAMES = { "BIO_new_CMS", "i2d_CMS_bio_stream", "PEM_write_bio_CMS_stream", + "PEM_write_bio_CMS", "CMS_final", "CMS_sign", "CMS_verify", |