From cd873a0ebf7fcb8cebfc90fedd495e011b12187b Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Mon, 28 Oct 2024 13:47:11 -0700 Subject: [PATCH 1/2] m --- .../manifests/full_message/decrypt.py | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py index 0f5b2e680..7300fcb35 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py @@ -630,21 +630,11 @@ def from_file(cls, input_file, keyrings): client_name = raw_manifest["client"]["name"] # type: str client_version = raw_manifest["client"]["version"] # type: str raw_scenarios = raw_manifest["tests"] # type: Dict[str, DECRYPT_SCENARIO_SPEC] - test_scenarios = { - name: MessageDecryptionTestScenario.from_scenario( - scenario=scenario, - plaintext_reader=root_reader, - ciphertext_reader=root_reader, - keys=keys, - keyrings=False, - keys_uri=keys_abs_path, - ) - for name, scenario in raw_scenarios.items() - } - # If optional keyrings argument is true, - # also add scenarios to decrypt with keyrings. + + # If optional keyrings argument is specified, + # decrypt with keyrings if keyrings: - keyrings_test_scenarios = { + test_scenarios = { name + "-keyring": MessageDecryptionTestScenario.from_scenario( scenario=scenario, plaintext_reader=root_reader, @@ -655,8 +645,20 @@ def from_file(cls, input_file, keyrings): ) for name, scenario in raw_scenarios.items() } - # Merge keyring scenarios into test_scenarios - test_scenarios = {**keyrings_test_scenarios, **test_scenarios} + # If optional keyrings argument is not specified, + # decrypt with master key providers + else: + test_scenarios = { + name: MessageDecryptionTestScenario.from_scenario( + scenario=scenario, + plaintext_reader=root_reader, + ciphertext_reader=root_reader, + keys=keys, + keyrings=False, + keys_uri=keys_abs_path, + ) + for name, scenario in raw_scenarios.items() + } # Remove any `None` scenarios from test scenarios. # `None` scenarios indicate the loader determined the scenario is invalid. From 8e5960ed5f27b238b898c07a2450cb6d234c47b2 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Mon, 28 Oct 2024 14:08:34 -0700 Subject: [PATCH 2/2] m --- .../src/awses_test_vectors/manifests/full_message/decrypt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py index 7300fcb35..c942d8bf4 100644 --- a/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py +++ b/test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py @@ -646,7 +646,7 @@ def from_file(cls, input_file, keyrings): for name, scenario in raw_scenarios.items() } # If optional keyrings argument is not specified, - # decrypt with master key providers + # decrypt with master key providers. else: test_scenarios = { name: MessageDecryptionTestScenario.from_scenario(