| commit | 77acc3638722fb55744478c00efba07abd6d5a0b | [log] [tgz] |
|---|---|---|
| author | Alex Gaynor <alex.gaynor@gmail.com> | Wed Aug 13 14:46:15 2014 -0700 |
| committer | Alex Gaynor <alex.gaynor@gmail.com> | Wed Aug 13 14:46:15 2014 -0700 |
| tree | 234da9241561894627cbfb0f52a509edc9a12367 | |
| parent | 1110bc91457b410d0799285c1f8cb0e7bf43b68b [diff] [blame] |
Fixes #145 -- fixes loading pkcs7 data from ASN1
diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py index 54569ea..313a30a 100644 --- a/OpenSSL/crypto.py +++ b/OpenSSL/crypto.py
@@ -2351,7 +2351,7 @@ if type == FILETYPE_PEM: pkcs7 = _lib.PEM_read_bio_PKCS7(bio, _ffi.NULL, _ffi.NULL, _ffi.NULL) elif type == FILETYPE_ASN1: - pass + pkcs7 = _lib.d2i_PKCS7_bio(bio, _ffi.NULL) else: # TODO: This is untested. _raise_current_error()