Remove WolfSSL support in FoundationDB

2023-03-01 12:56:28 -08:00 · 2023-03-01 12:56:28 -08:00 · 88eeb5a526
parent 117b6c0a6e
commit 88eeb5a526
17 changed files with 4 additions and 141 deletions
--- a/FDBLibTLS/FDBLibTLSPolicy.cpp
+++ b/FDBLibTLS/FDBLibTLSPolicy.cpp
@ -22,9 +22,6 @@
 #include "FDBLibTLS/FDBLibTLSSession.h"
 #include "flow/Trace.h"

-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
--- a/FDBLibTLS/FDBLibTLSSession.cpp
+++ b/FDBLibTLS/FDBLibTLSSession.cpp
@ -23,9 +23,6 @@
 #include "flow/flow.h"
 #include "flow/Trace.h"

-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
--- a/FDBLibTLS/FDBLibTLSVerify.cpp
+++ b/FDBLibTLS/FDBLibTLSVerify.cpp
@ -20,9 +20,6 @@

 #include "FDBLibTLS/FDBLibTLSVerify.h"

-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/objects.h>

 #include <algorithm>
--- a/FDBLibTLS/verify-test.cpp
+++ b/FDBLibTLS/verify-test.cpp
@ -25,9 +25,6 @@
 #include <string.h>
 #include <boost/lexical_cast.hpp>

-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/objects.h>

 #include "fdbrpc/ITLSPlugin.h"
--- a/cmake/FDBComponents.cmake
+++ b/cmake/FDBComponents.cmake
@ -20,39 +20,9 @@ endif()
 # SSL
 ################################################################################

-include(CheckSymbolExists)
-
-set(USE_WOLFSSL OFF CACHE BOOL "Build against WolfSSL instead of OpenSSL")
-set(USE_OPENSSL ON CACHE BOOL "Build against OpenSSL")
-if(USE_WOLFSSL)
-  set(WOLFSSL_USE_STATIC_LIBS TRUE)
-  find_package(WolfSSL)
-  if(WOLFSSL_FOUND)
-    set(CMAKE_REQUIRED_INCLUDES ${WOLFSSL_INCLUDE_DIR})
-    add_compile_options(-DHAVE_OPENSSL)
-    add_compile_options(-DHAVE_WOLFSSL)
-  else()
-    message(STATUS "WolfSSL was not found - Will compile without TLS Support")
-    message(STATUS "You can set WOLFSSL_ROOT_DIR to help cmake find it")
-    message(FATAL_ERROR "Unable to find WolfSSL")
-  endif()
-elseif(USE_OPENSSL)
-  set(OPENSSL_USE_STATIC_LIBS TRUE)
-  if(WIN32)
-    set(OPENSSL_MSVC_STATIC_RT ON)
-  endif()
-  find_package(OpenSSL)
-  if(OPENSSL_FOUND)
-    set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-    add_compile_options(-DHAVE_OPENSSL)
-  else()
-    message(STATUS "OpenSSL was not found - Will compile without TLS Support")
-    message(STATUS "You can set OPENSSL_ROOT_DIR to help cmake find it")
-    message(FATAL_ERROR "Unable to find OpenSSL")
-  endif()
-else()
-  message(FATAL_ERROR "Must set USE_WOLFSSL or USE_OPENSSL")
-endif()
+find_package(OpenSSL REQUIRED)
+set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+add_compile_options(-DHAVE_OPENSSL)

 ################################################################################
 # Python Bindings
