diff options
| author | David Reid <dreid@dreid.org> | 2014-08-13 15:29:22 -0700 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-08-13 15:29:22 -0700 |
| commit | 0541d40b975a85ddc64d65c4fdc36bc5641bdfc6 (patch) | |
| tree | 9611c41fac6e63a7dd0c35d47b378ed8650cec48 | |
| parent | ff9bafee7cdd295bc5e79252a5f2ca6f8bf3c1fe (diff) | |
| parent | 89e726e2484222e017650686b5426b3ea6c77984 (diff) | |
| download | cryptography-0541d40b975a85ddc64d65c4fdc36bc5641bdfc6.tar.gz cryptography-0541d40b975a85ddc64d65c4fdc36bc5641bdfc6.tar.bz2 cryptography-0541d40b975a85ddc64d65c4fdc36bc5641bdfc6.zip | |
Merge pull request #1303 from alex/add-d2i_PKCS7_bio
Added d2i_PKCS7_bio to bindings
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/pem.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cryptography/hazmat/bindings/openssl/pem.py b/cryptography/hazmat/bindings/openssl/pem.py index e42fc6fe..752f1987 100644 --- a/cryptography/hazmat/bindings/openssl/pem.py +++ b/cryptography/hazmat/bindings/openssl/pem.py @@ -41,6 +41,7 @@ int i2d_PKCS8PrivateKey_bio(BIO *, EVP_PKEY *, const EVP_CIPHER *, int i2d_PKCS8PrivateKey_nid_bio(BIO *, EVP_PKEY *, int, char *, int, pem_password_cb *, void *); +PKCS7 *d2i_PKCS7_bio(BIO *, PKCS7 **); EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *, EVP_PKEY **, pem_password_cb *, void *); |