diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-27 11:09:54 -0500 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-27 11:09:54 -0500 |
| commit | 504e3cfd829f6b5348f27013a8626106aa6cf995 (patch) | |
| tree | 5dfebbb72769a9886bb43236f884c0ae900617db /tests/hazmat/primitives/test_block.py | |
| parent | 3d1d97fa108ced9eae99fc99a5d6399811022425 (diff) | |
| parent | b645521e84026633f666aa107816ac2fc5e05cc6 (diff) | |
| download | cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.tar.gz cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.tar.bz2 cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.zip | |
Merge remote-tracking branch 'origin/master' into pyopenssl-test_crypto-with-optionals
Diffstat (limited to 'tests/hazmat/primitives/test_block.py')
| -rw-r--r-- | tests/hazmat/primitives/test_block.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/hazmat/primitives/test_block.py b/tests/hazmat/primitives/test_block.py index 573f5633..22a7c02f 100644 --- a/tests/hazmat/primitives/test_block.py +++ b/tests/hazmat/primitives/test_block.py @@ -41,6 +41,7 @@ class DummyCipher(object): name = "dummy-cipher" +@pytest.mark.cipher class TestCipher(object): def test_creates_encryptor(self, backend): cipher = Cipher( @@ -64,6 +65,7 @@ class TestCipher(object): Cipher(algorithm, mode=None, backend=backend) +@pytest.mark.cipher class TestCipherContext(object): def test_use_after_finalize(self, backend): cipher = Cipher( @@ -134,6 +136,7 @@ class TestCipherContext(object): decryptor.finalize() +@pytest.mark.cipher class TestAEADCipherContext(object): test_aead_exceptions = generate_aead_exception_test( algorithms.AES, |