Dcap Evidence Serialization

attest/core/src/lib.rs

@@ -39,7 +39,9 @@ pub use crate::{
     },
 };
 
-pub use mc_attest_verifier_types::{VerificationReport, VerificationSignature};
+pub use mc_attest_verifier_types::{
+    DcapEvidence, EvidenceMessage, VerificationReport, VerificationSignature,
+};
 
 pub use mc_sgx_core_types::{
     Attributes, ConfigId, ConfigSvn, CpuSvn, ExtendedProductId, FamilyId, IsvProductId, IsvSvn,

attest/untrusted/Cargo.toml

@@ -17,7 +17,8 @@ cfg-if = "1.0"
 displaydoc = { version = "0.2", default-features = false }
 mc-attest-core = { path = "../core", default-features = false }
 mc-attest-verifier = { path = "../verifier", default-features = false }
-mc-attestation-verifier = "0.3.1"
+mc-attest-verifier-types = { path = "../verifier/types", default-features = false }
+mc-attestation-verifier = "0.3.0"
 mc-rand = "1.1.0"
 mc-sgx-core-types = "0.7.4"
 mc-sgx-dcap-ql = "0.7.4"
@@ -28,7 +29,8 @@ p256 = { version = "0.13.0", default-features = false, features = ["ecdsa", "pem
 sha2 = { version = "0.10.6", default-features = false }
 
 [dev-dependencies]
-mc-attest-verifier-types = { path = "../verifier/types", default-features = false }
+mc-util-serial = { path = "../../util/serial" }
+prost = { version = "0.11", default-features = false, features = ["prost-derive"] }
 x509-cert = { version = "0.2.4", default-features = false, features = ["pem"] }
 
 [build-dependencies]

attest/untrusted/src/sim.rs

@@ -205,11 +205,13 @@ fn c_struct_as_bytes<T>(c_struct: &T) -> &[u8] {
 #[cfg(test)]
 mod test {
     use super::*;
+    use mc_attest_core::DcapEvidence;
     use mc_attest_verifier::DcapVerifier;
     use mc_attest_verifier_types::EnclaveReportDataContents;
     use mc_attestation_verifier::{Evidence, TrustedMrEnclaveIdentity};
     use mc_sgx_dcap_types::{CertificationData, TcbInfo};
     use p256::pkcs8::der::DateTime;
+    use prost::Message;
     use std::time::{SystemTime, UNIX_EPOCH};
     use x509_cert::{der::DecodePem, Certificate};
 
@@ -270,4 +272,28 @@ mod test {
         let verification = verifier.verify(evidence);
         assert_eq!(verification.is_success().unwrap_u8(), 1);
     }
+
+    #[test]
+    fn test_dcap_evidence_serialization() {
+        let mut buf: Vec<u8> = vec![];
+        let uut: DcapEvidence = Default::default();
+        uut.encode(&mut buf)
+            .expect("Failed to encode empty DcapEvidence");
+        let decoded =
+            DcapEvidence::decode(buf.as_slice()).expect("Failed to decode empty DcapEvidence");
+        assert_eq!(uut, decoded);
+        buf.clear();
+        let report = Report::default();
+        let quote = SimQuotingEnclave::quote_report(&report).expect("Failed to create quote");
+        let collateral = SimQuotingEnclave::collateral(&quote);
+        let mut uut = DcapEvidence {
+            quote: Some(quote),
+            collateral: Some(collateral),
+        };
+        uut.encode(&mut buf).expect("Failed to encode DcapEvidence");
+        let decoded = DcapEvidence::decode(buf.as_slice()).expect("Failed to decode DcapEvidence");
+        assert_eq!(uut, decoded);
+        uut.clear();
+        assert_eq!(DcapEvidence::default(), uut);
+    }
 }

attest/verifier/types/Cargo.toml

@@ -8,11 +8,13 @@ license = "Apache-2.0"
 rust-version = { workspace = true }
 
 [dependencies]
+mc-attestation-verifier = "0.2.0"
 mc-crypto-digestible = { path = "../../../crypto/digestible" }
 mc-crypto-keys = { path = "../../../crypto/keys" }
 mc-sgx-core-types = "0.7.4"
 mc-sgx-dcap-types = { version = "0.7.4", default-features = false, features = ["alloc"] }
 mc-util-encodings = { path = "../../../util/encodings" }
+mc-util-serial = { path = "../../../util/serial" }
 
 base64 = { version = "0.21", default-features = false, features = ["alloc"] }
 displaydoc = { version = "0.2", default-features = false }

attest/verifier/types/src/lib.rs

@@ -7,5 +7,6 @@ extern crate alloc;
 mod verification;
 
 pub use crate::verification::{
-    EnclaveReportDataContents, VerificationReport, VerificationSignature,
+    DcapEvidence, EnclaveReportDataContents, EvidenceMessage, VerificationReport,
+    VerificationSignature,
 };