diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-03-09 09:21:25 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-03-09 08:21:25 -0500 |
| commit | 4bd9a076a858ea28579fe80252a9e48654d78b90 (patch) | |
| tree | 39527a4494a2274e383ef9412cb94670b1d3decc /src | |
| parent | d5e05f27f03046c671d23f09f84cddb8237df0f8 (diff) | |
| download | cryptography-4bd9a076a858ea28579fe80252a9e48654d78b90.tar.gz cryptography-4bd9a076a858ea28579fe80252a9e48654d78b90.tar.bz2 cryptography-4bd9a076a858ea28579fe80252a9e48654d78b90.zip | |
reverts a change to our exceptions (#3429)
Trying to be too specific about why key loading fails is very difficult
when you're using the same logic across DH, EC, RSA, and DSA. This makes
it less fancy.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 41b86d6b..7c53d863 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -1210,23 +1210,6 @@ class Backend(object): _Reasons.UNSUPPORTED_CIPHER ) - elif errors[0][1:] in ( - ( - self._lib.ERR_LIB_ASN1, - self._lib.ASN1_F_ASN1_CHECK_TLEN, - self._lib.ASN1_R_WRONG_TAG - ), - ( - self._lib.ERR_LIB_PEM, - self._lib.PEM_F_PEM_READ_BIO, - self._lib.PEM_R_NO_START_LINE - ), - ): - raise UnsupportedAlgorithm( - "Unsupported public key algorithm.", - _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM - ) - elif any( error[1:] == ( self._lib.ERR_LIB_EVP, @@ -1235,10 +1218,7 @@ class Backend(object): ) for error in errors ): - raise UnsupportedAlgorithm( - "Unsupported public key algorithm.", - _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM - ) + raise ValueError("Unsupported public key algorithm.") else: assert errors[0][1] in ( |