update zkDCAP crate

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

Author: bluele

Cargo.lock

@@ -198,7 +198,7 @@ test:
 
 .PHONY: integration-test
 integration-test: $(Signed_RustEnclave_Name) bin/gaiad
-	@PATH=${PATH}:$(CURDIR)/bin cargo test $(CARGO_TARGET) --package integration-test $(APP_CARGO_FEATURES)
+	cargo test $(CARGO_TARGET) --package integration-test $(APP_CARGO_FEATURES)
 
 .PHONY: test-nodes
 test-setup-nodes: bin/gaiad

Makefile

@@ -27,7 +27,7 @@ crypto = { path = "../modules/crypto" }
 keymanager = { path = "../modules/keymanager" }
 remote-attestation = { path = "../modules/remote-attestation" }
 attestation-report = { path = "../modules/attestation-report" }
-zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "54ab01c04ca8738b8568b4a6c74a493715af9d2b" }
+zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "ff61208c9c8e6019289bb2beb7a76cfbf94e801f" }
 
 [build-dependencies]
 git2 = { version = "0.20", default-features = false }

app/Cargo.toml

@@ -9,8 +9,8 @@ use enclave_api::{Enclave, EnclaveCommandAPI, EnclaveProtoAPI};
 use host::store::transaction::CommitStore;
 use remote_attestation::{
     dcap,
+    dcap_pcs::client::PCSClient,
     dcap_simulation::{DCAP_SIM_ROOT_CA_PEM, DCAP_SIM_ROOT_KEY_PKCS8},
-    dcap_utils::CollateralService,
     ias, zkdcap, IASMode,
 };
 use remote_attestation::{
@@ -263,13 +263,13 @@ impl SgxCollateralService {
     }
 }
 
-impl From<SgxCollateralService> for CollateralService {
+impl From<SgxCollateralService> for PCSClient {
     fn from(service: SgxCollateralService) -> Self {
-        Self {
-            pccs_url: service.get_pccs_url(),
-            certs_service_url: service.get_certs_service_url(),
-            is_early_update: service.is_early_update,
-        }
+        Self::new(
+            service.get_pccs_url().as_str(),
+            service.get_certs_service_url().as_str(),
+            service.is_early_update,
+        )
     }
 }
 

app/src/commands/attestation.rs

@@ -156,7 +156,7 @@ fn run_list_keys<E: EnclaveCommandAPI<S>, S: CommitStore>(
                             "address": eki.address.to_hex_string(),
                             "attested": true,
                             "report_data": quote.report_data()?.to_string(),
-                            "isv_enclave_quote_status": quote.tcb_status,
+                            "isv_enclave_quote_status": quote.status,
                             "advisory_ids": quote.advisory_ids,
                             "attested_at": quote.attested_at.to_string(),
                         }});
@@ -167,7 +167,7 @@ fn run_list_keys<E: EnclaveCommandAPI<S>, S: CommitStore>(
                             "address": eki.address.to_hex_string(),
                             "attested": true,
                             "report_data": quote.dcap_quote.report_data()?.to_string(),
-                            "isv_enclave_quote_status": quote.dcap_quote.tcb_status,
+                            "isv_enclave_quote_status": quote.dcap_quote.status,
                             "advisory_ids": quote.dcap_quote.advisory_ids,
                             "attested_at": quote.dcap_quote.attested_at.to_string(),
                         }});

app/src/commands/enclave.rs

@@ -18,7 +18,7 @@ pem = { version = "2.0", default-features = false }
 webpki = { version = "0.22", features = ["alloc"] }
 anyhow = { version = "1", default-features = false }
 
-dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "54ab01c04ca8738b8568b4a6c74a493715af9d2b", optional = true }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "ff61208c9c8e6019289bb2beb7a76cfbf94e801f", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.0", default-features = false, features = ["macros"] }

modules/attestation-report/Cargo.toml

@@ -17,7 +17,7 @@ pub struct DCAPQuote {
     #[serde_as(as = "serde_with::hex::Hex<serde_with::formats::Lowercase>")]
     pub fmspc: [u8; 6],
     /// TCB status of the processor/platform
-    pub tcb_status: String,
+    pub status: String,
     /// Advisory IDs of the processor/platform
     pub advisory_ids: Vec<String>,
     /// Time when the quote was attested
@@ -41,7 +41,7 @@ impl DCAPQuote {
     #[cfg(feature = "std")]
     pub fn report_data(&self) -> Result<crate::ReportData, Error> {
         use dcap_quote_verifier::types::quotes::version_3::QuoteV3;
-        let quote = QuoteV3::from_bytes(&self.raw).map_err(Error::dcap_quote_verifier)?;
+        let (quote, _) = QuoteV3::from_bytes(&self.raw).map_err(Error::dcap_quote_verifier)?;
         Ok(crate::ReportData(quote.isv_enclave_report.report_data))
     }
 }

modules/attestation-report/src/dcap.rs

@@ -420,7 +420,7 @@ impl TryFrom<SealedEnclaveKeyInfo> for ProtoEnclaveKeyInfo {
                         quote: dcap.raw,
                         fmspc: dcap.fmspc.to_vec(),
                         attestation_time,
-                        tcb_status: dcap.tcb_status,
+                        tcb_status: dcap.status,
                         advisory_ids: dcap.advisory_ids,
                         collateral: Some(dcap.collateral),
                     })),
@@ -436,7 +436,7 @@ impl TryFrom<SealedEnclaveKeyInfo> for ProtoEnclaveKeyInfo {
                             quote: dcap.raw,
                             fmspc: dcap.fmspc.to_vec(),
                             attestation_time,
-                            tcb_status: dcap.tcb_status,
+                            tcb_status: dcap.status,
                             advisory_ids: dcap.advisory_ids,
                             collateral: Some(dcap.collateral),
                         }),

modules/keymanager/src/lib.rs

@@ -11,7 +11,7 @@ flex-error = { version = "0.4.4", default-features = false }
 tiny-keccak = { version = "2.0" }
 hex-literal = { version = "0.4.1" }
 alloy-sol-types = { version = "0.8", default-features = false }
-dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "54ab01c04ca8738b8568b4a6c74a493715af9d2b" }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "ff61208c9c8e6019289bb2beb7a76cfbf94e801f" }
 
 attestation-report = { path = "../attestation-report", default-features = false }
 remote-attestation = { path = "../remote-attestation", default-features = false }

modules/lcp-client/Cargo.toml

@@ -286,7 +286,7 @@ impl LCPClient {
                 .validate_time(ctx.host_timestamp().as_unix_timestamp_secs()),
             "invalid validity intersection"
         );
-        let tcb_status = message.quote_verification_output.tcb_status.to_string();
+        let tcb_status = message.quote_verification_output.status.to_string();
         assert!(
             tcb_status == "UpToDate" || client_state.allowed_quote_statuses.contains(&tcb_status),
             "unexpected tcb status"
@@ -302,7 +302,7 @@ impl LCPClient {
             verify_signature_address(
                 compute_eip712_zkdcap_register_enclave_key(
                     zkdcap_verifier_info,
-                    message.quote_verification_output.hash(),
+                    keccak256(&message.quote_verification_output.to_bytes()),
                 )
                 .as_ref(),
                 operator_signature.as_ref(),