Skip to content

Backport 27444 ([hsmtool] Add vendor specific AES_KW mechanism) #29249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pamaury merged 1 commit into from
Feb 12, 2026
+19 −3
Merged

Backport 27444 ([hsmtool] Add vendor specific AES_KW mechanism) #29249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions sw/host/hsmtool/src/util/wrap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ pub enum Wrap {
AesKeyWrapPad,
RsaPkcs,
RsaPkcsOaep,
VendorThalesAesKw,
VendorThalesAesKwp,
}

Expand All @@ -41,6 +42,7 @@ pub enum Wrap {
pub enum WrapPrivateKey {
AesKeyWrap,
AesKeyWrapPad,
VendorThalesAesKw,
VendorThalesAesKwp,
}

Expand All @@ -49,13 +51,15 @@ impl From<WrapPrivateKey> for Wrap {
match wrap {
WrapPrivateKey::AesKeyWrap => Wrap::AesKeyWrap,
WrapPrivateKey::AesKeyWrapPad => Wrap::AesKeyWrapPad,
WrapPrivateKey::VendorThalesAesKw => Wrap::VendorThalesAesKw,
WrapPrivateKey::VendorThalesAesKwp => Wrap::VendorThalesAesKwp,
}
}
}

impl Wrap {
// Vendor defined mechanism for Thales AES key wrap.
// Vendor defined mechanisms for Thales AES key wrap.
const CKM_THALES_AES_KW: u64 = CKM_VENDOR_DEFINED | 0x00000170;
const CKM_THALES_AES_KWP: u64 = CKM_VENDOR_DEFINED | 0x00000171;

pub fn mechanism(&self) -> Result<Mechanism<'_>> {
Expand All @@ -68,6 +72,12 @@ impl Wrap {
PkcsMgfType::MGF1_SHA256,
PkcsOaepSource::empty(),
))),
Wrap::VendorThalesAesKw => {
Ok(Mechanism::VendorDefined(VendorDefinedMechanism::new::<()>(
MechanismType::new_vendor_defined(Wrap::CKM_THALES_AES_KW)?,
None,
)))
}
Wrap::VendorThalesAesKwp => {
Ok(Mechanism::VendorDefined(VendorDefinedMechanism::new::<()>(
MechanismType::new_vendor_defined(Wrap::CKM_THALES_AES_KWP)?,
Expand All @@ -81,7 +91,10 @@ impl Wrap {
let mut attrs = helper::search_spec(None, label)?;
attrs.push(Attribute::Wrap(true));
match self {
Wrap::AesKeyWrap | Wrap::AesKeyWrapPad | Wrap::VendorThalesAesKwp => {
Wrap::AesKeyWrap
| Wrap::AesKeyWrapPad
| Wrap::VendorThalesAesKw
| Wrap::VendorThalesAesKwp => {
attrs.push(Attribute::KeyType(KeyType::Aes.try_into()?));
attrs.push(Attribute::Class(ObjectClass::SecretKey.try_into()?));
helper::find_one_object(session, &attrs)
Expand All @@ -98,7 +111,10 @@ impl Wrap {
let mut attrs = helper::search_spec(None, label)?;
attrs.push(Attribute::Unwrap(true));
match self {
Wrap::AesKeyWrap | Wrap::AesKeyWrapPad | Wrap::VendorThalesAesKwp => {
Wrap::AesKeyWrap
| Wrap::AesKeyWrapPad
| Wrap::VendorThalesAesKw
| Wrap::VendorThalesAesKwp => {
attrs.push(Attribute::KeyType(KeyType::Aes.try_into()?));
attrs.push(Attribute::Class(ObjectClass::SecretKey.try_into()?));
helper::find_one_object(session, &attrs)
Expand Down
Loading