Update DPE submodule

chipsalliance · Jan 14, 2025 · 2e5254d · 2e5254d
1 parent be20fe6
commit 2e5254d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/api/src/mailbox.rs b/api/src/mailbox.rs
@@ -630,7 +630,7 @@ pub struct CertifyKeyExtendedResp {
     pub certify_key_resp: [u8; CertifyKeyExtendedResp::CERTIFY_KEY_RESP_SIZE],
 }
 impl CertifyKeyExtendedResp {
-    pub const CERTIFY_KEY_RESP_SIZE: usize = 2176;
+    pub const CERTIFY_KEY_RESP_SIZE: usize = 6272;
 }
 impl Response for CertifyKeyExtendedResp {}
 
@@ -700,7 +700,7 @@ pub struct InvokeDpeResp {
     pub data: [u8; InvokeDpeResp::DATA_MAX_SIZE], // variable length
 }
 impl InvokeDpeResp {
-    pub const DATA_MAX_SIZE: usize = 2200;
+    pub const DATA_MAX_SIZE: usize = 6556;
 }
 impl ResponseVarSize for InvokeDpeResp {}
 

diff --git a/dpe b/dpe
diff --git a/drivers/src/memory_layout.rs b/drivers/src/memory_layout.rs
@@ -24,9 +24,9 @@ pub const CFI_STATE_ORG: u32 = 0x500003E4; // size = 6 words
 pub const BOOT_STATUS_ORG: u32 = 0x500003FC;
 pub const PERSISTENT_DATA_ORG: u32 = 0x50000400;
 
-pub const DATA_ORG: u32 = 0x5000D800;
+pub const DATA_ORG: u32 = 0x50009C00;
 
-pub const STACK_ORG: u32 = 0x5000f800;
+pub const STACK_ORG: u32 = 0x5000A400;
 pub const ROM_STACK_ORG: u32 = 0x5001C000;
 
 pub const ESTACK_ORG: u32 = 0x5001F800;
@@ -45,16 +45,16 @@ pub const ROM_NSTACK_ORG: u32 = 0x5001FC00;
 // reserved for future use and then allocating the rest of the DCCM.
 //
 // The `DATA_SIZE` variable reflects the leftover space.
-pub const PERSISTENT_DATA_SIZE: u32 = 53 * 1024;
+pub const PERSISTENT_DATA_SIZE: u32 = 38 * 1024;
 
 pub const ROM_RELAXATION_PADDING: u32 = 4 * 1024;
 pub const ROM_SIZE: u32 = 48 * 1024;
 pub const MBOX_SIZE: u32 = 128 * 1024;
 pub const ICCM_SIZE: u32 = 128 * 1024;
 pub const DCCM_SIZE: u32 = 128 * 1024;
 pub const ROM_DATA_SIZE: u32 = 996;
-pub const DATA_SIZE: u32 = 8 * 1024;
-pub const STACK_SIZE: u32 = 64 * 1024;
+pub const DATA_SIZE: u32 = 2 * 1024;
+pub const STACK_SIZE: u32 = 85 * 1024;
 pub const ROM_STACK_SIZE: u32 = 14 * 1024;
 pub const ESTACK_SIZE: u32 = 1024;
 pub const ROM_ESTACK_SIZE: u32 = 1024;

diff --git a/drivers/src/persistent.rs b/drivers/src/persistent.rs
@@ -38,7 +38,7 @@ pub const DPE_SIZE: u32 = 5 * 1024;
 pub const PCR_RESET_COUNTER_SIZE: u32 = 1024;
 pub const AUTH_MAN_IMAGE_METADATA_MAX_SIZE: u32 = 7 * 1024;
 pub const IDEVID_CSR_SIZE: u32 = 1024;
-pub const RESERVED_MEMORY_SIZE: u32 = 19 * 1024;
+pub const RESERVED_MEMORY_SIZE: u32 = 4 * 1024;
 
 pub const PCR_LOG_MAX_COUNT: usize = 17;
 pub const FUSE_LOG_MAX_COUNT: usize = 62;

diff --git a/libcaliptra/inc/caliptra_types.h b/libcaliptra/inc/caliptra_types.h
@@ -204,7 +204,7 @@ struct caliptra_certify_key_extended_req {
 
 struct caliptra_certify_key_extended_resp {
     struct caliptra_resp_header hdr;
-    uint8_t certify_key_resp[2176];
+    uint8_t certify_key_resp[6272];
 };
 
 struct caliptra_fips_version_resp {
@@ -243,7 +243,7 @@ struct dpe_resp_hdr {
 
 
 #define DPE_HANDLE_SIZE 16
-#define DPE_CERT_SIZE   2048
+#define DPE_CERT_SIZE   6144
 
 #ifndef DPE_PROFILE
 #define DPE_PROFILE DPE_PROFILE_384
+13 −5		Cargo.lock
+4 −4		ci.sh
+4 −1		crypto/src/openssl.rs
+4 −1		crypto/src/rustcrypto.rs
+4 −4		dpe/fuzz/Cargo.lock
+4 −4		dpe/src/commands/certify_key.rs
+4 −4		dpe/src/commands/derive_context.rs
+7 −7		dpe/src/commands/destroy_context.rs
+2 −2		dpe/src/commands/mod.rs
+6 −0		dpe/src/context.rs
+6 −4		dpe/src/lib.rs
+2 −2		dpe/src/response.rs
+5 −5		dpe/src/validation.rs
+8 −8		dpe/src/x509.rs
+1 −0		platform/src/lib.rs
+1 −1		platform/src/printer.rs
+1 −1		rust-toolchain.toml
+59 −37		verification/client/abi.go
+4 −0		verification/client/client.go
+46 −4		verification/client/profile.go
+4 −0		verification/testing/certifyKey.go
+19 −1		verification/testing/deriveContext.go
+1 −1		verification/testing/simulator.go
+1 −1		verification/testing/verification.go