aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-21 10:34:49 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-21 10:34:49 -0500
commit3211d16da6e9a90567248208164b0e7e9e4e3bcb (patch)
tree8abc6f2c2522ada35da7a43ef777ca8dfadfdfbc /cryptography
parent9e233139790599a3d779330bb351ba1da984ae60 (diff)
downloadcryptography-3211d16da6e9a90567248208164b0e7e9e4e3bcb.tar.gz
cryptography-3211d16da6e9a90567248208164b0e7e9e4e3bcb.tar.bz2
cryptography-3211d16da6e9a90567248208164b0e7e9e4e3bcb.zip
add test to verify AES CTR is always available in 0.9.8+, comment updates
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index d9165492..c66f0452 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -132,14 +132,14 @@ class Backend(object):
return _HashContext(self, algorithm)
def cipher_supported(self, cipher, mode):
- if self._cipher_supported(cipher, mode):
+ if self._evp_cipher_supported(cipher, mode):
return True
elif isinstance(mode, CTR) and isinstance(cipher, AES):
return True
else:
return False
- def _cipher_supported(self, cipher, mode):
+ def _evp_cipher_supported(self, cipher, mode):
try:
adapter = self._cipher_registry[type(cipher), type(mode)]
except KeyError:
@@ -856,10 +856,12 @@ class _CipherContext(object):
return self._tag
-# This is needed to provide support for AES CTR mode in OpenSSL 0.9.8. It can
-# be removed when we drop 0.9.8 support (RHEL5 extended life ends 2020).
@utils.register_interface(interfaces.CipherContext)
class _AESCTRCipherContext(object):
+ """
+ This is needed to provide support for AES CTR mode in OpenSSL 0.9.8. It can
+ be removed when we drop 0.9.8 support (RHEL5 extended life ends 2020).
+ """
def __init__(self, backend, cipher, mode):
self._backend = backend