@@ -61,9 +61,9 @@ def test_aws_kms_single_cmk_keyring_on_encrypt_empty_materials(fake_generator):
61
61
MasterKeyInfo (provider_id = _PROVIDER_ID , key_info = fake_generator ), result_materials .keyring_trace
62
62
)
63
63
64
- assert KeyringTraceFlag .WRAPPING_KEY_GENERATED_DATA_KEY in generator_flags
65
- assert KeyringTraceFlag .WRAPPING_KEY_ENCRYPTED_DATA_KEY in generator_flags
66
- assert KeyringTraceFlag .WRAPPING_KEY_SIGNED_ENC_CTX in generator_flags
64
+ assert KeyringTraceFlag .GENERATED_DATA_KEY in generator_flags
65
+ assert KeyringTraceFlag .ENCRYPTED_DATA_KEY in generator_flags
66
+ assert KeyringTraceFlag .SIGNED_ENCRYPTION_CONTEXT in generator_flags
67
67
68
68
69
69
def test_aws_kms_single_cmk_keyring_on_encrypt_existing_data_key (fake_generator ):
@@ -86,9 +86,9 @@ def test_aws_kms_single_cmk_keyring_on_encrypt_existing_data_key(fake_generator)
86
86
MasterKeyInfo (provider_id = _PROVIDER_ID , key_info = fake_generator ), result_materials .keyring_trace
87
87
)
88
88
89
- assert KeyringTraceFlag .WRAPPING_KEY_GENERATED_DATA_KEY not in generator_flags
90
- assert KeyringTraceFlag .WRAPPING_KEY_ENCRYPTED_DATA_KEY in generator_flags
91
- assert KeyringTraceFlag .WRAPPING_KEY_SIGNED_ENC_CTX in generator_flags
89
+ assert KeyringTraceFlag .GENERATED_DATA_KEY not in generator_flags
90
+ assert KeyringTraceFlag .ENCRYPTED_DATA_KEY in generator_flags
91
+ assert KeyringTraceFlag .SIGNED_ENCRYPTION_CONTEXT in generator_flags
92
92
93
93
94
94
@mock_kms
@@ -155,8 +155,8 @@ def test_aws_kms_single_cmk_keyring_on_decrypt_single_cmk(fake_generator):
155
155
MasterKeyInfo (provider_id = _PROVIDER_ID , key_info = fake_generator ), result_materials .keyring_trace
156
156
)
157
157
158
- assert KeyringTraceFlag .WRAPPING_KEY_DECRYPTED_DATA_KEY in generator_flags
159
- assert KeyringTraceFlag .WRAPPING_KEY_VERIFIED_ENC_CTX in generator_flags
158
+ assert KeyringTraceFlag .DECRYPTED_DATA_KEY in generator_flags
159
+ assert KeyringTraceFlag .VERIFIED_ENCRYPTION_CONTEXT in generator_flags
160
160
161
161
162
162
def test_aws_kms_single_cmk_keyring_on_decrypt_multiple_cmk (fake_generator_and_child ):
@@ -186,8 +186,8 @@ def test_aws_kms_single_cmk_keyring_on_decrypt_multiple_cmk(fake_generator_and_c
186
186
MasterKeyInfo (provider_id = _PROVIDER_ID , key_info = child ), result_materials .keyring_trace
187
187
)
188
188
189
- assert KeyringTraceFlag .WRAPPING_KEY_DECRYPTED_DATA_KEY in child_flags
190
- assert KeyringTraceFlag .WRAPPING_KEY_VERIFIED_ENC_CTX in child_flags
189
+ assert KeyringTraceFlag .DECRYPTED_DATA_KEY in child_flags
190
+ assert KeyringTraceFlag .VERIFIED_ENCRYPTION_CONTEXT in child_flags
191
191
192
192
193
193
def test_aws_kms_single_cmk_keyring_on_decrypt_no_match (fake_generator_and_child ):
@@ -274,8 +274,8 @@ def test_aws_kms_discovery_keyring_on_decrypt(encryption_materials_for_discovery
274
274
MasterKeyInfo (provider_id = _PROVIDER_ID , key_info = generator_key_id ), result_materials .keyring_trace
275
275
)
276
276
277
- assert KeyringTraceFlag .WRAPPING_KEY_DECRYPTED_DATA_KEY in generator_flags
278
- assert KeyringTraceFlag .WRAPPING_KEY_VERIFIED_ENC_CTX in generator_flags
277
+ assert KeyringTraceFlag .DECRYPTED_DATA_KEY in generator_flags
278
+ assert KeyringTraceFlag .VERIFIED_ENCRYPTION_CONTEXT in generator_flags
279
279
280
280
281
281
@mock_kms
@@ -380,8 +380,8 @@ def test_try_aws_kms_decrypt_succeed(fake_generator):
380
380
MasterKeyInfo (provider_id = _PROVIDER_ID , key_info = fake_generator ), result_materials .keyring_trace
381
381
)
382
382
383
- assert KeyringTraceFlag .WRAPPING_KEY_DECRYPTED_DATA_KEY in generator_flags
384
- assert KeyringTraceFlag .WRAPPING_KEY_VERIFIED_ENC_CTX in generator_flags
383
+ assert KeyringTraceFlag .DECRYPTED_DATA_KEY in generator_flags
384
+ assert KeyringTraceFlag .VERIFIED_ENCRYPTION_CONTEXT in generator_flags
385
385
386
386
387
387
@mock_kms
0 commit comments