From 871a25b8d9c67e1857a830eb6ec9a0a289b787ff Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Mon, 21 Nov 2022 16:06:17 +0000
Subject: [PATCH] README.md: add ngtcp2 crypto lib to the lib list [ci skip]

Reported-by: avih on github
Ref: https://github.com/curl/curl-for-win/issues/39
---
 README.md       | 6 +++---
 curl-gnumake.sh | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ff32822e6..b5ff70015 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ runtime-selectable option:
 ```
 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
 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
-Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2
+Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lngtcp2_crypto_openssl
 ```
 <details><summary>Alternate configurations with different footprints:</summary><p>
 
@@ -71,12 +71,12 @@ Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lc
 "big":
 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
 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
-Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lidn2 -lpsl -liconv -lunistring
+Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lngtcp2_crypto_openssl -lidn2 -lpsl -liconv -lunistring
 
 "boringssl":
 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
 Features: alt-svc AsynchDNS brotli gsasl HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz MultiSSL NTLM     SPNEGO SSL SSPI threadsafe         UnixSockets zstd
-Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2
+Libs: -lcurl -lz -lcrypt32 -lbcrypt -lwldap32 -lnghttp2 -lssh2 -lgsasl -lssl -lcrypto -lbrotlidec -lbrotlicommon -lzstd -lnghttp3 -lngtcp2 -lngtcp2_crypto_boringssl
 
 "noh3", HTTP/2:
 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
diff --git a/curl-gnumake.sh b/curl-gnumake.sh
index 3887b44da..d792166bc 100755
--- a/curl-gnumake.sh
+++ b/curl-gnumake.sh
@@ -128,7 +128,6 @@ _VER="$1"
   if [ -n "${_OPENSSL}" ]; then
     CFG="${CFG}-ssl"
     export OPENSSL_PATH="../../${_OPENSSL}/${_PP}"
-    export OPENSSL_LIBS='-lssl -lcrypto'
 
     if [ "${_OPENSSL}" = 'boringssl' ]; then
       CPPFLAGS="${CPPFLAGS} -DCURL_BORINGSSL_VERSION=\\\"$(printf '%.8s' "${BORINGSSL_VER_}")\\\""
@@ -167,9 +166,9 @@ _VER="$1"
         # }
         # ```
         # Ref: https://github.com/niXman/mingw-builds/issues/498
-        OPENSSL_LIBS="${OPENSSL_LIBS} -Wl,-Bdynamic -lpthread -Wl,-Bstatic"
+        LIBS="${LIBS} -Wl,-Bdynamic -lpthread -Wl,-Bstatic"
       else
-        OPENSSL_LIBS="${OPENSSL_LIBS} -Wl,-Bstatic -lpthread -Wl,-Bdynamic"
+        LIBS="${LIBS} -Wl,-Bstatic -lpthread -Wl,-Bdynamic"
       fi
       h3=1
     elif [ "${_OPENSSL}" = 'libressl' ]; then