Merge pull request #30 from datachainlab/update-rust-openssl

bluele · web-flow · commit 57c1045e5b5a · 2025-12-17T00:58:00.000+09:00
Update rust-openssl

Signed-off-by: Jun Kimura &lt;jun.kimura@datachain.jp&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,3 +7,26 @@ members = [
   "crates/collaterals",
 ]
 exclude = ["zkvm/risc0", "zkvm/risc0/guest"]
+
+[workspace.dependencies]
+alloy-sol-types = { version = "0.8.12" }
+anyhow          = { version = "1" }
+chrono          = { version = "0.4" }
+der             = { version = "0.7", features = ["alloc", "derive"] }
+hex             = { version = "0.4" }
+log             = { version = "0.4.8" }
+p256            = { version = "0.13.2" }
+pem             = { version = "3", default-features = false }
+proptest        = { version = "1.6" }
+reqwest         = { version = "0.12.9", default-features = false, features = ["rustls-tls", "blocking", "hickory-dns"] }
+serde           = { version = "1.0", features = ["derive"] }
+serde_json      = { version = "1.0" }
+sha2            = { version = "0.10.8" }
+sha3            = { version = "0.10.8" }
+urlencoding     = { version = "2" }
+x509-parser     = { version = "0.15.1" }
+openssl         = { git = "https://github.com/datachainlab/rust-openssl", rev = "1e4f9af40f9e2d74c9775482f7f5e6449cc7b8e1" }
+
+dcap-types          = { path = "crates/types" }
+dcap-collaterals    = { path = "crates/collaterals" }
+dcap-quote-verifier = { path = "crates/quote-verifier" }
diff --git a/crates/collaterals/Cargo.toml b/crates/collaterals/Cargo.toml
@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow      = "1"
-hex         = "0.4"
-x509-parser = "0.15.1"
-der         = { version = "0.7", features = ["alloc", "derive"] }
-chrono      = { version = "0.4" }
-serde_json  = { version = "1", features = ["preserve_order"] }
-openssl     = { git = "https://github.com/datachainlab/rust-openssl", rev = "6fdf2f32721719d173bf909c97e982fe4e2e2819" }
-dcap-types  = { path = "../types" }
+anyhow      = { workspace = true }
+hex         = { workspace = true }
+x509-parser = { workspace = true }
+der         = { workspace = true }
+chrono      = { workspace = true }
+serde_json  = { workspace = true, features = ["preserve_order"] }
+openssl     = { workspace = true }
+dcap-types  = { workspace = true }
 
 [features]
 default          = []
diff --git a/crates/pcs/Cargo.toml b/crates/pcs/Cargo.toml
@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow              = { version = "1" }
-log                 = { version = "0.4.8" }
-hex                 = { version = "0.4" }
-urlencoding         = { version = "2" }
-pem                 = { version = "3", default-features = false }
-reqwest             = { version = "0.12.9", default-features = false, features = ["rustls-tls", "blocking", "hickory-dns"] }
-dcap-types          = { path = "../types" }
-dcap-quote-verifier = { path = "../quote-verifier" }
+anyhow              = { workspace = true }
+log                 = { workspace = true }
+hex                 = { workspace = true }
+urlencoding         = { workspace = true }
+pem                 = { workspace = true }
+reqwest             = { workspace = true }
+dcap-types          = { workspace = true }
+dcap-quote-verifier = { workspace = true }
 
 [features]
 default = []
diff --git a/crates/quote-verifier/Cargo.toml b/crates/quote-verifier/Cargo.toml
@@ -8,20 +8,20 @@ edition = "2021"
 crate-type = ["lib"]
 
 [dependencies]
