Skip to content

Commit acf15b2

Browse files
committed
WL#13343 - Remove support for WolfSSL.
1 parent 27f1276 commit acf15b2

File tree

9 files changed

+6
-374
lines changed

9 files changed

+6
-374
lines changed

buildinfo.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ FUNCTION(GENERATE_INFO_BIN)
4444

4545
IF(OPENSSL_VERSION_GLOBAL)
4646
SET(INFO_SSL "ssl-library : OpenSSL ${OPENSSL_VERSION_GLOBAL}\n")
47-
ELSE()
48-
SET(INFO_SSL "ssl-library : WolfSSL ${WOLFSSL_VERSION_GLOBAL}\n")
4947
ENDIF()
5048

5149
IF(CMAKE_OSX_DEPLOYMENT_TARGET)

cdk/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ find_dependency(Coverage)
104104
# correct when used in a different environment.
105105

106106
add_config(WITH_SSL)
107-
add_config(WITH_SSL_WOLFSSL)
108-
109107

110108
#
111109
# Make sure WIN32 is defined on Windows

cdk/cmake/DepFindSSL.cmake

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ include(CheckSymbolExists)
4141

4242
add_config_option(WITH_SSL STRING DEFAULT system
4343
"Either 'system' to use system-wide OpenSSL library,"
44-
" or custom OpenSSL location or path to WolfSSL sources."
44+
" or custom OpenSSL location."
4545
)
4646

4747

@@ -51,13 +51,6 @@ function(main)
5151

5252
if(NOT WITH_SSL MATCHES "^(system|yes)$")
5353

54-
if(EXISTS ${WITH_SSL}/wolfssl/openssl/ssl.h)
55-
message(STATUS "Using WolfSSL implementation of SSL")
56-
use_wolfssl()
57-
check_x509_functions()
58-
return()
59-
endif()
60-
6154
if(EXISTS ${WITH_SSL}/include/openssl/ssl.h)
6255
set(OPENSSL_ROOT_DIR "${WITH_SSL}")
6356
endif()
@@ -120,7 +113,7 @@ function(main)
120113

121114
if(WIN32 AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/applink.c")
122115

123-
message("-- Handling applink.c")
116+
#message("-- Handling applink.c")
124117

125118
add_library(openssl-applink STATIC "${OPENSSL_INCLUDE_DIR}/openssl/applink.c")
126119
target_link_libraries(SSL::ssl INTERFACE openssl-applink)
@@ -328,31 +321,6 @@ function(bundle_ssl_libs)
328321
endfunction(bundle_ssl_libs)
329322

330323

331-
#
332-
# Define SSL::ssl and friends to point at WolfSSL libraries
333-
# built from sources in WOLFSSL_SOURCE_DIR. Build instructions
334-
# and target definitions for WolfSSL libraries are specified in
335-
# extra/wolfssl/CMakeLists.txt
336-
#
337-
338-
function(use_wolfssl)
339-
340-
set(WOLFSSL_SOURCE_DIR "${WITH_SSL}")
341-
message(STATUS "- using WolfSSL sources at: ${WOLFSSL_SOURCE_DIR}")
342-
343-
# Note: This cmake file expects WOLFSSL_SOURCE_DIR to be set
344-
345-
add_subdirectory("${PROJECT_SOURCE_DIR}/extra/wolfssl")
346-
347-
message(STATUS "- WolfSSL version: ${WOLFSSL_VERSION_GLOBAL}")
348-
349-
add_library(SSL::ssl ALIAS wolfssl)
350-
add_library(SSL::crypto ALIAS wolfcrypto)
351-
352-
set(WITH_SSL_WOLFSSL ON CACHE INTERNAL "Tells whether WolfSSL implementation is used")
353-
endfunction(use_wolfssl)
354-
355-
356324
main()
357325
return()
358326

cdk/extra/wolfssl/CMakeLists.txt

Lines changed: 0 additions & 236 deletions
This file was deleted.

0 commit comments

Comments
 (0)