[RTE-659] Adding TDX Collateral collection in the dcap-artifact-retrieval and pcs crate

intel-sgx/dcap-artifact-retrieval/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dcap-artifact-retrieval"
-version = "0.4.2"
+version = "0.5.0"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 edition = "2018"
@@ -28,7 +28,7 @@ mbedtls = { version = ">=0.12.0, <0.14.0", features = [
     "std",
 ], default-features = false }
 num_enum = { version = "0.7", features = ["complex-expressions"] }
-pcs = { version = "0.7.3", path = "../pcs" }
+pcs = { version = "0.8", path = "../pcs" }
 percent-encoding = "2.3.2"
 pkix = "0.2.0"
 quick-error = "1.1.0"
@@ -44,7 +44,7 @@ rustls-tls = ["reqwest?/rustls-tls"]
 
 [dev-dependencies]
 yasna = { version = "0.3", features = ["num-bigint", "bit-vec"] }
-pcs = { version = "0.7", path = "../pcs", features = ["verify"] }
+pcs = { version = "0.8", path = "../pcs", features = ["verify"] }
 
 [build-dependencies]
 mbedtls = { version = ">=0.12.0, <0.14.0", features = ["ssl", "x509"] }

intel-sgx/dcap-artifact-retrieval/src/cli.rs

@@ -8,7 +8,7 @@
 use std::path::{Path, PathBuf};
 
 use clap::clap_app;
-use pcs::{PckID, DcapArtifactIssuer};
+use pcs::{PckID, DcapArtifactIssuer, WriteOptionsBuilder};
 use reqwest::Url;
 use rustc_serialize::hex::ToHex;
 use serde::de::{value, IntoDeserializer};
@@ -32,7 +32,7 @@ enum Origin {
     Pccs,
 }
 
-fn str_deserialize(s: &str) -> value::StrDeserializer<value::Error> {
+fn str_deserialize<'a>(s: &'a str) -> value::StrDeserializer<'a, value::Error> {
     s.into_deserializer()
 }
 
