Skip to content

ml-kem: harden zeroization #415

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
tarcieri merged 1 commit into from
Oct 31, 2026
Merged

ml-kem: harden zeroization #415

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion ml-kem/src/decapsulation_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,15 @@ where
#[deprecated(since = "0.3.0", note = "use `DecapsulationKey::from_seed` instead")]
pub fn from_expanded(enc: &ExpandedDecapsulationKey<P>) -> Result<Self, InvalidKey> {
let (dk_pke, ek_pke, h, z) = P::split_dk(enc);
let dk_pke = MaybeBox::new(DecryptionKey::from_bytes(dk_pke));
let ek_pke = EncryptionKey::from_bytes(ek_pke)?;

let ek = EncapsulationKey::from_encryption_key(ek_pke);
if ek.h() != *h {
return Err(InvalidKey);
}

let dk_pke = MaybeBox::new(DecryptionKey::from_bytes(dk_pke));

Ok(Self {
dk_pke,
ek,
Expand Down
16 changes: 9 additions & 7 deletions ml-kem/src/pkcs8.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use array::Array;
#[cfg(feature = "alloc")]
use {
::kem::KeyExport,
::pkcs8::der::{Encode, TagMode, asn1::BitStringRef},
::pkcs8::der::{Encode, TagMode, asn1::BitStringRef, zeroize::Zeroizing},
};

/// Tag number for the seed value.
Expand Down Expand Up @@ -161,12 +161,14 @@ where
fn to_pkcs8_der(&self) -> ::pkcs8::Result<pkcs8::SecretDocument> {
let seed = self.to_seed().ok_or(pkcs8::KeyError::Invalid)?;

let seed_der = SeedString {
tag_mode: TagMode::Implicit,
tag_number: SEED_TAG_NUMBER,
value: OctetStringRef::new(&seed)?,
}
.to_der()?;
let seed_der = Zeroizing::new(
SeedString {
tag_mode: TagMode::Implicit,
tag_number: SEED_TAG_NUMBER,
value: OctetStringRef::new(&seed)?,
}
.to_der()?,
);

let private_key = OctetStringRef::new(&seed_der)?;
let private_key_info = pkcs8::PrivateKeyInfoRef::new(P::ALGORITHM_IDENTIFIER, private_key);
Expand Down
Loading