aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-09-26 15:32:08 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-09-26 15:32:08 -0400
commit854e49cab887122b9c140c5b1ccad4a9c221b743 (patch)
treeae9d2a7f25478065f1847502590071d3b3488430
parenta295ac9d5a17d3f79a2d26d19aea673e5a3327fb (diff)
downloadcryptography-854e49cab887122b9c140c5b1ccad4a9c221b743.tar.gz
cryptography-854e49cab887122b9c140c5b1ccad4a9c221b743.tar.bz2
cryptography-854e49cab887122b9c140c5b1ccad4a9c221b743.zip
fix the tests
-rw-r--r--src/cryptography/hazmat/bindings/openssl/binding.py8
-rw-r--r--tests/hazmat/backends/test_openssl.py3
2 files changed, 6 insertions, 5 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index 71c7b528..a5635f7d 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -30,11 +30,11 @@ def _consume_errors(lib):
if code == 0:
break
- lib = lib.ERR_GET_LIB(code)
- func = lib.ERR_GET_FUNC(code)
- reason = lib.ERR_GET_REASON(code)
+ err_lib = lib.ERR_GET_LIB(code)
+ err_func = lib.ERR_GET_FUNC(code)
+ err_reason = lib.ERR_GET_REASON(code)
- errors.append(_OpenSSLError(code, lib, func, reason))
+ errors.append(_OpenSSLError(code, err_lib, err_func, err_reason))
return errors
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index 5264ba55..abd707ca 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -17,9 +17,10 @@ from cryptography import utils
from cryptography.exceptions import InternalError, _Reasons
from cryptography.hazmat.backends.interfaces import RSABackend
from cryptography.hazmat.backends.openssl.backend import (
- Backend, UnhandledOpenSSLError, backend
+ Backend, backend
)
from cryptography.hazmat.backends.openssl.ec import _sn_to_elliptic_curve
+from cryptography.hazmat.bindings.openssl.binding import UnhandledOpenSSLError
from cryptography.hazmat.primitives import hashes, serialization
from cryptography.hazmat.primitives.asymmetric import dsa, ec, padding
from cryptography.hazmat.primitives.ciphers import (