Merge branch 'main' of github.com:microsoft/CCF into multi_threaded_s…

…np_take2
microsoft · Feb 20, 2025 · f9d1b38 · f9d1b38
2 parents 0e93076 + 4d3b6ec
commit f9d1b38
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/long-test.yml b/.github/workflows/long-test.yml
@@ -324,5 +324,5 @@ jobs:
           # Unit tests
           ./tests.sh --output-on-failure -L unit -j$(nproc --all)
           # All e2e tests, which are now supported on Mariner.
-          ./tests.sh --timeout 1600 --output-on-failure -LE "benchmark|lts_compatibility"
+          ./tests.sh --timeout 1600 --output-on-failure -LE "benchmark"
         shell: bash
diff --git a/cmake/cpack_settings.cmake b/cmake/cpack_settings.cmake
@@ -61,7 +61,7 @@ set(CPACK_RPM_PACKAGE_REQUIRES "${CCF_RPM_DEPENDENCIES}")
 # Default is formed as `name + version + release + architecture` joined via `-`.
 # To keep consistent release naming, we want - package name as  `name + version
 # + architecture` - output format via underscore:
-# `name_version_release_architecture.rpm`
+# `name_version_architecture.rpm`
 
 # CPACK_RPM_PACKAGE_ARCHITECTURE is empty for some reason, however it should be
 # set to `uname -m` output, see

diff --git a/include/ccf/pal/attestation.h b/include/ccf/pal/attestation.h
@@ -63,12 +63,12 @@ namespace ccf::pal
     auto quote =
       *reinterpret_cast<const snp::Attestation*>(quote_info.quote.data());
 
-    if (quote.version != snp::attestation_version)
+    if (quote.version < snp::minimum_attestation_version)
     {
       throw std::logic_error(fmt::format(
-        "SEV-SNP: Attestation version is {} not expected {}",
+        "SEV-SNP: Attestation version is {} not >= expected minimum {}",
         quote.version,
-        snp::attestation_version));
+        snp::minimum_attestation_version));
     }
 
     if (quote.flags.signing_key != snp::attestation_flags_signing_key_vcek)

diff --git a/include/ccf/pal/attestation_sev_snp.h b/include/ccf/pal/attestation_sev_snp.h
@@ -116,7 +116,7 @@ QPHfbkH0CyPfhl1jWhJFZasCAwEAAQ==
 #pragma pack(push, 1)
   // Table 21
 
-  static constexpr uint32_t attestation_version = 2;
+  static constexpr uint32_t minimum_attestation_version = 2;
   static constexpr uint32_t attestation_policy_abi_major = 1;
 
   struct Attestation