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/primitives/utils.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/primitives/utils.py')
| -rw-r--r-- | tests/hazmat/primitives/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py index b4a8a3e6..e6e97d1d 100644 --- a/tests/hazmat/primitives/utils.py +++ b/tests/hazmat/primitives/utils.py @@ -6,7 +6,7 @@ import pytest from cryptography.hazmat.bindings import _ALL_BACKENDS from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives import hmac -from cryptography.hazmat.primitives.block import BlockCipher +from cryptography.hazmat.primitives.ciphers import Cipher def generate_encrypt_test(param_loader, path, file_names, cipher_factory, @@ -34,7 +34,7 @@ def encrypt_test(backend, cipher_factory, mode_factory, params, only_if, pytest.skip(skip_message) plaintext = params.pop("plaintext") ciphertext = params.pop("ciphertext") - cipher = BlockCipher( + cipher = Cipher( cipher_factory(**params), mode_factory(**params), backend |