diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-02 08:15:01 -0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-02 08:15:01 -0800 |
commit | 2f54b2ba8953a309d35516d45634aeaa3ae03e14 (patch) | |
tree | 1a9f5d1feedfcc3b3fb2ffd15c92b8534f5241a2 | |
parent | b84b215af8e7669d50b7b63fb37e6854ba6f99db (diff) | |
parent | 30ff19b11a5586679549fbff8bddc0c03d4c590f (diff) | |
download | cryptography-2f54b2ba8953a309d35516d45634aeaa3ae03e14.tar.gz cryptography-2f54b2ba8953a309d35516d45634aeaa3ae03e14.tar.bz2 cryptography-2f54b2ba8953a309d35516d45634aeaa3ae03e14.zip |
Merge pull request #545 from public/error-strings
More detailed error message for InternalError
-rw-r--r-- | cryptography/hazmat/backends/openssl/backend.py | 10 | ||||
-rw-r--r-- | tests/hazmat/backends/test_openssl.py | 17 |
2 files changed, 26 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index e842f078..67b365fa 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -177,6 +177,11 @@ class Backend(object): return self._ffi.buffer(buf)[:] + def _err_string(self, code): + err_buf = self._ffi.new("char[]", 256) + self._lib.ERR_error_string_n(code, err_buf, 256) + return self._ffi.string(err_buf, 256)[:] + def _handle_error(self, mode): code = self._lib.ERR_get_error() if not code and isinstance(mode, GCM): @@ -211,7 +216,10 @@ class Backend(object): ) raise InternalError( - "Unknown error code from OpenSSL, you should probably file a bug." + "Unknown error code {0} from OpenSSL, " + "you should probably file a bug. {1}".format( + code, self._err_string(code) + ) ) diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index b0a58c41..1e35322a 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -116,6 +116,23 @@ class TestOpenSSL(object): assert backend._lib.ERR_peek_error() == 0 + def test_openssl_error_string(self): + backend._lib.ERR_put_error( + backend._lib.ERR_LIB_EVP, + backend._lib.EVP_F_EVP_DECRYPTFINAL_EX, + 0, + b"test_openssl.py", + -1 + ) + + with pytest.raises(InternalError) as exc: + backend._handle_error(None) + + assert ( + "digital envelope routines:" + "EVP_DecryptFinal_ex:digital envelope routines" in str(exc) + ) + def test_ssl_ciphers_registered(self): meth = backend._lib.TLSv1_method() ctx = backend._lib.SSL_CTX_new(meth) |