diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-01 23:52:09 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-01 23:52:09 -0600 |
| commit | b8dbb89676836db16272e0485086191263f98c45 (patch) | |
| tree | a0533b10b3abdd3a9854557c9344d83e3df72c79 /tests/hazmat/primitives | |
| parent | 607688cdcb5b262715bd4eb70f9770f0326ce9e5 (diff) | |
| parent | fa3d5aacd9d8047467ef4f7aaec45fd69ba4fb59 (diff) | |
| download | cryptography-b8dbb89676836db16272e0485086191263f98c45.tar.gz cryptography-b8dbb89676836db16272e0485086191263f98c45.tar.bz2 cryptography-b8dbb89676836db16272e0485086191263f98c45.zip | |
Merge branch 'master' into urandom-engine
* master:
Split OpenSSL binding
Fixed test for earlier exceptino
Rearrange
Move GCM tag size/value validation farther forward -- this makes it easier by not requiring future backends to implement the same checks
expose num_locks and {get,set}_{id,locking}_callback
Make the PyPy tox job consistent with the main one.
THis should be a seperate PR
Typo fix
This page has been subsumed by the index
Bump the copyright year
Document compiling OpenSSL to avoid conflicts
Conflicts:
cryptography/hazmat/backends/openssl/backend.py
Diffstat (limited to 'tests/hazmat/primitives')
| -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), |