Backport 26565 ([hsmtool] Add vendor specific AES_KWP mechanism) #29006
+75
−14
Conversation
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
The HSM used in provisioning infrastructure uses a custom mechanism identifier (`CKM_AES_KWP = (CKM_VENDOR_DEFINED + 0x171)`) even though the implementation follows the RFC 3394 and 5649 specifations. The `CKM_AES_KWP` implemented by Thales is also equivalent to the KWP algorithm specified by NIST SP 800-38F. This change adds a custom `Wrap::VendorThalesAesKwp` mechanism to `hsmtool` to be able to wrap/unwrap private keys with `AES_KWP`. Signed-off-by: Miguel Osorio <miguelosorio@google.com> (cherry picked from commit a1feef4)
jwnrt
approved these changes
Jan 5, 2026
| let wrapper = Wrap::AesKeyWrapPad; | ||
| let wrapper: Wrap = self | ||
| .wrap_mechanism | ||
| .ok_or(anyhow!("wrap_mechanism is required when wrap is specified"))? |
Contributor
There was a problem hiding this comment.
Nit: normally written .context("wrap_mechanism is required when wrap is specified")?
Contributor
Author
There was a problem hiding this comment.
Good catch, I added a commit to make the code more idiomatic
Signed-off-by: Amaury Pouly <amaury.pouly@lowrisc.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport #26565