Use CpuSvn from mc-sgx-core-types (#3441)

Previously there was a `CpuSecurityVersion` defined in `mc-attest-core`.
Now the `CpuSvn` from `mc-sgx-core-types` is used.

attest/core/data/test/quote_ok_str.txt

@@ -1 +1 @@
-Quote: { version: 2, sign_type: Unlinkable, epid_group_id: 00000b4d, qe_svn: 8, pce_svn: 7, xeid: 0, basename: Basename(b6b3ee840b3fb5a6a2b14c54221aab6aad6bd3cd49db38f2b12d2c37b8943eda), report_body: ReportBody: { cpu_svn: CpuSecurityVersion(0808ffffff0201000000000000000000), misc_select: 0, isv_ext_prod_id: ExtendedProductId(00000000000000000000000000000000), attributes: Attributes(sgx_attributes_t { flags: 7, xfrm: 7 }), mr_enclave: MrEnclave(973140462e17d2f523511d798061eae3e8282b884ee078de91c99d833f559bbc), mr_signer: MrSigner(7ee5e29d74623fdbc6fbf1454be6f3bb0b86c12366b7b478ad13353e44de8411), config_id: ConfigId([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]), isv_prod_id: 0, isv_svn: IsvSvn(0), config_svn: ConfigSvn(0), isv_family_id: FamilyId(00000000000000000000000000000000), report_data: ReportData(sgx_report_data_t { d: [231, 160, 220, 27, 37, 176, 225, 77, 21, 108, 159, 18, 130, 15, 61, 34, 104, 25, 253, 104, 242, 55, 106, 203, 247, 61, 64, 28, 149, 154, 85, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }) }, signature_len: 680, signature: Some(146c25c134df61f2f55fbba368333e1c77b3524f483212f90b89d6432a21ab2adcfdbeaeb816bdb7a988a67b502c92e7b4a683b88df6ffc649d24e75d61dbfcf8aa09e22da5fb84b24fa1908f8d338277bbf8dc3c6e060ace551b7eaf2d3fdbbfc38905d0ed9d4cd28657f07ce4d5ba9e405a597c534484b4e38c54d5f9a7bcc602373f96a2962c51b60162b28c30d8a374d12f3f46ec5970699c39e8e7a3527443c65cd56abf0ad1153426e0ba32edf84070f2bfa3a32a7463bcdaec0c46ce9337899c1399e68b04ed36409c49bddd2db2bfc40ff7a1b281e2c4fa9607c678ffa4f7a7d93cfd4610047eeb62755861240eed273158c33dd17f539d248a1b3a197d986f9c52d43a246060a6a3bff21e971d82f1bfec654b31265f0e980a54a29e2ba8aca6bffe27668dd21a268010000d46a0dc1ffc4986b994b0b6efd610637d7b22bf21888c6296a9a538cadb8ac5d8f4156ac01db17579b90acd4e130f5865373a84d2ea131ee4f326d169d41d1b552daaa4c514c8ae1245185bccf4f4c9b6b5f3e3cec93216cd1ae023f03155fbf05ff0701b7fadd29a1f097318b9ba2a416e86d3131859c7aea45c58cda4a5a6fa833eabcf0a520d7342d514dbd5c9fa85ed89d8e85342a3b6f1bc1144c11102cd6409e9e93ee672ebffed9b17b0e766a9556ff0bc0da5baac91de39d1deacc35e4036795bd5ebfe7c2e8392921757f2355fdb5ff0c3d6885712cf399d0598a95df36ea34f10f3e4906043d913449d24e12228583d0713aed8a54c530cdc4c28acfc916fe7ba96be700ed2eccb3ba6874a1badd2a1ef80bac9169305666b33091f8ad935e31d3ed33251642787b161e0322d891e3a1fa171251783b61b3b33e5dffaba9010ee33e445840e0e493799d7281a681d86b1afd05cfd90b2eaf0584bccf7eefe5d9747a2e52a0e5c7a0a5d2ff1f1af590d7064abd) }
+Quote: { version: 2, sign_type: Unlinkable, epid_group_id: 00000b4d, qe_svn: 8, pce_svn: 7, xeid: 0, basename: Basename(b6b3ee840b3fb5a6a2b14c54221aab6aad6bd3cd49db38f2b12d2c37b8943eda), report_body: ReportBody: { cpu_svn: CpuSvn(sgx_cpu_svn_t { svn: [8, 8, 255, 255, 255, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0] }), misc_select: 0, isv_ext_prod_id: ExtendedProductId(00000000000000000000000000000000), attributes: Attributes(sgx_attributes_t { flags: 7, xfrm: 7 }), mr_enclave: MrEnclave(973140462e17d2f523511d798061eae3e8282b884ee078de91c99d833f559bbc), mr_signer: MrSigner(7ee5e29d74623fdbc6fbf1454be6f3bb0b86c12366b7b478ad13353e44de8411), config_id: ConfigId([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]), isv_prod_id: 0, isv_svn: IsvSvn(0), config_svn: ConfigSvn(0), isv_family_id: FamilyId(00000000000000000000000000000000), report_data: ReportData(sgx_report_data_t { d: [231, 160, 220, 27, 37, 176, 225, 77, 21, 108, 159, 18, 130, 15, 61, 34, 104, 25, 253, 104, 242, 55, 106, 203, 247, 61, 64, 28, 149, 154, 85, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }) }, signature_len: 680, signature: Some(146c25c134df61f2f55fbba368333e1c77b3524f483212f90b89d6432a21ab2adcfdbeaeb816bdb7a988a67b502c92e7b4a683b88df6ffc649d24e75d61dbfcf8aa09e22da5fb84b24fa1908f8d338277bbf8dc3c6e060ace551b7eaf2d3fdbbfc38905d0ed9d4cd28657f07ce4d5ba9e405a597c534484b4e38c54d5f9a7bcc602373f96a2962c51b60162b28c30d8a374d12f3f46ec5970699c39e8e7a3527443c65cd56abf0ad1153426e0ba32edf84070f2bfa3a32a7463bcdaec0c46ce9337899c1399e68b04ed36409c49bddd2db2bfc40ff7a1b281e2c4fa9607c678ffa4f7a7d93cfd4610047eeb62755861240eed273158c33dd17f539d248a1b3a197d986f9c52d43a246060a6a3bff21e971d82f1bfec654b31265f0e980a54a29e2ba8aca6bffe27668dd21a268010000d46a0dc1ffc4986b994b0b6efd610637d7b22bf21888c6296a9a538cadb8ac5d8f4156ac01db17579b90acd4e130f5865373a84d2ea131ee4f326d169d41d1b552daaa4c514c8ae1245185bccf4f4c9b6b5f3e3cec93216cd1ae023f03155fbf05ff0701b7fadd29a1f097318b9ba2a416e86d3131859c7aea45c58cda4a5a6fa833eabcf0a520d7342d514dbd5c9fa85ed89d8e85342a3b6f1bc1144c11102cd6409e9e93ee672ebffed9b17b0e766a9556ff0bc0da5baac91de39d1deacc35e4036795bd5ebfe7c2e8392921757f2355fdb5ff0c3d6885712cf399d0598a95df36ea34f10f3e4906043d913449d24e12228583d0713aed8a54c530cdc4c28acfc916fe7ba96be700ed2eccb3ba6874a1badd2a1ef80bac9169305666b33091f8ad935e31d3ed33251642787b161e0322d891e3a1fa171251783b61b3b33e5dffaba9010ee33e445840e0e493799d7281a681d86b1afd05cfd90b2eaf0584bccf7eefe5d9747a2e52a0e5c7a0a5d2ff1f1af590d7064abd) }

attest/core/src/lib.rs

@@ -35,17 +35,17 @@ pub use crate::{
     seal::{IntelSealed, IntelSealingError, ParseSealedError, Sealed},
     sigrl::SigRL,
     types::{
-        basename::Basename, cpu_svn::CpuSecurityVersion, epid_group_id::EpidGroupId,
-        ext_prod_id::ExtendedProductId, family_id::FamilyId, key_id::KeyId, mac::Mac,
-        measurement::Measurement, pib::PlatformInfoBlob, report_body::ReportBody,
-        report_data::ReportDataMask, spid::ProviderId, update_info::*, MiscSelect, ProductId,
+        basename::Basename, epid_group_id::EpidGroupId, ext_prod_id::ExtendedProductId,
+        family_id::FamilyId, key_id::KeyId, mac::Mac, measurement::Measurement,
+        pib::PlatformInfoBlob, report_body::ReportBody, report_data::ReportDataMask,
+        spid::ProviderId, update_info::*, MiscSelect, ProductId,
     },
 };
 
 pub use mc_attest_verifier_types::{VerificationReport, VerificationSignature};
 
 pub use mc_sgx_core_types::{
-    Attributes, ConfigId, ConfigSvn, IsvSvn, MrEnclave, MrSigner, ReportData, TargetInfo,
+    Attributes, ConfigId, ConfigSvn, CpuSvn, IsvSvn, MrEnclave, MrSigner, ReportData, TargetInfo,
 };
 
 /// The IAS version we support

attest/core/src/report.rs

@@ -204,7 +204,7 @@ mod test {
         },
     };
 
-    const TEST_REPORT_DEBUGSTR: &str = "Report: { body: ReportBody: { cpu_svn: CpuSecurityVersion(0102030405060708090a0b0c0d0e0f10), misc_select: 17, isv_ext_prod_id: ExtendedProductId(0102030405060708090a0b0c0d0e0f10), attributes: Attributes(sgx_attributes_t { flags: 72623859790382856, xfrm: 578437695752307201 }), mr_enclave: MrEnclave(1112131415161718191a1b1c1d1e1f202122232425262728292a2b2b2c2d2e2f), mr_signer: MrSigner(303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f), config_id: ConfigId([80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143]), isv_prod_id: 144, isv_svn: IsvSvn(145), config_svn: ConfigSvn(146), isv_family_id: FamilyId(939495969798999a9b9c9d9e9fa0a1a2), report_data: ReportData(sgx_report_data_t { d: [163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226] }) }, key: KeyId(0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20), mac: Mac(0102030405060708090a0b0c0d0e0f10) }";
+    const TEST_REPORT_DEBUGSTR: &str = "Report: { body: ReportBody: { cpu_svn: CpuSvn(sgx_cpu_svn_t { svn: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] }), misc_select: 17, isv_ext_prod_id: ExtendedProductId(0102030405060708090a0b0c0d0e0f10), attributes: Attributes(sgx_attributes_t { flags: 72623859790382856, xfrm: 578437695752307201 }), mr_enclave: MrEnclave(1112131415161718191a1b1c1d1e1f202122232425262728292a2b2b2c2d2e2f), mr_signer: MrSigner(303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f), config_id: ConfigId([80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143]), isv_prod_id: 144, isv_svn: IsvSvn(145), config_svn: ConfigSvn(146), isv_family_id: FamilyId(939495969798999a9b9c9d9e9fa0a1a2), report_data: ReportData(sgx_report_data_t { d: [163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226] }) }, key: KeyId(0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20), mac: Mac(0102030405060708090a0b0c0d0e0f10) }";
 
     #[test]
     fn test_serde() {

attest/core/src/types.rs

@@ -4,7 +4,6 @@
 //! or in multiple places.
 
 pub mod basename;
-pub mod cpu_svn;
 pub mod epid_group_id;
 pub mod ext_prod_id;
 pub mod family_id;

attest/core/src/types/report_body.rs

@@ -7,10 +7,10 @@ use crate::{
     impl_sgx_wrapper_reqs,
     traits::SgxWrapperType,
     types::{
-        cpu_svn::CpuSecurityVersion, ext_prod_id::ExtendedProductId, family_id::FamilyId,
-        measurement::Measurement, report_data::ReportDataMask, MiscSelect, ProductId,
+        ext_prod_id::ExtendedProductId, family_id::FamilyId, measurement::Measurement,
+        report_data::ReportDataMask, MiscSelect, ProductId,
     },
-    Attributes, ConfigId, ConfigSvn, IsvSvn, ReportData,
+    Attributes, ConfigId, ConfigSvn, CpuSvn, IsvSvn, ReportData,
 };
 use alloc::vec::Vec;
 use core::{
@@ -20,12 +20,14 @@ use core::{
     mem::size_of,
 };
 use mc_sgx_core_types::{AttributeFlags, MrEnclave, MrSigner};
-use mc_sgx_types::{sgx_attributes_t, sgx_measurement_t, sgx_report_body_t, SGX_CONFIGID_SIZE};
+use mc_sgx_types::{
+    sgx_attributes_t, sgx_cpu_svn_t, sgx_measurement_t, sgx_report_body_t, SGX_CONFIGID_SIZE,
+};
 use mc_util_encodings::{Error as EncodingError, IntelLayout};
 
 // Offsets of various fields in a sgx_report_body_t with x86_64 layout
 const RB_CPUSVN_START: usize = 0;
-const RB_CPUSVN_END: usize = RB_CPUSVN_START + <CpuSecurityVersion as IntelLayout>::X86_64_CSIZE;
+const RB_CPUSVN_END: usize = RB_CPUSVN_START + CpuSvn::SIZE;
 const RB_SELECT_START: usize = RB_CPUSVN_END;
 const RB_SELECT_END: usize = RB_SELECT_START + size_of::<u32>();
 const RB_RESERVED1_START: usize = RB_SELECT_END;
@@ -92,7 +94,7 @@ impl ReportBody {
 
     /// Retrieve the security version of the CPU the report was generated
     /// on
-    pub fn cpu_security_version(&self) -> CpuSecurityVersion {
+    pub fn cpu_security_version(&self) -> CpuSvn {
         self.0.cpu_svn.into()
     }
 
@@ -287,10 +289,7 @@ impl SgxWrapperType<sgx_report_body_t> for ReportBody {
             return Err(EncodingError::InvalidOutputLength);
         }
 
-        CpuSecurityVersion::write_ffi_bytes(
-            &src.cpu_svn,
-            &mut dest[RB_CPUSVN_START..RB_CPUSVN_END],
-        )?;
+        dest[RB_CPUSVN_START..RB_CPUSVN_END].copy_from_slice(src.cpu_svn.svn.as_ref());
         dest[RB_SELECT_START..RB_SELECT_END].copy_from_slice(&src.misc_select.to_le_bytes());
         ExtendedProductId::write_ffi_bytes(
             &src.isv_ext_prod_id,
@@ -333,7 +332,9 @@ impl<'src> TryFrom<&'src [u8]> for ReportBody {
         reserved4[..].copy_from_slice(&src[RB_RESERVED4_START..RB_RESERVED4_END]);
 
         Ok(Self(sgx_report_body_t {
-            cpu_svn: CpuSecurityVersion::try_from(&src[RB_CPUSVN_START..RB_CPUSVN_END])?.into(),
+            cpu_svn: sgx_cpu_svn_t {
+                svn: src[RB_CPUSVN_START..RB_CPUSVN_END].try_into().unwrap(),
+            },
             misc_select: u32::from_le_bytes(
                 (&src[RB_SELECT_START..RB_SELECT_END]).try_into().unwrap(),
             ),

attest/verifier/src/lib.rs

@@ -71,8 +71,8 @@ use displaydoc::Display;
 use hex_fmt::HexList;
 use mbedtls::{alloc::Box as MbedtlsBox, x509::Certificate, Error as TlsError};
 use mc_attest_core::{
-    Attributes, Basename, ConfigId, ConfigSvn, CpuSecurityVersion, EpidGroupId, ExtendedProductId,
-    FamilyId, IasNonce, IsvSvn, MiscSelect, ProductId, Quote, QuoteSignType, ReportDataMask,
+    Attributes, Basename, ConfigId, ConfigSvn, CpuSvn, EpidGroupId, ExtendedProductId, FamilyId,
+    IasNonce, IsvSvn, MiscSelect, ProductId, Quote, QuoteSignType, ReportDataMask,
     VerificationReport, VerificationReportData, VerifyError,
 };
 use mc_attestation_verifier::TrustedIdentity;
@@ -293,8 +293,8 @@ impl Verifier {
     }
 
     /// Verify the report body CPU version is at least the given value.
-    pub fn cpu_version(&mut self, cpu_svn: &CpuSecurityVersion) -> &mut Self {
-        self.report_body_verifiers.push((*cpu_svn).into());
+    pub fn cpu_version(&mut self, cpu_svn: &CpuSvn) -> &mut Self {
+        self.report_body_verifiers.push(cpu_svn.clone().into());
         self
     }
 

attest/verifier/src/report_body.rs

@@ -8,8 +8,8 @@ use crate::{
     Verify,
 };
 use mc_attest_core::{
-    Attributes, ConfigId, ConfigSvn, CpuSecurityVersion, ExtendedProductId, FamilyId, IsvSvn,
-    MiscSelect, ProductId, ReportBody, ReportDataMask,
+    Attributes, ConfigId, ConfigSvn, CpuSvn, ExtendedProductId, FamilyId, IsvSvn, MiscSelect,
+    ProductId, ReportBody, ReportDataMask,
 };
 use mc_sgx_core_types::AttributeFlags;
 use serde::{Deserialize, Serialize};
@@ -44,7 +44,7 @@ pub enum Kind {
 impl_kind_from_inner! {
     AttributesVerifier, Attributes, Attributes;
     ConfigIdVerifier, ConfigId, ConfigId;
-    CpuVersionVerifier, CpuVersion, CpuSecurityVersion;
+    CpuVersionVerifier, CpuVersion, CpuSvn;
     DataVerifier, Data, ReportDataMask;
     ExtendedProductIdVerifier, ExtendedProductId, ExtendedProductId;
     FamilyIdVerifier, FamilyId, FamilyId;
@@ -112,8 +112,8 @@ impl Verify<ReportBody> for ConfigVersionVerifier {
 
 /// A [`Verify<ReportBody>`] implementation that will check if the cpu version
 /// is at least the version specified.
-#[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
-pub struct CpuVersionVerifier(CpuSecurityVersion);
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub struct CpuVersionVerifier(CpuSvn);
 
 impl Verify<ReportBody> for CpuVersionVerifier {
     fn verify(&self, report_body: &ReportBody) -> bool {
@@ -334,7 +334,7 @@ mod test {
     #[test]
     fn cpu_svn_eq_pass() {
         let report_body = ReportBody::from(&REPORT_BODY_SRC);
-        let verifier = Kind::from(CpuSecurityVersion::from(REPORT_BODY_SRC.cpu_svn));
+        let verifier = Kind::from(CpuSvn::from(REPORT_BODY_SRC.cpu_svn));
 
         assert!(verifier.verify(&report_body));
     }
@@ -345,7 +345,7 @@ mod test {
         let report_body = ReportBody::from(&REPORT_BODY_SRC);
         let mut cpu_svn = REPORT_BODY_SRC.cpu_svn;
         cpu_svn.svn[0] = 0;
-        let verifier = Kind::from(CpuSecurityVersion::from(cpu_svn));
+        let verifier = Kind::from(CpuSvn::from(cpu_svn));
 
         assert!(verifier.verify(&report_body));
     }
@@ -356,7 +356,7 @@ mod test {
         let report_body = ReportBody::from(&REPORT_BODY_SRC);
         let mut cpu_svn = REPORT_BODY_SRC.cpu_svn;
         cpu_svn.svn[0] = 0xff;
-        let verifier = Kind::from(CpuSecurityVersion::from(cpu_svn));
+        let verifier = Kind::from(CpuSvn::from(cpu_svn));
 
         assert!(!verifier.verify(&report_body));
     }

sgx/types/src/types.rs

@@ -31,7 +31,7 @@ use error::*;
 use marker::ContiguousMemory;
 
 extern crate mc_sgx_core_sys_types;
-pub use self::mc_sgx_core_sys_types::{sgx_target_info_t, sgx_report_data_t, sgx_attributes_t, sgx_isv_svn_t, sgx_config_svn_t};
+pub use self::mc_sgx_core_sys_types::{sgx_target_info_t, sgx_report_data_t, sgx_attributes_t, sgx_isv_svn_t, sgx_config_svn_t, sgx_cpu_svn_t};
 
 //
 // sgx_attributes.h
@@ -210,10 +210,6 @@ pub type sgx_config_id_t = [::uint8_t; SGX_CONFIGID_SIZE];
 
 impl_struct! {
 
-    pub struct sgx_cpu_svn_t {
-        pub svn: [::uint8_t; SGX_CPUSVN_SIZE],
-    }
-
     pub struct sgx_key_id_t {
         pub id: [::uint8_t; SGX_KEYID_SIZE],
     }