Fix/hkeyring branch key material 1691 - #1698
Closed
kessplas wants to merge 2 commits into
Closed
Conversation
getBranchKeyMaterials returned the cached NodeBranchKeyMaterial by reference. The cryptographic materials cache zeroes a material's buffer in place when the entry is evicted, so under concurrency an eviction (overwrite, TTL expiry, or tail eviction) could zero the branch key another in-flight operation was about to derive its wrapping key from. Triggering this requires two branch key acquisitions to resolve within the same event-loop tick. This does not arise during normal operation with the DynamoDB/KMS-backed keystore; fetches complete on separate I/O callbacks. We are nevertheless patching it. Return an independent deep copy from getBranchKeyMaterials so callers never share a buffer the cache can zero. Add concurrency regression tests covering both the encrypt and decrypt paths. Fixes #1691
… into fix/hkeyring-branch-key-material-1691
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Check any applicable: