Skip to content

Commit e9da0d4

Browse files
committed
curl-cmake.sh: fix to enable SSPI for Windows [ci skip]
After disabling MultiSSL (due to HTTP/3 incompatibility) and Schannel with it, Kerberos/SPNEGO/SSPI feature were gone, because they depended on the SSPI build option which got its default from the Schannel-enabler option. A related issue is that the SSPI build option `BUILD_WINDOWS_SSPI` is broken, up until 8.6.0, so we use a workaround until merging the fix upstream and switching to a clean solution for 8.7.0. Depends on curl/curl#13061 for 8.7.0. Reported-by: Andreas Loew Fixes curl/curl#13056
1 parent d2d1481 commit e9da0d4

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Uses [LibreSSL](https://www.libressl.org/) TLS backend.
6161
```
6262
Windows:
6363
Protocols: dict file ftp ftps gopher gophers http https imap imaps ipfs ipns ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
64-
Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz NTLM PSL SPNEGO SSL threadsafe UnixSockets zstd
64+
Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz NTLM PSL SPNEGO SSL SSPI threadsafe UnixSockets zstd
6565
6666
macOS:
6767
Protocols: dict file ftp ftps gopher gophers http https imap imaps ipfs ipns ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
@@ -76,7 +76,7 @@ Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTP3 HTTPS-proxy IPv6
7676
```
7777
"noh3", HTTP/2:
7878
Protocols: dict file ftp ftps gopher gophers http https imap imaps ipfs ipns ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
79-
Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTPS-proxy IDN IPv6 Kerberos Largefile libz NTLM PSL SPNEGO SSL threadsafe UnixSockets zstd
79+
Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTPS-proxy IDN IPv6 Kerberos Largefile libz NTLM PSL SPNEGO SSL SSPI threadsafe UnixSockets zstd
8080
8181
"mini", without brotli and zstd, with OS TLS backend (Schannel, SecureTransport) if available:
8282
Protocols: dict file ftp ftps gopher gophers http https imap imaps ipfs ipns ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss

_versions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export CURL_HASH=3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db1
1010
# Create revision string
1111
# NOTE: Set _REV to 1 after bumping CURL_VER_, then increment for each
1212
# CI rebuild via `main` branch push (e.g. after bumping a dependency).
13-
export _REV="${CW_REVISION:-3}"
13+
export _REV="${CW_REVISION:-4}"
1414

1515
export TRURL_VER_='0.10'
1616
export TRURL_HASH=e54ee05a1a39f2547fbb39225f9cf5e2608eeaf07ad3f7dbff0a069d060d3c46

curl-cmake.sh

+6
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@ _VER="$1"
129129
fi
130130
fi
131131

132+
if [ "${CURL_VER_}" = '8.6.0' ]; then
133+
CPPFLAGS+=' -DUSE_WINDOWS_SSPI'
134+
else
135+
options+=' -DCURL_WINDOWS_SSPI=ON'
136+
fi
137+
132138
if [[ "${_CONFIG}" = *'nocookie'* ]]; then
133139
options+=' -DCURL_DISABLE_COOKIES=ON'
134140
fi

0 commit comments

Comments
 (0)