@@ -72,30 +72,30 @@ fn download_dcap_artifacts(
         // instead we mimic it using pckcert API.
         let pckcerts = prov_client.pckcerts_with_fallback(&pckid)?;
 
-        let pckcerts_file = pckcerts.store(output_dir, pckid.qe_id.as_slice())?;
+        let pckcerts_file = pckcerts.write_to_file(output_dir, pckid.qe_id.as_slice(), WriteOptionsBuilder::new().build())?;
 
         if verbose {
-            println!("   pckcerts:    {}", pckcerts_file);
+            println!("   pckcerts:    {}", pckcerts_file.unwrap().display());
         }
 
         let fmspc = pckcerts.fmspc()?;
         let evaluation_data_numbers = prov_client
-            .tcb_evaluation_data_numbers()?;
+            .sgx_tcb_evaluation_data_numbers()?;
 
-        let file = evaluation_data_numbers.write_to_file(output_dir)?;
+        let file = evaluation_data_numbers.write_to_file(output_dir, WriteOptionsBuilder::new().build())?;
         if verbose {
-            println!("   tcb evaluation data numbers:    {}\n", file);
+            println!("   tcb evaluation data numbers:    {}\n", file.unwrap().display());
         }
 
         for number in evaluation_data_numbers.evaluation_data_numbers()?.numbers() {
             let tcb_info = prov_client
-                .tcbinfo(&fmspc, Some(number.number()));
+                .sgx_tcbinfo(&fmspc, Some(number.number()));
 
             match tcb_info {
                 Ok(tcb_info) => {
-                    let file = tcb_info.store(output_dir)?;
+                    let file = tcb_info.write_to_file(output_dir, WriteOptionsBuilder::new().build())?;
                     if verbose {
-                        println!("   tcb info:    {}", file);
+                        println!("   tcb info:    {}", file.unwrap().display());
                     }
                 },
                 Err(Error::PCSError(StatusCode::Gone, _)) => {
@@ -114,9 +114,9 @@ fn download_dcap_artifacts(
 
             match qe_identity {
                 Ok(qe_identity) => {
-                    let file = qe_identity.write_to_file(output_dir)?;
+                    let file = qe_identity.write_to_file(output_dir, WriteOptionsBuilder::new().build())?;
                     if verbose {
-                        println!("   qe identity: {}\n", file);
+                        println!("   qe identity: {}\n", file.unwrap().display());
                     }
                 }
                 Err(Error::PCSError(StatusCode::Gone, _)) => {
@@ -132,17 +132,17 @@ fn download_dcap_artifacts(
     }
     let pckcrl = prov_client
         .pckcrl(DcapArtifactIssuer::PCKProcessorCA)
-        .and_then(|crl| crl.write_to_file_as(output_dir, DcapArtifactIssuer::PCKProcessorCA).map_err(|e| e.into()))?;
+        .and_then(|crl| crl.write_to_file_as(output_dir, DcapArtifactIssuer::PCKProcessorCA, WriteOptionsBuilder::new().build()).map_err(|e| e.into()))?;
     if verbose {
         println!("==[ generic ]==");
-        println!("   PCKProcessorCA Crl:      {}", pckcrl);
+        println!("   PCKProcessorCA Crl:      {}", pckcrl.unwrap().display());
     }
 
     let pckcrl = prov_client
         .pckcrl(DcapArtifactIssuer::PCKPlatformCA)
-        .and_then(|crl| crl.write_to_file_as(output_dir, DcapArtifactIssuer::PCKPlatformCA).map_err(|e| e.into()))?;
+        .and_then(|crl| crl.write_to_file_as(output_dir, DcapArtifactIssuer::PCKPlatformCA, WriteOptionsBuilder::new().build()).map_err(|e| e.into()))?;
     if verbose {
-        println!("   PCKPlatformCA Crl:      {}", pckcrl);
+        println!("   PCKPlatformCA Crl:      {}", pckcrl.unwrap().display());
     }
     Ok(())
 }

intel-sgx/dcap-artifact-retrieval/src/provisioning_client/azure.rs

@@ -46,10 +46,13 @@ impl AzureProvisioningClientBuilder {
         let pck_cert = PckCertApi::new(self.api_version.clone());
         let pck_crl = PckCrlApi::new(self.api_version.clone());
         let qeid = QeIdApi::new(self.api_version.clone());
-        let tcbinfo = TcbInfoApi::new(self.api_version.clone());
-        let evaluation_data_numbers = TcbEvaluationDataNumbersApi::new(INTEL_BASE_URL.into());
+        let sgx_tcbinfo = TcbInfoApi::new(self.api_version.clone());
+        let tdx_tcbinfo = TcbInfoApi::new(self.api_version.clone());
+        let sgx_evaluation_data_numbers = TcbEvaluationDataNumbersApi::new(INTEL_BASE_URL.into());
+        let tdx_evaluation_data_numbers = TcbEvaluationDataNumbersApi::new(INTEL_BASE_URL.into());
+
         self.client_builder
-            .build(pck_certs, pck_cert, pck_crl, qeid, tcbinfo, evaluation_data_numbers, fetcher)
+            .build(pck_certs, pck_cert, pck_crl, qeid, sgx_tcbinfo, tdx_tcbinfo, sgx_evaluation_data_numbers, tdx_evaluation_data_numbers, fetcher)
     }
 }
 
@@ -239,7 +242,7 @@ mod tests {
                 );
 
                 let fmspc = pck.fmspc().unwrap();
-                assert!(client.tcbinfo(&fmspc, None).is_ok());
+                assert!(client.sgx_tcbinfo(&fmspc, None).is_ok());
             }
         }
     }
@@ -279,7 +282,7 @@ mod tests {
                 let pckcerts = client.pckcerts_with_fallback(&pckid).unwrap();
                 println!("Found {} PCK certs.", pckcerts.as_pck_certs().len());
 
-                let tcb_info = client.tcbinfo(&pckcerts.fmspc().unwrap(), None).unwrap();
+                let tcb_info = client.sgx_tcbinfo(&pckcerts.fmspc().unwrap(), None).unwrap();
                 let tcb_data = tcb_info.data().unwrap();
 
                 let selected = pckcerts.select_pck(
@@ -304,12 +307,12 @@ mod tests {
     }
 
     #[test]
-    pub fn tcb_evaluation_data_numbers() {
+    pub fn sgx_tcb_evaluation_data_numbers() {
         for api_version in [PcsVersion::V3, PcsVersion::V4] {
             let client = AzureProvisioningClientBuilder::new(api_version)
                 .set_retry_timeout(TIME_RETRY_TIMEOUT)
                 .build(reqwest_client());
-            assert!(client.tcb_evaluation_data_numbers().is_ok());
+            assert!(client.sgx_tcb_evaluation_data_numbers().is_ok());
         }
     }
 }