add tcb_evaulation_data_number option to zkdcap command

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

Author: bluele

Cargo.lock

@@ -27,7 +27,7 @@ crypto = { path = "../modules/crypto" }
 keymanager = { path = "../modules/keymanager" }
 remote-attestation = { path = "../modules/remote-attestation" }
 attestation-report = { path = "../modules/attestation-report", features = ["dcap-quote-parser"] }
-zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "v0.0.2" }
+zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "49a2e9360db289c637732a60460f3d7d47f9fb53" }
 
 [build-dependencies]
 git2 = { version = "0.20", default-features = false }

app/Cargo.toml

@@ -248,36 +248,17 @@ pub struct SgxCollateralService {
     )]
     pub certs_service_url: Option<String>,
     #[clap(
-        long = "update_policy",
-        default_value = "early",
-        help = "Update policy (early(default) or standard)"
+        long = "tcb_evaluation_data_number",
+        help = "TCB Evaluation Data Number for TCB Info and QE Identity (default: Latest TCB Evaluation Data Number)"
     )]
-    pub update_policy: UpdatePolicy,
+    pub tcb_evaluation_data_number: Option<u32>,
     #[clap(
         long = "expected_tcb_evaluation_data_number",
         help = "Expected TCB Evaluation Data Number for TCB Info and QE Identity"
     )]
     pub expected_tcb_evaluation_data_number: Option<u32>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
-pub enum UpdatePolicy {
-    Early,
-    Standard,
-}
-
-impl FromStr for UpdatePolicy {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.to_lowercase().as_str() {
-            "early" => Ok(Self::Early),
-            "standard" => Ok(Self::Standard),
-            _ => Err(anyhow!("invalid update policy: {}", s)),
-        }
-    }
-}
-
 impl SgxCollateralService {
     pub fn get_pccs_url(&self) -> String {
         self.pccs_url
@@ -298,7 +279,7 @@ impl From<SgxCollateralService> for ValidatedPCSClient {
             PCSClient::new(
                 service.get_pccs_url().as_str(),
                 service.get_certs_service_url().as_str(),
-                service.update_policy == UpdatePolicy::Early,
+                service.tcb_evaluation_data_number,
             ),
             service.expected_tcb_evaluation_data_number,
         )

app/src/commands/attestation.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 = "v0.0.2", optional = true }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "49a2e9360db289c637732a60460f3d7d47f9fb53", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.0", default-features = false, features = ["macros"] }

modules/attestation-report/Cargo.toml

@@ -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 = "v0.0.2" }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "49a2e9360db289c637732a60460f3d7d47f9fb53" }
 
 attestation-report = { path = "../attestation-report", default-features = false }
 remote-attestation = { path = "../remote-attestation", default-features = false }

modules/lcp-client/Cargo.toml

@@ -27,9 +27,9 @@ serde_json = { version = "1.0", features = ["preserve_order"] }
 rsa = { version = "0.9.2", features = ["pem"], optional = true }
 chrono = { version = "0.4.38", features = ["now"], optional = true }
 
-dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "v0.0.2" }
-dcap-pcs = { git = "https://github.com/datachainlab/zkdcap", rev = "v0.0.2" }
-dcap-collaterals = { git = "https://github.com/datachainlab/zkdcap", rev = "v0.0.2" }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "49a2e9360db289c637732a60460f3d7d47f9fb53" }
+dcap-pcs = { git = "https://github.com/datachainlab/zkdcap", rev = "49a2e9360db289c637732a60460f3d7d47f9fb53" }
+dcap-collaterals = { git = "https://github.com/datachainlab/zkdcap", rev = "49a2e9360db289c637732a60460f3d7d47f9fb53" }
 
 lcp-types = { path = "../types" }
 crypto = { path = "../crypto", default-features = false }

modules/remote-attestation/Cargo.toml

@@ -144,7 +144,7 @@ mod tests {
         let pcs_client = PCSClient::new(
             "https://api.trustedservices.intel.com/",
             "https://certificates.trustedservices.intel.com/",
-            false,
+            None,
         );
         let collateral = pcs_client
             .get_collateral(true, &quote.signature.qe_cert_data)

modules/remote-attestation/src/dcap.rs

@@ -35,7 +35,7 @@ attestation-report = { path = "../../modules/attestation-report" }
 keymanager = { path = "../../modules/keymanager" }
 remote-attestation = { path = "../../modules/remote-attestation" }
 
-zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "v0.0.2" }
+zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "49a2e9360db289c637732a60460f3d7d47f9fb53" }
 
 [features]
 default = []

tests/integration/Cargo.toml

@@ -255,7 +255,7 @@ mod tests {
                     PCSClient::new(
                         "https://api.trustedservices.intel.com/",
                         "https://certificates.trustedservices.intel.com/",
-                        false,
+                        None,
                     ),
                     None,
                 ),