From 016eed1cc1cc26ff404ac31ed3858de362ca37f2 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 16 Oct 2013 14:16:04 -0700 Subject: Ported openssl vector tests --- tests/primitives/utils.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/primitives/utils.py') diff --git a/tests/primitives/utils.py b/tests/primitives/utils.py index e35c915a..13bf0d89 100644 --- a/tests/primitives/utils.py +++ b/tests/primitives/utils.py @@ -7,18 +7,15 @@ from cryptography.bindings import openssl from cryptography.primitives.block import BlockCipher -def generate_encrypt_test(param_loader, cipher_name, vector_type, file_names, - cipher_factory, mode_factory, - only_if=lambda api: True): +def generate_encrypt_test(param_loader, path, file_names, cipher_factory, + mode_factory, only_if=lambda api: True): def test_encryption(self): for api in [openssl.api]: if not only_if(api): yield encrypt_skipped else: for file_name in file_names: - for params in param_loader( - os.path.join(cipher_name, vector_type, file_name) - ): + for params in param_loader(os.path.join(path, file_name)): yield encrypt_test, api, cipher_factory, mode_factory, params return test_encryption -- cgit v1.2.3