diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-01 20:00:29 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-01 20:00:29 -0800 |
| commit | 69edb3b7412e04cb32d1d6f7cea87393500c4eeb (patch) | |
| tree | bebcd5baac9ed479417c62cf4aa8e37dfd7f6e3b /tests/hazmat/primitives/utils.py | |
| parent | 604afb5d5531da3f93ed83526e81f09ba76b3c60 (diff) | |
| parent | fa3d5aacd9d8047467ef4f7aaec45fd69ba4fb59 (diff) | |
| download | cryptography-69edb3b7412e04cb32d1d6f7cea87393500c4eeb.tar.gz cryptography-69edb3b7412e04cb32d1d6f7cea87393500c4eeb.tar.bz2 cryptography-69edb3b7412e04cb32d1d6f7cea87393500c4eeb.zip | |
Merge branch 'master' into privatize-me-captain
Conflicts:
cryptography/hazmat/backends/openssl/backend.py
Diffstat (limited to 'tests/hazmat/primitives/utils.py')
| -rw-r--r-- | tests/hazmat/primitives/utils.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py index cdcf84cb..6ecc70ff 100644 --- a/tests/hazmat/primitives/utils.py +++ b/tests/hazmat/primitives/utils.py @@ -264,13 +264,10 @@ def aead_tag_exception_test(backend, cipher_factory, mode_factory): ) with pytest.raises(ValueError): cipher.decryptor() - cipher = Cipher( - cipher_factory(binascii.unhexlify(b"0" * 32)), - mode_factory(binascii.unhexlify(b"0" * 24), b"000"), - backend - ) + with pytest.raises(ValueError): - cipher.decryptor() + mode_factory(binascii.unhexlify(b"0" * 24), b"000") + cipher = Cipher( cipher_factory(binascii.unhexlify(b"0" * 32)), mode_factory(binascii.unhexlify(b"0" * 24), b"0" * 16), |