fix to use string type for collateral's json values

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" }
-zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "1c52677de65c389d95d93359c9740cca9b3ec03f" }
+zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "9616d7976a84e97a128fa02175ec994b95e3c137" }
 
 [build-dependencies]
 git2 = { version = "0.20", default-features = false }

app/Cargo.toml

@@ -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 = "1c52677de65c389d95d93359c9740cca9b3ec03f", optional = true }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "9616d7976a84e97a128fa02175ec994b95e3c137", 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 = "1c52677de65c389d95d93359c9740cca9b3ec03f" }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "9616d7976a84e97a128fa02175ec994b95e3c137" }
 
 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 = "1c52677de65c389d95d93359c9740cca9b3ec03f" }
-dcap-pcs = { git = "https://github.com/datachainlab/zkdcap", rev = "1c52677de65c389d95d93359c9740cca9b3ec03f" }
-dcap-collaterals = { git = "https://github.com/datachainlab/zkdcap", rev = "1c52677de65c389d95d93359c9740cca9b3ec03f" }
+dcap-quote-verifier = { git = "https://github.com/datachainlab/zkdcap", rev = "9616d7976a84e97a128fa02175ec994b95e3c137" }
+dcap-pcs = { git = "https://github.com/datachainlab/zkdcap", rev = "9616d7976a84e97a128fa02175ec994b95e3c137" }
+dcap-collaterals = { git = "https://github.com/datachainlab/zkdcap", rev = "9616d7976a84e97a128fa02175ec994b95e3c137" }
 
 lcp-types = { path = "../types" }
 crypto = { path = "../crypto", default-features = false }

modules/remote-attestation/Cargo.toml

@@ -271,8 +271,8 @@ pub(crate) fn simulate_gen_quote_and_collaterals(
         .unwrap();
 
     let collateral = QvCollateral {
-        tcb_info_json: serde_json::to_vec(&tcb_info).unwrap(),
-        qe_identity_json: serde_json::to_vec(&qe_identity).unwrap(),
+        tcb_info_json: serde_json::to_string(&tcb_info).unwrap(),
+        qe_identity_json: serde_json::to_string(&qe_identity).unwrap(),
         sgx_intel_root_ca_der: root_ca.cert.to_der().unwrap(),
         sgx_tcb_signing_der: tcb_certchain.cert.to_der().unwrap(),
         sgx_intel_root_ca_crl_der: root_ca.crl.to_der().unwrap(),

modules/remote-attestation/src/dcap_simulation.rs

@@ -127,10 +127,10 @@ pub struct Risc0ZkvmProof {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QvCollateral {
-    #[prost(bytes = "vec", tag = "1")]
-    pub tcb_info_json: ::prost::alloc::vec::Vec<u8>,
-    #[prost(bytes = "vec", tag = "2")]
-    pub qe_identity_json: ::prost::alloc::vec::Vec<u8>,
+    #[prost(string, tag = "1")]
+    pub tcb_info_json: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub qe_identity_json: ::prost::alloc::string::String,
     #[prost(bytes = "vec", tag = "3")]
     pub sgx_intel_root_ca_der: ::prost::alloc::vec::Vec<u8>,
     #[prost(bytes = "vec", tag = "4")]

proto/src/descriptor.bin

@@ -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 = "1c52677de65c389d95d93359c9740cca9b3ec03f" }
+zkdcap-risc0 = { git = "https://github.com/datachainlab/zkdcap", rev = "9616d7976a84e97a128fa02175ec994b95e3c137" }
 
 [features]
 default = []