diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-26 11:13:31 -1000 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-15 15:49:48 -0600 |
| commit | 7638c3151ccbc17ff1adee0384b1fa10530cf87c (patch) | |
| tree | 6bdeee007fe53cee97da023f211cbcf9b4bd42b5 /src | |
| parent | 30c5ccdfb505e33dcdaa7f248c3479e3050a70da (diff) | |
| download | cryptography-7638c3151ccbc17ff1adee0384b1fa10530cf87c.tar.gz cryptography-7638c3151ccbc17ff1adee0384b1fa10530cf87c.tar.bz2 cryptography-7638c3151ccbc17ff1adee0384b1fa10530cf87c.zip | |
improve x509 load error handling
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index ceb10cfc..19d149b5 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -682,14 +682,20 @@ class Backend(object): x509 = self._lib.PEM_read_bio_X509( mem_bio.bio, self._ffi.NULL, self._ffi.NULL, self._ffi.NULL ) - assert x509 != self._ffi.NULL + if x509 == self._ffi.NULL: + self._consume_errors() + raise ValueError("Unable to load certificate") + x509 = self._ffi.gc(x509, self._lib.X509_free) return _X509Certificate(self, x509) def load_der_x509_certificate(self, data): mem_bio = self._bytes_to_bio(data) x509 = self._lib.d2i_X509_bio(mem_bio.bio, self._ffi.NULL) - assert x509 != self._ffi.NULL + if x509 == self._ffi.NULL: + self._consume_errors() + raise ValueError("Unable to load certificate") + x509 = self._ffi.gc(x509, self._lib.X509_free) return _X509Certificate(self, x509) |