Address comments regarding tpm2.h restructuring

src/lib/prov/tpm2/tpm2.cpp

@@ -24,8 +24,7 @@ std::string TPM2_Error::error_message() const {
    return Tss2_RC_Decode(m_rc);
 }
 
-class TPM2_Context::Impl {
-   public:
+struct TPM2_Context::Impl {
       TSS2_TCTI_CONTEXT* m_tcti_ctx;
       ESYS_CONTEXT* m_ctx;
 };
@@ -47,26 +46,6 @@ TPM2_Context::TPM2_Context(const char* tcti_nameconf) : m_impl(std::make_unique<
    check_tss2_rc("TPM2 Initialization", Esys_Initialize(&m_impl->m_ctx, m_impl->m_tcti_ctx, nullptr /* ABI version */));
 }
 
-TPM2_Context::TPM2_Context(TPM2_Context&& ctx) noexcept {
-   m_impl->m_ctx = ctx.m_impl->m_ctx;
-   m_impl->m_tcti_ctx = ctx.m_impl->m_tcti_ctx;
-
-   ctx.m_impl->m_ctx = nullptr;
-   ctx.m_impl->m_tcti_ctx = nullptr;
-}
-
-TPM2_Context& TPM2_Context::operator=(TPM2_Context&& ctx) noexcept {
-   if(this != &ctx) {
-      m_impl->m_ctx = ctx.m_impl->m_ctx;
-      m_impl->m_tcti_ctx = ctx.m_impl->m_tcti_ctx;
-
-      ctx.m_impl->m_ctx = nullptr;
-      ctx.m_impl->m_tcti_ctx = nullptr;
-   }
-
-   return *this;
-}
-
 void* TPM2_Context::get() {
    return m_impl->m_ctx;
 }

src/lib/prov/tpm2/tpm2.h

@@ -11,6 +11,7 @@
 
 #include <botan/exceptn.h>
 
+#include <memory>
 #include <optional>
 
 namespace Botan {
@@ -42,20 +43,20 @@ class BOTAN_PUBLIC_API(3, 6) TPM2_Context final {
       static std::shared_ptr<TPM2_Context> create(std::optional<std::string> tcti_nameconf = {});
 
       TPM2_Context(const TPM2_Context&) = delete;
-      TPM2_Context(TPM2_Context&& ctx) noexcept;
+      TPM2_Context(TPM2_Context&& ctx) noexcept = default;
       ~TPM2_Context();
 
       TPM2_Context& operator=(const TPM2_Context&) = delete;
-      TPM2_Context& operator=(TPM2_Context&& ctx) noexcept;
+      TPM2_Context& operator=(TPM2_Context&& ctx) noexcept = default;
 
-      // Return an ESYS_CONTEXT* for use in other TPM2 functions.
+      /// @return an ESYS_CONTEXT* for use in other TPM2 functions.
       void* get();
 
    private:
       TPM2_Context(const char* tcti_nameconf);
 
    private:
-      class Impl;  // PImpl to avoid TPM2-TSS includes in this header
+      struct Impl;  // PImpl to avoid TPM2-TSS includes in this header
       std::unique_ptr<Impl> m_impl;
 };