aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-07-12 15:18:58 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-07-12 15:18:58 -0500
commit8c3dc65bb52ff3ce7acd28c4da07804378d2087a (patch)
tree06f96b4a3f205e88bad8dfdbac4b5ec287ca2e06 /src
parent699616f4ed6ee7f2e92d87b038842864c517feaa (diff)
parent9af0bacc64d51a2d33b467321dcb2c52e4b5a506 (diff)
downloadcryptography-8c3dc65bb52ff3ce7acd28c4da07804378d2087a.tar.gz
cryptography-8c3dc65bb52ff3ce7acd28c4da07804378d2087a.tar.bz2
cryptography-8c3dc65bb52ff3ce7acd28c4da07804378d2087a.zip
Merge pull request #2148 from reaperhulk/fix-random-order
clear the error stack if d2i_ASN1_TYPE fails
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/backend.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index 637b28cc..56096811 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -216,6 +216,7 @@ def _encode_subject_alt_name(backend, san):
backend._ffi.NULL, data_ptr_ptr, len(alt_name.value)
)
if value == backend._ffi.NULL:
+ backend._consume_errors()
raise ValueError("Invalid ASN.1 data")
other_name.type_id = type_id
other_name.value = value