luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ae016b0cce
curl/lib
History
Viktor Szakats f153b4bfa0
cmake: include wolfssl/options.h first 
It was missing while detecting `wolfSSL_DES_ecb_encrypt`,
`wolfSSL_BIO_new` and `wolfSSL_BIO_set_shutdown`.

We have not seen it causing issues in stable wolfSSL releases as of
v5.7.4, until a recent commit in wolfSSL master, which broke detections:
```
curl/CMakeFiles/CMakeScratch//CheckSymbolExists.c:8:19: error: ‘wolfSSL_BIO_new’ undeclared (first use in this function); did you mean ‘wolfSSL_CTX_new’?
curl/CMakeFiles/CMakeScratch//CheckSymbolExists.c:8:19: error: ‘wolfSSL_BIO_set_shutdown’ undeclared (first use in this function); did you mean ‘wolfSSL_set_shutdown’?
```
This in turn disabled `HTTPS-proxy` and failed related pytests:
https://github.com/curl/curl/actions/runs/11953800545/job/33324250039?pr=15620

wolfSSL source diff causing the regression:
be70bea687..c06f65a8ac

The wolfSSL build says:
```
Note: Make sure your application includes "wolfssl/options.h" before any other wolfSSL headers.
      You can define "WOLFSSL_USE_OPTIONS_H" in your application to include this automatically.
```

This patch makes sure to follow this rule across the curl codebase.

Also:
- include `wolfssl/options.h` first in `lib/vtls/wolfssl.c`.
  It was preceded by `wolfssl/version.h`, which did not cause issues.
  Background for the pre-existing include order:
  Ref: deb9462ff2 #3903
  Ref: https://curl.se/mail/lib-2015-04/0069.html

Bug: https://github.com/curl/curl/pull/15620#issuecomment-2491872463
Follow-up to d68a121266 #14064

