Skip to content

Commit 871a25b

Browse files
committed
README.md: add ngtcp2 crypto lib to the lib list [ci skip]
Reported-by: avih on github Ref: #39
1 parent 4729ed6 commit 871a25b

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ runtime-selectable option:
6363
```
6464
Protocols: dict file ftp ftps gopher gophers http https imap imaps ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
6565
Features: alt-svc AsynchDNS brotli gsasl HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz MultiSSL NTLM SPNEGO SSL SSPI threadsafe TLS-SRP UnixSockets zstd
66-
Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2
66+
Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lngtcp2_crypto_openssl
6767
```
6868
<details><summary>Alternate configurations with different footprints:</summary><p>
6969

7070
```
7171
"big":
7272
Protocols: dict file ftp ftps gopher gophers http https imap imaps ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
7373
Features: alt-svc AsynchDNS brotli gsasl HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz MultiSSL NTLM PSL SPNEGO SSL SSPI threadsafe UnixSockets zstd
74-
Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lidn2 -lpsl -liconv -lunistring
74+
Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lngtcp2_crypto_openssl -lidn2 -lpsl -liconv -lunistring
7575
7676
"boringssl":
7777
Protocols: dict file ftp ftps gopher gophers http https imap imaps ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
7878
Features: alt-svc AsynchDNS brotli gsasl HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz MultiSSL NTLM SPNEGO SSL SSPI threadsafe UnixSockets zstd
79-
Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2
79+
Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lngtcp2_crypto_boringssl
8080
8181
"noh3", HTTP/2:
8282
Protocols: dict file ftp ftps gopher gophers http https imap imaps ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss

curl-gnumake.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ _VER="$1"
128128
if [ -n "${_OPENSSL}" ]; then
129129
CFG="${CFG}-ssl"
130130
export OPENSSL_PATH="../../${_OPENSSL}/${_PP}"
131-
export OPENSSL_LIBS='-lssl -lcrypto'
132131

133132
if [ "${_OPENSSL}" = 'boringssl' ]; then
134133
CPPFLAGS="${CPPFLAGS} -DCURL_BORINGSSL_VERSION=\\\"$(printf '%.8s' "${BORINGSSL_VER_}")\\\""
@@ -167,9 +166,9 @@ _VER="$1"
167166
# }
168167
# ```
169168
# Ref: https://github.com/niXman/mingw-builds/issues/498
170-
OPENSSL_LIBS="${OPENSSL_LIBS} -Wl,-Bdynamic -lpthread -Wl,-Bstatic"
169+
LIBS="${LIBS} -Wl,-Bdynamic -lpthread -Wl,-Bstatic"
171170
else
172-
OPENSSL_LIBS="${OPENSSL_LIBS} -Wl,-Bstatic -lpthread -Wl,-Bdynamic"
171+
LIBS="${LIBS} -Wl,-Bstatic -lpthread -Wl,-Bdynamic"
173172
fi
174173
h3=1
175174
elif [ "${_OPENSSL}" = 'libressl' ]; then

0 commit comments

Comments
 (0)