diff options
| author | David Reid <dreid@dreid.org> | 2013-11-06 09:48:00 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-11-06 09:48:00 -0800 |
| commit | 30eff66f48189671740f6f1a423454c68dcb9ae8 (patch) | |
| tree | 5d8b58ac917d5cfcf9be209127a84de03ea942e1 /tests/hazmat/bindings/test_openssl.py | |
| parent | e71121bd9756112f141d7f02bf734ba496c70472 (diff) | |
| parent | dd0b51b92d9bafe6aaacc2565ace0c591a493965 (diff) | |
| download | cryptography-30eff66f48189671740f6f1a423454c68dcb9ae8.tar.gz cryptography-30eff66f48189671740f6f1a423454c68dcb9ae8.tar.bz2 cryptography-30eff66f48189671740f6f1a423454c68dcb9ae8.zip | |
Merge pull request #226 from reaperhulk/blockcipher-rename
Reorganize Block Cipher
Diffstat (limited to 'tests/hazmat/bindings/test_openssl.py')
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index f283a7dd..f1493e8d 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -15,9 +15,9 @@ import pytest from cryptography.exceptions import UnsupportedAlgorithm from cryptography.hazmat.bindings.openssl.backend import backend, Backend -from cryptography.hazmat.primitives.block import BlockCipher -from cryptography.hazmat.primitives.block.ciphers import AES -from cryptography.hazmat.primitives.block.modes import CBC +from cryptography.hazmat.primitives.ciphers import Cipher +from cryptography.hazmat.primitives.ciphers.algorithms import AES +from cryptography.hazmat.primitives.ciphers.modes import CBC class FakeMode(object): @@ -62,7 +62,7 @@ class TestOpenSSL(object): FakeMode, lambda backend, cipher, mode: backend.ffi.NULL ) - cipher = BlockCipher( + cipher = Cipher( FakeCipher(), FakeMode(), backend=b, ) with pytest.raises(UnsupportedAlgorithm): |