--- a/cmake/FindWolfSSL.cmake
+++ b/cmake/FindWolfSSL.cmake
@ -1,63 +0,0 @@
-# FindWolfSSL
-
-# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
-if(WOLFSSL_USE_STATIC_LIBS)
-  if(WIN32)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  else()
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-  endif()
-endif()
-
-find_path(WOLFSSL_ROOT_DIR
-  NAMES
-    include/wolfssl/options.h
-)
-
-find_path(WOLFSSL_INCLUDE_DIR
-  NAMES
-    wolfssl/ssl.h
-  PATHS
-   ${WOLFSSL_ROOT_DIR}/include
-)
-
-find_library(WOLFSSL_LIBRARY
-  NAMES 
-    wolfssl
-  PATHS
-   ${WOLFSSL_ROOT_DIR}/lib
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(WolfSSL
-  REQUIRED_VARS
-    WOLFSSL_LIBRARY
-    WOLFSSL_INCLUDE_DIR
-  FAIL_MESSAGE
-    "Could NOT find WolfSSL"
-)
-
-mark_as_advanced(
-  WOLFSSL_ROOT_DIR
-  WOLFSSL_LIBRARY
-  WOLFSSL_INCLUDE_DIR
-)
-
-if(WOLFSSL_FOUND)
-  message(STATUS "Found wolfssl library: ${WOLFSSL_LIBRARY}")
-  message(STATUS "Found wolfssl includes: ${WOLFSSL_INCLUDE_DIR}")
-
-  set(WOLFSSL_INCLUDE_DIRS ${WOLFSSL_INCLUDE_DIR})
-  set(WOLFSSL_LIBRARIES ${WOLFSSL_LIBRARY})
-
-  add_library(WolfSSL UNKNOWN IMPORTED GLOBAL)
-  add_library(OpenSSL::SSL ALIAS WolfSSL)
-  add_library(OpenSSL::CRYPTO ALIAS WolfSSL)
-
-  target_include_directories(WolfSSL INTERFACE "${WOLFSSL_INCLUDE_DIR}")
-  target_link_libraries(WolfSSL INTERFACE "${WOLFSSL_TLS_LIBRARY}" "${WOLFSSL_SSL_LIBRARY}" "${WOLFSSL_CRYPTO_LIBRARY}")
-  set_target_properties(WolfSSL PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${WOLFSSL_INCLUDE_DIR}"
-    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-    IMPORTED_LOCATION "${WOLFSSL_LIBRARY}")
-endif()
--- a/contrib/md5/include/md5/md5.h
+++ b/contrib/md5/include/md5/md5.h
@ -24,9 +24,6 @@
 */

 #if defined(HAVE_OPENSSL)
-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/md5.h>
 #elif !defined(_MD5_H)
 #define _MD5_H
--- a/fdbclient/S3BlobStore.actor.cpp
+++ b/fdbclient/S3BlobStore.actor.cpp
@ -26,15 +26,9 @@
 #include "fdbclient/sha1/SHA1.h"
 #include <time.h>
 #include <iomanip>
-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/sha.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
-#if defined(HAVE_WOLFSSL)
-#undef SHA1 // wolfSSL will will shadow FDB SHA1.h
-#endif
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string.hpp>
--- a/fdbclient/include/fdbclient/BlobCipher.h
+++ b/fdbclient/include/fdbclient/BlobCipher.h
@ -54,9 +54,6 @@
 #include <unordered_map>
 #include <variant>
 #include <vector>
-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif

 #define AES_256_KEY_LENGTH 32
 #define AES_256_IV_LENGTH 16
--- a/fdbrpc/JsonWebKeySet.cpp
+++ b/fdbrpc/JsonWebKeySet.cpp
@ -28,9 +28,6 @@
 #include "fdbrpc/Base64Encode.h"
 #include "fdbrpc/Base64Decode.h"
 #include "fdbrpc/JsonWebKeySet.h"
-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/err.h>
--- a/fdbrpc/TokenSign.cpp
+++ b/fdbrpc/TokenSign.cpp
@ -36,9 +36,6 @@
 #include <string_view>
 #include <type_traits>
 #include <utility>
-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/ec.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@ -85,9 +85,6 @@ foreach(ft flow flow_sampling flowlinktest)
        target_link_libraries(${ft} PUBLIC Valgrind)
    endif()
    target_link_libraries(${ft} PUBLIC OpenSSL::SSL)
-    if(USE_WOLFSSL)
-        target_include_directories(${ft} SYSTEM BEFORE PUBLIC ${WOLFSSL_INCLUDE_DIR}/wolfssl)
-    endif()
    target_link_libraries(${ft} PUBLIC Threads::Threads ${CMAKE_DL_LIBS})
    target_link_libraries(${ft} PUBLIC boost_target)
    if(USE_VALGRIND)
--- a/flow/MkCert.cpp
+++ b/flow/MkCert.cpp
@ -29,6 +29,7 @@
 #include <memory>
 #include <string>
 #include <cstring>
+
 #include <openssl/bio.h>
 #include <openssl/ec.h>
 #include <openssl/err.h>
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@ -36,9 +36,6 @@
 #define BOOST_REGEX_NO_LIB
 #endif
 #include <boost/asio.hpp>
-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include "boost/asio/ssl.hpp"
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/range.hpp>
--- a/flow/TLSConfig.actor.cpp
+++ b/flow/TLSConfig.actor.cpp
@ -30,9 +30,6 @@ TLSPolicy::~TLSPolicy() {}
 #include <exception>
 #include <map>
 #include <set>
-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/objects.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
--- a/flow/include/flow/StreamCipher.h
+++ b/flow/include/flow/StreamCipher.h
@ -24,9 +24,6 @@
 #include "flow/FastRef.h"
 #include "flow/flow.h"

-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/aes.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
--- a/flow/include/flow/TLSConfig.actor.h
+++ b/flow/include/flow/TLSConfig.actor.h
@ -39,9 +39,6 @@
 #include "flow/Knobs.h"
 #include "flow/flow.h"

-#if defined(HAVE_WOLFSSL)
-#include <wolfssl/options.h>
-#endif
 #include <openssl/x509.h>
 typedef int NID;