diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-06-30 10:03:22 -0700 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-06-30 10:03:22 -0700 |
commit | a94775925595bf21c849af6eca1a833e51d12e4e (patch) | |
tree | 7c46e24eeff71166b2119829fc668cdef6772296 /tests/hazmat | |
parent | cc5224f973de58ddd298d94d8966ccddb7f761a8 (diff) | |
download | cryptography-a94775925595bf21c849af6eca1a833e51d12e4e.tar.gz cryptography-a94775925595bf21c849af6eca1a833e51d12e4e.tar.bz2 cryptography-a94775925595bf21c849af6eca1a833e51d12e4e.zip |
Simplify code and add test
Diffstat (limited to 'tests/hazmat')
-rw-r--r-- | tests/hazmat/primitives/test_aes.py | 4 | ||||
-rw-r--r-- | tests/hazmat/primitives/utils.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py index 003b3ba0..5bde7d3c 100644 --- a/tests/hazmat/primitives/test_aes.py +++ b/tests/hazmat/primitives/test_aes.py @@ -225,6 +225,6 @@ class TestAESModeGCM(object): "gcmEncryptExtIV192.rsp", "gcmEncryptExtIV256.rsp", ], - lambda key: algorithms.AES(key), - lambda iv, tag, min_tag_length=16: modes.GCM(iv, tag, min_tag_length), + algorithms.AES, + modes.GCM, ) diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py index 4640c2ea..6428b03e 100644 --- a/tests/hazmat/primitives/utils.py +++ b/tests/hazmat/primitives/utils.py @@ -311,6 +311,9 @@ def aead_tag_exception_test(backend, cipher_factory, mode_factory): with pytest.raises(ValueError): mode_factory(binascii.unhexlify(b"0" * 24), b"000") + with pytest.raises(ValueError): + mode_factory(binascii.unhexlify(b"0" * 24), b"000000", 2) + cipher = Cipher( cipher_factory(binascii.unhexlify(b"0" * 32)), mode_factory(binascii.unhexlify(b"0" * 24), b"0" * 16), |