Update to the latest zerocopy.

chipsalliance · Feb 21, 2025 · c8c4586 · c8c4586
1 parent 20d76ae
commit c8c4586
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -184,7 +184,7 @@ ureg-schema = { path = "ureg/lib/schema" }
 ureg-systemrdl = { path = "ureg/lib/systemrdl" }
 wycheproof = "0.5.1"
 x509-parser = "0.15.0"
-zerocopy = { version = "0.8.8", features = ["derive"] }
+zerocopy = { version = "0.8.17", features = ["derive"] }
 serial_test = "2.0.0"
 nix = "0.26.2"
 libc = "0.2"

diff --git a/api/src/mailbox.rs b/api/src/mailbox.rs
@@ -472,7 +472,7 @@ pub struct GetIdevInfoResp {
 #[repr(C)]
 #[derive(Default, Debug, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
 pub struct GetLdevCertReq {
-    header: MailboxReqHeader,
+    pub header: MailboxReqHeader,
 }
 
 impl Request for GetLdevCertReq {
@@ -506,7 +506,7 @@ impl Default for GetLdevCertResp {
 #[repr(C)]
 #[derive(Default, Debug, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
 pub struct GetRtAliasCertReq {
-    header: MailboxReqHeader,
+    pub header: MailboxReqHeader,
 }
 impl Request for GetRtAliasCertReq {
     const ID: CommandId = CommandId::GET_RT_ALIAS_CERT;
@@ -734,7 +734,7 @@ impl Default for InvokeDpeResp {
 #[repr(C)]
 #[derive(Debug, Default, IntoBytes, FromBytes, Immutable, KnownLayout, PartialEq, Eq)]
 pub struct GetFmcAliasCertReq {
-    header: MailboxReqHeader,
+    pub header: MailboxReqHeader,
 }
 impl Request for GetFmcAliasCertReq {
     const ID: CommandId = CommandId::GET_FMC_ALIAS_CERT;

diff --git a/drivers/src/pcr_reset.rs b/drivers/src/pcr_reset.rs
@@ -19,7 +19,7 @@ use zeroize::Zeroize;
 #[repr(C, align(4))]
 #[derive(IntoBytes, FromBytes, Immutable, KnownLayout, Zeroize)]
 pub struct PcrResetCounter {
-    counter: [u32; PcrBank::ALL_PCR_IDS.len()],
+    pub counter: [u32; PcrBank::ALL_PCR_IDS.len()],
 }
 
 impl Default for PcrResetCounter {

diff --git a/image/gen/src/generator.rs b/image/gen/src/generator.rs
@@ -245,12 +245,12 @@ impl<Crypto: ImageGeneratorCrypto> ImageGenerator<Crypto> {
     where
         E: ImageGenratorExecutable,
     {
-        let r#type = ImageTocEntryType::Executable;
+        let image_type = ImageTocEntryType::Executable;
         let digest = self.crypto.sha384_digest(image.content())?;
 
         let entry = ImageTocEntry {
             id: id.into(),
-            r#type: r#type.into(),
+            image_type: image_type.into(),
             revision: *image.rev(),
             version: image.version(),
             svn: image.svn(),

diff --git a/image/types/src/lib.rs b/image/types/src/lib.rs
@@ -304,7 +304,7 @@ pub struct VendorSignedData {
     /// Vendor End Date [ASN1 Time Format] For FMC alias certificate.
     pub vendor_not_after: [u8; 15],
 
-    reserved: [u8; 10],
+    pub reserved: [u8; 10],
 }
 
 #[repr(C)]
@@ -320,7 +320,7 @@ pub struct OwnerSignedData {
     /// Owner epoch, used to diversify stable SVN keys.
     pub epoch: [u8; 2],
 
-    reserved: [u8; 8],
+    pub reserved: [u8; 8],
 }
 
 /// Caliptra Image header
@@ -396,7 +396,7 @@ pub struct ImageTocEntry {
     pub id: u32,
 
     /// Type
-    pub r#type: u32,
+    pub image_type: u32,
 
     /// Commit revision
     pub revision: ImageRevision,