Remove ExtendTci and rename DeriveChild to DeriveContext

chipsalliance · Jan 26, 2024 · f46084b · f46084b
1 parent 410f50d
commit f46084b
Show file tree

Hide file tree

Showing 26 changed files with 518 additions and 753 deletions.
diff --git a/dpe/Cargo.toml b/dpe/Cargo.toml
@@ -12,7 +12,7 @@ dpe_profile_p384_sha384 = ["platform/dpe_profile_p384_sha384"]
 # Run ARBITRARY_MAX_HANDLES=n cargo build --features arbitrary_max_handles to use this feature
 arbitrary_max_handles = []
 disable_simulation = []
-disable_extend_tci = []
+disable_recursive = []
 disable_auto_init = []
 disable_rotate_context = []
 disable_x509 = []
@@ -21,6 +21,7 @@ disable_is_symmetric = []
 disable_internal_info = []
 disable_internal_dice = []
 disable_is_ca = []
+disable_retain_parent_context = []
 
 [dependencies]
 bitflags = "2.4.0"

diff --git a/dpe/fuzz/src/fuzz_target_1.rs b/dpe/fuzz/src/fuzz_target_1.rs
@@ -76,12 +76,11 @@ fn harness(data: &[u8]) {
     let response_code = match response {
         Response::GetProfile(ref res) => res.resp_hdr.status,
         Response::InitCtx(ref res) => res.resp_hdr.status,
-        Response::DeriveChild(ref res) => res.resp_hdr.status,
+        Response::DeriveContext(ref res) => res.resp_hdr.status,
         Response::RotateCtx(ref res) => res.resp_hdr.status,
         Response::CertifyKey(ref res) => res.resp_hdr.status,
         Response::Sign(ref res) => res.resp_hdr.status,
         Response::DestroyCtx(ref resp_hdr) => resp_hdr.status,
-        Response::ExtendTci(ref res) => res.resp_hdr.status,
         Response::GetCertificateChain(ref res) => res.resp_hdr.status,
         Response::Error(ref resp_hdr) => resp_hdr.status,
     };

diff --git a/dpe/src/commands/certify_key.rs b/dpe/src/commands/certify_key.rs
@@ -100,7 +100,7 @@ impl CommandExecution for CertifyKeyCmd {
             label: &self.label,
             tci_nodes: &nodes[..tcb_count],
             is_ca: self.uses_is_ca(),
-            supports_extend_tci: dpe.support.extend_tci(),
+            supports_recursive: dpe.support.recursive(),
         };
 
         let mut issuer_name = [0u8; MAX_CHUNK_SIZE];