From a778fbc56cb6354fb6ecdced0196eab1d3d6c9ec Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 15 Jun 2016 09:52:16 -0400 Subject: Small cleanup (#2979) --- src/cryptography/hazmat/backends/openssl/backend.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 4c621466..9a89ae83 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -219,7 +219,7 @@ class Backend(object): self._cipher_registry[cipher_cls, mode_cls] = adapter def _register_default_ciphers(self): - for mode_cls in [CBC, CTR, ECB, OFB, CFB, CFB8]: + for mode_cls in [CBC, CTR, ECB, OFB, CFB, CFB8, GCM]: self.register_cipher_adapter( AES, mode_cls, @@ -268,11 +268,6 @@ class Backend(object): type(None), GetCipherByName("rc4") ) - self.register_cipher_adapter( - AES, - GCM, - GetCipherByName("{cipher.name}-{cipher.key_size}-{mode.name}") - ) def create_symmetric_encryption_ctx(self, cipher, mode): if (isinstance(mode, CTR) and isinstance(cipher, AES) and -- cgit v1.2.3