Skip to content

Commit 39901e2

Browse files
committed
fix: Branch key creation uses unchanged input
Discovery and changing the region of a KMS key on decrypt do not mutate the customer input. This aligns with customer intent. Further the behavior of the code is to use the provided key directly #267 underspecified how branch keys should be created so this PR rolls back that change.
1 parent bffb953 commit 39901e2

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

framework/branch-key-store.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
### Changelog
1111

12+
- 0.7.1
13+
- Branch key creation only uses customer input (pre 0.5 behavior)
1214
- 0.7.0
1315
- [Mitigate Update Race in the Branch Key Store](../changes/2025-01-16_key-store-mitigate-update-race/background.md)
1416
- 0.6.0
@@ -380,7 +382,7 @@ The operation MUST call [AWS KMS API GenerateDataKeyWithoutPlaintext](https://do
380382
The call to AWS KMS GenerateDataKeyWithoutPlaintext MUST use the configured AWS KMS client to make the call.
381383
The operation MUST call AWS KMS GenerateDataKeyWithoutPlaintext with a request constructed as follows:
382384

383-
- `KeyId` MUST be [compatible with](#aws-key-arn-compatibility) the configured KMS Key in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
385+
- `KeyId` MUST be the configured `AWS KMS Key ARN` in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
384386
- `NumberOfBytes` MUST be 32.
385387
- `EncryptionContext` MUST be the [encryption context for beacon keys](#beacon-key-encryption-context).
386388
- `GrantTokens` MUST be this keystore's [grant tokens](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token).
@@ -396,7 +398,7 @@ The operation MUST call [AWS KMS API GenerateDataKeyWithoutPlaintext](https://do
396398
The call to AWS KMS GenerateDataKeyWithoutPlaintext MUST use the configured AWS KMS client to make the call.
397399
The operation MUST call AWS KMS GenerateDataKeyWithoutPlaintext with a request constructed as follows:
398400

399-
- `KeyId` MUST be [compatible with](#aws-key-arn-compatibility) the configured KMS Key in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
401+
- `KeyId` MUST be the configured `AWS KMS Key ARN` in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
400402
- `NumberOfBytes` MUST be 32.
401403
- `EncryptionContext` MUST be the [DECRYPT_ONLY encryption context for branch keys](#decrypt_only-encryption-context).
402404
- GenerateDataKeyWithoutPlaintext `GrantTokens` MUST be this keystore's [grant tokens](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token).
@@ -409,10 +411,10 @@ The operation MUST call [AWS KMS API ReEncrypt](https://docs.aws.amazon.com/kms/
409411
with a request constructed as follows:
410412

411413
- `SourceEncryptionContext` MUST be the [DECRYPT_ONLY encryption context for branch keys](#decrypt_only-encryption-context).
412-
- `SourceKeyId` MUST be [compatible with](#aws-key-arn-compatibility) the configured KMS Key in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
414+
- `SourceKeyId` MUST be the configured `AWS KMS Key ARN` in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
413415
- `CiphertextBlob` MUST be the wrapped DECRYPT_ONLY Branch Key.
414416
- ReEncrypt `GrantTokens` MUST be this keystore's [grant tokens](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token).
415-
- `DestinationKeyId` MUST be [compatible with](#aws-key-arn-compatibility) the configured KMS Key in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
417+
- `DestinationKeyId` MUST be the configured `AWS KMS Key ARN` in the [AWS KMS Configuration](#aws-kms-configuration) for this keystore.
416418
- `DestinationEncryptionContext` MUST be the [ACTIVE encryption context for branch keys](#active-encryption-context).
417419

418420
If the call to AWS KMS ReEncrypt succeeds,

0 commit comments

Comments
 (0)