Remove tagging from DPE

This will be added to caliptra-sw runtime in a separate PR.
chipsalliance · Nov 17, 2023 · e05063e · e05063e
1 parent 8e3623d
commit e05063e
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 488 deletions.
diff --git a/dpe/fuzz/src/fuzz_target_1.rs b/dpe/fuzz/src/fuzz_target_1.rs
@@ -82,8 +82,6 @@ fn harness(data: &[u8]) {
         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::TagTci(ref res) => res.resp_hdr.status,
-        Response::GetTaggedTci(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/get_tagged_tci.rs b/dpe/src/commands/get_tagged_tci.rs
diff --git a/dpe/src/commands/mod.rs b/dpe/src/commands/mod.rs
@@ -12,10 +12,8 @@ pub use self::initialize_context::InitCtxCmd;
 pub use self::certify_key::{CertifyKeyCmd, CertifyKeyFlags};
 
 use self::extend_tci::ExtendTciCmd;
-use self::get_tagged_tci::GetTaggedTciCmd;
 pub use self::rotate_context::{RotateCtxCmd, RotateCtxFlags};
 pub use self::sign::{SignCmd, SignFlags};
-use self::tag_tci::TagTciCmd;
 
 use crate::{
     dpe_instance::{DpeEnv, DpeInstance, DpeTypes},
@@ -30,11 +28,9 @@ mod derive_child;
 mod destroy_context;
 mod extend_tci;
 mod get_certificate_chain;
-mod get_tagged_tci;
 mod initialize_context;
 mod rotate_context;
 mod sign;
-mod tag_tci;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum Command {
@@ -46,8 +42,6 @@ pub enum Command {
     RotateCtx(RotateCtxCmd),
     DestroyCtx(DestroyCtxCmd),
     ExtendTci(ExtendTciCmd),
-    TagTci(TagTciCmd),
-    GetTaggedTci(GetTaggedTciCmd),
     GetCertificateChain(GetCertificateChainCmd),
 }
 
@@ -85,8 +79,6 @@ impl Command {
                 Self::parse_command(Command::GetCertificateChain, bytes)
             }
             Command::EXTEND_TCI => Self::parse_command(Command::ExtendTci, bytes),
-            Command::TAG_TCI => Self::parse_command(Command::TagTci, bytes),
-            Command::GET_TAGGED_TCI => Self::parse_command(Command::GetTaggedTci, bytes),
             _ => Err(DpeErrorCode::InvalidCommand),
         }
     }
@@ -112,8 +104,6 @@ impl From<Command> for u32 {
             Command::RotateCtx(_) => Command::ROTATE_CONTEXT_HANDLE,
             Command::DestroyCtx(_) => Command::DESTROY_CONTEXT,
             Command::ExtendTci(_) => Command::EXTEND_TCI,
-            Command::TagTci(_) => Command::TAG_TCI,
-            Command::GetTaggedTci(_) => Command::GET_TAGGED_TCI,
             Command::GetCertificateChain(_) => Command::GET_CERTIFICATE_CHAIN,
         }
     }

diff --git a/dpe/src/commands/tag_tci.rs b/dpe/src/commands/tag_tci.rs
diff --git a/dpe/src/dpe_instance.rs b/dpe/src/dpe_instance.rs
@@ -114,8 +114,6 @@ impl DpeInstance {
             Command::RotateCtx(cmd) => cmd.execute(self, env, locality),
             Command::DestroyCtx(cmd) => cmd.execute(self, env, locality),
             Command::ExtendTci(cmd) => cmd.execute(self, env, locality),
-            Command::TagTci(cmd) => cmd.execute(self, env, locality),
-            Command::GetTaggedTci(cmd) => cmd.execute(self, env, locality),
             Command::GetCertificateChain(cmd) => cmd.execute(self, env, locality),
         };
 

diff --git a/dpe/src/response.rs b/dpe/src/response.rs
@@ -5,8 +5,8 @@ Abstract:
     DPE reponses and serialization.
 --*/
 use crate::{
-    context::ContextHandle, tci::TciMeasurement, CURRENT_PROFILE_MAJOR_VERSION,
-    CURRENT_PROFILE_MINOR_VERSION, DPE_PROFILE, MAX_CERT_SIZE, MAX_HANDLES,
+    context::ContextHandle, CURRENT_PROFILE_MAJOR_VERSION, CURRENT_PROFILE_MINOR_VERSION,
+    DPE_PROFILE, MAX_CERT_SIZE, MAX_HANDLES,
 };
 use crypto::CryptoError;
 use platform::PlatformError;
@@ -23,8 +23,6 @@ pub enum Response {
     Sign(SignResp),
     DestroyCtx(ResponseHdr),
     ExtendTci(NewHandleResp),
-    TagTci(NewHandleResp),
-    GetTaggedTci(GetTaggedTciResp),
     GetCertificateChain(GetCertificateChainResp),
     Error(ResponseHdr),
 }
@@ -40,8 +38,6 @@ impl Response {
             Response::Sign(res) => res.as_bytes(),
             Response::DestroyCtx(res) => res.as_bytes(),
             Response::ExtendTci(res) => res.as_bytes(),
-            Response::TagTci(res) => res.as_bytes(),
-            Response::GetTaggedTci(res) => res.as_bytes(),
             Response::GetCertificateChain(res) => res.as_bytes(),
             Response::Error(res) => res.as_bytes(),
         }
@@ -135,15 +131,6 @@ pub struct SignResp {
     pub sig_s: [u8; DPE_PROFILE.get_ecc_int_size()],
 }
 
-#[repr(C)]
-#[derive(Debug, zerocopy::AsBytes)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
-pub struct GetTaggedTciResp {
-    pub resp_hdr: ResponseHdr,
-    pub tci_cumulative: TciMeasurement,
-    pub tci_current: TciMeasurement,
-}
-
 #[repr(C)]
 #[derive(Debug, PartialEq, Eq, zerocopy::AsBytes, zerocopy::FromBytes)]
 pub struct GetCertificateChainResp {