Merge branch 'main' into remove_historical_adapter_v2

microsoft · Dec 19, 2023 · 01e702e · 01e702e
2 parents c3745e3 + 3c5168d
commit 01e702e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Removed
 
 - `ccf::historical::adapter_v2` is removed, replaced by `ccf::historical::adapter_v3` first introduced in 2.0.0.
+- `ccf::EnclaveAttestationProvider` has been removed. It is replaced by `ccf::AttestationProvider`
 
 ## [5.0.0-dev10]
 

diff --git a/include/ccf/node/quote.h b/include/ccf/node/quote.h
@@ -41,7 +41,4 @@ namespace ccf
       const std::vector<uint8_t>& expected_node_public_key_der,
       pal::PlatformAttestationMeasurement& measurement);
   };
-
-  using EnclaveAttestationProvider CCF_DEPRECATED("Will be removed in 4.x") =
-    AttestationProvider;
 }