Removed openssl code from 'detail' header, added it to public usage b…

…ased on used crypto provider (#90) Signed-off-by: AssemblyJohn <[email protected]>
EVerest · Aug 5, 2024 · aec3836 · aec3836
1 parent d1f9a77
commit aec3836
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,7 +55,9 @@ option(LIBEVSE_SECURITY_USE_BOOST_FILESYSTEM "Usage of boost/filesystem.hpp inst
 option(LIBEVSE_CRYPTO_SUPPLIER_OPENSSL "Default OpenSSL cryptography supplier" ON)
 
 # dependencies
-find_package(OpenSSL 3 REQUIRED)
+if (LIBEVSE_CRYPTO_SUPPLIER_OPENSSL)
+    find_package(OpenSSL 3 REQUIRED)
+endif()
 
 add_subdirectory(lib)
 

diff --git a/include/evse_security/crypto/openssl/openssl_crypto_supplier.hpp b/include/evse_security/crypto/openssl/openssl_crypto_supplier.hpp
@@ -2,6 +2,8 @@
 // Copyright Pionix GmbH and Contributors to EVerest
 #pragma once
 
+#ifdef LIBEVSE_CRYPTO_SUPPLIER_OPENSSL
+
 #include <evse_security/crypto/interface/crypto_supplier.hpp>
 
 namespace evse_security {
@@ -54,4 +56,6 @@ class OpenSSLSupplier : public AbstractCryptoSupplier {
     static bool base64_encode_from_string(const std::string& string, std::string& out_encoded);
 };
 
-} // namespace evse_security
+} // namespace evse_security
+
+#endif
diff --git a/...security/detail/openssl/openssl_types.hpp → ...security/crypto/openssl/openssl_types.hpp b/...security/detail/openssl/openssl_types.hpp → ...security/crypto/openssl/openssl_types.hpp
@@ -2,6 +2,8 @@
 // Copyright Pionix GmbH and Contributors to EVerest
 #pragma once
 
+#ifdef LIBEVSE_CRYPTO_SUPPLIER_OPENSSL
+
 #include <memory>
 #include <openssl/x509v3.h>
 
@@ -118,3 +120,5 @@ struct KeyHandleOpenSSL : public KeyHandle {
 };
 
 } // namespace evse_security
+
+#endif
diff --git a/lib/evse_security/CMakeLists.txt b/lib/evse_security/CMakeLists.txt
@@ -15,10 +15,16 @@ target_sources(evse_security
 
         crypto/interface/crypto_supplier.cpp
         crypto/interface/crypto_types.cpp
-        crypto/openssl/openssl_crypto_supplier.cpp
-        crypto/openssl/openssl_provider.cpp
 )
 
+if (LIBEVSE_CRYPTO_SUPPLIER_OPENSSL)
+    target_sources(evse_security
+        PRIVATE                 
+            crypto/openssl/openssl_crypto_supplier.cpp
+            crypto/openssl/openssl_provider.cpp
+    )
+endif()
+
 target_include_directories(evse_security
     PUBLIC
         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>

diff --git a/lib/evse_security/crypto/openssl/openssl_crypto_supplier.cpp b/lib/evse_security/crypto/openssl/openssl_crypto_supplier.cpp
@@ -2,9 +2,6 @@
 // Copyright Pionix GmbH and Contributors to EVerest
 #include <evse_security/crypto/openssl/openssl_crypto_supplier.hpp>
 
-#include <evse_security/detail/openssl/openssl_types.hpp>
-#include <evse_security/utils/evse_filesystem.hpp>
-
 #include <everest/logging.hpp>
 
 #include <algorithm>
@@ -23,6 +20,8 @@
 #include <openssl/x509v3.h>
 
 #include <evse_security/crypto/openssl/openssl_provider.hpp>
+#include <evse_security/crypto/openssl/openssl_types.hpp>
+#include <evse_security/utils/evse_filesystem.hpp>
 
 namespace evse_security {