b56e103d4d
Viktor Szakats
2026-02-26
Subject
build: do not include wolfSSL header in `curl_setup.h`
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMakeLists.txt+4 -0
| @@ -883,6 +883,10 @@ if(CURL_USE_WOLFSSL) | |
| endif() | |
| set(_curl_ca_bundle_supported TRUE) | |
| + | if(USE_OPENSSL AND WOLFSSL_VERSION VERSION_LESS 5.7.6) |
| + | message(FATAL_ERROR "wolfSSL 5.7.6 or newer is required to coexist with OpenSSL.") |
| + | endif() |
| + | |
| set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "WOLFSSL_OPTIONS_IGNORE_SYS") | |
| endif() | |
lib/curl_setup.h+3 -8
| @@ -734,14 +734,9 @@ | |
| #endif | |
| #if defined(USE_OPENSSL) && defined(USE_WOLFSSL) | |
| - | # include <wolfssl/version.h> |
| - | # if LIBWOLFSSL_VERSION_HEX >= 0x05007006 |
| - | # ifndef OPENSSL_COEXIST |
| - | # define OPENSSL_COEXIST |
| - | # endif |
| - | # else |
| - | # error "OpenSSL can only coexist with wolfSSL v5.7.6 or upper" |
| - | # endif |
| + | #ifndef OPENSSL_COEXIST |
| + | #define OPENSSL_COEXIST |
| + | #endif |
| #endif | |
| #if defined(USE_WOLFSSL) && defined(USE_GNUTLS) | |
lib/vtls/wolfssl.c+3 -0
| @@ -36,6 +36,9 @@ | |
| #if LIBWOLFSSL_VERSION_HEX < 0x03004006 /* wolfSSL 3.4.6 (2015) */ | |
| #error "wolfSSL version should be at least 3.4.6" | |
| #endif | |
| + | #if defined(OPENSSL_COEXIST) && LIBWOLFSSL_VERSION_HEX < 0x05007006 |
| + | #error "wolfSSL 5.7.6 or newer is required to coexist with OpenSSL" |
| + | #endif |
| /* To determine what functions are available we rely on one or both of: | |
| - the user's options.h generated by wolfSSL | |