aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-07 17:24:58 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-07 17:28:31 -0600
commit0f72bdadc4de8b764967ea66d376da65e5bf3281 (patch)
tree4a6066b4506084e9da1fcd7378497fd65721735b /cryptography
parent7ec30af9a58647d1e38bb78b5381e64af67128a6 (diff)
downloadcryptography-0f72bdadc4de8b764967ea66d376da65e5bf3281.tar.gz
cryptography-0f72bdadc4de8b764967ea66d376da65e5bf3281.tar.bz2
cryptography-0f72bdadc4de8b764967ea66d376da65e5bf3281.zip
remove CAST5 for first release
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py7
-rw-r--r--cryptography/hazmat/primitives/ciphers/algorithms.py15
2 files changed, 1 insertions, 21 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 49066466..284fa989 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -22,7 +22,7 @@ from cryptography.hazmat.backends.interfaces import (
)
from cryptography.hazmat.primitives import interfaces
from cryptography.hazmat.primitives.ciphers.algorithms import (
- AES, Blowfish, Camellia, CAST5, TripleDES, ARC4,
+ AES, Blowfish, Camellia, TripleDES, ARC4,
)
from cryptography.hazmat.primitives.ciphers.modes import (
CBC, CTR, ECB, OFB, CFB, GCM,
@@ -108,11 +108,6 @@ class Backend(object):
GetCipherByName("bf-{mode.name}")
)
self.register_cipher_adapter(
- CAST5,
- ECB,
- GetCipherByName("cast5-ecb")
- )
- self.register_cipher_adapter(
ARC4,
type(None),
GetCipherByName("rc4")
diff --git a/cryptography/hazmat/primitives/ciphers/algorithms.py b/cryptography/hazmat/primitives/ciphers/algorithms.py
index a5cfce92..19cf1920 100644
--- a/cryptography/hazmat/primitives/ciphers/algorithms.py
+++ b/cryptography/hazmat/primitives/ciphers/algorithms.py
@@ -90,21 +90,6 @@ class Blowfish(object):
return len(self.key) * 8
-@utils.register_interface(interfaces.BlockCipherAlgorithm)
-@utils.register_interface(interfaces.CipherAlgorithm)
-class CAST5(object):
- name = "CAST5"
- block_size = 64
- key_sizes = frozenset(range(40, 129, 8))
-
- def __init__(self, key):
- self.key = _verify_key_size(self, key)
-
- @property
- def key_size(self):
- return len(self.key) * 8
-
-
@utils.register_interface(interfaces.CipherAlgorithm)
class ARC4(object):
name = "RC4"