Move definitiion of P11Engine dtor out of header

These calls are deprecated, and moving them out to the implementation means they are only pulled when BUILD_P11 is set.
uptane · Aug 4, 2024 · aacf20b · aacf20b
1 parent f88fb5f
commit aacf20b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/libaktualizr/crypto/p11engine.cc b/src/libaktualizr/crypto/p11engine.cc
@@ -128,6 +128,14 @@ P11Engine::P11Engine(boost::filesystem::path module_path, std::string pass)
   ssl_engine_ = engine;
 }
 
+P11Engine::~P11Engine() {
+  if (ssl_engine_ != nullptr) {
+    ENGINE_finish(ssl_engine_);
+    ENGINE_free(ssl_engine_);
+    ENGINE_cleanup();  // for openssl < 1.1
+  }
+}
+
 // Hack for clang-tidy
 #ifndef PKCS11_ENGINE_PATH
 #define PKCS11_ENGINE_PATH "dummy"

diff --git a/src/libaktualizr/crypto/p11engine.h b/src/libaktualizr/crypto/p11engine.h
@@ -51,13 +51,7 @@ class P11Engine {
   P11Engine &operator=(const P11Engine &) = delete;
   P11Engine &operator=(P11Engine &&) = delete;
 
-  virtual ~P11Engine() {
-    if (ssl_engine_ != nullptr) {
-      ENGINE_finish(ssl_engine_);
-      ENGINE_free(ssl_engine_);
-      ENGINE_cleanup();  // for openssl < 1.1
-    }
-  }
+  virtual ~P11Engine();
 
   ENGINE *getEngine() { return ssl_engine_; }
   std::string getItemFullId(const std::string &id) const { return uri_prefix_ + id; }