diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-14 10:18:27 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-14 10:18:27 -0700 |
| commit | b38ae0a5e3117eaa5c73e0bd1a34e5a5981b162b (patch) | |
| tree | 3621be53d19a979a60775e822d558e3e6bab3bb9 /cryptography | |
| parent | c97992640a13c6fa654954c801988c2dc401c0f5 (diff) | |
| parent | 26c5c42edde913f9146de5553af1414640115a49 (diff) | |
| download | cryptography-b38ae0a5e3117eaa5c73e0bd1a34e5a5981b162b.tar.gz cryptography-b38ae0a5e3117eaa5c73e0bd1a34e5a5981b162b.tar.bz2 cryptography-b38ae0a5e3117eaa5c73e0bd1a34e5a5981b162b.zip | |
Merge pull request #1398 from reaperhulk/fix-1389
if EC_KEY_check_key fails consume errors off stack (+ add test)
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/backends/openssl/backend.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index eadea50e..a449a55e 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -1007,7 +1007,9 @@ class Backend(object): assert res == 1 res = self._lib.EC_KEY_check_key(ctx) - assert res == 1 + if res != 1: + self._consume_errors() + raise ValueError("Invalid EC key.") return ctx |