romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 18:01:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: do not include wolfSSL header in curl_setup.h

Browse source 
To fix building tests/server with cmake and both wolfSSL and OpenSSL
enabled (MultiSSL).

tests/server do not have libcurl dependency header paths setup because
it does not use libcurl. The code however includes `curl_setup.h`, which
tried including `wolfssl/version.h` before this patch to verify if the
wolfSSL coexist feature is available. Without a header path, it failed:
```
In file included from bld/tests/server/servers.c:3:
In file included from tests/server/first.h:40:
lib/curl_setup.h:737:12: fatal error: 'wolfssl/version.h' file not found
  737 | #  include <wolfssl/version.h>
      |            ^~~~~~~~~~~~~~~~~~~
1 error generated.
```
Ref: https://github.com/curl/curl/actions/runs/22410066319/job/64880787424#step:46:76

Fix by moving the include and version check to `vtls/wolfssl.c`.

Also: add an early version check to cmake.

Follow-up to 16f073ef49 #16973
Cherry-picked from #20720

Closes #20726
This commit is contained in:
Viktor Szakats 2026-02-25 20:55:03 +01:00
parent aae361242f
commit b56e103d4d
No known key found for this signature in database
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -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()

11
lib/curl_setup.h
View file

@ -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)

3
lib/vtls/wolfssl.c
View file

@ -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