Closes #15623
2024-11-21 23:50:46 +01:00
..
vauth strtok: use namespaced strtok_r macro instead of redefining it 2024-11-14 09:55:45 +01:00
vquic vquic: recv_mmsg, use fewer, but larger buffers 2024-10-31 23:40:51 +01:00
vssh libssh: when using IPv6 numerical address, add brackets 2024-11-09 10:34:45 +01:00
vtls cmake: include wolfssl/options.h first 2024-11-21 23:50:46 +01:00
.checksrc
.gitattributes
.gitignore
altsvc.c altsvc: avoid using local buffer and memcpy 2024-10-08 12:50:52 +02:00
altsvc.h
amigaos.c
amigaos.h
arpa_telnet.h
asyn-ares.c asyn-ares: remove typecast, fix expire 2024-10-04 14:08:09 +02:00
asyn-thread.c
asyn.h
base64.c
bufq.c bufq: unwrite fix 2024-10-03 13:27:36 +02:00
bufq.h
bufref.c
bufref.h
c-hyper.c WebSockets: make support official (non-experimental) 2024-09-27 13:20:25 +02:00
c-hyper.h
cf-h1-proxy.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
cf-h1-proxy.h
cf-h2-proxy.c nghttp2: use custom memory functions 2024-11-08 23:20:32 +01:00
cf-h2-proxy.h
cf-haproxy.c
cf-haproxy.h
cf-https-connect.c TLS: TLSv1.3 earlydata support for curl 2024-10-11 12:28:22 +02:00
cf-https-connect.h
cf-socket.c socket: handle binding to "host!<ip>" 2024-11-17 11:34:40 +01:00
cf-socket.h ftp: move listen handling to socket filter 2024-10-13 23:15:28 +02:00
cfilters.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
cfilters.h
CMakeLists.txt cmake: avoid setting BUILD_TESTING 2024-10-23 21:24:02 +02:00
config-amigaos.h config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
config-dos.h config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
config-mac.h config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
config-os400.h config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
config-plan9.h config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
config-riscos.h config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
config-win32.h build: use _fseeki64() on Windows, drop detections 2024-11-11 14:25:04 +01:00
config-win32ce.h config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
conncache.c tidy-up: whitespace, fix CI spacecheck for docs 2024-10-30 23:15:28 +01:00
conncache.h
connect.c source: avoid use of 'very' in comments 2024-10-17 13:36:33 +02:00
connect.h
content_encoding.c build: fix clang-cl builds, add CI job 2024-10-30 23:15:32 +01:00
content_encoding.h
cookie.c strtok: use namespaced strtok_r macro instead of redefining it 2024-11-14 09:55:45 +01:00
cookie.h cookie: overhaul and cleanup 2024-10-11 09:01:03 +02:00
curl_addrinfo.c curl_addrinfo: support operating systems with only getaddrinfo(3) 2024-11-02 22:28:59 +01:00
curl_addrinfo.h curl_addrinfo: support operating systems with only getaddrinfo(3) 2024-11-02 22:28:59 +01:00
curl_base64.h
curl_config.h.cmake build: use _fseeki64() on Windows, drop detections 2024-11-11 14:25:04 +01:00
curl_ctype.h
curl_des.c
curl_des.h
curl_endian.c
curl_endian.h
curl_fnmatch.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
curl_fnmatch.h
curl_get_line.c
curl_get_line.h
curl_gethostname.c
curl_gethostname.h
curl_gssapi.c tidy-up: whitespace, fix CI spacecheck for docs 2024-10-30 23:15:28 +01:00
curl_gssapi.h
curl_hmac.h lib: remove function pointer typecasts for hmac/sha256/md5 2024-10-15 14:32:39 +02:00
curl_krb5.h
curl_ldap.h
curl_md4.h
curl_md5.h lib: remove function pointer typecasts for hmac/sha256/md5 2024-10-15 14:32:39 +02:00
curl_memory.h
curl_memrchr.c
curl_memrchr.h
curl_multibyte.c
curl_multibyte.h
curl_ntlm_core.c lib: remove function pointer typecasts for hmac/sha256/md5 2024-10-15 14:32:39 +02:00
curl_ntlm_core.h
curl_printf.h
curl_range.c
curl_range.h
curl_rtmp.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
curl_rtmp.h
curl_sasl.c
curl_sasl.h
curl_setup_once.h
curl_setup.h macos: disable gcc availability workaround as needed 2024-11-08 11:15:31 +01:00
curl_sha256.h lib: remove function pointer typecasts for hmac/sha256/md5 2024-10-15 14:32:39 +02:00
curl_sha512_256.c tidy-up: spelling 2024-09-22 09:51:15 +02:00
curl_sha512_256.h
curl_sspi.c
curl_sspi.h
curl_threads.c
curl_threads.h
curl_trc.c strtok: use namespaced strtok_r macro instead of redefining it 2024-11-14 09:55:45 +01:00
curl_trc.h lib: fix disabled-verbose-strings + enable-debug build warnings 2024-09-27 13:20:25 +02:00
curlx.h tidy-up: indent, whitespace, comment in sources 2024-09-22 09:51:14 +02:00
cw-out.c lib/cw-out: initialize 'flush_all' directly 2024-09-26 16:55:01 +02:00
cw-out.h
dict.c
dict.h
dllmain.c
doh.c lib: msnprintf tidy-ups 2024-10-28 22:56:11 +01:00
doh.h
dynbuf.c
dynbuf.h
dynhds.c
dynhds.h
easy_lock.h
easy.c duphandle: also init netrc 2024-11-07 09:47:53 +01:00
easygetopt.c
easyif.h WebSockets: make support official (non-experimental) 2024-09-27 13:20:25 +02:00
easyoptions.c
easyoptions.h
escape.c curl.h: remove the struct pointer for CURL/CURLSH/CURLM typedefs 2024-10-15 14:33:40 +02:00
escape.h
file.c
file.h
fileinfo.c
fileinfo.h
fopen.c
fopen.h
formdata.c build: use _fseeki64() on Windows, drop detections 2024-11-11 14:25:04 +01:00
formdata.h curl.h: remove the struct pointer for CURL/CURLSH/CURLM typedefs 2024-10-15 14:33:40 +02:00
ftp.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
ftp.h
ftplistparser.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
ftplistparser.h
functypes.h
getenv.c
getinfo.c TLS: TLSv1.3 earlydata support for curl 2024-10-11 12:28:22 +02:00
getinfo.h
gopher.c
gopher.h
hash.c
hash.h
headers.c
headers.h
hmac.c lib: remove function pointer typecasts for hmac/sha256/md5 2024-10-15 14:32:39 +02:00
hostasyn.c
hostip4.c curl_addrinfo: support operating systems with only getaddrinfo(3) 2024-11-02 22:28:59 +01:00
hostip6.c
hostip.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
hostip.h
hostsyn.c
hsts.c hsts: support "implied LWS" properly around max-age 2024-10-18 11:42:42 +02:00
hsts.h
http1.c
http1.h
http2.c nghttp2: use custom memory functions 2024-11-08 23:20:32 +01:00
http2.h nghttp2: use custom memory functions 2024-11-08 23:20:32 +01:00
http_aws_sigv4.c lib: remove function pointer typecasts for hmac/sha256/md5 2024-10-15 14:32:39 +02:00
http_aws_sigv4.h
http_chunks.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
http_chunks.h
http_digest.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
http_digest.h
http_negotiate.c
http_negotiate.h
http_ntlm.c
http_ntlm.h
http_proxy.c
http_proxy.h
http.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
http.h
idn.c
idn.h
if2ip.c
if2ip.h
imap.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
imap.h
inet_ntop.c
inet_ntop.h
inet_pton.c
inet_pton.h
krb5.c krb5: fix socket/sockindex confusion, MSVC compiler warnings 2024-11-16 00:12:08 +01:00
ldap.c strtok: use namespaced strtok_r macro instead of redefining it 2024-11-14 09:55:45 +01:00
libcurl.def
libcurl.rc
libcurl.vers.in build: tidy up and improve versioned-symbols options 2024-09-21 12:21:14 +02:00
llist.c
llist.h
macos.c
macos.h
Makefile.am
Makefile.inc lib: move curl_path.[ch] into vssh/ 2024-10-13 23:16:18 +02:00
Makefile.mk
Makefile.soname build: tidy up and improve versioned-symbols options 2024-09-21 12:21:14 +02:00
md4.c
md5.c lib: remove function pointer typecasts for hmac/sha256/md5 2024-10-15 14:32:39 +02:00
memdebug.c source: avoid use of 'very' in comments 2024-10-17 13:36:33 +02:00
memdebug.h
mime.c curl.h: remove the struct pointer for CURL/CURLSH/CURLM typedefs 2024-10-15 14:33:40 +02:00
mime.h
mprintf.c mprintf: treat %o as unsigned, add tests for %o, %x, %X 2024-10-24 10:17:24 +02:00
mqtt.c
mqtt.h
multi.c multi: add clarifying comment for wakeup_write() 2024-11-17 16:50:58 +01:00
multihandle.h vquic: recv_mmsg, use fewer, but larger buffers 2024-10-31 23:40:51 +01:00
multiif.h vquic: recv_mmsg, use fewer, but larger buffers 2024-10-31 23:40:51 +01:00
netrc.c netrc: fix pointer to bool conversion 2024-11-17 13:18:00 +01:00
netrc.h netrc: cache the netrc file in memory 2024-10-11 14:40:12 +02:00
nonblock.c
nonblock.h
noproxy.c
noproxy.h
openldap.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
optiontable.pl
parsedate.c
parsedate.h
pingpong.c
pingpong.h
pop3.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
pop3.h
progress.c TLS: TLSv1.3 earlydata support for curl 2024-10-11 12:28:22 +02:00
progress.h TLS: TLSv1.3 earlydata support for curl 2024-10-11 12:28:22 +02:00
psl.c
psl.h curl.h: remove the struct pointer for CURL/CURLSH/CURLM typedefs 2024-10-15 14:33:40 +02:00
rand.c
rand.h
rename.c
rename.h
request.c
request.h
rtsp.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
rtsp.h
select.c select: use poll() if existing, avoid poll() with no sockets 2024-10-01 15:11:50 +02:00
select.h
sendf.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
sendf.h
setopt.c setopt: fix CURLOPT_HTTP_CONTENT_DECODING 2024-11-07 17:29:36 +01:00
setopt.h
setup-os400.h
setup-vms.h
setup-win32.h
sha256.c wolfssl: no more use of the OpenSSL API 2024-11-04 10:23:05 +01:00
share.c curl.h: remove the struct pointer for CURL/CURLSH/CURLM typedefs 2024-10-15 14:33:40 +02:00
share.h
sigpipe.h
slist.c
slist.h
smb.c config: rename the OS define to CURL_OS to reduce collision risk 2024-10-30 14:59:54 +01:00
smb.h
smtp.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
smtp.h
sockaddr.h
socketpair.c
socketpair.h socketpair: fix enabling USE_EVENTFD 2024-11-14 09:55:45 +01:00
socks_gssapi.c socks_gssapi: switch to dynbuf from buffer with strcpy 2024-09-26 23:24:14 +02:00
socks_sspi.c
socks.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
socks.h
speedcheck.c
speedcheck.h tests: fix callback signatures to please UndefinedBehaviorSanitizer 2024-10-15 14:33:47 +02:00
splay.c source: avoid use of 'very' in comments 2024-10-17 13:36:33 +02:00
splay.h
strcase.c
strcase.h
strdup.c
strdup.h
strerror.c curl.h: mark two error codes as obsolete 2024-11-16 23:39:04 +01:00
strerror.h
strtok.c
strtok.h strtok: use namespaced strtok_r macro instead of redefining it 2024-11-14 09:55:45 +01:00
strtoofft.c
strtoofft.h
system_win32.c
system_win32.h
telnet.c telnet: avoid two strcpy() by pointing to the strings instead 2024-10-08 15:40:00 +02:00
telnet.h
tftp.c src/lib: remove redundant ternary operators 2024-10-29 08:18:30 +01:00
tftp.h
timediff.c
timediff.h
timeval.c
timeval.h
transfer.c lib: remove Curl_ prefix from static functions 2024-10-27 10:57:21 +01:00
transfer.h multi: convert Curl_follow to static multi_follow 2024-10-11 12:26:36 +02:00
url.c netrc: address several netrc parser flaws 2024-11-17 11:33:56 +01:00
url.h
urlapi-int.h
urlapi.c urlapi: normalize the IPv6 address 2024-10-03 16:05:03 +02:00
urldata.h source: avoid use of 'very' in comments 2024-10-17 13:36:33 +02:00
version_win32.c lib: use bool/TRUE/FALSE properly 2024-10-03 09:31:56 +02:00
version_win32.h
version.c tidy-up: indentation [ci skip] 2024-11-15 22:05:06 +01:00
warnless.c warnless: remove curlx_sktosi and curlx_sitosk 2024-10-05 00:28:06 +02:00
warnless.h warnless: remove curlx_sktosi and curlx_sitosk 2024-10-05 00:28:06 +02:00
ws.c curl_ws_recv: return recv 0 and point meta to NULL on all errors 2024-10-20 22:57:24 +02:00
ws.h WebSockets: make support official (non-experimental) 2024-09-27 13:20:25 +02:00