diff options
| author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2019-09-18 23:18:01 -0300 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-09-20 20:48:12 +0200 |
| commit | 79d91aa6e7f2fe544a4953fbae1c8bdcdba78099 (patch) | |
| tree | 7820ee0a7d54fac4b58c55cb307c06d07f39f6d6 /CMakeLists.txt | |
| parent | e8f9c22d02fccde1d992f324280fb9966d3b4be6 (diff) | |
| download | ustream-ssl-79d91aa6e7f2fe544a4953fbae1c8bdcdba78099.tar.gz | |
Remove CyaSSL, WolfSSL < 3.10.4 support
This updates the CyaSSL names to wolfSSL, and removes obsolete code to
support old versions of the library < v3.10.4.
Some #include statements were moved around, so that wolfssl/options.h is
loaded before any other wolfssl/openssl header.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c4a3c44..3b557c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 2.6) -INCLUDE(CheckIncludeFiles) - PROJECT(ustream-ssl C) ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations) @@ -11,15 +9,10 @@ IF(MBEDTLS) ADD_DEFINITIONS(-DHAVE_MBEDTLS) SET(SSL_SRC ustream-mbedtls.c) SET(SSL_LIB mbedtls mbedcrypto mbedx509 m) -ELSEIF(CYASSL) - CHECK_INCLUDE_FILES (cyassl/version.h HAVE_CYASSL_VERSION_H) - SET(CMAKE_EXTRA_INCLUDE_FILES cyassl/ssl.h) - IF (HAVE_CYASSL_VERSION_H) - ADD_DEFINITIONS(-DHAVE_CYASSL_VERSION_H) - ENDIF() - ADD_DEFINITIONS(-DHAVE_CYASSL) - SET(SSL_SRC ustream-io-cyassl.c ustream-openssl.c) - SET(SSL_LIB cyassl m) +ELSEIF(WOLFSSL) + ADD_DEFINITIONS(-DHAVE_WOLFSSL) + SET(SSL_SRC ustream-io-wolfssl.c ustream-openssl.c) + SET(SSL_LIB wolfssl m) ELSE() SET(SSL_SRC ustream-io-openssl.c ustream-openssl.c) SET(SSL_LIB crypto ssl) |