Convert the new code to zerocopy

chipsalliance · Feb 9, 2025 · 79b5081 · 79b5081
1 parent 0eba271
commit 79b5081
Show file tree

Hide file tree

Showing 31 changed files with 233 additions and 260 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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
diff --git a/drivers/src/data_vault.rs b/drivers/src/data_vault.rs
@@ -13,11 +13,11 @@ Abstract:
 --*/
 
 use crate::{Array4x12, Ecc384PubKey, Ecc384Signature, Mldsa87PubKey, Mldsa87Signature};
-use zerocopy::{AsBytes, FromBytes};
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 use zeroize::Zeroize;
 
 #[repr(C)]
-#[derive(FromBytes, AsBytes, Zeroize, Default)]
+#[derive(Default, FromBytes, Immutable, IntoBytes, KnownLayout, Zeroize)]
 pub struct ColdResetEntries {
     ldev_dice_ecc_sig: Ecc384Signature,
     ldev_dice_ecc_pk: Ecc384PubKey,
@@ -37,7 +37,7 @@ pub struct ColdResetEntries {
 }
 
 #[repr(C)]
-#[derive(FromBytes, AsBytes, Zeroize, Default)]
+#[derive(Default, FromBytes, Immutable, IntoBytes, KnownLayout, Zeroize)]
 pub struct WarmResetEntries {
     rt_tci: Array4x12,
     fw_svn: u32,
@@ -48,7 +48,7 @@ pub struct WarmResetEntries {
 }
 
 #[repr(C)]
-#[derive(FromBytes, AsBytes, Zeroize, Default)]
+#[derive(Default, FromBytes, Immutable, IntoBytes, KnownLayout, Zeroize)]
 pub struct DataVault {
     cold_reset_entries: ColdResetEntries,
     warm_reset_entries: WarmResetEntries,

diff --git a/drivers/src/dma.rs b/drivers/src/dma.rs
@@ -21,7 +21,7 @@ use caliptra_registers::i3ccsr::RegisterBlock as I3CRegisterBlock;
 use core::cell::Cell;
 use core::ops::Add;
 use ureg::{Mmio, MmioMut, RealMmioMut};
-use zerocopy::AsBytes;
+use zerocopy::IntoBytes;
 
 use crate::cprintln;
 
@@ -298,7 +298,7 @@ impl Dma {
     /// * `CaliptraResult<u32>` - Read value or error code
     pub fn read_dword(&self, read_addr: AxiAddr) -> CaliptraResult<u32> {
         let mut read_val: u32 = 0;
-        self.read_buffer(read_addr, read_val.as_bytes_mut())?;
+        self.read_buffer(read_addr, read_val.as_mut_bytes())?;
         Ok(read_val)
     }
+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