Convert the new code to zerocopy

chipsalliance · Feb 12, 2025 · 621f273 · 621f273
1 parent 721037e
commit 621f273
Show file tree

Hide file tree

Showing 34 changed files with 246 additions and 273 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/src/mailbox.rs b/api/src/mailbox.rs
@@ -1095,7 +1095,7 @@ impl Response for AuthorizeAndStashResp {}
 
 // MANUF_DEBUG_UNLOCK_REQ_TOKEN
 #[repr(C)]
-#[derive(Debug, AsBytes, FromBytes, PartialEq, Eq, Default)]
+#[derive(Debug, FromBytes, Immutable, IntoBytes, KnownLayout, PartialEq, Eq, Default)]
 pub struct ManufDebugUnlockTokenReq {
     pub hdr: MailboxReqHeader,
     pub token: [u8; 16],
@@ -1107,7 +1107,7 @@ impl Request for ManufDebugUnlockTokenReq {
 
 // PRODUCTION_AUTH_DEBUG_UNLOCK_REQ
 #[repr(C)]
-#[derive(Debug, AsBytes, FromBytes, PartialEq, Eq, Default)]
+#[derive(Debug, FromBytes, Immutable, IntoBytes, KnownLayout, PartialEq, Eq, Default)]
 pub struct ProductionAuthDebugUnlockReq {
     pub hdr: MailboxReqHeader,
     pub vendor_id: u16,           // Vendor ID (2 bytes)
@@ -1126,7 +1126,7 @@ impl Request for ProductionAuthDebugUnlockReq {
 
 // PRODUCTION_AUTH_DEBUG_UNLOCK_CHALLENGE
 #[repr(C)]
-#[derive(Debug, AsBytes, FromBytes, PartialEq, Eq)]
+#[derive(Debug, FromBytes, Immutable, IntoBytes, KnownLayout, PartialEq, Eq)]
 pub struct ProductionAuthDebugUnlockChallenge {
     pub hdr: MailboxRespHeader,
     pub vendor_id: u16,                     // Vendor ID (2 bytes)
@@ -1155,7 +1155,7 @@ impl Response for ProductionAuthDebugUnlockChallenge {}
 
 // PRODUCTION_AUTH_DEBUG_UNLOCK_TOKEN
 #[repr(C)]
-#[derive(Debug, AsBytes, FromBytes, PartialEq, Eq)]
+#[derive(Debug, FromBytes, Immutable, IntoBytes, KnownLayout, PartialEq, Eq)]
 pub struct ProductionAuthDebugUnlockToken {
     pub hdr: MailboxReqHeader,
     pub vendor_id: u16,                     // Vendor ID (2 bytes)

diff --git a/auth-manifest/types/src/lib.rs b/auth-manifest/types/src/lib.rs
@@ -192,7 +192,7 @@ pub struct AuthorizationManifest {
 #[cfg(test)]
 mod test {
     use crate::{AuthManifestPreamble, AUTH_MANIFEST_PREAMBLE_SIZE};
-    use zerocopy::AsBytes;
+    use zerocopy::IntoBytes;
 
     #[test]
     fn test_auth_preamble_size() {

diff --git a/common/src/verifier.rs b/common/src/verifier.rs
@@ -16,7 +16,7 @@ use caliptra_drivers::*;
 use caliptra_image_types::*;
 use caliptra_image_verify::ImageVerificationEnv;
 use core::ops::Range;
-use zerocopy::{AsBytes, FromBytes};
+use zerocopy::{FromBytes, IntoBytes};
 
 use caliptra_drivers::memory_layout::ICCM_RANGE;
 
@@ -104,17 +104,19 @@ impl<'a, 'b> ImageVerificationEnv for &mut FirmwareImageVerificationEnv<'a, 'b>
             .as_bytes()
             .try_into()
             .map_err(|_| CaliptraError::IMAGE_VERIFIER_ERR_MLDSA_TYPE_CONVERSION_FAILED)?;
-        let pub_key = Mldsa87PubKey::read_from(pub_key_bytes.as_bytes())
-            .ok_or(CaliptraError::IMAGE_VERIFIER_ERR_MLDSA_TYPE_CONVERSION_FAILED)?;
+        let pub_key = Mldsa87PubKey::read_from_bytes(pub_key_bytes.as_bytes()).or(Err(
+            CaliptraError::IMAGE_VERIFIER_ERR_MLDSA_TYPE_CONVERSION_FAILED,
+        ))?;
 
         // Signature is received in hw format from the image. No conversion needed.
         let sig_bytes: [u8; MLDSA87_SIGNATURE_BYTE_SIZE] = sig
             .0
             .as_bytes()
             .try_into()
             .map_err(|_| CaliptraError::IMAGE_VERIFIER_ERR_MLDSA_TYPE_CONVERSION_FAILED)?;
-        let sig = Mldsa87Signature::read_from(sig_bytes.as_bytes())
-            .ok_or(CaliptraError::IMAGE_VERIFIER_ERR_MLDSA_TYPE_CONVERSION_FAILED)?;
+        let sig = Mldsa87Signature::read_from_bytes(sig_bytes.as_bytes()).or(Err(
+            CaliptraError::IMAGE_VERIFIER_ERR_MLDSA_TYPE_CONVERSION_FAILED,
+        ))?;
 
         // digest is received in hw format. No conversion needed.
         let msg = digest.into();

diff --git a/common/src/x509.rs b/common/src/x509.rs
@@ -14,7 +14,7 @@ Abstract:
 use caliptra_drivers::*;
 use core::mem::size_of;
 use core::usize;
-use zerocopy::AsBytes;
+use zerocopy::IntoBytes;
 
 use crate::crypto::PubKey;
 

diff --git a/dpe b/dpe
+18 −25		Cargo.lock
+2 −2		Cargo.toml
+42 −30		dpe/fuzz/Cargo.lock
+3 −0		dpe/fuzz/Cargo.toml
+20 −4		dpe/src/commands/certify_key.rs
+20 −4		dpe/src/commands/derive_context.rs
+11 −3		dpe/src/commands/destroy_context.rs
+13 −3		dpe/src/commands/get_certificate_chain.rs
+11 −3		dpe/src/commands/initialize_context.rs
+29 −20		dpe/src/commands/mod.rs
+20 −4		dpe/src/commands/rotate_context.rs
+20 −4		dpe/src/commands/sign.rs
+7 −39		dpe/src/context.rs
+3 −3		dpe/src/dpe_instance.rs
+4 −2		dpe/src/lib.rs
+64 −8		dpe/src/response.rs
+2 −2		dpe/src/support.rs
+7 −3		dpe/src/tci.rs
+1 −18		dpe/src/validation.rs
+2 −2		dpe/src/x509.rs
+ −		platform/src/test_data/cert_256.der
+9 −9		platform/src/test_data/cert_256.pem
+ −		platform/src/test_data/cert_384.der
+10 −10		platform/src/test_data/cert_384.pem
+3 −3		platform/src/test_data/generate.sh
+ −		platform/src/test_data/key_256.der
+3 −3		platform/src/test_data/key_256.pem
+ −		platform/src/test_data/key_384.der
+4 −4		platform/src/test_data/key_384.pem
+1 −1		tools/src/sample_dpe_cert.rs