diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-09 09:12:29 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-09 11:15:15 -0500 |
| commit | 7e914c90611a2fc6c62d4697d40d0215dc33ce57 (patch) | |
| tree | f310c9e42f64a177595d9add0f5409513af4982f /cryptography | |
| parent | 65a890d0f66bc611cb1ff1be979345c4933160d8 (diff) | |
| download | cryptography-7e914c90611a2fc6c62d4697d40d0215dc33ce57.tar.gz cryptography-7e914c90611a2fc6c62d4697d40d0215dc33ce57.tar.bz2 cryptography-7e914c90611a2fc6c62d4697d40d0215dc33ce57.zip | |
add SEED docs, tests, small fixes
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/backends/openssl/backend.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/ciphers/algorithms.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index c454a4f3..021ce8c4 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -35,7 +35,7 @@ from cryptography.hazmat.primitives.asymmetric.padding import ( MGF1, PKCS1v15, PSS ) from cryptography.hazmat.primitives.ciphers.algorithms import ( - AES, ARC4, Blowfish, CAST5, Camellia, IDEA, TripleDES, SEED + AES, ARC4, Blowfish, CAST5, Camellia, IDEA, SEED, TripleDES ) from cryptography.hazmat.primitives.ciphers.modes import ( CBC, CFB, CTR, ECB, GCM, OFB diff --git a/cryptography/hazmat/primitives/ciphers/algorithms.py b/cryptography/hazmat/primitives/ciphers/algorithms.py index 0305c36b..52daf178 100644 --- a/cryptography/hazmat/primitives/ciphers/algorithms.py +++ b/cryptography/hazmat/primitives/ciphers/algorithms.py @@ -131,6 +131,7 @@ class IDEA(object): def key_size(self): return len(self.key) * 8 + @utils.register_interface(interfaces.BlockCipherAlgorithm) @utils.register_interface(interfaces.CipherAlgorithm) class SEED(object): |