From e547d8f883b4a6425e33f72c347f2dd73af6940c Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 15 Feb 2014 21:37:52 -0600 Subject: Reformat AES CTR vectors to use NIST loader & document their source properly --- tests/hazmat/primitives/test_aes.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/hazmat/primitives/test_aes.py') 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)), -- cgit v1.2.3