aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-06-13 17:02:58 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2014-06-13 17:02:58 -0400
commitfcef4976e326d310d0cf77a6a7b929313583e4ad (patch)
tree860ac3d385ef3f1d2ec8f9074ef810bf476e134f /cryptography
parent19b70d2adb5f7b9c1903d7b69e580b4c1148f394 (diff)
parentd1bac5e2a644b9072b9f0976110d5c929594b554 (diff)
downloadcryptography-fcef4976e326d310d0cf77a6a7b929313583e4ad.tar.gz
cryptography-fcef4976e326d310d0cf77a6a7b929313583e4ad.tar.bz2
cryptography-fcef4976e326d310d0cf77a6a7b929313583e4ad.zip
Merge pull request #1131 from reaperhulk/add-3des-ecb
Add TripleDES ECB
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/commoncrypto/backend.py1
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/commoncrypto/backend.py b/cryptography/hazmat/backends/commoncrypto/backend.py
index 213cbd8c..41be11f9 100644
--- a/cryptography/hazmat/backends/commoncrypto/backend.py
+++ b/cryptography/hazmat/backends/commoncrypto/backend.py
@@ -178,6 +178,7 @@ class Backend(object):
)
for mode_cls, mode_const in [
(CBC, self._lib.kCCModeCBC),
+ (ECB, self._lib.kCCModeECB),
(CFB, self._lib.kCCModeCFB),
(CFB8, self._lib.kCCModeCFB8),
(OFB, self._lib.kCCModeOFB),
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index ab3f9471..eea58bec 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -181,6 +181,11 @@ class Backend(object):
mode_cls,
GetCipherByName("des-ede3-{mode.name}")
)
+ self.register_cipher_adapter(
+ TripleDES,
+ ECB,
+ GetCipherByName("des-ede3")
+ )
for mode_cls in [CBC, CFB, OFB, ECB]:
self.register_cipher_adapter(
Blowfish,