diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-16 17:31:30 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-16 17:31:30 -0800 |
| commit | 3e4489ac893571505f62bb39f039c06b9901f4af (patch) | |
| tree | e454ce35fe9cf5d50ec6ff2263a5a30be6618292 /tests/hazmat/primitives/test_aes.py | |
| parent | c5b0aa06a7cc843578523acb847646f3881df27f (diff) | |
| parent | e547d8f883b4a6425e33f72c347f2dd73af6940c (diff) | |
| download | cryptography-3e4489ac893571505f62bb39f039c06b9901f4af.tar.gz cryptography-3e4489ac893571505f62bb39f039c06b9901f4af.tar.bz2 cryptography-3e4489ac893571505f62bb39f039c06b9901f4af.zip | |
Merge pull request #623 from reaperhulk/openssl-loader-your-time-is-coming
Reformat AES CTR vectors to use NIST loader & document their source
Diffstat (limited to 'tests/hazmat/primitives/test_aes.py')
| -rw-r--r-- | tests/hazmat/primitives/test_aes.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py index 8cba8c66..157d3536 100644 --- a/tests/hazmat/primitives/test_aes.py +++ b/tests/hazmat/primitives/test_aes.py @@ -21,9 +21,7 @@ import pytest from cryptography.hazmat.primitives.ciphers import algorithms, modes from .utils import generate_encrypt_test, generate_aead_test -from ...utils import ( - load_nist_vectors, load_openssl_vectors, -) +from ...utils import load_nist_vectors @pytest.mark.supported( @@ -167,7 +165,7 @@ class TestAES_CFB(object): @pytest.mark.cipher class TestAES_CTR(object): test_CTR = generate_encrypt_test( - load_openssl_vectors, + load_nist_vectors, os.path.join("ciphers", "AES", "CTR"), ["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"], lambda key, **kwargs: algorithms.AES(binascii.unhexlify(key)), |