fix: Handle errors when decrypting multiple EDKs with raw RSA MKPs #672
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:
Catch a
ValueError
thrown by cryptography if the master key provider cannot decrypt the EDK, and surface it as aIncorrectMasterKeyError
.From MKP Decrypt Data Key spec:
"The master key provider SHOULD attempt to decrypt the data key by passing the request to any master keys that it has access to until it has either exhausted available master keys or obtained a plaintext data key."
Surfacing the
ValueError
as anIncorrectMasterKeyError
lets this logic swallow the exception, and try to decrypt other data keys from the encrypted data key list.This is extremely similar to this previous issue, except with raw RSA keys instead of KMSMasterKeys.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Check any applicable: