diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-12 17:31:24 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-13 12:27:07 -0600 |
| commit | 513b7cb41671ccf7d9345075534bfa3d92c1c05e (patch) | |
| tree | b6756e82399b1253e881d58390211be6ccd9d4cc /tests/hazmat/backends/test_openssl.py | |
| parent | 0f696fab0e012bca0b69f2c933c679f5ecbe80ad (diff) | |
| download | cryptography-513b7cb41671ccf7d9345075534bfa3d92c1c05e.tar.gz cryptography-513b7cb41671ccf7d9345075534bfa3d92c1c05e.tar.bz2 cryptography-513b7cb41671ccf7d9345075534bfa3d92c1c05e.zip | |
move cipher and mode interfaces
Diffstat (limited to 'tests/hazmat/backends/test_openssl.py')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 97d58085..878d71bb 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -23,14 +23,16 @@ from cryptography.hazmat.primitives import hashes, interfaces from cryptography.hazmat.primitives.asymmetric import dsa, padding from cryptography.hazmat.primitives.ciphers import Cipher from cryptography.hazmat.primitives.ciphers.algorithms import AES -from cryptography.hazmat.primitives.ciphers.modes import CBC, CTR -from cryptography.hazmat.primitives.interfaces import BlockCipherAlgorithm +from cryptography.hazmat.primitives.ciphers.base import ( + BlockCipherAlgorithm, CipherAlgorithm +) +from cryptography.hazmat.primitives.ciphers.modes import CBC, CTR, Mode from ..primitives.fixtures_rsa import RSA_KEY_512 from ...utils import load_vectors_from_file, raises_unsupported_algorithm -@utils.register_interface(interfaces.Mode) +@utils.register_interface(Mode) class DummyMode(object): name = "dummy-mode" @@ -38,7 +40,7 @@ class DummyMode(object): pass -@utils.register_interface(interfaces.CipherAlgorithm) +@utils.register_interface(CipherAlgorithm) class DummyCipher(object): name = "dummy-cipher" key_size = None |