aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-08 11:33:35 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-11 11:22:12 -0400
commit7ba0c011880d7b346615aad246e0e72e4c9b4691 (patch)
tree4232bbfd8a798c4309a95a74e57af11a016d778e /cryptography
parente5dc122b74b9335454cb4e9321b21a20e756dc96 (diff)
downloadcryptography-7ba0c011880d7b346615aad246e0e72e4c9b4691.tar.gz
cryptography-7ba0c011880d7b346615aad246e0e72e4c9b4691.tar.bz2
cryptography-7ba0c011880d7b346615aad246e0e72e4c9b4691.zip
add IDEA support for CBC, CFB, OFB + tests for all IDEA
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 5d739135..bdbbffd6 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -159,11 +159,14 @@ class Backend(object):
mode_cls,
GetCipherByName("bf-{mode.name}")
)
- for mode_cls in [CBC, CFB, OFB, ECB]:
+ for cipher_cls, mode_cls in itertools.product(
+ [CAST5, IDEA],
+ [CBC, OFB, CFB, ECB],
+ ):
self.register_cipher_adapter(
- CAST5,
+ cipher_cls,
mode_cls,
- GetCipherByName("cast5-{mode.name}")
+ GetCipherByName("{cipher.name}-{mode.name}")
)
self.register_cipher_adapter(
ARC4,
@@ -175,12 +178,6 @@ class Backend(object):
GCM,
GetCipherByName("{cipher.name}-{cipher.key_size}-{mode.name}")
)
- for mode_cls in [ECB]:
- self.register_cipher_adapter(
- IDEA,
- mode_cls,
- GetCipherByName("idea-{mode.name}")
- )
def create_symmetric_encryption_ctx(self, cipher, mode):
return _CipherContext(self, cipher, mode, _CipherContext._ENCRYPT)