-hex             = { version = "0.4" }
-x509-parser     = { version = "0.15.1" }
-serde           = { version = "1.0", features = ["derive"] }
-serde_json      = { version = "1.0" }
-anyhow          = { version = "1" }
-p256            = { version = "0.13.2" }
-sha2            = { version = "0.10.8" }
-sha3            = { version = "0.10.8" }
-alloy-sol-types = { version = "0.8.12" }
-dcap-types      = { path = "../types" }
+hex             = { workspace = true }
+x509-parser     = { workspace = true }
+serde           = { workspace = true }
+serde_json      = { workspace = true }
+anyhow          = { workspace = true }
+p256            = { workspace = true }
+sha2            = { workspace = true }
+sha3            = { workspace = true }
+alloy-sol-types = { workspace = true }
+dcap-types      = { workspace = true }
 
 [features]
 default = []
 
 [dev-dependencies]
-serde_json       = { version = "1.0", features = ["preserve_order"] }
-dcap-collaterals = { path = "../collaterals" }
+serde_json       = { workspace = true, features = ["preserve_order"] }
+dcap-collaterals = { workspace = true }
diff --git a/crates/quote-verifier/src/tcb_info.rs b/crates/quote-verifier/src/tcb_info.rs
@@ -210,13 +210,17 @@ mod tests {
             }
         }
         {
-            let pck_ca_crl = gen_crl_der(
-                &pck_certchain.pck_cert_ca,
-                &pck_certchain.pck_cert_ca_key,
-                vec![tcb_certchain.cert.clone()],
-                None,
+            // Generate another TCB signing cert from root CA to use as revoked cert
+            let another_tcb_key = gen_key();
+            let another_tcb_cert = gen_tcb_signing_ca(
+                &root_ca.cert,
+                &root_ca.key,
+                &another_tcb_key,
+                Validity::new_with_duration(1730000001, 1000),
             )
             .unwrap();
+            let root_ca_crl =
+                gen_crl_der(&root_ca.cert, &root_ca.key, vec![another_tcb_cert], None).unwrap();
             let crls = IntelSgxCrls::new(
                 CertificateRevocationList::from_der(root_ca_crl.as_ref())
                     .unwrap()
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
@@ -8,14 +8,14 @@ edition = "2021"
 crate-type = ["lib"]
 
 [dependencies]
-x509-parser = { version = "0.15.1" }
-serde       = { version = "1.0", features = ["derive"] }
-chrono      = { version = "0.4" }
-anyhow      = { version = "1" }
-hex         = { version = "0.4" }
+x509-parser = { workspace = true }
+serde       = { workspace = true }
+chrono      = { workspace = true }
+anyhow      = { workspace = true }
+hex         = { workspace = true }
 
 [features]
 default = []
 
 [dev-dependencies]
-proptest = "1.6"
+proptest = { workspace = true }
diff --git a/zkvm/risc0/Cargo.lock b/zkvm/risc0/Cargo.lock

Original file line number	Diff line number	Diff line change
`@@ -210,13 +210,17 @@ mod tests {`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`	`{`
`213`		`- let pck_ca_crl = gen_crl_der(`
`214`		`- &pck_certchain.pck_cert_ca,`
`215`		`- &pck_certchain.pck_cert_ca_key,`
`216`		`- vec![tcb_certchain.cert.clone()],`
`217`		`- None,`
	`213`	`+ // Generate another TCB signing cert from root CA to use as revoked cert`
	`214`	`+ let another_tcb_key = gen_key();`
	`215`	`+ let another_tcb_cert = gen_tcb_signing_ca(`
	`216`	`+ &root_ca.cert,`
	`217`	`+ &root_ca.key,`
	`218`	`+ &another_tcb_key,`
	`219`	`+ Validity::new_with_duration(1730000001, 1000),`
`218`	`220`	`)`
`219`	`221`	`.unwrap();`
	`222`	`+ let root_ca_crl =`
	`223`	`+ gen_crl_der(&root_ca.cert, &root_ca.key, vec![another_tcb_cert], None).unwrap();`
`220`	`224`	`let crls = IntelSgxCrls::new(`
`221`	`225`	`CertificateRevocationList::from_der(root_ca_crl.as_ref())`
`222`	`226`	`.unwrap()`