aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/utils.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-06 12:22:09 +0800
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-06 12:22:09 +0800
commit21dde56b48bf473932ce815860dd2ec99f2e2c75 (patch)
tree3932669bfed4d6119b31723970684aad773d7d28 /tests/hazmat/primitives/utils.py
parent1e636c3052a452792ec01349b99c7591ea29e9ed (diff)
downloadcryptography-21dde56b48bf473932ce815860dd2ec99f2e2c75.tar.gz
cryptography-21dde56b48bf473932ce815860dd2ec99f2e2c75.tar.bz2
cryptography-21dde56b48bf473932ce815860dd2ec99f2e2c75.zip
block cipher rename
* block renamed to ciphers * ciphers renamed to algorithms * base moved into algorithms
Diffstat (limited to 'tests/hazmat/primitives/utils.py')
-rw-r--r--tests/hazmat/primitives/utils.py4
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