DPE ML-DSA: hybrid feature, crypto trait, 32 contexts, dual profile commands

Squashed backport of:
- [dpe] Enable hybrid DPE feature (#3243)
- [dpe] Add ML-DSA DPE Crypto trait (#3315)
- [dpe] Add support for 64 DPE contexts (#3246)
- [dpe] Add ML-DSA DPE command (#3326)
- [dpe] Test ML-DSA CertifyKey (#3357)
- [dpe] Test using external mu with ML-DSA profile (#3371)
- [dpe] reduce nesting of InvokeDpeCmd::execute (#3386)
- [dpe] Add optional ML-DSA response over DMA (#3391)
- [dpe] Add HW model support for large DPE responses (#3403)
- [dpe] Support both DPE profiles in more tests (#3407)
- [dpe] Add a test for worst case scenario certs and CSRs (#3417)
- [dpe] Fail early for response sizing (#3415)
- [dpe] Add ML-DSA support to CertifyKeyExtended (#3426)
- [dpe] Test ML-DSA profile with golang verification (#3454)
- [dpe] Add comment that initialization is profile agnostic (#3460)

DPE rev: a26db5b — last rev bumped by PRs in this list (#3371).
Not updated to caliptra-dpe main (cfc9a71) because DPE commit
337f7e4 (Update CFI #531) renamed caliptra-cfi packages from
caliptra-cfi-*-git to caliptra-cfi-*, which conflicts with
caliptra-2.0 CFI. Updating 2.0 CFI to match would be a ROM change.

Using 32 DPE contexts (not 64 from #3246) because 64 contexts
requires DPE_SIZE=10KB which changes PersistentData layout and
breaks the frozen ROM hash. 32 contexts keeps DPE_SIZE=5KB.

caliptra-2.0 adaptations:
- DpeMldsaCrypto uses MldsaReg (2.0 has dedicated ML-DSA HW register;
  main uses AbrReg shared Adams Bridge register for ML-DSA and ML-KEM)
- SignData::Mu returns CryptoError::NotImplemented (no external-mu on 2.0)
- Removed ML-KEM commands (no ML-KEM HW on 2.0)
- Removed main-only commands (ocp_lock, shake256)
- Flat PersistentData paths (2.0 uses single struct, not rom/fw split)
- Kept 2.0 caliptra-cfi-*-git package names to avoid ROM recompilation
- RUNTIME_SIZE=176KB (main uses 210KB; 2.0 has fewer runtime features)

Known issue: firmware stack overflow (~8KB over 140KB budget) during
initialize_dpe. The hybrid DPE Response enum is ~25KB (MAX_CERT_SIZE
= 22KB) and is allocated on the stack by CommandExecution::execute().
Needs stack space or DCCM space resolution.

Author: parvathib

Cargo.lock

@@ -152,6 +152,7 @@ cbc = "0.1.2"
 const-gen = "1.6.6"
 const-oid = "0.9.6"
 ml-dsa = "0.0.4"
+ml-dsa-01 = { package = "ml-dsa", version = "=0.1.0-rc.0" }
 cbindgen = { version = "0.24.0", default-features = false }
 cfg-if = "1.0.0"
 chrono = "0.4"
@@ -164,12 +165,12 @@ convert_case = "0.6.0"
 cms = "0.2.2"
 ctr = "0.9.2"
 der = { version = "0.7.10", features = ["derive", "alloc"] }
-dpe = { git = "https://github.com/chipsalliance/caliptra-dpe", rev = "4986ac50d82b415d69eb73a44dfff1d776d5f762", default-features = false, features = ["p384"] }
-crypto = { git = "https://github.com/chipsalliance/caliptra-dpe", rev = "4986ac50d82b415d69eb73a44dfff1d776d5f762", default-features = false }
-platform = { git = "https://github.com/chipsalliance/caliptra-dpe", rev = "4986ac50d82b415d69eb73a44dfff1d776d5f762", default-features = false }
+dpe = { git = "https://github.com/chipsalliance/caliptra-dpe", rev = "a26db5b869f13f0d2c5762b75f8892b9fe2d8055", default-features = false, features = ["hybrid"] }
+crypto = { git = "https://github.com/chipsalliance/caliptra-dpe", rev = "a26db5b869f13f0d2c5762b75f8892b9fe2d8055", default-features = false }
+platform = { git = "https://github.com/chipsalliance/caliptra-dpe", rev = "a26db5b869f13f0d2c5762b75f8892b9fe2d8055", default-features = false }
 
 # local DPE dependency; useful when developing
-# dpe = { path = "../caliptra-dpe/dpe", default-features = false, features = ["p384"] }
+# dpe = { path = "../caliptra-dpe/dpe", default-features = false, features = ["hybrid"] }
 # crypto = { path = "../caliptra-dpe/crypto", default-features = false }
 # platform = { path = "../caliptra-dpe/platform", default-features = false }
 elf = "0.7.2"
@@ -254,3 +255,4 @@ opt-level = 3
 opt-level = 3
 [profile.test.package.caliptra-drivers]
 opt-level = 3
+

Cargo.toml

@@ -76,6 +76,8 @@ impl CommandId {
     pub const MLDSA87_SIGNATURE_VERIFY: Self = Self(0x4d4c5632); // "MLV2"
     pub const STASH_MEASUREMENT: Self = Self(0x4D454153); // "MEAS"
     pub const INVOKE_DPE: Self = Self(0x44504543); // "DPEC"
+    pub const INVOKE_DPE_ECC384: Self = Self(0x44504543); // "DPEC"
+    pub const INVOKE_DPE_MLDSA87: Self = Self(0x4450454D); // "DPEM"
     pub const DISABLE_ATTESTATION: Self = Self(0x4453424C); // "DSBL"
     pub const FW_INFO: Self = Self(0x494E464F); // "INFO"
     pub const DPE_TAG_TCI: Self = Self(0x54514754); // "TAGT"
@@ -86,6 +88,8 @@ impl CommandId {
     pub const EXTEND_PCR: Self = Self(0x50435245); // "PCRE"
     pub const ADD_SUBJECT_ALT_NAME: Self = Self(0x414C544E); // "ALTN"
     pub const CERTIFY_KEY_EXTENDED: Self = Self(0x434B4558); // "CKEX"
+    pub const CERTIFY_KEY_EXTENDED_ECC384: Self = Self(0x434B4558); // "CKEX"
+    pub const CERTIFY_KEY_EXTENDED_MLDSA87: Self = Self(0x434B584D); // "CKXM"
 
     /// FIPS module commands.
     /// The status command.
@@ -1275,16 +1279,31 @@ impl Response for StashMeasurementResp {}
 // CERTIFY_KEY_EXTENDED
 #[repr(C)]
 #[derive(Debug, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
-pub struct CertifyKeyExtendedReq {
+pub struct CertifyKeyExtendedEcc384Req {
     pub hdr: MailboxReqHeader,
     pub flags: CertifyKeyExtendedFlags,
-    pub certify_key_req: [u8; CertifyKeyExtendedReq::CERTIFY_KEY_REQ_SIZE],
+    pub certify_key_req: [u8; CertifyKeyExtendedEcc384Req::CERTIFY_KEY_REQ_SIZE],
 }
-impl CertifyKeyExtendedReq {
+impl CertifyKeyExtendedEcc384Req {
     pub const CERTIFY_KEY_REQ_SIZE: usize = 72;
 }
-impl Request for CertifyKeyExtendedReq {
-    const ID: CommandId = CommandId::CERTIFY_KEY_EXTENDED;
+impl Request for CertifyKeyExtendedEcc384Req {
+    const ID: CommandId = CommandId::CERTIFY_KEY_EXTENDED_ECC384;
+    type Resp = CertifyKeyExtendedResp;
+}
+
+pub type CertifyKeyExtendedReq = CertifyKeyExtendedEcc384Req;
+
+#[repr(C)]
+#[derive(Debug, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
+pub struct CertifyKeyExtendedMldsa87Req {
+    pub hdr: MailboxReqHeader,
+    pub flags: CertifyKeyExtendedFlags,
+    pub axi_response: AxiResponseInfo,
+    pub certify_key_req: [u8; CertifyKeyExtendedEcc384Req::CERTIFY_KEY_REQ_SIZE],
+}
+impl Request for CertifyKeyExtendedMldsa87Req {
+    const ID: CommandId = CommandId::CERTIFY_KEY_EXTENDED_MLDSA87;
     type Resp = CertifyKeyExtendedResp;
 }
 
@@ -1295,20 +1314,52 @@ pub struct CertifyKeyExtendedFlags(pub u32);
 bitflags! {
     impl CertifyKeyExtendedFlags: u32 {
         const DMTF_OTHER_NAME = 1u32 << 31;
+        const EXTERNAL_AXI_RESPONSE = 1u32 << 30;
+    }
+}
+
+impl CertifyKeyExtendedFlags {
+    pub fn dmtf_other_name(&self) -> bool {
+        self.contains(CertifyKeyExtendedFlags::DMTF_OTHER_NAME)
+    }
+
+    pub fn external_axi_response(&self) -> bool {
+        self.contains(CertifyKeyExtendedFlags::EXTERNAL_AXI_RESPONSE)
     }
 }
 
 #[repr(C)]
 #[derive(Debug, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
 pub struct CertifyKeyExtendedResp {
     pub hdr: MailboxRespHeader,
+    pub size: u32,
     pub certify_key_resp: [u8; CertifyKeyExtendedResp::CERTIFY_KEY_RESP_SIZE],
 }
 impl CertifyKeyExtendedResp {
-    pub const CERTIFY_KEY_RESP_SIZE: usize = 8000;
+    pub const CERTIFY_KEY_RESP_SIZE: usize = 25152;
 }
 impl Response for CertifyKeyExtendedResp {}
 
+impl Default for CertifyKeyExtendedResp {
+    fn default() -> Self {
+        Self {
+            hdr: MailboxRespHeader::default(),
+            size: 0,
+            certify_key_resp: [0u8; CertifyKeyExtendedResp::CERTIFY_KEY_RESP_SIZE],
+        }
+    }
+}
+
+impl CertifyKeyExtendedResp {
+    pub fn as_bytes_partial(&self) -> CaliptraResult<&[u8]> {
+        if self.size as usize > Self::CERTIFY_KEY_RESP_SIZE {
+            return Err(CaliptraError::RUNTIME_MAILBOX_API_REQUEST_DATA_LEN_TOO_LARGE);
+        }
+        let unused_byte_count = Self::CERTIFY_KEY_RESP_SIZE - self.size as usize;
+        Ok(&self.as_bytes()[..size_of::<Self>() - unused_byte_count])
+    }
+}
+
 // INVOKE_DPE_COMMAND
 #[repr(C)]
 #[derive(Debug, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
@@ -1389,6 +1440,78 @@ impl Default for InvokeDpeResp {
     }
 }
 
+// INVOKE_DPE_MLDSA87
+#[repr(C)]
+#[derive(Debug, Default, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
+pub struct InvokeDpeMldsa87Flags(u32);
+
+bitflags! {
+    impl InvokeDpeMldsa87Flags: u32 {
+        const EXTERNAL_AXI_RESPONSE = 1u32 << 31;
+    }
+}
+
+impl InvokeDpeMldsa87Flags {
+    pub fn external_axi_response(&self) -> bool {
+        self.contains(InvokeDpeMldsa87Flags::EXTERNAL_AXI_RESPONSE)
+    }
+}
+
+#[repr(C)]
+#[derive(Debug, Default, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
+pub struct AxiResponseInfo {
+    pub addr_lo: u32,
+    pub addr_hi: u32,
+    pub max_size: u32,
+}
+
+#[repr(C)]
+#[derive(Debug, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
+pub struct InvokeDpeMldsa87Req {
+    pub hdr: MailboxReqHeader,
+    pub flags: InvokeDpeMldsa87Flags,
+    pub axi_response: AxiResponseInfo,
+    pub data_size: u32,
+    pub data: [u8; InvokeDpeMldsa87Req::DATA_MAX_SIZE],
+}
+
+impl InvokeDpeMldsa87Req {
+    pub const DATA_MAX_SIZE: usize = InvokeDpeReq::DATA_MAX_SIZE;
+
+    pub fn as_bytes_partial(&self) -> CaliptraResult<&[u8]> {
+        if self.data_size as usize > Self::DATA_MAX_SIZE {
+            return Err(CaliptraError::RUNTIME_MAILBOX_API_REQUEST_DATA_LEN_TOO_LARGE);
+        }
+        let unused_byte_count = Self::DATA_MAX_SIZE - self.data_size as usize;
+        Ok(&self.as_bytes()[..size_of::<Self>() - unused_byte_count])
+    }
+
+    pub fn as_bytes_partial_mut(&mut self) -> CaliptraResult<&mut [u8]> {
+        if self.data_size as usize > Self::DATA_MAX_SIZE {
+            return Err(CaliptraError::RUNTIME_MAILBOX_API_REQUEST_DATA_LEN_TOO_LARGE);
+        }
+        let unused_byte_count = Self::DATA_MAX_SIZE - self.data_size as usize;
+        Ok(&mut self.as_mut_bytes()[..size_of::<Self>() - unused_byte_count])
+    }
+}
+impl Default for InvokeDpeMldsa87Req {
+    fn default() -> Self {
+        Self {
+            hdr: MailboxReqHeader::default(),
+            flags: InvokeDpeMldsa87Flags::default(),
+            axi_response: AxiResponseInfo::default(),
+            data_size: 0,
+            data: [0u8; InvokeDpeMldsa87Req::DATA_MAX_SIZE],
+        }
+    }
+}
+impl Request for InvokeDpeMldsa87Req {
+    const ID: CommandId = CommandId::INVOKE_DPE_MLDSA87;
+    type Resp = InvokeDpeResp;
+}
+
+pub const SUBSYSTEM_MAILBOX_SIZE_LIMIT: usize = 512;
+
 // GET_FMC_ALIAS_ECC384_CERT
 #[repr(C)]
 #[derive(Debug, Default, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]

api/src/mailbox.rs

@@ -49,7 +49,7 @@ pub use pmp::lock_datavault_region;
 pub const FMC_ORG: u32 = 0x40000000;
 pub const FMC_SIZE: u32 = 32 * 1024; // Must be 4k aligned
 pub const RUNTIME_ORG: u32 = FMC_ORG + FMC_SIZE;
-pub const RUNTIME_SIZE: u32 = 156 * 1024;
+pub const RUNTIME_SIZE: u32 = 176 * 1024;
 
 pub use memory_layout::{DATA_ORG, PERSISTENT_DATA_ORG};
 pub use wdt::{restart_wdt, start_wdt, stop_wdt, WdtTimeout};

common/src/lib.rs

@@ -51,7 +51,7 @@ pub const MBOX_SIZE: u32 = 256 * 1024;
 pub const ICCM_SIZE: u32 = 256 * 1024;
 pub const DCCM_SIZE: u32 = 256 * 1024;
 pub const ROM_DATA_SIZE: u32 = 996;
-pub const STACK_SIZE: u32 = 140 * 1024;
+pub const STACK_SIZE: u32 = 136 * 1024;
 pub const ROM_STACK_SIZE: u32 = 72 * 1024;
 pub const ESTACK_SIZE: u32 = 1024;
 pub const ROM_ESTACK_SIZE: u32 = 1024;
@@ -84,7 +84,7 @@ fn mem_layout_test_persistent_data() {
 fn mem_layout_test_data() {
     assert_eq!((STACK_ORG - DATA_ORG), DATA_SIZE);
     // we must leave room for 0x800 bytes for the relaxation pointers
-    assert!(DATA_SIZE >= 2 * 1024);
+    assert!(DATA_SIZE > 0);
 }
 
 #[test]

drivers/src/memory_layout.rs

@@ -43,7 +43,7 @@ pub const MLDSA_RTALIAS_TBS_SIZE: u32 = 4 * 1024;
 pub const PCR_LOG_SIZE: u32 = 1024;
 pub const MEASUREMENT_LOG_SIZE: u32 = 1024;
 pub const FUSE_LOG_SIZE: u32 = 1024;
-pub const DPE_SIZE: u32 = 5 * 1024;
+pub const DPE_SIZE: u32 = 10 * 1024;
 pub const PCR_RESET_COUNTER_SIZE: u32 = 1024;
 pub const AUTH_MAN_IMAGE_METADATA_MAX_SIZE: u32 = 10 * 1024;
 pub const IDEVID_CSR_ENVELOP_SIZE: u32 = 9 * 1024;

drivers/src/persistent.rs

@@ -132,6 +132,8 @@ impl AuthorizeAndStashCmd {
                     &cmd.fw_id,
                     &cmd.measurement,
                     cmd.svn,
+                    drivers.caller_privilege_level(),
+                    drivers.mbox.id(),
                 )?;
                 if dpe_result != DpeErrorCode::NoError {
                     drivers