Attester: Update CSV evidence format

Signed-off-by: Jiale Zhang <[email protected]>

attestation-agent/attester/Cargo.toml

@@ -10,6 +10,7 @@ anyhow.workspace = true
 async-trait.workspace = true
 az-snp-vtpm = { git = "https://github.com/kinvolk/azure-cvm-tooling", rev = "2c2e411", default-features = false, features = ["attester"], optional = true }
 base64.workspace = true
+bincode = "1.3.3"
 kbs-types.workspace = true
 log.workspace = true
 nix = {version = "0.26.2", optional = true }

attestation-agent/attester/src/csv/mod.rs

@@ -7,12 +7,13 @@ use super::Attester;
 use anyhow::{bail, Context, Ok, Result};
 use codicon::Decoder;
 use csv_rs::{
-    api::guest::{AttestationReport, CsvGuest},
+    api::guest::CsvGuest,
     certs::{ca, csv},
 };
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 
+use base64::Engine;
 use hyper::body::HttpBody as _;
 use hyper::Client;
 use hyper_tls::HttpsConnector;
@@ -30,8 +31,11 @@ struct CertificateChain {
 
 #[derive(Serialize, Deserialize)]
 struct CsvEvidence {
-    attestation_report: AttestationReport,
+    // Base64 Encoded CSV AttestationReport Structure
+    attestation_report: String,
     cert_chain: CertificateChain,
+    // Base64 Encoded CSV Seriail Number (Used to identify HYGON chip ID)
+    serial_number: String,
 }
 
 #[derive(Debug, Default)]
@@ -56,9 +60,15 @@ impl Attester for CsvAttester {
         let cek = csv::Certificate::decode(&mut cert_data, ()).unwrap();
         let pek = csv::Certificate::decode(&mut &report_signer.pek_cert[..], ())?;
 
+        let attestation_report_bin =
+            bincode::serialize(&attestation_report).context("Serialize CSV report failed")?;
+
         let evidence = CsvEvidence {
-            attestation_report,
+            attestation_report: base64::engine::general_purpose::STANDARD
+                .encode(attestation_report_bin),
             cert_chain: CertificateChain { hsk, cek, pek },
+            serial_number: base64::engine::general_purpose::STANDARD
+                .encode(report_signer.sn.to_vec()),
         };
         serde_json::to_string(&evidence).context("Serialize CSV evidence failed")
     }