aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat
diff options
context:
space:
mode:
Diffstat (limited to 'tests/hazmat')
-rw-r--r--tests/hazmat/primitives/test_block.py4
-rw-r--r--tests/hazmat/primitives/test_utils.py4
-rw-r--r--tests/hazmat/primitives/utils.py18
3 files changed, 14 insertions, 12 deletions
diff --git a/tests/hazmat/primitives/test_block.py b/tests/hazmat/primitives/test_block.py
index 296821a4..2806efd5 100644
--- a/tests/hazmat/primitives/test_block.py
+++ b/tests/hazmat/primitives/test_block.py
@@ -26,7 +26,7 @@ from cryptography.hazmat.primitives.ciphers import (
Cipher, algorithms, modes
)
-from .utils import generate_aead_use_after_finalize_test
+from .utils import generate_aead_exception_test
@utils.register_interface(interfaces.CipherAlgorithm)
@@ -127,7 +127,7 @@ class TestCipherContext(object):
class TestAEADCipherContext(object):
- test_use_after_finalize = generate_aead_use_after_finalize_test(
+ test_aead_exceptions = generate_aead_exception_test(
algorithms.AES,
modes.GCM,
only_if=lambda backend: backend.cipher_supported(
diff --git a/tests/hazmat/primitives/test_utils.py b/tests/hazmat/primitives/test_utils.py
index f286e02d..ebb8b5c4 100644
--- a/tests/hazmat/primitives/test_utils.py
+++ b/tests/hazmat/primitives/test_utils.py
@@ -3,7 +3,7 @@ import pytest
from .utils import (
base_hash_test, encrypt_test, hash_test, long_string_hash_test,
base_hmac_test, hmac_test, stream_encryption_test, aead_test,
- aead_use_after_finalize_test,
+ aead_exception_test,
)
@@ -32,7 +32,7 @@ class TestAEADTest(object):
class TestAEADFinalizeTest(object):
def test_skips_if_only_if_returns_false(self):
with pytest.raises(pytest.skip.Exception) as exc_info:
- aead_use_after_finalize_test(
+ aead_exception_test(
None, None, None,
only_if=lambda backend: False,
skip_message="message!"
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py
index 2a99cab9..8df02e78 100644
--- a/tests/hazmat/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -7,7 +7,7 @@ from cryptography.hazmat.bindings import _ALL_BACKENDS
from cryptography.hazmat.primitives import hashes, hmac
from cryptography.hazmat.primitives.ciphers import Cipher
from cryptography.exceptions import (
- AlreadyFinalized, NotYetFinalized,
+ AlreadyFinalized, NotYetFinalized, AlreadyUpdated,
)
from ...utils import load_vectors_from_file
@@ -307,23 +307,23 @@ def base_hmac_test(backend, algorithm, only_if, skip_message):
assert h._ctx != h_copy._ctx
-def generate_aead_use_after_finalize_test(cipher_factory, mode_factory,
- only_if, skip_message):
- def test_aead_use_after_finalize(self):
+def generate_aead_exception_test(cipher_factory, mode_factory,
+ only_if, skip_message):
+ def test_aead_exception(self):
for backend in _ALL_BACKENDS:
yield (
- aead_use_after_finalize_test,
+ aead_exception_test,
backend,
cipher_factory,
mode_factory,
only_if,
skip_message
)
- return test_aead_use_after_finalize
+ return test_aead_exception
-def aead_use_after_finalize_test(backend, cipher_factory, mode_factory,
- only_if, skip_message):
+def aead_exception_test(backend, cipher_factory, mode_factory,
+ only_if, skip_message):
if not only_if(backend):
pytest.skip(skip_message)
cipher = Cipher(
@@ -335,6 +335,8 @@ def aead_use_after_finalize_test(backend, cipher_factory, mode_factory,
encryptor.update(b"a" * 16)
with pytest.raises(NotYetFinalized):
encryptor.tag
+ with pytest.raises(AlreadyUpdated):
+ encryptor.add_data(b"b" * 16)
encryptor.finalize()
with pytest.raises(AlreadyFinalized):
encryptor.add_data(b"b" * 16)