Merge pull request #27 from datachainlab/risc0-v3

Bump risc zero to v3.0

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

Author: bluele

.github/workflows/test.yml

@@ -30,12 +30,12 @@ jobs:
           curl -L https://risczero.com/install | bash
           echo "$HOME/.risc0/bin" >> $GITHUB_PATH
       - name: Install RISC Zero toolchain
-        run: rzup install rust && rzup install cargo-risczero 1.2.4
+        run: rzup install rust && rzup install cargo-risczero 3.0.3
       - run: . "/home/runner/.bashrc" && ZKDCAP_RISC0_BUILD=1 cargo build -r --manifest-path=./zkvm/risc0/Cargo.toml
       - run: git diff --exit-code
 
   test-i686:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - run: docker run -v .:/root/zkdcap -w /root/zkdcap -t i386/rust:1.84 cargo test
+      - run: docker run -v .:/root/zkdcap -w /root/zkdcap -t i386/rust:1.89 cargo test

crates/collaterals/src/utils.rs

@@ -52,7 +52,7 @@ pub fn p256_prvkey_to_pubkey_bytes(pkey: &PKeyRef<Private>) -> Result<[u8; 64],
     Ok(pubkey)
 }
 
-pub fn parse_cert_der(cert_der: &[u8]) -> Result<X509Certificate, anyhow::Error> {
+pub fn parse_cert_der(cert_der: &[u8]) -> Result<X509Certificate<'_>, anyhow::Error> {
     let (_, c) = X509Certificate::from_der(cert_der)?;
     Ok(c)
 }

crates/quote-verifier/src/cert.rs

@@ -61,7 +61,7 @@ impl BitAnd for KeyUsageFlags {
 }
 
 /// Parse a PEM-encoded certificate chain into a vector of `X509Certificate`.
-pub fn parse_certchain(pem_certs: &[Pem]) -> crate::Result<Vec<X509Certificate>> {
+pub fn parse_certchain(pem_certs: &[Pem]) -> crate::Result<Vec<X509Certificate<'_>>> {
     Ok(pem_certs
         .iter()
         .map(|pem| pem.parse_x509())
@@ -204,6 +204,7 @@ pub fn get_sgx_tdx_tcb_status_v3(
             if match_tdxtcbcomp(&tee_tcb_svn.unwrap(), tdxtcbcomponents) {
                 // Return advisory IDs associated with matched TDX TCB level
                 return Ok((
+                    #[allow(clippy::unnecessary_unwrap)]
                     sgx_tcb_status.unwrap(),
                     Some(TcbInfoV3TcbStatus::from_str(tcb_level.tcb_status.as_str())?),
                     tcb_level.advisory_ids.clone().unwrap_or_default(),

crates/quote-verifier/src/collateral.rs

@@ -145,22 +145,22 @@ impl QvCollateral {
     }
 
     /// Returns the SGX Intel Root CA certificate
-    pub fn get_sgx_intel_root_ca(&self) -> Result<X509Certificate> {
+    pub fn get_sgx_intel_root_ca(&self) -> Result<X509Certificate<'_>> {
         parse_x509_der(&self.sgx_intel_root_ca_der)
     }
 
     /// Returns the SGX TCB Signing certificate
-    pub fn get_sgx_tcb_signing(&self) -> Result<X509Certificate> {
+    pub fn get_sgx_tcb_signing(&self) -> Result<X509Certificate<'_>> {
         parse_x509_der(&self.sgx_tcb_signing_der)
     }
 
     /// Returns the SGX Intel Root CA CRL
-    pub fn get_sgx_intel_root_ca_crl(&self) -> Result<CertificateRevocationList> {
+    pub fn get_sgx_intel_root_ca_crl(&self) -> Result<CertificateRevocationList<'_>> {
         parse_crl_der(&self.sgx_intel_root_ca_crl_der)
     }
 
     /// Returns the SGX PCK Platform/Processor CA CRL
-    pub fn get_sgx_pck_crl(&self) -> Result<CertificateRevocationList> {
+    pub fn get_sgx_pck_crl(&self) -> Result<CertificateRevocationList<'_>> {
         parse_crl_der(&self.sgx_pck_crl_der)
     }
 }

crates/types/src/quotes/mod.rs

@@ -326,7 +326,7 @@ impl Certificates {
     }
 
     /// Get the certificates as a vector of X509Certificate.
-    pub fn get_certs(&self) -> Result<Vec<X509Certificate>> {
+    pub fn get_certs(&self) -> Result<Vec<X509Certificate<'_>>> {
         parse_x509_der_multi(&self.certs_der)
     }
 }

crates/types/src/utils.rs

@@ -20,17 +20,17 @@ pub fn parse_pem(raw_bytes: &[u8]) -> Result<Vec<Pem>, PEMError> {
     Pem::iter_from_buffer(raw_bytes).collect()
 }
 
-pub fn parse_crl_der(raw_bytes: &[u8]) -> crate::Result<CertificateRevocationList> {
+pub fn parse_crl_der(raw_bytes: &[u8]) -> crate::Result<CertificateRevocationList<'_>> {
     let (_, crl) = CertificateRevocationList::from_der(raw_bytes)?;
     Ok(crl)
 }
 
-pub fn parse_x509_der(raw_bytes: &[u8]) -> crate::Result<X509Certificate> {
+pub fn parse_x509_der(raw_bytes: &[u8]) -> crate::Result<X509Certificate<'_>> {
     let (_, cert) = X509Certificate::from_der(raw_bytes)?;
     Ok(cert)
 }
 
-pub fn parse_x509_der_multi(raw_bytes: &[u8]) -> crate::Result<Vec<X509Certificate>> {
+pub fn parse_x509_der_multi(raw_bytes: &[u8]) -> crate::Result<Vec<X509Certificate<'_>>> {
     let mut certs = Vec::new();
     let mut i = raw_bytes;
     while !i.is_empty() {