Skip to content

Commit

Permalink
Merge branch 'main-2.x' into ArthurHeymans/KV64B
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhatrevi
mhatrevi committed Nov 21, 2024
2 parents 1379a7f + 790118d commit 9e9b7b6
Show file tree
Hide file tree
Showing 12 changed files with 251 additions and 141 deletions.
10 changes: 8 additions & 2 deletions rom/dev/src/flow/cold_reset/crypto.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl Ecdsa384SignatureAdapter for Ecc384Signature {
}
}

/// DICE Layer Key Pair
/// DICE Layer ECC Key Pair
#[derive(Debug, Zeroize)]
pub struct Ecc384KeyPair {
/// Private Key KV Slot Id
Expand All @@ -48,7 +48,7 @@ pub struct Ecc384KeyPair {
pub pub_key: Ecc384PubKey,
}

/// DICE Layer Key Pair
/// DICE Layer MLDSA Key Pair
#[derive(Debug, Zeroize)]
pub struct MlDsaKeyPair {
/// Key Pair Generation KV Slot Id
Expand All @@ -59,6 +59,12 @@ pub struct MlDsaKeyPair {
pub pub_key: Mldsa87PubKey,
}

#[derive(Debug)]
pub enum PubKey<'a> {
Ecc(&'a Ecc384PubKey),
Mldsa(&'a Mldsa87PubKey),
}

pub enum Crypto {}

impl Crypto {
Expand Down
21 changes: 15 additions & 6 deletions rom/dev/src/flow/cold_reset/dice.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,23 @@ use zeroize::Zeroize;
/// DICE Layer Input
#[derive(Debug)]
pub struct DiceInput<'a> {
/// Authority Key Pair
pub auth_key_pair: &'a Ecc384KeyPair,
/// ECC Authority Key Pair
pub ecc_auth_key_pair: &'a Ecc384KeyPair,

/// Authority Serial Number
pub auth_sn: &'a [u8; 64],
/// ECC Authority Serial Number
pub ecc_auth_sn: &'a [u8; 64],

/// Authority Key Identifier
pub auth_key_id: &'a [u8; 20],
/// ECC Authority Key Identifier
pub ecc_auth_key_id: &'a [u8; 20],

/// MLDSA Authority Key Pair
pub mldsa_auth_key_pair: &'a MlDsaKeyPair,

/// MLDSA Authority Serial Number
pub mldsa_auth_sn: &'a [u8; 64],

/// MLDSA Authority Key Identifier
pub mldsa_auth_key_id: &'a [u8; 20],
}

/// DICE Layer Output
Expand Down
77 changes: 50 additions & 27 deletions rom/dev/src/flow/cold_reset/fmc_alias.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use super::dice::{DiceInput, DiceOutput};
use super::fw_processor::FwProcInfo;
use super::x509::X509;
use crate::cprintln;
use crate::flow::cold_reset::crypto::MlDsaKeyPair;
use crate::flow::cold_reset::crypto::{MlDsaKeyPair, PubKey};
use crate::flow::cold_reset::{copy_tbs, TbsType};
use crate::print::HexBytes;
use crate::rom_env::RomEnv;
Expand Down Expand Up @@ -48,10 +48,15 @@ impl FmcAliasLayer {
) -> CaliptraResult<()> {
cprintln!("[afmc] ++");
cprintln!("[afmc] CDI.KEYID = {}", KEY_ID_ROM_FMC_CDI as u8);
cprintln!("[afmc] SUBJECT.KEYID = {}", KEY_ID_FMC_ECDSA_PRIV_KEY as u8);
cprintln!(
"[afmc] AUTHORITY.KEYID = {}",
input.auth_key_pair.priv_key as u8
"[afmc] ECC SUBJECT.KEYID = {}, MLDSA SUBJECT.KEYID = {}",
KEY_ID_FMC_ECDSA_PRIV_KEY as u8,
KEY_ID_FMC_MLDSA_KEYPAIR_SEED as u8
);
cprintln!(
"[afmc] ECC AUTHORITY.KEYID = {}, MLDSA AUTHORITY.KEYID = {}",
input.ecc_auth_key_pair.priv_key as u8,
input.mldsa_auth_key_pair.key_pair_seed as u8
);

// We use the value of PCR0 as the measurement for deriving the CDI.
Expand All @@ -62,31 +67,34 @@ impl FmcAliasLayer {
measurement.0.zeroize();
result?;

// Derive DICE Key Pair from CDI
let ecc_key_pair =
Self::derive_key_pair(env, KEY_ID_ROM_FMC_CDI, KEY_ID_FMC_ECDSA_PRIV_KEY)?;
// Derive DICE ECC and MLDSA Key Pairs from CDI
let (ecc_key_pair, mldsa_key_pair) = Self::derive_key_pair(
env,
KEY_ID_ROM_FMC_CDI,
KEY_ID_FMC_ECDSA_PRIV_KEY,
KEY_ID_FMC_MLDSA_KEYPAIR_SEED,
)?;

// Generate the Subject Serial Number and Subject Key Identifier.
//
// This information will be used by next DICE Layer while generating
// certificates
let ecc_subj_sn = X509::subj_sn(env, &ecc_key_pair.pub_key)?;
let ecc_subj_sn = X509::subj_sn(env, &PubKey::Ecc(&ecc_key_pair.pub_key))?;
let mldsa_subj_sn = X509::subj_sn(env, &PubKey::Mldsa(&mldsa_key_pair.pub_key))?;
report_boot_status(FmcAliasSubjIdSnGenerationComplete.into());

let ecc_subj_key_id = X509::subj_key_id(env, &ecc_key_pair.pub_key)?;
let ecc_subj_key_id = X509::subj_key_id(env, &PubKey::Ecc(&ecc_key_pair.pub_key))?;
let mldsa_subj_key_id = X509::subj_key_id(env, &PubKey::Mldsa(&mldsa_key_pair.pub_key))?;
report_boot_status(FmcAliasSubjKeyIdGenerationComplete.into());

// Generate the output for next layer
let mut output = DiceOutput {
ecc_subj_key_pair: ecc_key_pair,
ecc_subj_sn,
ecc_subj_key_id,
mldsa_subj_key_id: [0; 20],
mldsa_subj_key_pair: MlDsaKeyPair {
key_pair_seed: KEY_ID_FMC_MLDSA_KEYPAIR_SEED,
pub_key: Default::default(),
},
mldsa_subj_sn: [0; 64],
mldsa_subj_key_pair: mldsa_key_pair,
mldsa_subj_sn,
mldsa_subj_key_id,
};

// Generate FMC Alias Certificate
Expand All @@ -111,7 +119,7 @@ impl FmcAliasLayer {
fn derive_cdi(env: &mut RomEnv, measurements: &Array4x12, cdi: KeyId) -> CaliptraResult<()> {
let mut measurements: [u8; 48] = measurements.into();

let result = Crypto::hmac384_kdf(env, cdi, b"fmc_alias_cdi", Some(&measurements), cdi);
let result = Crypto::hmac384_kdf(env, cdi, b"alias_fmc_cdi", Some(&measurements), cdi);
measurements.zeroize();
result?;
report_boot_status(FmcAliasDeriveCdiComplete.into());
Expand All @@ -124,7 +132,8 @@ impl FmcAliasLayer {
///
/// * `env` - ROM Environment
/// * `cdi` - Composite Device Identity
/// * `priv_key` - Key slot to store the private key into
/// * `ecc_priv_key` - Key slot to store the ECC private key into
/// * `mldsa_keypair_seed` - Key slot to store the MLDSA key pair seed
///
/// # Returns
///
Expand All @@ -133,16 +142,28 @@ impl FmcAliasLayer {
fn derive_key_pair(
env: &mut RomEnv,
cdi: KeyId,
priv_key: KeyId,
) -> CaliptraResult<Ecc384KeyPair> {
let result = Crypto::ecc384_key_gen(env, cdi, b"fmc_alias_keygen", priv_key);
ecc_priv_key: KeyId,
mldsa_keypair_seed: KeyId,
) -> CaliptraResult<(Ecc384KeyPair, MlDsaKeyPair)> {
let result = Crypto::ecc384_key_gen(env, cdi, b"alias_fmc_ecc_key", ecc_priv_key);
if cfi_launder(result.is_ok()) {
cfi_assert!(result.is_ok());
} else {
cfi_assert!(result.is_err());
}
let ecc_keypair = result?;

// Derive the MLDSA Key Pair.
let result = Crypto::mldsa_key_gen(env, cdi, b"alias_fmc_mldsa_key", mldsa_keypair_seed);
if cfi_launder(result.is_ok()) {
cfi_assert!(result.is_ok());
report_boot_status(FmcAliasKeyPairDerivationComplete.into());
} else {
cfi_assert!(result.is_err());
}
result
let mldsa_keypair = result?;

report_boot_status(FmcAliasKeyPairDerivationComplete.into());
Ok((ecc_keypair, mldsa_keypair))
}

/// Generate Local Device ID Certificate Signature
Expand All @@ -158,8 +179,8 @@ impl FmcAliasLayer {
output: &DiceOutput,
fw_proc_info: &FwProcInfo,
) -> CaliptraResult<()> {
let auth_priv_key = input.auth_key_pair.priv_key;
let auth_pub_key = &input.auth_key_pair.pub_key;
let auth_priv_key = input.ecc_auth_key_pair.priv_key;
let auth_pub_key = &input.ecc_auth_key_pair.pub_key;
let pub_key = &output.ecc_subj_key_pair.pub_key;

let flags = Self::make_flags(env.soc_ifc.lifecycle(), env.soc_ifc.debug_locked());
Expand Down Expand Up @@ -189,9 +210,9 @@ impl FmcAliasLayer {
ueid: &X509::ueid(env)?,
subject_sn: &output.ecc_subj_sn,
subject_key_id: &output.ecc_subj_key_id,
issuer_sn: input.auth_sn,
authority_key_id: input.auth_key_id,
serial_number: &X509::cert_sn(env, pub_key)?,
issuer_sn: input.ecc_auth_sn,
authority_key_id: input.ecc_auth_key_id,
serial_number: &X509::ecc_cert_sn(env, pub_key)?,
public_key: &pub_key.to_der(),
tcb_info_fmc_tci: &(&env.data_vault.fmc_tci()).into(),
tcb_info_device_info_hash: &fuse_info_digest.into(),
Expand Down Expand Up @@ -240,6 +261,8 @@ impl FmcAliasLayer {
// Copy TBS to DCCM.
copy_tbs(tbs.tbs(), TbsType::FmcaliasTbs, env)?;

// [CAP2][TODO] Generate MLDSA certificate signature, TBS.

report_boot_status(FmcAliasCertSigGenerationComplete.into());
Ok(())
}
Expand Down
30 changes: 18 additions & 12 deletions rom/dev/src/flow/cold_reset/idev_id.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,23 @@ impl InitDevIdLayer {
// Generate the Subject Serial Number and Subject Key Identifier for ECC.
// This information will be used by next DICE Layer while generating
// certificates
let ecc_subj_sn = X509::subj_sn(env, &ecc_key_pair.pub_key)?;
let ecc_subj_sn = X509::subj_sn(env, &PubKey::Ecc(&ecc_key_pair.pub_key))?;
let mldsa_subj_sn = X509::subj_sn(env, &PubKey::Mldsa(&mldsa_key_pair.pub_key))?;
report_boot_status(IDevIdSubjIdSnGenerationComplete.into());

let ecc_subj_key_id = X509::idev_subj_key_id(env, &ecc_key_pair.pub_key)?;
let ecc_subj_key_id = X509::idev_subj_key_id(env, &PubKey::Ecc(&ecc_key_pair.pub_key))?;
let mldsa_subj_key_id =
X509::idev_subj_key_id(env, &PubKey::Mldsa(&mldsa_key_pair.pub_key))?;
report_boot_status(IDevIdSubjKeyIdGenerationComplete.into());

// [TODO] Generate the Subject Serial Number and Subject Key Identifier for MLDSA.

// Generate the output for next layer
let output = DiceOutput {
ecc_subj_key_pair: ecc_key_pair,
ecc_subj_sn,
ecc_subj_key_id,
mldsa_subj_key_id: [0; 20],
mldsa_subj_key_id,
mldsa_subj_key_pair: mldsa_key_pair,
mldsa_subj_sn: [0; 64],
mldsa_subj_sn,
};

// Generate the Initial DevID Certificate Signing Request (CSR)
Expand Down Expand Up @@ -193,7 +194,7 @@ impl InitDevIdLayer {
///
/// * `env` - ROM Environment
/// * `cdi` - Composite Device Identity
/// * `ecdsa_priv_key` - Key slot to store the ECC private key into
/// * `ecc_priv_key` - Key slot to store the ECC private key into
/// * `mldsa_keypair_seed` - Key slot to store the MLDSA key pair seed
///
/// # Returns
Expand All @@ -203,10 +204,10 @@ impl InitDevIdLayer {
fn derive_key_pair(
env: &mut RomEnv,
cdi: KeyId,
ecdsa_priv_key: KeyId,
ecc_priv_key: KeyId,
mldsa_keypair_seed: KeyId,
) -> CaliptraResult<(Ecc384KeyPair, MlDsaKeyPair)> {
let result = Crypto::ecc384_key_gen(env, cdi, b"idevid_ecc_key", ecdsa_priv_key);
let result = Crypto::ecc384_key_gen(env, cdi, b"idevid_ecc_key", ecc_priv_key);
if cfi_launder(result.is_ok()) {
cfi_assert!(result.is_ok());
} else {
Expand All @@ -215,11 +216,16 @@ impl InitDevIdLayer {
let ecc_keypair = result?;

// Derive the MLDSA Key Pair.
let mldsa_key_pair =
Crypto::mldsa_key_gen(env, cdi, b"idevid_mldsa_key", mldsa_keypair_seed)?;
let result = Crypto::mldsa_key_gen(env, cdi, b"idevid_mldsa_key", mldsa_keypair_seed);
if cfi_launder(result.is_ok()) {
cfi_assert!(result.is_ok());
} else {
cfi_assert!(result.is_err());
}
let mldsa_keypair = result?;

report_boot_status(IDevIdKeyPairDerivationComplete.into());
Ok((ecc_keypair, mldsa_key_pair))
Ok((ecc_keypair, mldsa_keypair))
}

/// Generate Local Device ID CSR
Expand Down
Loading

0 comments on commit 9e9b7b6

Please sign in to comment.