Use attest repo to compute expected measurements from image hashes

crates/attestation/Cargo.toml

@@ -13,6 +13,8 @@ pccs = { workspace = true }
 mock-tdx = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["fs"] }
 tokio-rustls = { workspace = true, default-features = false }
+attest-types = { git = "https://github.com/easy-tee/attest.git", branch = "ah/better-interface" }
+attest-measure = {git = "https://github.com/easy-tee/attest.git", branch = "ah/better-interface" }
 
 anyhow = "1.0.100"
 pem-rfc7468 = { version = "0.7.0", features = ["std"] }

crates/attestation/src/azure/mod.rs

@@ -599,7 +599,7 @@ mod tests {
         .unwrap();
 
         assert_eq!(async_measurements, sync_measurements);
-        measurement_policy.check_measurement(&async_measurements).unwrap();
+        measurement_policy.check_measurement(&async_measurements, None).unwrap();
     }
 
     #[tokio::test]

crates/attestation/src/dcap.rs

@@ -1,5 +1,6 @@
 //! Data Center Attestation Primitives (DCAP) evidence generation and
 //! verification
+use attest_types::AttestationEvidence;
 use dcap_qvl::{
     QuoteCollateralV3,
     collateral::get_collateral_for_fmspc,
@@ -21,10 +22,12 @@ const AZURE_BAD_FMSPC: &str = "90C06F000000";
 pub const PCS_URL: &str = "https://api.trustedservices.intel.com";
 
 /// Generate a TDX quote
-pub fn create_dcap_attestation(input_data: [u8; 64]) -> Result<Vec<u8>, AttestationError> {
-    let quote = generate_quote(input_data)?;
-    tracing::info!("Generated TDX quote of {} bytes", quote.len());
-    Ok(quote)
+pub fn create_dcap_attestation(
+    input_data: [u8; 64],
+) -> Result<AttestationEvidence, AttestationError> {
+    let attestation_evidence = generate_quote(input_data)?;
+    tracing::info!("Generated TDX quote of {} bytes", attestation_evidence.quote.len());
+    Ok(attestation_evidence)
 }
 
 /// Verify a DCAP TDX quote, and return the measurement values
@@ -254,16 +257,19 @@ pub fn verify_dcap_attestation_sync(
 
 /// Create a mock quote for testing on non-confidential hardware
 #[cfg(any(test, feature = "mock"))]
-fn generate_quote(input: [u8; 64]) -> Result<Vec<u8>, tdx_attest::TdxAttestError> {
-    generate_mock_tdx_quote(input).map_err(|error| {
-        tdx_attest::TdxAttestError::QuoteFailure(format!("mock-tdx quote generation: {error}"))
-    })
+fn generate_quote(input: [u8; 64]) -> Result<AttestationEvidence, AttestationError> {
+    generate_mock_tdx_quote(input).map_err(|error| AttestationError::Mock(format!("{error}")))
 }
 
 /// Create a quote
 #[cfg(not(any(test, feature = "mock")))]
-fn generate_quote(input: [u8; 64]) -> Result<Vec<u8>, tdx_attest::TdxAttestError> {
-    tdx_attest::get_quote(&input)
+fn generate_quote(input: [u8; 64]) -> Result<AttestationEvidence, AttestationError> {
+    use attest_measure::platform;
+
+    Ok(AttestationEvidence {
+        quote: tdx_attest::get_quote(&input)?,
+        platform: platform::metadata_for(attest_types::AttestationType::GcpTdx)?,
+    })
 }
 
 /// Given a [Report] get the input data regardless of report type
@@ -363,7 +369,7 @@ mod tests {
         .unwrap();
 
         assert_eq!(async_measurements, sync_measurements);
-        measurement_policy.check_measurement(&async_measurements).unwrap();
+        measurement_policy.check_measurement(&async_measurements, None).unwrap();
     }
 
     // This specifically tests a quote which has outdated TCB level from Azure
@@ -407,10 +413,10 @@ mod tests {
         .unwrap();
         let pccs = Pccs::new(Some(mock_pcs.base_url.clone()));
         let expected_input_data = [0xA5; 64];
-        let attestation_bytes = create_dcap_attestation(expected_input_data).unwrap();
+        let attestation = create_dcap_attestation(expected_input_data).unwrap();
 
         let measurements =
-            verify_dcap_attestation(attestation_bytes, expected_input_data, Some(pccs))
+            verify_dcap_attestation(attestation.quote, expected_input_data, Some(pccs))
                 .await
                 .unwrap();