diff options
| author | David Reid <dreid@dreid.org> | 2013-11-12 15:50:43 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-11-12 15:50:43 -0800 |
| commit | fcd36a9bb98fe6e13bc37cc833f317a3ee656eef (patch) | |
| tree | adc44cfbca50c99f261c45d893d9378ea57e673b /cryptography/hazmat/primitives/ciphers/algorithms.py | |
| parent | 9d0d94d97cb8ed8d15b24018e20c08cf1f7b78b4 (diff) | |
| parent | 4faa094526f49c83a75d21a6e796546d4d539c6c (diff) | |
| download | cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.tar.gz cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.tar.bz2 cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.zip | |
Merge branch 'master' into hmac-context-from-backend
Conflicts:
cryptography/hazmat/bindings/openssl/backend.py
cryptography/hazmat/primitives/hmac.py
Diffstat (limited to 'cryptography/hazmat/primitives/ciphers/algorithms.py')
| -rw-r--r-- | cryptography/hazmat/primitives/ciphers/algorithms.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cryptography/hazmat/primitives/ciphers/algorithms.py b/cryptography/hazmat/primitives/ciphers/algorithms.py index cbfaceb8..c135f563 100644 --- a/cryptography/hazmat/primitives/ciphers/algorithms.py +++ b/cryptography/hazmat/primitives/ciphers/algorithms.py @@ -20,7 +20,6 @@ class AES(object): key_sizes = frozenset([128, 192, 256]) def __init__(self, key): - super(AES, self).__init__() self.key = key # Verify that the key size matches the expected key size @@ -40,7 +39,6 @@ class Camellia(object): key_sizes = frozenset([128, 192, 256]) def __init__(self, key): - super(Camellia, self).__init__() self.key = key # Verify that the key size matches the expected key size @@ -60,7 +58,6 @@ class TripleDES(object): key_sizes = frozenset([64, 128, 192]) def __init__(self, key): - super(TripleDES, self).__init__() if len(key) == 8: key += key + key elif len(key) == 16: @@ -84,7 +81,6 @@ class Blowfish(object): key_sizes = frozenset(range(32, 449, 8)) def __init__(self, key): - super(Blowfish, self).__init__() self.key = key # Verify that the key size matches the expected key size @@ -104,7 +100,6 @@ class CAST5(object): key_sizes = frozenset([40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120, 128]) def __init__(self, key): - super(CAST5, self).__init__() self.key = key # Verify that the key size matches the expected key size @@ -120,10 +115,10 @@ class CAST5(object): class ARC4(object): name = "RC4" + block_size = 1 key_sizes = frozenset([40, 56, 64, 80, 128, 192, 256]) def __init__(self, key): - super(ARC4, self).__init__() self.key = key # Verify that the key size matches the expected key size |