vtls: reduce conn->data use
—
$ git checkout -f bbe3aa9f881fa27fe828e3c9a36d6831f254a3ee
Previous HEAD position was a304051620 lib: more conn->data cleanups
HEAD is now at bbe3aa9f88 vtls: reduce conn->data use
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/curl.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl-curl_ctype.o
Removing lib/curl-curl_multibyte.o
Removing lib/curl-dynbuf.o
Removing lib/curl-nonblock.o
Removing lib/curl-strtoofft.o
Removing lib/curl-version_win32.o
Removing lib/curl-warnless.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_ctype.lo
Removing lib/libcurl_la-curl_ctype.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dotdot.lo
Removing lib/libcurl_la-dotdot.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostcheck.lo
Removing lib/libcurl_la-hostcheck.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn_win32.lo
Removing lib/libcurl_la-idn_win32.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-non-ascii.lo
Removing lib/libcurl_la-non-ascii.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-wildcard.lo
Removing lib/libcurl_la-wildcard.o
Removing lib/libcurl_la-x509asn1.lo
Removing lib/libcurl_la-x509asn1.o
Removing lib/stamp-h1
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-ngtcp2.lo
Removing lib/vquic/libcurl_la-ngtcp2.o
Removing lib/vquic/libcurl_la-quiche.lo
Removing lib/vquic/libcurl_la-quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gskit.lo
Removing lib/vtls/libcurl_la-gskit.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-mesalink.lo
Removing lib/vtls/libcurl_la-mesalink.o
Removing lib/vtls/libcurl_la-nss.lo
Removing lib/vtls/libcurl_la-nss.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/curl-slist_wc.o
Removing src/curl-tool_binmode.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_convert.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_homedir.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_main.o
Removing src/curl-tool_metalink.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_panykey.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_sleep.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/tool_hugehelp.c
Removing test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:44: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:44: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:147: CURL_CHECK_OPTION_DEBUG is expanded from...
configure.ac:44: the top level
configure.ac:45: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:45: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:181: CURL_CHECK_OPTION_OPTIMIZE is expanded from...
configure.ac:45: the top level
configure.ac:46: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:46: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:360: CURL_CHECK_OPTION_WARNINGS is expanded from...
configure.ac:46: the top level
configure.ac:47: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:47: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:394: CURL_CHECK_OPTION_WERROR is expanded from...
configure.ac:47: the top level
configure.ac:48: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:48: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:94: CURL_CHECK_OPTION_CURLDEBUG is expanded from...
configure.ac:48: the top level
configure.ac:49: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:49: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:237: CURL_CHECK_OPTION_SYMBOL_HIDING is expanded from...
configure.ac:49: the top level
configure.ac:50: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:50: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:58: CURL_CHECK_OPTION_ARES is expanded from...
configure.ac:50: the top level
configure.ac:51: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:51: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:328: CURL_CHECK_OPTION_RT is expanded from...
configure.ac:51: the top level
configure.ac:52: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:52: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:658: CURL_CHECK_OPTION_ECH is expanded from...
configure.ac:52: the top level
configure.ac:123: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:123: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-functions.m4:7304: CURL_COVERAGE is expanded from...
configure.ac:123: the top level
configure.ac:381: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:381: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:381: the top level
configure.ac:382: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:382: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:382: the top level
configure.ac:405: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:405: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:405: the top level
configure.ac:406: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:406: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:406: the top level
configure.ac:420: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:420: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:420: the top level
configure.ac:421: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:421: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:421: the top level
configure.ac:435: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:435: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:435: the top level
configure.ac:436: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:436: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:436: the top level
configure.ac:451: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:451: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:451: the top level
configure.ac:452: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:452: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:452: the top level
configure.ac:483: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:483: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:483: the top level
configure.ac:484: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:484: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:484: the top level
configure.ac:509: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:509: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:509: the top level
configure.ac:510: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:510: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:510: the top level
configure.ac:526: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:526: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:526: the top level
configure.ac:527: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:527: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:527: the top level
configure.ac:541: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:541: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:541: the top level
configure.ac:542: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:542: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:542: the top level
configure.ac:556: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:556: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:556: the top level
configure.ac:557: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:557: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:557: the top level
configure.ac:572: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:572: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:572: the top level
configure.ac:573: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:573: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:573: the top level
configure.ac:589: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:589: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:589: the top level
configure.ac:590: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:590: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:590: the top level
configure.ac:606: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:606: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:606: the top level
configure.ac:607: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:607: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:607: the top level
configure.ac:622: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:622: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:622: the top level
configure.ac:623: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:623: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:623: the top level
configure.ac:638: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:638: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:638: the top level
configure.ac:639: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:639: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:639: the top level
configure.ac:654: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:654: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:654: the top level
configure.ac:655: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:655: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:655: the top level
configure.ac:674: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:674: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:674: the top level
configure.ac:675: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:675: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:675: the top level
configure.ac:695: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:695: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:695: the top level
configure.ac:696: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:696: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:696: the top level
configure.ac:715: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:715: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:715: the top level
configure.ac:922: warning: The macro `AC_HEADER_TIME' is obsolete.
configure.ac:922: You should run autoupdate.
./lib/autoconf/headers.m4:743: AC_HEADER_TIME is expanded from...
acinclude.m4:1575: CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC is expanded from...
acinclude.m4:1618: CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC is expanded from...
configure.ac:922: the top level
configure.ac:943: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:943: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:943: the top level
configure.ac:944: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:944: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:944: the top level
configure.ac:1050: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1050: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1050: the top level
configure.ac:1051: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1051: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1051: the top level
configure.ac:1136: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1136: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1136: the top level
configure.ac:1137: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1137: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1137: the top level
configure.ac:1222: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1222: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1222: the top level
configure.ac:1227: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1227: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1227: the top level
configure.ac:1308: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1308: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1308: the top level
configure.ac:1309: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1309: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1309: the top level
configure.ac:1320: warning: The macro `AC_TRY_RUN' is obsolete.
configure.ac:1320: You should run autoupdate.
./lib/autoconf/general.m4:2997: AC_TRY_RUN is expanded from...
configure.ac:1320: the top level
configure.ac:1358: warning: The macro `AC_TRY_COMPILE' is obsolete.
configure.ac:1358: You should run autoupdate.
./lib/autoconf/general.m4:2847: AC_TRY_COMPILE is expanded from...
configure.ac:1358: the top level
configure.ac:1419: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1419: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1419: the top level
configure.ac:1426: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1426: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1426: the top level
configure.ac:1433: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1433: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1433: the top level
configure.ac:1599: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1599: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1599: the top level
configure.ac:1600: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1600: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1600: the top level
configure.ac:1626: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1626: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1626: the top level
configure.ac:1627: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1627: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1627: the top level
configure.ac:1631: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1631: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1631: the top level
configure.ac:1632: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1632: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1632: the top level
configure.ac:1661: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1661: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1661: the top level
configure.ac:1662: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1662: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1662: the top level
configure.ac:1666: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1666: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1666: the top level
configure.ac:1667: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1667: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1667: the top level
configure.ac:1691: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1691: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1691: the top level
configure.ac:1692: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1692: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1692: the top level
configure.ac:1727: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1727: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1727: the top level
configure.ac:1728: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1728: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1728: the top level
configure.ac:1746: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1746: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
configure.ac:1746: the top level
configure.ac:1832: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1832: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
configure.ac:1832: the top level
configure.ac:1832: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1832: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/general.m4:2894: _AC_LINK_IFELSE is expanded from...
./lib/autoconf/general.m4:2911: AC_LINK_IFELSE is expanded from...
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
configure.ac:1832: the top level
configure.ac:2048: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2048: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2048: the top level
configure.ac:2059: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2059: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2059: the top level
configure.ac:2094: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2094: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2094: the top level
configure.ac:2095: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2095: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2095: the top level
configure.ac:2111: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2111: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2111: the top level
configure.ac:2112: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2112: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2112: the top level
configure.ac:2272: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2272: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2272: the top level
configure.ac:2273: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2273: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2273: the top level
configure.ac:2366: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2366: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2366: the top level
configure.ac:2367: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2367: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2367: the top level
configure.ac:2526: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2526: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2526: the top level
configure.ac:2527: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2527: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2527: the top level
configure.ac:2617: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2617: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2617: the top level
configure.ac:2618: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2618: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2618: the top level
configure.ac:2708: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2708: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2708: the top level
configure.ac:2709: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2709: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2709: the top level
configure.ac:2874: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2874: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
acinclude.m4:2163: CURL_CHECK_CA_BUNDLE is expanded from...
configure.ac:2874: the top level
configure.ac:2905: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2905: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2905: the top level
configure.ac:2906: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2906: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2906: the top level
configure.ac:2999: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2999: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2999: the top level
configure.ac:3000: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3000: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3000: the top level
configure.ac:3006: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3006: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3006: the top level
configure.ac:3007: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3007: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3007: the top level
configure.ac:3012: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3012: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3012: the top level
configure.ac:3013: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3013: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3013: the top level
configure.ac:3194: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3194: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3194: the top level
configure.ac:3195: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3195: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3195: the top level
configure.ac:3273: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3273: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3273: the top level
configure.ac:3274: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3274: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3274: the top level
configure.ac:3325: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3325: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3325: the top level
configure.ac:3326: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3326: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3326: the top level
configure.ac:3403: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3403: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3403: the top level
configure.ac:3404: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3404: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3404: the top level
configure.ac:3538: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3538: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3538: the top level
configure.ac:3539: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3539: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3539: the top level
configure.ac:3623: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3623: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3623: the top level
configure.ac:3624: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3624: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3624: the top level
configure.ac:3822: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3822: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3822: the top level
configure.ac:3823: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3823: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3823: the top level
configure.ac:3913: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3913: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3913: the top level
configure.ac:3914: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3914: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3914: the top level
configure.ac:4003: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4003: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4003: the top level
configure.ac:4004: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4004: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4004: the top level
configure.ac:4089: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4089: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4089: the top level
configure.ac:4090: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4090: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4090: the top level
configure.ac:4114: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4114: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4114: the top level
configure.ac:4115: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4115: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4115: the top level
configure.ac:4143: warning: The macro `AC_HEADER_STDC' is obsolete.
configure.ac:4143: You should run autoupdate.
./lib/autoconf/headers.m4:704: AC_HEADER_STDC is expanded from...
configure.ac:4143: the top level
configure.ac:4230: warning: The macro `AC_HEADER_TIME' is obsolete.
configure.ac:4230: You should run autoupdate.
./lib/autoconf/headers.m4:743: AC_HEADER_TIME is expanded from...
configure.ac:4230: the top level
configure.ac:4345: warning: The macro `AC_TYPE_SIGNAL' is obsolete.
configure.ac:4345: You should run autoupdate.
./lib/autoconf/types.m4:776: AC_TYPE_SIGNAL is expanded from...
configure.ac:4345: the top level
configure.ac:4525: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4525: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:32: CURL_CHECK_OPTION_THREADED_RESOLVER is expanded from...
configure.ac:4525: the top level
configure.ac:4533: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4533: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4533: the top level
configure.ac:4535: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4535: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4535: the top level
configure.ac:4636: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4636: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4636: the top level
configure.ac:4637: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4637: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4637: the top level
configure.ac:4655: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4655: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4655: the top level
configure.ac:4656: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4656: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4656: the top level
configure.ac:4691: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4691: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4691: the top level
configure.ac:4692: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4692: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4692: the top level
configure.ac:4705: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4705: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:599: CURL_CHECK_OPTION_NTLM_WB is expanded from...
configure.ac:4705: the top level
configure.ac:4714: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4714: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4714: the top level
configure.ac:4715: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4715: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4715: the top level
configure.ac:4740: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4740: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4740: the top level
configure.ac:4741: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4741: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4741: the top level
configure.ac:4773: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4773: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4773: the top level
configure.ac:4774: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4774: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4774: the top level
configure.ac:4791: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4791: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4791: the top level
configure.ac:4792: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4792: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4792: the top level
configure.ac:4809: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4809: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4809: the top level
configure.ac:4810: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4810: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4810: the top level
configure.ac:4827: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4827: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4827: the top level
configure.ac:4828: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4828: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4828: the top level
configure.ac:4845: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4845: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4845: the top level
configure.ac:4846: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4846: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4846: the top level
configure.ac:4863: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4863: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4863: the top level
configure.ac:4864: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4864: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4864: the top level
configure.ac:4881: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4881: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4881: the top level
configure.ac:4882: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4882: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4882: the top level
configure.ac:4899: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4899: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4899: the top level
configure.ac:4900: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4900: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4900: the top level
configure.ac:4917: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4917: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4917: the top level
configure.ac:4918: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4918: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4918: the top level
configure.ac:4935: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4935: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4935: the top level
configure.ac:4936: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4936: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4936: the top level
configure.ac:4953: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4953: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4953: the top level
configure.ac:4954: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4954: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4954: the top level
configure.ac:4974: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4974: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4974: the top level
configure.ac:4975: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4975: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4975: the top level
configure.ac:120: installing './compile'
configure.ac:185: installing './config.guess'
configure.ac:185: installing './config.sub'
configure.ac:120: installing './install-sh'
configure.ac:125: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 7.75.0-DEV
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for sys/time.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking if compiler is LCC... no
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking if compiler is Watcom C... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler accepts debug disabling options... yes
configure: compiler options added:
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers -Wenum-conversion
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking for windows.h... no
checking whether build target is a native Windows one... no
checking whether build target supports WIN32 file API... no
checking for good-to-use Mac CFLAGS... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking for windows.h... (cached) no
checking for winsock.h... (cached) no
checking for winsock2.h... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldapssl.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS (Windows native builds only)... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL)... no
checking for library containing psl_builtin... -lpsl
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libngtcp2 options with pkg-config... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for quiche options with pkg-config... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for hyper options with pkg-config... no
configure: -l is -lhyper
configure: -I is
configure: -L is
checking for hyper_io_new in -lhyper... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... no
checking for egrep... (cached) /usr/bin/grep -E
checking for malloc.h... yes
checking for memory.h... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for sys/uio.h... yes
checking for assert.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for sgtty.h... yes
checking for fcntl.h... yes
checking for alloca.h... yes
checking for time.h... (cached) yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for errno.h... yes
checking for stdbool.h... yes
checking for arpa/tftp.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for compiler support of C99 variadic macro style... yes
checking for compiler support of old gcc variadic macro style... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of short... 2
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking for long long... yes
checking if numberLL works... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for signal.h... yes
checking for sig_atomic_t... yes
checking if sig_atomic_t is already defined as volatile... no
checking return type of signal handlers... void
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking types of args and return type for select... int,fd_set *,struct timeval *,int
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking types of args and return type for recv... int,void *,size_t,int,ssize_t
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking types of args and return type for send... int,const void *,size_t,int,ssize_t
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for string.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking if connect can be linked... yes
checking if connect is prototyped... yes
checking if connect is compilable... yes
checking if connect usage allowed... yes
checking if connect might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for ws2tcpip.h... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if freeifaddrs can be linked... yes
checking if freeifaddrs is prototyped... yes
checking if freeifaddrs is compilable... yes
checking if freeifaddrs usage allowed... yes
checking if freeifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking for stdlib.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gai_strerror can be linked... yes
checking if gai_strerror is prototyped... yes
checking if gai_strerror is compilable... yes
checking if gai_strerror usage allowed... yes
checking if gai_strerror might be used... yes
checking if gethostbyaddr can be linked... yes
checking if gethostbyaddr is prototyped... yes
checking if gethostbyaddr is compilable... yes
checking if gethostbyaddr usage allowed... yes
checking if gethostbyaddr might be used... yes
checking if gethostbyaddr_r can be linked... yes
checking if gethostbyaddr_r is prototyped... yes
checking if gethostbyaddr_r takes 5 args.... no
checking if gethostbyaddr_r takes 7 args.... no
checking if gethostbyaddr_r takes 8 args.... yes
checking if gethostbyaddr_r is compilable... yes
checking if gethostbyaddr_r usage allowed... yes
checking if gethostbyaddr_r might be used... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking if getservbyport_r can be linked... yes
checking if getservbyport_r is prototyped... yes
checking if getservbyport_r takes 4 args.... no
checking if getservbyport_r takes 5 args.... no
checking if getservbyport_r takes 6 args.... yes
checking if getservbyport_r is compilable... yes
checking if getservbyport_r usage allowed... yes
checking if getservbyport_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntoa_r can be linked... no
checking if inet_ntoa_r might be used... no
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if localtime_r can be linked... yes
checking if localtime_r is prototyped... yes
checking if localtime_r is compilable... yes
checking if localtime_r seems to work... yes
checking if localtime_r usage allowed... yes
checking if localtime_r might be used... yes
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking if setsockopt can be linked... yes
checking if setsockopt is prototyped... yes
checking if setsockopt is compilable... yes
checking if setsockopt usage allowed... yes
checking if setsockopt might be used... yes
checking if setsockopt SO_NONBLOCK is compilable... no
checking if setsockopt SO_NONBLOCK might be used... no
checking for sys/types.h... (cached) yes
checking for signal.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking for setjmp.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strncasecmp can be linked... yes
checking if strncasecmp is prototyped... yes
checking if strncasecmp is compilable... yes
checking if strncasecmp usage allowed... yes
checking if strncasecmp might be used... yes
checking if strncmpi can be linked... no
checking if strncmpi might be used... no
checking if strnicmp can be linked... no
checking if strnicmp might be used... no
checking if strstr can be linked... yes
checking if strstr is prototyped... yes
checking if strstr is compilable... yes
checking if strstr usage allowed... yes
checking if strstr might be used... yes
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/uio.h... (cached) yes
checking if writev can be linked... yes
checking if writev is prototyped... yes
checking if writev is compilable... yes
checking if writev usage allowed... yes
checking if writev might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for usleep... yes
checking for utime... yes
checking for utimes... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable cryptographic authentication methods... yes
checking whether to enable NTLM delegation to winbind's helper... no
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... no
checking whether to support HSTS... no
checking whether hiding of library internal symbols will actually happen... yes
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: amending lib/Makefile
configure: amending src/Makefile
configure: amending tests/unit/Makefile
configure: amending tests/server/Makefile
configure: amending tests/libtest/Makefile
configure: amending docs/examples/Makefile
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers -Wenum-conversion
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 7.75.0-DEV
SSL: no (--with-{ssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,mesalink,amissl,bearssl} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build libcurl: Shared=no, Static=yes
Built-in manual: enabled
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
Metalink: no (--with-libmetalink)
PSL: enabled
Alt-svc: enabled
HTTP1: enabled (--with-hyper)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2, --with-quiche)
ECH: no (--enable-ech)
Protocols: DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 PSL UnixSockets alt-svc libz
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.
configure: WARNING: Use --with-ssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl or --with-bearssl to address this.
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_ctype.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dotdot.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostcheck.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-idn_win32.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-non-ascii.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-wildcard.lo
CC libcurl_la-x509asn1.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gskit.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-mesalink.lo
CC vtls/libcurl_la-nss.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vquic/libcurl_la-ngtcp2.lo
CC vquic/libcurl_la-quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
generate ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC curl-slist_wc.o
CC curl-tool_bname.o
CC curl-tool_binmode.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_see.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_convert.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_helpers.o
CC curl-tool_homedir.o
HUGE tool_hugehelp.c
CC curl-tool_libinfo.o
CC curl-tool_main.o
CC curl-tool_metalink.o
CC curl-tool_msgs.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_panykey.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_strdup.o
CC curl-tool_setopt.o
CC curl-tool_sleep.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout_json.o
CC curl-tool_writeout.o
CC curl-tool_xattr.o
CC ../lib/curl-strtoofft.o
CC ../lib/curl-nonblock.o
CC ../lib/curl-curl_ctype.o
CC ../lib/curl-warnless.o
CC ../lib/curl-curl_multibyte.o
CC ../lib/curl-version_win32.o
CC ../lib/curl-dynbuf.o
CC curl-tool_hugehelp.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'
| @@ -443,7 +443,7 @@ static CURLcode InitiateTransfer(struct Curl_easy *data) | |
| /* since we only have a plaintext TCP connection here, we must now | |
| * do the TLS stuff */ | |
| infof(data, "Doing the SSL/TLS handshake on the data stream\n"); | |
| - | result = Curl_ssl_connect(conn, SECONDARYSOCKET); |
| + | result = Curl_ssl_connect(data, conn, SECONDARYSOCKET); |
| if(result) | |
| return result; | |
| } | |
| @@ -2734,7 +2734,7 @@ static CURLcode ftp_statemachine(struct Curl_easy *data, | |
| if((ftpcode == 234) || (ftpcode == 334)) { | |
| /* Curl_ssl_connect is BLOCKING */ | |
| - | result = Curl_ssl_connect(conn, FIRSTSOCKET); |
| + | result = Curl_ssl_connect(data, conn, FIRSTSOCKET); |
| if(!result) { | |
| conn->bits.ftp_use_data_ssl = FALSE; /* clear-text data */ | |
| conn->bits.ftp_use_control_ssl = TRUE; /* SSL on control */ | |
| @@ -2800,7 +2800,7 @@ static CURLcode ftp_statemachine(struct Curl_easy *data, | |
| case FTP_CCC: | |
| if(ftpcode < 500) { | |
| /* First shut down the SSL layer (note: this call will block) */ | |
| - | result = Curl_ssl_shutdown(conn, FIRSTSOCKET); |
| + | result = Curl_ssl_shutdown(data, conn, FIRSTSOCKET); |
| if(result) | |
| failf(data, "Failed to clear the command channel (CCC)"); | |
| @@ -3138,7 +3138,7 @@ static CURLcode ftp_connect(struct Curl_easy *data, | |
| if(conn->handler->flags & PROTOPT_SSL) { | |
| /* BLOCKING */ | |
| - | result = Curl_ssl_connect(conn, FIRSTSOCKET); |
| + | result = Curl_ssl_connect(data, conn, FIRSTSOCKET); |
| if(result) | |
| return result; | |
| conn->bits.ftp_use_control_ssl = TRUE; | |
| @@ -3284,7 +3284,7 @@ static CURLcode ftp_done(struct Curl_easy *data, CURLcode status, | |
| if(conn->ssl[SECONDARYSOCKET].use) { | |
| /* The secondary socket is using SSL so we must close down that part | |
| first before we close the socket for real */ | |
| - | Curl_ssl_close(conn, SECONDARYSOCKET); |
| + | Curl_ssl_close(data, conn, SECONDARYSOCKET); |
| /* Note that we keep "use" set to TRUE since that (next) connection is | |
| still requested to use SSL */ | |
| @@ -113,7 +113,7 @@ static CURLcode gopher_connect(struct Curl_easy *data, bool *done) | |
| static CURLcode gopher_connecting(struct Curl_easy *data, bool *done) | |
| { | |
| struct connectdata *conn = data->conn; | |
| - | CURLcode result = Curl_ssl_connect(conn, FIRSTSOCKET); |
| + | CURLcode result = Curl_ssl_connect(data, conn, FIRSTSOCKET); |
| if(result) | |
| connclose(conn, "Failed TLS connection"); | |
| *done = TRUE; | |
| @@ -1532,7 +1532,7 @@ static CURLcode https_connecting(struct Curl_easy *data, bool *done) | |
| #endif | |
| /* perform SSL initialization for this socket */ | |
| - | result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, done); |
| + | result = Curl_ssl_connect_nonblocking(data, conn, FIRSTSOCKET, done); |
| if(result) | |
| connclose(conn, "Failed HTTPS connection"); | |
| @@ -58,7 +58,7 @@ static CURLcode https_proxy_connect(struct connectdata *conn, int sockindex) | |
| if(!conn->bits.proxy_ssl_connected[sockindex]) { | |
| /* perform SSL initialization for this socket */ | |
| result = | |
| - | Curl_ssl_connect_nonblocking(conn, sockindex, |
| + | Curl_ssl_connect_nonblocking(conn->data, conn, sockindex, |
| &conn->bits.proxy_ssl_connected[sockindex]); | |
| if(result) | |
| /* a failed connection is marked for closure to prevent (bad) re-use or | |
| @@ -473,7 +473,7 @@ static CURLcode imap_perform_upgrade_tls(struct Curl_easy *data, | |
| { | |
| /* Start the SSL connection */ | |
| struct imap_conn *imapc = &conn->proto.imapc; | |
| - | CURLcode result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, |
| + | CURLcode result = Curl_ssl_connect_nonblocking(data, conn, FIRSTSOCKET, |
| &imapc->ssldone); | |
| if(!result) { | |
| @@ -1366,7 +1366,8 @@ static CURLcode imap_multi_statemach(struct Curl_easy *data, bool *done) | |
| struct imap_conn *imapc = &conn->proto.imapc; | |
| if((conn->handler->flags & PROTOPT_SSL) && !imapc->ssldone) { | |
| - | result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &imapc->ssldone); |
| + | result = Curl_ssl_connect_nonblocking(data, conn, |
| + | FIRSTSOCKET, &imapc->ssldone); |
| if(result || !imapc->ssldone) | |
| return result; | |
| } | |
| @@ -245,7 +245,8 @@ static CURLcode ldap_connect(struct Curl_easy *data, bool *done) | |
| #ifdef USE_SSL | |
| if(conn->handler->flags & PROTOPT_SSL) { | |
| CURLcode result; | |
| - | result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &li->ssldone); |
| + | result = Curl_ssl_connect_nonblocking(data, conn, |
| + | FIRSTSOCKET, &li->ssldone); |
| if(result) | |
| return result; | |
| } | |
| @@ -267,7 +268,7 @@ static CURLcode ldap_connecting(struct Curl_easy *data, bool *done) | |
| if(conn->handler->flags & PROTOPT_SSL) { | |
| /* Is the SSL handshake complete yet? */ | |
| if(!li->ssldone) { | |
| - | CURLcode result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, |
| + | CURLcode result = Curl_ssl_connect_nonblocking(data, conn, FIRSTSOCKET, |
| &li->ssldone); | |
| if(result || !li->ssldone) | |
| return result; | |
| @@ -368,7 +368,7 @@ static CURLcode pop3_perform_upgrade_tls(struct Curl_easy *data, | |
| { | |
| /* Start the SSL connection */ | |
| struct pop3_conn *pop3c = &conn->proto.pop3c; | |
| - | CURLcode result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, |
| + | CURLcode result = Curl_ssl_connect_nonblocking(data, conn, FIRSTSOCKET, |
| &pop3c->ssldone); | |
| if(!result) { | |
| @@ -1029,7 +1029,8 @@ static CURLcode pop3_multi_statemach(struct Curl_easy *data, bool *done) | |
| struct pop3_conn *pop3c = &conn->proto.pop3c; | |
| if((conn->handler->flags & PROTOPT_SSL) && !pop3c->ssldone) { | |
| - | result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &pop3c->ssldone); |
| + | result = Curl_ssl_connect_nonblocking(data, conn, |
| + | FIRSTSOCKET, &pop3c->ssldone); |
| if(result || !pop3c->ssldone) | |
| return result; | |
| } | |
| @@ -669,7 +669,8 @@ static CURLcode smb_connection_state(struct Curl_easy *data, bool *done) | |
| #ifdef USE_SSL | |
| if((conn->handler->flags & PROTOPT_SSL)) { | |
| bool ssl_done = FALSE; | |
| - | result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &ssl_done); |
| + | result = Curl_ssl_connect_nonblocking(data, conn, |
| + | FIRSTSOCKET, &ssl_done); |
| if(result && result != CURLE_AGAIN) | |
| return result; | |
| if(!ssl_done) | |
| @@ -395,7 +395,7 @@ static CURLcode smtp_perform_upgrade_tls(struct Curl_easy *data) | |
| /* Start the SSL connection */ | |
| struct connectdata *conn = data->conn; | |
| struct smtp_conn *smtpc = &conn->proto.smtpc; | |
| - | CURLcode result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, |
| + | CURLcode result = Curl_ssl_connect_nonblocking(data, conn, FIRSTSOCKET, |
| &smtpc->ssldone); | |
| if(!result) { | |
| @@ -1256,7 +1256,8 @@ static CURLcode smtp_multi_statemach(struct Curl_easy *data, bool *done) | |
| struct smtp_conn *smtpc = &conn->proto.smtpc; | |
| if((conn->handler->flags & PROTOPT_SSL) && !smtpc->ssldone) { | |
| - | result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone); |
| + | result = Curl_ssl_connect_nonblocking(data, conn, |
| + | FIRSTSOCKET, &smtpc->ssldone); |
| if(result || !smtpc->ssldone) | |
| return result; | |
| } | |
| @@ -723,8 +723,8 @@ static void conn_shutdown(struct Curl_easy *data, struct connectdata *conn) | |
| /* close the SSL stuff before we close any sockets since they will/may | |
| write to the sockets */ | |
| - | Curl_ssl_close(conn, FIRSTSOCKET); |
| - | Curl_ssl_close(conn, SECONDARYSOCKET); |
| + | Curl_ssl_close(data, conn, FIRSTSOCKET); |
| + | Curl_ssl_close(data, conn, SECONDARYSOCKET); |
| /* close possibly still open sockets */ | |
| if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) | |
| @@ -294,9 +294,9 @@ static const br_x509_class x509_vtable = { | |
| x509_get_pkey | |
| }; | |
| - | static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) |
| + | static CURLcode bearssl_connect_step1(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile); | |
| @@ -374,12 +374,12 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) | |
| if(SSL_SET_OPTION(primary.sessionid)) { | |
| void *session; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, &session, NULL, sockindex)) { |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, &session, NULL, sockindex)) { |
| br_ssl_engine_set_session_parameters(&backend->ctx.eng, session); | |
| infof(data, "BearSSL: re-using session ID\n"); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| if(conn->bits.tls_enable_alpn) { | |
| @@ -429,10 +429,10 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode bearssl_run_until(struct connectdata *conn, int sockindex, |
| + | static CURLcode bearssl_run_until(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex, |
| unsigned target) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| @@ -507,14 +507,15 @@ static CURLcode bearssl_run_until(struct connectdata *conn, int sockindex, | |
| } | |
| } | |
| - | static CURLcode bearssl_connect_step2(struct connectdata *conn, int sockindex) |
| + | static CURLcode bearssl_connect_step2(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| CURLcode ret; | |
| - | ret = bearssl_run_until(conn, sockindex, BR_SSL_SENDAPP | BR_SSL_RECVAPP); |
| + | ret = bearssl_run_until(data, conn, sockindex, |
| + | BR_SSL_SENDAPP | BR_SSL_RECVAPP); |
| if(ret == CURLE_AGAIN) | |
| return CURLE_OK; | |
| if(ret == CURLE_OK) { | |
| @@ -527,9 +528,9 @@ static CURLcode bearssl_connect_step2(struct connectdata *conn, int sockindex) | |
| return ret; | |
| } | |
| - | static CURLcode bearssl_connect_step3(struct connectdata *conn, int sockindex) |
| + | static CURLcode bearssl_connect_step3(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| CURLcode ret; | |
| @@ -568,12 +569,13 @@ static CURLcode bearssl_connect_step3(struct connectdata *conn, int sockindex) | |
| if(!session) | |
| return CURLE_OUT_OF_MEMORY; | |
| br_ssl_engine_get_session_parameters(&backend->ctx.eng, session); | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | incache = !(Curl_ssl_getsessionid(conn, &oldsession, NULL, sockindex)); |
| + | Curl_ssl_sessionid_lock(data); |
| + | incache = !(Curl_ssl_getsessionid(data, conn, |
| + | &oldsession, NULL, sockindex)); |
| if(incache) | |
| - | Curl_ssl_delsessionid(conn, oldsession); |
| - | ret = Curl_ssl_addsessionid(conn, session, 0, sockindex); |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_delsessionid(data, oldsession); |
| + | ret = Curl_ssl_addsessionid(data, conn, session, 0, sockindex); |
| + | Curl_ssl_sessionid_unlock(data); |
| if(ret) { | |
| free(session); | |
| return CURLE_OUT_OF_MEMORY; | |
| @@ -595,7 +597,7 @@ static ssize_t bearssl_send(struct Curl_easy *data, int sockindex, | |
| size_t applen; | |
| for(;;) { | |
| - | *err = bearssl_run_until(conn, sockindex, BR_SSL_SENDAPP); |
| + | *err = bearssl_run_until(data, conn, sockindex, BR_SSL_SENDAPP); |
| if (*err != CURLE_OK) | |
| return -1; | |
| app = br_ssl_engine_sendapp_buf(&backend->ctx.eng, &applen); | |
| @@ -627,7 +629,7 @@ static ssize_t bearssl_recv(struct Curl_easy *data, int sockindex, | |
| unsigned char *app; | |
| size_t applen; | |
| - | *err = bearssl_run_until(conn, sockindex, BR_SSL_RECVAPP); |
| + | *err = bearssl_run_until(data, conn, sockindex, BR_SSL_RECVAPP); |
| if(*err != CURLE_OK) | |
| return -1; | |
| app = br_ssl_engine_recvapp_buf(&backend->ctx.eng, &applen); | |
| @@ -641,13 +643,13 @@ static ssize_t bearssl_recv(struct Curl_easy *data, int sockindex, | |
| return applen; | |
| } | |
| - | static CURLcode bearssl_connect_common(struct connectdata *conn, |
| + | static CURLcode bearssl_connect_common(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool nonblocking, | |
| bool *done) | |
| { | |
| CURLcode ret; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| timediff_t timeout_ms; | |
| @@ -660,7 +662,7 @@ static CURLcode bearssl_connect_common(struct connectdata *conn, | |
| } | |
| if(ssl_connect_1 == connssl->connecting_state) { | |
| - | ret = bearssl_connect_step1(conn, sockindex); |
| + | ret = bearssl_connect_step1(data, conn, sockindex); |
| if(ret) | |
| return ret; | |
| } | |
| @@ -713,7 +715,7 @@ static CURLcode bearssl_connect_common(struct connectdata *conn, | |
| * before step2 has completed while ensuring that a client using select() | |
| * or epoll() will always have a valid fdset to wait on. | |
| */ | |
| - | ret = bearssl_connect_step2(conn, sockindex); |
| + | ret = bearssl_connect_step2(data, conn, sockindex); |
| if(ret || (nonblocking && | |
| (ssl_connect_2 == connssl->connecting_state || | |
| ssl_connect_2_reading == connssl->connecting_state || | |
| @@ -722,7 +724,7 @@ static CURLcode bearssl_connect_common(struct connectdata *conn, | |
| } | |
| if(ssl_connect_3 == connssl->connecting_state) { | |
| - | ret = bearssl_connect_step3(conn, sockindex); |
| + | ret = bearssl_connect_step3(data, conn, sockindex); |
| if(ret) | |
| return ret; | |
| } | |
| @@ -775,12 +777,13 @@ static CURLcode bearssl_random(struct Curl_easy *data UNUSED_PARAM, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode bearssl_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode bearssl_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode ret; | |
| bool done = FALSE; | |
| - | ret = bearssl_connect_common(conn, sockindex, FALSE, &done); |
| + | ret = bearssl_connect_common(data, conn, sockindex, FALSE, &done); |
| if(ret) | |
| return ret; | |
| @@ -789,10 +792,11 @@ static CURLcode bearssl_connect(struct connectdata *conn, int sockindex) | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode bearssl_connect_nonblocking(struct connectdata *conn, |
| + | static CURLcode bearssl_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, bool *done) | |
| { | |
| - | return bearssl_connect_common(conn, sockindex, TRUE, done); |
| + | return bearssl_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| static void *bearssl_get_internals(struct ssl_connect_data *connssl, | |
| @@ -802,7 +806,8 @@ static void *bearssl_get_internals(struct ssl_connect_data *connssl, | |
| return &backend->ctx; | |
| } | |
| - | static void bearssl_close(struct connectdata *conn, int sockindex) |
| + | static void bearssl_close(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -810,7 +815,7 @@ static void bearssl_close(struct connectdata *conn, int sockindex) | |
| if(backend->active) { | |
| br_ssl_engine_close(&backend->ctx.eng); | |
| - | (void)bearssl_run_until(conn, sockindex, BR_SSL_CLOSED); |
| + | (void)bearssl_run_until(data, conn, sockindex, BR_SSL_CLOSED); |
| } | |
| for(i = 0; i < backend->anchors_len; ++i) | |
| free(backend->anchors[i].dn.data); | |
| @@ -610,10 +610,10 @@ static void close_one(struct ssl_connect_data *connssl, struct Curl_easy *data, | |
| } | |
| - | static ssize_t real_gskit_send(struct Curl_easy *data, |
| - | struct connectdata *conn, int sockindex, |
| - | const void *mem, size_t len, CURLcode *curlcode) |
| + | static ssize_t gskit_send(struct connectdata *conn, int sockindex, |
| + | const void *mem, size_t len, CURLcode *curlcode) |
| { | |
| + | struct connectdata *conn = data->conn; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| CURLcode cc = CURLE_SEND_ERROR; | |
| int written; | |
| @@ -634,17 +634,11 @@ static ssize_t real_gskit_send(struct Curl_easy *data, | |
| return (ssize_t) written; /* number of bytes */ | |
| } | |
| - | static ssize_t gskit_send(struct connectdata *conn, int sockindex, |
| - | const void *mem, size_t len, CURLcode *curlcode) |
| - | { |
| - | return real_gskit_send(conn->data, conn, sockindex, mem, len, curlcode); |
| - | } |
| - | |
| - | static ssize_t real_gskit_recv(struct Curl_easy *data, |
| - | struct connectdata *conn, int num, char *buf, |
| + | static ssize_t gskit_recv(struct Curl_easy *data, int num, char *buf, |
| size_t buffersize, CURLcode *curlcode) | |
| { | |
| + | struct connectdata *conn = data->conn; |
| struct ssl_connect_data *connssl = &conn->ssl[num]; | |
| int nread; | |
| CURLcode cc = CURLE_RECV_ERROR; | |
| @@ -668,12 +662,6 @@ static ssize_t real_gskit_recv(struct Curl_easy *data, | |
| return (ssize_t) nread; | |
| } | |
| - | static ssize_t gskit_recv(struct connectdata *conn, int num, char *buf, |
| - | size_t buffersize, CURLcode *curlcode) |
| - | { |
| - | return real_gskit_recv(conn->data, conn, num, buf, buffersize, curlcode); |
| - | } |
| - | |
| static CURLcode | |
| set_ssl_version_min_max(unsigned int *protoflags, struct Curl_easy *data) | |
| { | |
| @@ -1137,9 +1125,9 @@ static CURLcode gskit_connect_common(struct Curl_easy *data, | |
| } | |
| - | static CURLcode real_gskit_connect_nonblocking(struct Curl_easy *data, |
| - | struct connectdata *conn, |
| - | int sockindex, bool *done) |
| + | static CURLcode gskit_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| + | int sockindex, bool *done) |
| { | |
| CURLcode result; | |
| @@ -1149,15 +1137,9 @@ static CURLcode real_gskit_connect_nonblocking(struct Curl_easy *data, | |
| return result; | |
| } | |
| - | static CURLcode gskit_connect_nonblocking(struct connectdata *conn, |
| - | int sockindex, bool *done) |
| - | { |
| - | return real_gskit_connect_nonblocking(conn->data, conn, sockindex, done); |
| - | } |
| - | |
| - | static CURLcode real_gskit_connect(struct Curl_easy *data, |
| - | struct connectdata *conn, int sockindex) |
| + | static CURLcode gskit_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode result; | |
| bool done; | |
| @@ -1172,27 +1154,17 @@ static CURLcode real_gskit_connect(struct Curl_easy *data, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode gskit_connect(struct connectdata *conn, int sockindex) |
| - | { |
| - | return real_gskit_connect(conn->data, conn, sockindex); |
| - | } |
| - | |
| - | static void real_gskit_close(struct Curl_easy *data, struct connectdata *conn, |
| - | int sockindex) |
| + | static void gskit_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| close_one(&conn->ssl[sockindex], data, conn, sockindex); | |
| close_one(&conn->proxy_ssl[sockindex], data, conn, sockindex); | |
| } | |
| - | static void gskit_close(struct connectdata *conn, int sockindex) |
| - | { |
| - | real_gskit_close(conn->data, conn, sockindex); |
| - | } |
| - | |
| - | static int real_gskit_shutdown(struct Curl_easy *data, |
| - | struct connectdata *conn, int sockindex) |
| + | static int gskit_shutdown(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| int what; | |
| @@ -1247,11 +1219,6 @@ static int real_gskit_shutdown(struct Curl_easy *data, | |
| return rc; | |
| } | |
| - | static int gskit_shutdown(struct connectdata *conn, int sockindex) |
| - | { |
| - | return real_gskit_shutdown(conn->data, conn, sockindex); |
| - | } |
| - | |
| static size_t gskit_version(char *buffer, size_t size) | |
| { | |
| @@ -200,12 +200,12 @@ static void unload_file(gnutls_datum_t data) | |
| /* this function does a SSL/TLS (re-)handshake */ | |
| - | static CURLcode handshake(struct connectdata *conn, |
| + | static CURLcode handshake(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool duringconnect, | |
| bool nonblocking) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| gnutls_session_t session = backend->session; | |
| @@ -314,9 +314,9 @@ static gnutls_x509_crt_fmt_t do_file_type(const char *type) | |
| #define GNUTLS_SRP "+SRP" | |
| static CURLcode | |
| - | set_ssl_version_min_max(const char **prioritylist, struct connectdata *conn) |
| + | set_ssl_version_min_max(const char **prioritylist, struct Curl_easy *data) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| + | struct connectdata *conn = data->conn; |
| long ssl_version = SSL_CONN_CONFIG(version); | |
| long ssl_version_max = SSL_CONN_CONFIG(version_max); | |
| @@ -379,10 +379,10 @@ set_ssl_version_min_max(const char **prioritylist, struct connectdata *conn) | |
| } | |
| static CURLcode | |
| - | gtls_connect_step1(struct connectdata *conn, |
| + | gtls_connect_step1(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| unsigned int init_flags; | |
| @@ -568,7 +568,7 @@ gtls_connect_step1(struct connectdata *conn, | |
| case CURL_SSLVERSION_TLSv1_2: | |
| case CURL_SSLVERSION_TLSv1_3: | |
| { | |
| - | CURLcode result = set_ssl_version_min_max(&prioritylist, conn); |
| + | CURLcode result = set_ssl_version_min_max(&prioritylist, data); |
| if(result != CURLE_OK) | |
| return result; | |
| break; | |
| @@ -731,15 +731,16 @@ gtls_connect_step1(struct connectdata *conn, | |
| void *ssl_sessionid; | |
| size_t ssl_idsize; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, &ssl_idsize, sockindex)) { |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, |
| + | &ssl_sessionid, &ssl_idsize, sockindex)) { |
| /* we got a session id, use it! */ | |
| gnutls_session_set_data(session, ssl_sessionid, ssl_idsize); | |
| /* Informational message */ | |
| infof(data, "SSL re-using session ID\n"); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| return CURLE_OK; | |
| @@ -807,7 +808,8 @@ static Curl_recv gtls_recv; | |
| static Curl_send gtls_send; | |
| static CURLcode | |
| - | gtls_connect_step3(struct connectdata *conn, |
| + | gtls_connect_step3(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex) | |
| { | |
| unsigned int cert_list_size; | |
| @@ -820,7 +822,6 @@ gtls_connect_step3(struct connectdata *conn, | |
| size_t size; | |
| time_t certclock; | |
| const char *ptr; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| gnutls_session_t session = backend->session; | |
| @@ -1290,19 +1291,19 @@ gtls_connect_step3(struct connectdata *conn, | |
| /* extract session ID to the allocated buffer */ | |
| gnutls_session_get_data(session, connect_sessionid, &connect_idsize); | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | incache = !(Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, |
| + | Curl_ssl_sessionid_lock(data); |
| + | incache = !(Curl_ssl_getsessionid(data, conn, &ssl_sessionid, NULL, |
| sockindex)); | |
| if(incache) { | |
| /* there was one before in the cache, so instead of risking that the | |
| previous one was rejected, we just kill that and store the new */ | |
| - | Curl_ssl_delsessionid(conn, ssl_sessionid); |
| + | Curl_ssl_delsessionid(data, ssl_sessionid); |
| } | |
| /* store this session id */ | |
| - | result = Curl_ssl_addsessionid(conn, connect_sessionid, connect_idsize, |
| - | sockindex); |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | result = Curl_ssl_addsessionid(data, conn, connect_sessionid, |
| + | connect_idsize, sockindex); |
| + | Curl_ssl_sessionid_unlock(data); |
| if(result) { | |
| free(connect_sessionid); | |
| result = CURLE_OUT_OF_MEMORY; | |
| @@ -1326,7 +1327,8 @@ gtls_connect_step3(struct connectdata *conn, | |
| 'ssl_connect_2_writing' (waiting to be able to write). | |
| */ | |
| static CURLcode | |
| - | gtls_connect_common(struct connectdata *conn, |
| + | gtls_connect_common(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool nonblocking, | |
| bool *done) | |
| @@ -1336,19 +1338,19 @@ gtls_connect_common(struct connectdata *conn, | |
| /* Initiate the connection, if not already done */ | |
| if(ssl_connect_1 == connssl->connecting_state) { | |
| - | rc = gtls_connect_step1(conn, sockindex); |
| + | rc = gtls_connect_step1(data, conn, sockindex); |
| if(rc) | |
| return rc; | |
| } | |
| - | rc = handshake(conn, sockindex, TRUE, nonblocking); |
| + | rc = handshake(data, conn, sockindex, TRUE, nonblocking); |
| if(rc) | |
| /* handshake() sets its own error message with failf() */ | |
| return rc; | |
| /* Finish connecting once the handshake is done */ | |
| if(ssl_connect_1 == connssl->connecting_state) { | |
| - | rc = gtls_connect_step3(conn, sockindex); |
| + | rc = gtls_connect_step3(data, conn, sockindex); |
| if(rc) | |
| return rc; | |
| } | |
| @@ -1358,18 +1360,20 @@ gtls_connect_common(struct connectdata *conn, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode gtls_connect_nonblocking(struct connectdata *conn, |
| + | static CURLcode gtls_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, bool *done) | |
| { | |
| - | return gtls_connect_common(conn, sockindex, TRUE, done); |
| + | return gtls_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| - | static CURLcode gtls_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode gtls_connect(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| CURLcode result; | |
| bool done = FALSE; | |
| - | result = gtls_connect_common(conn, sockindex, FALSE, &done); |
| + | result = gtls_connect_common(data, conn, sockindex, FALSE, &done); |
| if(result) | |
| return result; | |
| @@ -1441,8 +1445,10 @@ static void close_one(struct ssl_connect_data *connssl) | |
| #endif | |
| } | |
| - | static void gtls_close(struct connectdata *conn, int sockindex) |
| + | static void gtls_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| + | (void) data; |
| close_one(&conn->ssl[sockindex]); | |
| #ifndef CURL_DISABLE_PROXY | |
| close_one(&conn->proxy_ssl[sockindex]); | |
| @@ -1453,12 +1459,12 @@ static void gtls_close(struct connectdata *conn, int sockindex) | |
| * This function is called to shut down the SSL layer but keep the | |
| * socket open (CCC - Clear Command Channel) | |
| */ | |
| - | static int gtls_shutdown(struct connectdata *conn, int sockindex) |
| + | static int gtls_shutdown(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| int retval = 0; | |
| - | struct Curl_easy *data = conn->data; |
| #ifndef CURL_DISABLE_FTP | |
| /* This has only been tested on the proftpd server, and the mod_tls code | |
| @@ -1547,7 +1553,7 @@ static ssize_t gtls_recv(struct Curl_easy *data, /* connection data */ | |
| if(ret == GNUTLS_E_REHANDSHAKE) { | |
| /* BLOCKING call, this is bad but a work-around for now. Fixing this "the | |
| proper way" takes a whole lot of work. */ | |
| - | CURLcode result = handshake(conn, num, FALSE, FALSE); |
| + | CURLcode result = handshake(data, conn, num, FALSE, FALSE); |
| if(result) | |
| /* handshake() writes error message on its own */ | |
| *curlcode = result; | |
| @@ -1557,7 +1563,7 @@ static ssize_t gtls_recv(struct Curl_easy *data, /* connection data */ | |
| } | |
| if(ret < 0) { | |
| - | failf(conn->data, "GnuTLS recv error (%d): %s", |
| + | failf(data, "GnuTLS recv error (%d): %s", |
| (int)ret, gnutls_strerror((int)ret)); | |
| *curlcode = CURLE_RECV_ERROR; | |
| @@ -1606,7 +1612,7 @@ static CURLcode gtls_random(struct Curl_easy *data, | |
| return rc?CURLE_FAILED_INIT:CURLE_OK; | |
| #elif defined(USE_GNUTLS) | |
| if(data) | |
| - | Curl_gtls_seed(data); /* Initiate the seed if not already done */ |
| + | gtls_seed(data); /* Initiate the seed if not already done */ |
| gcry_randomize(entropy, length, GCRY_STRONG_RANDOM); | |
| #endif | |
| return CURLE_OK; | |
| @@ -196,9 +196,9 @@ static CURLcode mbedtls_version_from_curl(int *mbedver, long version) | |
| } | |
| static CURLcode | |
| - | set_ssl_version_min_max(struct connectdata *conn, int sockindex) |
| + | set_ssl_version_min_max(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| int mbedtls_ver_min = MBEDTLS_SSL_MINOR_VERSION_1; | |
| @@ -241,10 +241,9 @@ set_ssl_version_min_max(struct connectdata *conn, int sockindex) | |
| } | |
| static CURLcode | |
| - | mbed_connect_step1(struct connectdata *conn, |
| + | mbed_connect_step1(struct Curl_easy *data, struct connectdata *conn, |
| int sockindex) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile); | |
| @@ -427,7 +426,7 @@ mbed_connect_step1(struct connectdata *conn, | |
| case CURL_SSLVERSION_TLSv1_2: | |
| case CURL_SSLVERSION_TLSv1_3: | |
| { | |
| - | CURLcode result = set_ssl_version_min_max(conn, sockindex); |
| + | CURLcode result = set_ssl_version_min_max(data, conn, sockindex); |
| if(result != CURLE_OK) | |
| return result; | |
| break; | |
| @@ -463,17 +462,17 @@ mbed_connect_step1(struct connectdata *conn, | |
| if(SSL_SET_OPTION(primary.sessionid)) { | |
| void *old_session = NULL; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, &old_session, NULL, sockindex)) { |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, &old_session, NULL, sockindex)) { |
| ret = mbedtls_ssl_set_session(&backend->ssl, old_session); | |
| if(ret) { | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf(data, "mbedtls_ssl_set_session returned -0x%x", -ret); | |
| return CURLE_SSL_CONNECT_ERROR; | |
| } | |
| infof(data, "mbedTLS re-using session\n"); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| mbedtls_ssl_conf_ca_chain(&backend->config, | |
| @@ -541,11 +540,10 @@ mbed_connect_step1(struct connectdata *conn, | |
| } | |
| static CURLcode | |
| - | mbed_connect_step2(struct connectdata *conn, |
| + | mbed_connect_step2(struct Curl_easy *data, struct connectdata *conn, |
| int sockindex) | |
| { | |
| int ret; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| const mbedtls_x509_crt *peercert; | |
| @@ -713,13 +711,12 @@ mbed_connect_step2(struct connectdata *conn, | |
| } | |
| static CURLcode | |
| - | mbed_connect_step3(struct connectdata *conn, |
| + | mbed_connect_step3(struct Curl_easy *data, struct connectdata *conn, |
| int sockindex) | |
| { | |
| CURLcode retcode = CURLE_OK; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| - | struct Curl_easy *data = conn->data; |
| DEBUGASSERT(ssl_connect_3 == connssl->connecting_state); | |
| @@ -744,12 +741,13 @@ mbed_connect_step3(struct connectdata *conn, | |
| } | |
| /* If there's already a matching session in the cache, delete it */ | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, sockindex)) |
| - | Curl_ssl_delsessionid(conn, old_ssl_sessionid); |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, &old_ssl_sessionid, NULL, sockindex)) |
| + | Curl_ssl_delsessionid(data, old_ssl_sessionid); |
| - | retcode = Curl_ssl_addsessionid(conn, our_ssl_sessionid, 0, sockindex); |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | retcode = Curl_ssl_addsessionid(data, conn, |
| + | our_ssl_sessionid, 0, sockindex); |
| + | Curl_ssl_sessionid_unlock(data); |
| if(retcode) { | |
| mbedtls_ssl_session_free(our_ssl_sessionid); | |
| free(our_ssl_sessionid); | |
| @@ -788,10 +786,13 @@ static void mbedtls_close_all(struct Curl_easy *data) | |
| (void)data; | |
| } | |
| - | static void mbedtls_close(struct connectdata *conn, int sockindex) |
| + | static void mbedtls_close(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| + | |
| + | (void) data; |
| mbedtls_pk_free(&backend->pk); | |
| mbedtls_x509_crt_free(&backend->clicert); | |
| mbedtls_x509_crt_free(&backend->cacert); | |
| @@ -899,13 +900,13 @@ static CURLcode mbedtls_random(struct Curl_easy *data, | |
| } | |
| static CURLcode | |
| - | mbed_connect_common(struct connectdata *conn, |
| + | mbed_connect_common(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool nonblocking, | |
| bool *done) | |
| { | |
| CURLcode retcode; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| timediff_t timeout_ms; | |
| @@ -926,7 +927,7 @@ mbed_connect_common(struct connectdata *conn, | |
| failf(data, "SSL connection timeout"); | |
| return CURLE_OPERATION_TIMEDOUT; | |
| } | |
| - | retcode = mbed_connect_step1(conn, sockindex); |
| + | retcode = mbed_connect_step1(data, conn, sockindex); |
| if(retcode) | |
| return retcode; | |
| } | |
| @@ -981,7 +982,7 @@ mbed_connect_common(struct connectdata *conn, | |
| * ensuring that a client using select() or epoll() will always | |
| * have a valid fdset to wait on. | |
| */ | |
| - | retcode = mbed_connect_step2(conn, sockindex); |
| + | retcode = mbed_connect_step2(data, conn, sockindex); |
| if(retcode || (nonblocking && | |
| (ssl_connect_2 == connssl->connecting_state || | |
| ssl_connect_2_reading == connssl->connecting_state || | |
| @@ -991,7 +992,7 @@ mbed_connect_common(struct connectdata *conn, | |
| } /* repeat step2 until all transactions are done. */ | |
| if(ssl_connect_3 == connssl->connecting_state) { | |
| - | retcode = mbed_connect_step3(conn, sockindex); |
| + | retcode = mbed_connect_step3(data, conn, sockindex); |
| if(retcode) | |
| return retcode; | |
| } | |
| @@ -1011,19 +1012,21 @@ mbed_connect_common(struct connectdata *conn, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode mbedtls_connect_nonblocking(struct connectdata *conn, |
| + | static CURLcode mbedtls_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, bool *done) | |
| { | |
| - | return mbed_connect_common(conn, sockindex, TRUE, done); |
| + | return mbed_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| - | static CURLcode mbedtls_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode mbedtls_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode retcode; | |
| bool done = FALSE; | |
| - | retcode = mbed_connect_common(conn, sockindex, FALSE, &done); |
| + | retcode = mbed_connect_common(data, conn, sockindex, FALSE, &done); |
| if(retcode) | |
| return retcode; | |
| @@ -89,10 +89,10 @@ static int do_file_type(const char *type) | |
| * layer and do all necessary magic. | |
| */ | |
| static CURLcode | |
| - | mesalink_connect_step1(struct connectdata *conn, int sockindex) |
| + | mesalink_connect_step1(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| char *ciphers; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct in_addr addr4; | |
| #ifdef ENABLE_IPV6 | |
| @@ -260,11 +260,11 @@ mesalink_connect_step1(struct connectdata *conn, int sockindex) | |
| if(SSL_SET_OPTION(primary.sessionid)) { | |
| void *ssl_sessionid = NULL; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, &ssl_sessionid, NULL, sockindex)) { |
| /* we got a session id, use it! */ | |
| if(!SSL_set_session(BACKEND->handle, ssl_sessionid)) { | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf( | |
| data, | |
| "SSL: SSL_set_session failed: %s", | |
| @@ -274,7 +274,7 @@ mesalink_connect_step1(struct connectdata *conn, int sockindex) | |
| /* Informational message */ | |
| infof(data, "SSL re-using session ID\n"); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| #endif /* MESALINK_HAVE_SESSION */ | |
| @@ -288,10 +288,10 @@ mesalink_connect_step1(struct connectdata *conn, int sockindex) | |
| } | |
| static CURLcode | |
| - | mesalink_connect_step2(struct connectdata *conn, int sockindex) |
| + | mesalink_connect_step2(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| int ret = -1; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| conn->recv[sockindex] = mesalink_recv; | |
| @@ -348,27 +348,28 @@ mesalink_connect_step3(struct connectdata *conn, int sockindex) | |
| our_ssl_sessionid = SSL_get_session(BACKEND->handle); | |
| - | Curl_ssl_sessionid_lock(conn); |
| + | Curl_ssl_sessionid_lock(data); |
| incache = | |
| - | !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, sockindex)); |
| + | !(Curl_ssl_getsessionid(data, conn, |
| + | &old_ssl_sessionid, NULL, sockindex)); |
| if(incache) { | |
| if(old_ssl_sessionid != our_ssl_sessionid) { | |
| infof(data, "old SSL session ID is stale, removing\n"); | |
| - | Curl_ssl_delsessionid(conn, old_ssl_sessionid); |
| + | Curl_ssl_delsessionid(data, old_ssl_sessionid); |
| incache = FALSE; | |
| } | |
| } | |
| if(!incache) { | |
| result = Curl_ssl_addsessionid( | |
| - | conn, our_ssl_sessionid, 0 /* unknown size */, sockindex); |
| + | data, conn, our_ssl_sessionid, 0 /* unknown size */, sockindex); |
| if(result) { | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf(data, "failed to store ssl session"); | |
| return result; | |
| } | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| #endif /* MESALINK_HAVE_SESSION */ | |
| @@ -408,10 +409,12 @@ mesalink_send(struct Curl_easy *data, int sockindex, const void *mem, | |
| } | |
| static void | |
| - | Curl_mesalink_close(struct connectdata *conn, int sockindex) |
| + | mesalink_close(struct Curl_easy *data, struct connectdata *conn, int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| + | (void) data; |
| + | |
| if(BACKEND->handle) { | |
| (void)SSL_shutdown(BACKEND->handle); | |
| SSL_free(BACKEND->handle); | |
| @@ -458,13 +461,13 @@ mesalink_recv(struct Curl_easy *data, int num, char *buf, size_t buffersize, | |
| } | |
| static size_t | |
| - | Curl_mesalink_version(char *buffer, size_t size) |
| + | mesalink_version(char *buffer, size_t size) |
| { | |
| return msnprintf(buffer, size, "MesaLink/%s", MESALINK_VERSION_STRING); | |
| } | |
| static int | |
| - | Curl_mesalink_init(void) |
| + | mesalink_init(void) |
| { | |
| return (SSL_library_init() == SSL_SUCCESS); | |
| } | |
| @@ -474,11 +477,14 @@ Curl_mesalink_init(void) | |
| * socket open (CCC - Clear Command Channel) | |
| */ | |
| static int | |
| - | Curl_mesalink_shutdown(struct connectdata *conn, int sockindex) |
| + | mesalink_shutdown(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| int retval = 0; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| + | (void) data; |
| + | |
| if(BACKEND->handle) { | |
| SSL_free(BACKEND->handle); | |
| BACKEND->handle = NULL; | |
| @@ -487,11 +493,10 @@ Curl_mesalink_shutdown(struct connectdata *conn, int sockindex) | |
| } | |
| static CURLcode | |
| - | mesalink_connect_common(struct connectdata *conn, int sockindex, |
| - | bool nonblocking, bool *done) |
| + | mesalink_connect_common(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex, bool nonblocking, bool *done) |
| { | |
| CURLcode result; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| timediff_t timeout_ms; | |
| @@ -513,7 +518,7 @@ mesalink_connect_common(struct connectdata *conn, int sockindex, | |
| return CURLE_OPERATION_TIMEDOUT; | |
| } | |
| - | result = mesalink_connect_step1(conn, sockindex); |
| + | result = mesalink_connect_step1(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -570,7 +575,7 @@ mesalink_connect_common(struct connectdata *conn, int sockindex, | |
| * ensuring that a client using select() or epoll() will always | |
| * have a valid fdset to wait on. | |
| */ | |
| - | result = mesalink_connect_step2(conn, sockindex); |
| + | result = mesalink_connect_step2(data, conn, sockindex); |
| if(result || | |
| (nonblocking && (ssl_connect_2 == connssl->connecting_state || | |
| @@ -602,19 +607,20 @@ mesalink_connect_common(struct connectdata *conn, int sockindex, | |
| } | |
| static CURLcode | |
| - | Curl_mesalink_connect_nonblocking(struct connectdata *conn, int sockindex, |
| - | bool *done) |
| + | mesalink_connect_nonblocking(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex, bool *done) |
| { | |
| - | return mesalink_connect_common(conn, sockindex, TRUE, done); |
| + | return mesalink_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| static CURLcode | |
| - | Curl_mesalink_connect(struct connectdata *conn, int sockindex) |
| + | mesalink_connect(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| CURLcode result; | |
| bool done = FALSE; | |
| - | result = mesalink_connect_common(conn, sockindex, FALSE, &done); |
| + | result = mesalink_connect_common(data, conn, sockindex, FALSE, &done); |
| if(result) | |
| return result; | |
| @@ -624,8 +630,8 @@ Curl_mesalink_connect(struct connectdata *conn, int sockindex) | |
| } | |
| static void * | |
| - | Curl_mesalink_get_internals(struct ssl_connect_data *connssl, |
| - | CURLINFO info UNUSED_PARAM) |
| + | mesalink_get_internals(struct ssl_connect_data *connssl, |
| + | CURLINFO info UNUSED_PARAM) |
| { | |
| (void)info; | |
| return BACKEND->handle; | |
| @@ -638,26 +644,26 @@ const struct Curl_ssl Curl_ssl_mesalink = { | |
| sizeof(struct ssl_backend_data), | |
| - | Curl_mesalink_init, /* init */ |
| - | Curl_none_cleanup, /* cleanup */ |
| - | Curl_mesalink_version, /* version */ |
| - | Curl_none_check_cxn, /* check_cxn */ |
| - | Curl_mesalink_shutdown, /* shutdown */ |
| - | Curl_none_data_pending, /* data_pending */ |
| - | Curl_none_random, /* random */ |
| + | mesalink_init, /* init */ |
| + | Curl_none_cleanup, /* cleanup */ |
| + | mesalink_version, /* version */ |
| + | Curl_none_check_cxn, /* check_cxn */ |
| + | mesalink_shutdown, /* shutdown */ |
| + | Curl_none_data_pending, /* data_pending */ |
| + | Curl_none_random, /* random */ |
| Curl_none_cert_status_request, /* cert_status_request */ | |
| - | Curl_mesalink_connect, /* connect */ |
| - | Curl_mesalink_connect_nonblocking, /* connect_nonblocking */ |
| - | Curl_mesalink_get_internals, /* get_internals */ |
| - | Curl_mesalink_close, /* close_one */ |
| - | Curl_none_close_all, /* close_all */ |
| - | Curl_none_session_free, /* session_free */ |
| - | Curl_none_set_engine, /* set_engine */ |
| - | Curl_none_set_engine_default, /* set_engine_default */ |
| - | Curl_none_engines_list, /* engines_list */ |
| - | Curl_none_false_start, /* false_start */ |
| - | Curl_none_md5sum, /* md5sum */ |
| - | NULL /* sha256sum */ |
| + | mesalink_connect, /* connect */ |
| + | mesalink_connect_nonblocking, /* connect_nonblocking */ |
| + | mesalink_get_internals, /* get_internals */ |
| + | mesalink_close, /* close_one */ |
| + | Curl_none_close_all, /* close_all */ |
| + | Curl_none_session_free, /* session_free */ |
| + | Curl_none_set_engine, /* set_engine */ |
| + | Curl_none_set_engine_default, /* set_engine_default */ |
| + | Curl_none_engines_list, /* engines_list */ |
| + | Curl_none_false_start, /* false_start */ |
| + | Curl_none_md5sum, /* md5sum */ |
| + | NULL /* sha256sum */ |
| }; | |
| #endif | |
| @@ -443,7 +443,7 @@ static CURLcode insert_wrapped_ptr(struct Curl_llist *list, void *ptr) | |
| /* Call PK11_CreateGenericObject() with the given obj_class and filename. If | |
| * the call succeeds, append the object handle to the list of objects so that | |
| - | * the object can be destroyed in Curl_nss_close(). */ |
| + | * the object can be destroyed in nss_close(). */ |
| static CURLcode nss_create_object(struct ssl_connect_data *connssl, | |
| CK_OBJECT_CLASS obj_class, | |
| const char *filename, bool cacert) | |
| @@ -508,7 +508,7 @@ static CURLcode nss_create_object(struct ssl_connect_data *connssl, | |
| /* Destroy the NSS object whose handle is given by ptr. This function is | |
| * a callback of Curl_llist_alloc() used by Curl_llist_destroy() to destroy | |
| - | * NSS objects in Curl_nss_close() */ |
| + | * NSS objects in nss_close() */ |
| static void nss_destroy_object(void *user, void *ptr) | |
| { | |
| struct ptr_list_wrap *wrap = (struct ptr_list_wrap *) ptr; | |
| @@ -665,14 +665,13 @@ fail: | |
| return CURLE_SSL_CRL_BADFILE; | |
| } | |
| - | static CURLcode nss_load_key(struct connectdata *conn, int sockindex, |
| - | char *key_file) |
| + | static CURLcode nss_load_key(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex, char *key_file) |
| { | |
| PK11SlotInfo *slot, *tmp; | |
| SECStatus status; | |
| CURLcode result; | |
| struct ssl_connect_data *ssl = conn->ssl; | |
| - | struct Curl_easy *data = conn->data; |
| (void)sockindex; /* unused */ | |
| @@ -701,15 +700,15 @@ static CURLcode nss_load_key(struct connectdata *conn, int sockindex, | |
| return (SECSuccess == status) ? CURLE_OK : CURLE_SSL_CERTPROBLEM; | |
| } | |
| - | static int display_error(struct connectdata *conn, PRInt32 err, |
| + | static int display_error(struct Curl_easy *data, PRInt32 err, |
| const char *filename) | |
| { | |
| switch(err) { | |
| case SEC_ERROR_BAD_PASSWORD: | |
| - | failf(conn->data, "Unable to load client key: Incorrect password"); |
| + | failf(data, "Unable to load client key: Incorrect password"); |
| return 1; | |
| case SEC_ERROR_UNKNOWN_CERT: | |
| - | failf(conn->data, "Unable to load certificate %s", filename); |
| + | failf(data, "Unable to load certificate %s", filename); |
| return 1; | |
| default: | |
| break; | |
| @@ -717,17 +716,16 @@ static int display_error(struct connectdata *conn, PRInt32 err, | |
| return 0; /* The caller will print a generic error */ | |
| } | |
| - | static CURLcode cert_stuff(struct connectdata *conn, int sockindex, |
| - | char *cert_file, char *key_file) |
| + | static CURLcode cert_stuff(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex, char *cert_file, char *key_file) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| CURLcode result; | |
| if(cert_file) { | |
| result = nss_load_cert(&conn->ssl[sockindex], cert_file, PR_FALSE); | |
| if(result) { | |
| const PRErrorCode err = PR_GetError(); | |
| - | if(!display_error(conn, err, cert_file)) { |
| + | if(!display_error(data, err, cert_file)) { |
| const char *err_name = nss_error_to_name(err); | |
| failf(data, "unable to load client cert: %d (%s)", err, err_name); | |
| } | |
| @@ -738,13 +736,13 @@ static CURLcode cert_stuff(struct connectdata *conn, int sockindex, | |
| if(key_file || (is_file(cert_file))) { | |
| if(key_file) | |
| - | result = nss_load_key(conn, sockindex, key_file); |
| + | result = nss_load_key(data, conn, sockindex, key_file); |
| else | |
| /* In case the cert file also has the key */ | |
| - | result = nss_load_key(conn, sockindex, cert_file); |
| + | result = nss_load_key(data, conn, sockindex, cert_file); |
| if(result) { | |
| const PRErrorCode err = PR_GetError(); | |
| - | if(!display_error(conn, err, key_file)) { |
| + | if(!display_error(data, err, key_file)) { |
| const char *err_name = nss_error_to_name(err); | |
| failf(data, "unable to load client key: %d (%s)", err, err_name); | |
| } | |
| @@ -771,7 +769,8 @@ static char *nss_get_password(PK11SlotInfo *slot, PRBool retry, void *arg) | |
| static SECStatus nss_auth_cert_hook(void *arg, PRFileDesc *fd, PRBool checksig, | |
| PRBool isServer) | |
| { | |
| - | struct connectdata *conn = (struct connectdata *)arg; |
| + | struct Curl_easy *data = (struct Curl_easy *)arg; |
| + | struct connectdata *conn = data->conn; |
| #ifdef SSL_ENABLE_OCSP_STAPLING | |
| if(SSL_CONN_CONFIG(verifystatus)) { | |
| @@ -779,12 +778,12 @@ static SECStatus nss_auth_cert_hook(void *arg, PRFileDesc *fd, PRBool checksig, | |
| const SECItemArray *csa = SSL_PeerStapledOCSPResponses(fd); | |
| if(!csa) { | |
| - | failf(conn->data, "Invalid OCSP response"); |
| + | failf(data, "Invalid OCSP response"); |
| return SECFailure; | |
| } | |
| if(csa->len == 0) { | |
| - | failf(conn->data, "No OCSP response received"); |
| + | failf(data, "No OCSP response received"); |
| return SECFailure; | |
| } | |
| @@ -794,14 +793,14 @@ static SECStatus nss_auth_cert_hook(void *arg, PRFileDesc *fd, PRBool checksig, | |
| ); | |
| if(cacheResult != SECSuccess) { | |
| - | failf(conn->data, "Invalid OCSP response"); |
| + | failf(data, "Invalid OCSP response"); |
| return cacheResult; | |
| } | |
| } | |
| #endif | |
| if(!SSL_CONN_CONFIG(verifypeer)) { | |
| - | infof(conn->data, "skipping SSL peer certificate verification\n"); |
| + | infof(data, "skipping SSL peer certificate verification\n"); |
| return SECSuccess; | |
| } | |
| @@ -813,8 +812,8 @@ static SECStatus nss_auth_cert_hook(void *arg, PRFileDesc *fd, PRBool checksig, | |
| */ | |
| static void HandshakeCallback(PRFileDesc *sock, void *arg) | |
| { | |
| - | struct connectdata *conn = (struct connectdata*) arg; |
| - | struct Curl_easy *data = conn->data; |
| + | struct Curl_easy *data = (struct Curl_easy *)arg; |
| + | struct connectdata *conn = data->conn; |
| unsigned int buflenmax = 50; | |
| unsigned char buf[50]; | |
| unsigned int buflen; | |
| @@ -857,7 +856,7 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg) | |
| !memcmp(ALPN_HTTP_1_1, buf, ALPN_HTTP_1_1_LENGTH)) { | |
| conn->negnpn = CURL_HTTP_VERSION_1_1; | |
| } | |
| - | Curl_multiuse_state(conn->data, conn->negnpn == CURL_HTTP_VERSION_2 ? |
| + | Curl_multiuse_state(data, conn->negnpn == CURL_HTTP_VERSION_2 ? |
| BUNDLE_MULTIPLEX : BUNDLE_NO_MULTIUSE); | |
| } | |
| } | |
| @@ -866,8 +865,7 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg) | |
| static SECStatus CanFalseStartCallback(PRFileDesc *sock, void *client_data, | |
| PRBool *canFalseStart) | |
| { | |
| - | struct connectdata *conn = client_data; |
| - | struct Curl_easy *data = conn->data; |
| + | struct Curl_easy *data = (struct Curl_easy *)client_data; |
| SSLChannelInfo channelInfo; | |
| SSLCipherSuiteInfo cipherInfo; | |
| @@ -950,10 +948,9 @@ static void display_cert_info(struct Curl_easy *data, | |
| PR_Free(common_name); | |
| } | |
| - | static CURLcode display_conn_info(struct connectdata *conn, PRFileDesc *sock) |
| + | static CURLcode display_conn_info(struct Curl_easy *data, PRFileDesc *sock) |
| { | |
| CURLcode result = CURLE_OK; | |
| - | struct Curl_easy *data = conn->data; |
| SSLChannelInfo channel; | |
| SSLCipherSuiteInfo suite; | |
| CERTCertificate *cert; | |
| @@ -1023,8 +1020,8 @@ static CURLcode display_conn_info(struct connectdata *conn, PRFileDesc *sock) | |
| static SECStatus BadCertHandler(void *arg, PRFileDesc *sock) | |
| { | |
| - | struct connectdata *conn = (struct connectdata *)arg; |
| - | struct Curl_easy *data = conn->data; |
| + | struct Curl_easy *data = (struct Curl_easy *)arg; |
| + | struct connectdata *conn = data->conn; |
| PRErrorCode err = PR_GetError(); | |
| CERTCertificate *cert; | |
| @@ -1549,7 +1546,8 @@ static void close_one(struct ssl_connect_data *connssl) | |
| /* | |
| * This function is called when an SSL connection is closed. | |
| */ | |
| - | static void nss_close(struct connectdata *conn, int sockindex) |
| + | static void nss_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| #ifndef CURL_DISABLE_PROXY | |
| @@ -1557,6 +1555,7 @@ static void nss_close(struct connectdata *conn, int sockindex) | |
| #endif | |
| struct ssl_backend_data *backend = connssl->backend; | |
| + | (void)data; |
| if(backend->handle | |
| #ifndef CURL_DISABLE_PROXY | |
| || connssl_proxy->backend->handle | |
| @@ -1613,10 +1612,10 @@ static bool is_cc_error(PRInt32 err) | |
| static Curl_recv nss_recv; | |
| static Curl_send nss_send; | |
| - | static CURLcode nss_load_ca_certificates(struct connectdata *conn, |
| + | static CURLcode nss_load_ca_certificates(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| const char *cafile = SSL_CONN_CONFIG(CAfile); | |
| const char *capath = SSL_CONN_CONFIG(CApath); | |
| bool use_trust_module; | |
| @@ -1821,14 +1820,14 @@ static CURLcode nss_set_blocking(struct ssl_connect_data *connssl, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode nss_setup_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| PRFileDesc *model = NULL; | |
| PRFileDesc *nspr_io = NULL; | |
| PRFileDesc *nspr_io_stub = NULL; | |
| PRBool ssl_no_cache; | |
| PRBool ssl_cbc_random_iv; | |
| - | struct Curl_easy *data = conn->data; |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -1851,11 +1850,11 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) | |
| backend->data = data; | |
| - | /* list of all NSS objects we need to destroy in Curl_nss_close() */ |
| + | /* list of all NSS objects we need to destroy in nss_do_close() */ |
| Curl_llist_init(&backend->obj_list, nss_destroy_object); | |
| PR_Lock(nss_initlock); | |
| - | result = nss_setup(conn->data); |
| + | result = nss_setup(data); |
| if(result) { | |
| PR_Unlock(nss_initlock); | |
| goto error; | |
| @@ -1935,20 +1934,20 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) | |
| /* bypass the default SSL_AuthCertificate() hook in case we do not want to | |
| * verify peer */ | |
| - | if(SSL_AuthCertificateHook(model, nss_auth_cert_hook, conn) != SECSuccess) |
| + | if(SSL_AuthCertificateHook(model, nss_auth_cert_hook, data) != SECSuccess) |
| goto error; | |
| /* not checked yet */ | |
| SSL_SET_OPTION_LVALUE(certverifyresult) = 0; | |
| - | if(SSL_BadCertHook(model, BadCertHandler, conn) != SECSuccess) |
| + | if(SSL_BadCertHook(model, BadCertHandler, data) != SECSuccess) |
| goto error; | |
| - | if(SSL_HandshakeCallback(model, HandshakeCallback, conn) != SECSuccess) |
| + | if(SSL_HandshakeCallback(model, HandshakeCallback, data) != SECSuccess) |
| goto error; | |
| { | |
| - | const CURLcode rv = nss_load_ca_certificates(conn, sockindex); |
| + | const CURLcode rv = nss_load_ca_certificates(data, conn, sockindex); |
| if((rv == CURLE_SSL_CACERT_BADFILE) && !SSL_CONN_CONFIG(verifypeer)) | |
| /* not a fatal error because we are not going to verify the peer */ | |
| infof(data, "warning: CA certificates failed to load\n"); | |
| @@ -1974,7 +1973,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) | |
| backend->obj_clicert = NULL; | |
| } | |
| else { | |
| - | CURLcode rv = cert_stuff(conn, sockindex, |
| + | CURLcode rv = cert_stuff(data, conn, sockindex, |
| SSL_SET_OPTION(primary.clientcert), | |
| SSL_SET_OPTION(key)); | |
| if(rv) { | |
| @@ -2073,7 +2072,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) | |
| goto error; | |
| if(SSL_SetCanFalseStartCallback(backend->handle, CanFalseStartCallback, | |
| - | conn) != SECSuccess) |
| + | data) != SECSuccess) |
| goto error; | |
| } | |
| #endif | |
| @@ -2127,11 +2126,11 @@ error: | |
| return nss_fail_connect(connssl, data, result); | |
| } | |
| - | static CURLcode nss_do_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode nss_do_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| - | struct Curl_easy *data = conn->data; |
| CURLcode result = CURLE_SSL_CONNECT_ERROR; | |
| PRUint32 timeout; | |
| @@ -2156,7 +2155,7 @@ static CURLcode nss_do_connect(struct connectdata *conn, int sockindex) | |
| goto error; | |
| } | |
| - | result = display_conn_info(conn, backend->handle); |
| + | result = display_conn_info(data, backend->handle); |
| if(result) | |
| goto error; | |
| @@ -2190,11 +2189,11 @@ error: | |
| return nss_fail_connect(connssl, data, result); | |
| } | |
| - | static CURLcode nss_connect_common(struct connectdata *conn, int sockindex, |
| + | static CURLcode nss_connect_common(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex, |
| bool *done) | |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| - | struct Curl_easy *data = conn->data; |
| const bool blocking = (done == NULL); | |
| CURLcode result; | |
| @@ -2205,7 +2204,7 @@ static CURLcode nss_connect_common(struct connectdata *conn, int sockindex, | |
| } | |
| if(connssl->connecting_state == ssl_connect_1) { | |
| - | result = nss_setup_connect(conn, sockindex); |
| + | result = nss_setup_connect(data, conn, sockindex); |
| if(result) | |
| /* we do not expect CURLE_AGAIN from nss_setup_connect() */ | |
| return result; | |
| @@ -2218,7 +2217,7 @@ static CURLcode nss_connect_common(struct connectdata *conn, int sockindex, | |
| if(result) | |
| return result; | |
| - | result = nss_do_connect(conn, sockindex); |
| + | result = nss_do_connect(data, conn, sockindex); |
| switch(result) { | |
| case CURLE_OK: | |
| break; | |
| @@ -2251,15 +2250,17 @@ static CURLcode nss_connect_common(struct connectdata *conn, int sockindex, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode nss_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode nss_connect(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| - | return nss_connect_common(conn, sockindex, /* blocking */ NULL); |
| + | return nss_connect_common(data, conn, sockindex, /* blocking */ NULL); |
| } | |
| - | static CURLcode nss_connect_nonblocking(struct connectdata *conn, |
| + | static CURLcode nss_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, bool *done) | |
| { | |
| - | return nss_connect_common(conn, sockindex, done); |
| + | return nss_connect_common(data, conn, sockindex, done); |
| } | |
| static ssize_t nss_send(struct Curl_easy *data, /* transfer */ | |
| @@ -2288,7 +2289,7 @@ static ssize_t nss_send(struct Curl_easy *data, /* transfer */ | |
| infof(data, "SSL write: error %d (%s)\n", err, err_name); | |
| /* print a human-readable message describing the error if available */ | |
| - | nss_print_error_message(conn->data, err); |
| + | nss_print_error_message(data, err); |
| *curlcode = (is_cc_error(err)) | |
| ? CURLE_SSL_CERTPROBLEM | |
| @@ -2303,8 +2304,8 @@ static ssize_t nss_send(struct Curl_easy *data, /* transfer */ | |
| static ssize_t nss_recv(struct Curl_easy *data, /* transfer */ | |
| int sockindex, /* socketindex */ | |
| - | char *buf, /* store read data here */ |
| - | size_t buffersize, /* max amount to read */ |
| + | char *buf, /* store read data here */ |
| + | size_t buffersize, /* max amount to read */ |
| CURLcode *curlcode) | |
| { | |
| struct connectdata *conn = data->conn; | |
| @@ -2330,7 +2331,7 @@ static ssize_t nss_recv(struct Curl_easy *data, /* transfer */ | |
| infof(data, "SSL read: errno %d (%s)\n", err, err_name); | |
| /* print a human-readable message describing the error if available */ | |
| - | nss_print_error_message(conn->data, err); |
| + | nss_print_error_message(data, err); |
| *curlcode = (is_cc_error(err)) | |
| ? CURLE_SSL_CERTPROBLEM | |
| @@ -362,6 +362,18 @@ static char *ossl_strerror(unsigned long error, char *buf, size_t size) | |
| return buf; | |
| } | |
| + | /* Return an extra data index for the transfer data. |
| + | * This index can be used with SSL_get_ex_data() and SSL_set_ex_data(). |
| + | */ |
| + | static int ossl_get_ssl_data_index(void) |
| + | { |
| + | static int ssl_ex_data_data_index = -1; |
| + | if(ssl_ex_data_data_index < 0) { |
| + | ssl_ex_data_data_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL); |
| + | } |
| + | return ssl_ex_data_data_index; |
| + | } |
| + | |
| /* Return an extra data index for the connection data. | |
| * This index can be used with SSL_get_ex_data() and SSL_set_ex_data(). | |
| */ | |
| @@ -572,8 +584,7 @@ static bool is_pkcs11_uri(const char *string) | |
| #endif | |
| - | static CURLcode ossl_set_engine(struct Curl_easy *data, |
| - | const char *engine); |
| + | static CURLcode ossl_set_engine(struct Curl_easy *data, const char *engine); |
| static int | |
| SSL_CTX_use_certificate_bio(SSL_CTX *ctx, BIO *in, int type, | |
| @@ -700,7 +711,7 @@ SSL_CTX_use_certificate_chain_bio(SSL_CTX *ctx, BIO* in, | |
| } | |
| static | |
| - | int cert_stuff(struct connectdata *conn, |
| + | int cert_stuff(struct Curl_easy *data, |
| SSL_CTX* ctx, | |
| char *cert_file, | |
| BIO *cert_bio, | |
| @@ -710,7 +721,6 @@ int cert_stuff(struct connectdata *conn, | |
| const char *key_type, | |
| char *key_passwd) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| char error_buffer[256]; | |
| bool check_privkey = TRUE; | |
| @@ -1161,7 +1171,8 @@ static int ossl_init(void) | |
| Curl_tls_keylog_open(); | |
| /* Initialize the extra data indexes */ | |
| - | if(ossl_get_ssl_conn_index() < 0 || ossl_get_ssl_sockindex_index() < 0) |
| + | if(ossl_get_ssl_data_index() < 0 || ossl_get_ssl_conn_index() < 0 || |
| + | ossl_get_ssl_sockindex_index() < 0) |
| return 0; | |
| return 1; | |
| @@ -1258,8 +1269,7 @@ static int ossl_check_cxn(struct connectdata *conn) | |
| /* Selects an OpenSSL crypto engine | |
| */ | |
| - | static CURLcode ossl_set_engine(struct Curl_easy *data, |
| - | const char *engine) |
| + | static CURLcode ossl_set_engine(struct Curl_easy *data, const char *engine) |
| { | |
| #ifdef USE_OPENSSL_ENGINE | |
| ENGINE *e; | |
| @@ -1365,8 +1375,10 @@ static void ossl_closeone(struct ssl_connect_data *connssl) | |
| /* | |
| * This function is called when an SSL connection is closed. | |
| */ | |
| - | static void ossl_close(struct connectdata *conn, int sockindex) |
| + | static void ossl_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| + | (void) data; |
| ossl_closeone(&conn->ssl[sockindex]); | |
| #ifndef CURL_DISABLE_PROXY | |
| ossl_closeone(&conn->proxy_ssl[sockindex]); | |
| @@ -1377,11 +1389,11 @@ static void ossl_close(struct connectdata *conn, int sockindex) | |
| * This function is called to shut down the SSL layer but keep the | |
| * socket open (CCC - Clear Command Channel) | |
| */ | |
| - | static int ossl_shutdown(struct connectdata *conn, int sockindex) |
| + | static int ossl_shutdown(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| int retval = 0; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| - | struct Curl_easy *data = conn->data; |
| char buf[256]; /* We will use this for the OpenSSL error buffer, so it has | |
| to be at least 256 bytes long. */ | |
| unsigned long sslerror; | |
| @@ -1582,12 +1594,12 @@ static bool subj_alt_hostcheck(struct Curl_easy *data, | |
| in the certificate and must exactly match the IP in the URI. | |
| */ | |
| - | static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert) |
| + | static CURLcode verifyhost(struct Curl_easy *data, struct connectdata *conn, |
| + | X509 *server_cert) |
| { | |
| bool matched = FALSE; | |
| int target = GEN_DNS; /* target type, GEN_DNS or GEN_IPADD */ | |
| size_t addrlen = 0; | |
| - | struct Curl_easy *data = conn->data; |
| STACK_OF(GENERAL_NAME) *altnames; | |
| #ifdef ENABLE_IPV6 | |
| struct in6_addr addr; | |
| @@ -1782,14 +1794,13 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert) | |
| #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \ | |
| !defined(OPENSSL_NO_OCSP) | |
| - | static CURLcode verifystatus(struct connectdata *conn, |
| + | static CURLcode verifystatus(struct Curl_easy *data, |
| struct ssl_connect_data *connssl) | |
| { | |
| int i, ocsp_status; | |
| unsigned char *status; | |
| const unsigned char *p; | |
| CURLcode result = CURLE_OK; | |
| - | struct Curl_easy *data = conn->data; |
| OCSP_RESPONSE *rsp = NULL; | |
| OCSP_BASICRESP *br = NULL; | |
| X509_STORE *st = NULL; | |
| @@ -2359,16 +2370,14 @@ typedef long ctx_option_t; | |
| #if (OPENSSL_VERSION_NUMBER < 0x10100000L) /* 1.1.0 */ | |
| static CURLcode | |
| set_ssl_version_min_max_legacy(ctx_option_t *ctx_options, | |
| - | struct connectdata *conn, int sockindex) |
| + | struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| - | #if (OPENSSL_VERSION_NUMBER < 0x1000100FL) || !defined(TLS1_3_VERSION) |
| - | /* convoluted #if condition just to avoid compiler warnings on unused |
| - | variable */ |
| - | struct Curl_easy *data = conn->data; |
| - | #endif |
| long ssl_version = SSL_CONN_CONFIG(version); | |
| long ssl_version_max = SSL_CONN_CONFIG(version_max); | |
| + | (void) data; /* In case it's unused. */ |
| + | |
| switch(ssl_version) { | |
| case CURL_SSLVERSION_TLSv1_3: | |
| #ifdef TLS1_3_VERSION | |
| @@ -2443,17 +2452,18 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) | |
| struct Curl_easy *data; | |
| int sockindex; | |
| curl_socket_t *sockindex_ptr; | |
| + | int data_idx = ossl_get_ssl_data_index(); |
| int connectdata_idx = ossl_get_ssl_conn_index(); | |
| int sockindex_idx = ossl_get_ssl_sockindex_index(); | |
| - | if(connectdata_idx < 0 || sockindex_idx < 0) |
| + | if(data_idx < 0 || connectdata_idx < 0 || sockindex_idx < 0) |
| return 0; | |
| conn = (struct connectdata*) SSL_get_ex_data(ssl, connectdata_idx); | |
| if(!conn) | |
| return 0; | |
| - | data = conn->data; |
| + | data = (struct Curl_easy *) SSL_get_ex_data(ssl, data_idx); |
| /* The sockindex has been stored as a pointer to an array element */ | |
| sockindex_ptr = (curl_socket_t*) SSL_get_ex_data(ssl, sockindex_idx); | |
| @@ -2463,19 +2473,19 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) | |
| bool incache; | |
| void *old_ssl_sessionid = NULL; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | incache = !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, |
| + | Curl_ssl_sessionid_lock(data); |
| + | incache = !(Curl_ssl_getsessionid(data, conn, &old_ssl_sessionid, NULL, |
| sockindex)); | |
| if(incache) { | |
| if(old_ssl_sessionid != ssl_sessionid) { | |
| infof(data, "old SSL session ID is stale, removing\n"); | |
| - | Curl_ssl_delsessionid(conn, old_ssl_sessionid); |
| + | Curl_ssl_delsessionid(data, old_ssl_sessionid); |
| incache = FALSE; | |
| } | |
| } | |
| if(!incache) { | |
| - | if(!Curl_ssl_addsessionid(conn, ssl_sessionid, |
| + | if(!Curl_ssl_addsessionid(data, conn, ssl_sessionid, |
| 0 /* unknown size */, sockindex)) { | |
| /* the session has been put into the session cache */ | |
| res = 1; | |
| @@ -2483,17 +2493,17 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) | |
| else | |
| failf(data, "failed to store ssl session"); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| return res; | |
| } | |
| - | static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) |
| + | static CURLcode ossl_connect_step1(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode result = CURLE_OK; | |
| char *ciphers; | |
| - | struct Curl_easy *data = conn->data; |
| SSL_METHOD_QUAL SSL_METHOD *req_method = NULL; | |
| X509_LOOKUP *lookup = NULL; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| @@ -2714,7 +2724,8 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) | |
| #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) /* 1.1.0 */ | |
| result = set_ssl_version_min_max(backend->ctx, conn); | |
| #else | |
| - | result = set_ssl_version_min_max_legacy(&ctx_options, conn, sockindex); |
| + | result = set_ssl_version_min_max_legacy(&ctx_options, data, conn, |
| + | sockindex); |
| #endif | |
| if(result != CURLE_OK) | |
| return result; | |
| @@ -2782,7 +2793,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) | |
| result = CURLE_OUT_OF_MEMORY; | |
| } | |
| if(!result && | |
| - | !cert_stuff(conn, backend->ctx, |
| + | !cert_stuff(data, backend->ctx, |
| ssl_cert, ssl_cert_bio, ssl_cert_type, | |
| SSL_SET_OPTION(key), ssl_key_bio, | |
| SSL_SET_OPTION(key_type), SSL_SET_OPTION(key_passwd))) | |
| @@ -3187,21 +3198,23 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) | |
| /* Check if there's a cached ID we can/should use here! */ | |
| if(SSL_SET_OPTION(primary.sessionid)) { | |
| void *ssl_sessionid = NULL; | |
| + | int data_idx = ossl_get_ssl_data_index(); |
| int connectdata_idx = ossl_get_ssl_conn_index(); | |
| int sockindex_idx = ossl_get_ssl_sockindex_index(); | |
| - | if(connectdata_idx >= 0 && sockindex_idx >= 0) { |
| + | if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0) { |
| /* Store the data needed for the "new session" callback. | |
| * The sockindex is stored as a pointer to an array element. */ | |
| + | SSL_set_ex_data(backend->handle, data_idx, data); |
| SSL_set_ex_data(backend->handle, connectdata_idx, conn); | |
| SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); | |
| } | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, &ssl_sessionid, NULL, sockindex)) { |
| /* we got a session id, use it! */ | |
| if(!SSL_set_session(backend->handle, ssl_sessionid)) { | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf(data, "SSL: SSL_set_session failed: %s", | |
| ossl_strerror(ERR_get_error(), error_buffer, | |
| sizeof(error_buffer))); | |
| @@ -3210,7 +3223,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) | |
| /* Informational message */ | |
| infof(data, "SSL re-using session ID\n"); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| #ifndef CURL_DISABLE_PROXY | |
| @@ -3237,9 +3250,9 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode ossl_connect_step2(struct connectdata *conn, int sockindex) |
| + | static CURLcode ossl_connect_step2(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| int err; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -3491,13 +3504,12 @@ typedef size_t numcert_t; | |
| typedef int numcert_t; | |
| #endif | |
| - | static CURLcode get_cert_chain(struct connectdata *conn, |
| + | static CURLcode get_cert_chain(struct Curl_easy *data, |
| struct ssl_connect_data *connssl) | |
| { | |
| CURLcode result; | |
| STACK_OF(X509) *sk; | |
| int i; | |
| - | struct Curl_easy *data = conn->data; |
| numcert_t numcerts; | |
| BIO *mem; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -3772,14 +3784,14 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, X509* cert, | |
| * We check certificates to authenticate the server; otherwise we risk | |
| * man-in-the-middle attack. | |
| */ | |
| - | static CURLcode servercert(struct connectdata *conn, |
| + | static CURLcode servercert(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| struct ssl_connect_data *connssl, | |
| bool strict) | |
| { | |
| CURLcode result = CURLE_OK; | |
| int rc; | |
| long lerr; | |
| - | struct Curl_easy *data = conn->data; |
| X509 *issuer; | |
| BIO *fp = NULL; | |
| char error_buffer[256]=""; | |
| @@ -3790,7 +3802,7 @@ static CURLcode servercert(struct connectdata *conn, | |
| if(data->set.ssl.certinfo) | |
| /* we've been asked to gather certificate info! */ | |
| - | (void)get_cert_chain(conn, connssl); |
| + | (void)get_cert_chain(data, connssl); |
| backend->server_cert = SSL_get_peer_certificate(backend->handle); | |
| if(!backend->server_cert) { | |
| @@ -3826,7 +3838,7 @@ static CURLcode servercert(struct connectdata *conn, | |
| BIO_free(mem); | |
| if(SSL_CONN_CONFIG(verifyhost)) { | |
| - | result = verifyhost(conn, backend->server_cert); |
| + | result = verifyhost(data, conn, backend->server_cert); |
| if(result) { | |
| X509_free(backend->server_cert); | |
| backend->server_cert = NULL; | |
| @@ -3928,7 +3940,7 @@ static CURLcode servercert(struct connectdata *conn, | |
| #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \ | |
| !defined(OPENSSL_NO_OCSP) | |
| if(SSL_CONN_CONFIG(verifystatus)) { | |
| - | result = verifystatus(conn, connssl); |
| + | result = verifystatus(data, connssl); |
| if(result) { | |
| X509_free(backend->server_cert); | |
| backend->server_cert = NULL; | |
| @@ -3956,7 +3968,8 @@ static CURLcode servercert(struct connectdata *conn, | |
| return result; | |
| } | |
| - | static CURLcode ossl_connect_step3(struct connectdata *conn, int sockindex) |
| + | static CURLcode ossl_connect_step3(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode result = CURLE_OK; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| @@ -3970,8 +3983,8 @@ static CURLcode ossl_connect_step3(struct connectdata *conn, int sockindex) | |
| * operations. | |
| */ | |
| - | result = servercert(conn, connssl, (SSL_CONN_CONFIG(verifypeer) || |
| - | SSL_CONN_CONFIG(verifyhost))); |
| + | result = servercert(data, conn, connssl, (SSL_CONN_CONFIG(verifypeer) || |
| + | SSL_CONN_CONFIG(verifyhost))); |
| if(!result) | |
| connssl->connecting_state = ssl_connect_done; | |
| @@ -3982,13 +3995,13 @@ static CURLcode ossl_connect_step3(struct connectdata *conn, int sockindex) | |
| static Curl_recv ossl_recv; | |
| static Curl_send ossl_send; | |
| - | static CURLcode ossl_connect_common(struct connectdata *conn, |
| + | static CURLcode ossl_connect_common(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool nonblocking, | |
| bool *done) | |
| { | |
| CURLcode result; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| int what; | |
| @@ -4009,7 +4022,7 @@ static CURLcode ossl_connect_common(struct connectdata *conn, | |
| return CURLE_OPERATION_TIMEDOUT; | |
| } | |
| - | result = ossl_connect_step1(conn, sockindex); |
| + | result = ossl_connect_step1(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -4061,7 +4074,7 @@ static CURLcode ossl_connect_common(struct connectdata *conn, | |
| * before step2 has completed while ensuring that a client using select() | |
| * or epoll() will always have a valid fdset to wait on. | |
| */ | |
| - | result = ossl_connect_step2(conn, sockindex); |
| + | result = ossl_connect_step2(data, conn, sockindex); |
| if(result || (nonblocking && | |
| (ssl_connect_2 == connssl->connecting_state || | |
| ssl_connect_2_reading == connssl->connecting_state || | |
| @@ -4071,7 +4084,7 @@ static CURLcode ossl_connect_common(struct connectdata *conn, | |
| } /* repeat step2 until all transactions are done. */ | |
| if(ssl_connect_3 == connssl->connecting_state) { | |
| - | result = ossl_connect_step3(conn, sockindex); |
| + | result = ossl_connect_step3(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -4091,19 +4104,21 @@ static CURLcode ossl_connect_common(struct connectdata *conn, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode ossl_connect_nonblocking(struct connectdata *conn, |
| + | static CURLcode ossl_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool *done) | |
| { | |
| - | return ossl_connect_common(conn, sockindex, TRUE, done); |
| + | return ossl_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| - | static CURLcode ossl_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode ossl_connect(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| CURLcode result; | |
| bool done = FALSE; | |
| - | result = ossl_connect_common(conn, sockindex, FALSE, &done); |
| + | result = ossl_connect_common(data, conn, sockindex, FALSE, &done); |
| if(result) | |
| return result; | |
| @@ -4265,7 +4280,7 @@ static ssize_t ossl_recv(struct Curl_easy *data, /* transfer */ | |
| strncpy(error_buffer, SSL_ERROR_to_str(err), sizeof(error_buffer)); | |
| error_buffer[sizeof(error_buffer) - 1] = '\0'; | |
| } | |
| - | failf(conn->data, OSSL_PACKAGE " SSL_read: %s, errno %d", |
| + | failf(data, OSSL_PACKAGE " SSL_read: %s, errno %d", |
| error_buffer, sockerr); | |
| *curlcode = CURLE_RECV_ERROR; | |
| return -1; | |
| @@ -4287,7 +4302,7 @@ static ssize_t ossl_recv(struct Curl_easy *data, /* transfer */ | |
| msnprintf(error_buffer, sizeof(error_buffer), | |
| "Connection closed abruptly"); | |
| } | |
| - | failf(conn->data, OSSL_PACKAGE " SSL_read: %s, errno %d" |
| + | failf(data, OSSL_PACKAGE " SSL_read: %s, errno %d" |
| " (Fatal because this is a curl debug build)", | |
| error_buffer, sockerr); | |
| *curlcode = CURLE_RECV_ERROR; | |
| @@ -142,7 +142,8 @@ | |
| static Curl_recv schannel_recv; | |
| static Curl_send schannel_send; | |
| - | static CURLcode pkp_pin_peer_pubkey(struct connectdata *conn, int sockindex, |
| + | static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex, |
| const char *pinnedpubkey); | |
| static void InitSecBuffer(SecBuffer *buffer, unsigned long BufType, | |
| @@ -162,9 +163,9 @@ static void InitSecBufferDesc(SecBufferDesc *desc, SecBuffer *BufArr, | |
| } | |
| static CURLcode | |
| - | set_ssl_version_min_max(SCHANNEL_CRED *schannel_cred, struct connectdata *conn) |
| + | set_ssl_version_min_max(SCHANNEL_CRED *schannel_cred, struct Curl_easy *data, |
| + | struct connectdata *conn) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| long ssl_version = SSL_CONN_CONFIG(version); | |
| long ssl_version_max = SSL_CONN_CONFIG(version_max); | |
| long i = ssl_version; | |
| @@ -405,10 +406,10 @@ get_cert_location(TCHAR *path, DWORD *store_name, TCHAR **store_path, | |
| #endif | |
| static CURLcode | |
| - | schannel_connect_step1(struct connectdata *conn, int sockindex) |
| + | schannel_connect_step1(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| ssize_t written = -1; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| SecBuffer outbuf; | |
| SecBufferDesc outbuf_desc; | |
| @@ -493,8 +494,9 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) | |
| /* check for an existing re-usable credential handle */ | |
| if(SSL_SET_OPTION(primary.sessionid)) { | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL, sockindex)) { |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, |
| + | (void **)&old_cred, NULL, sockindex)) { |
| BACKEND->cred = old_cred; | |
| DEBUGF(infof(data, "schannel: re-using existing credential handle\n")); | |
| @@ -504,7 +506,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) | |
| "schannel: incremented credential handle refcount = %d\n", | |
| BACKEND->cred->refcount)); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| if(!BACKEND->cred) { | |
| @@ -563,7 +565,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) | |
| case CURL_SSLVERSION_TLSv1_2: | |
| case CURL_SSLVERSION_TLSv1_3: | |
| { | |
| - | result = set_ssl_version_min_max(&schannel_cred, conn); |
| + | result = set_ssl_version_min_max(&schannel_cred, data, conn); |
| if(result != CURLE_OK) | |
| return result; | |
| break; | |
| @@ -980,11 +982,11 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) | |
| } | |
| static CURLcode | |
| - | schannel_connect_step2(struct connectdata *conn, int sockindex) |
| + | schannel_connect_step2(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| int i; | |
| ssize_t nread = -1, written = -1; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| unsigned char *reallocated_buffer; | |
| SecBuffer outbuf[3]; | |
| @@ -1252,7 +1254,7 @@ schannel_connect_step2(struct connectdata *conn, int sockindex) | |
| data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY] : | |
| data->set.str[STRING_SSL_PINNEDPUBLICKEY_ORIG]; | |
| if(pubkey_ptr) { | |
| - | result = pkp_pin_peer_pubkey(conn, sockindex, pubkey_ptr); |
| + | result = pkp_pin_peer_pubkey(data, conn, sockindex, pubkey_ptr); |
| if(result) { | |
| failf(data, "SSL: public key does not match pinned public key!"); | |
| return result; | |
| @@ -1261,7 +1263,7 @@ schannel_connect_step2(struct connectdata *conn, int sockindex) | |
| #ifdef HAS_MANUAL_VERIFY_API | |
| if(conn->ssl_config.verifypeer && BACKEND->use_manual_cred_validation) { | |
| - | return Curl_verify_certificate(conn, sockindex); |
| + | return Curl_verify_certificate(data, conn, sockindex); |
| } | |
| #endif | |
| @@ -1328,10 +1330,10 @@ add_cert_to_certinfo(const CERT_CONTEXT *ccert_context, void *raw_arg) | |
| } | |
| static CURLcode | |
| - | schannel_connect_step3(struct connectdata *conn, int sockindex) |
| + | schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| CURLcode result = CURLE_OK; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| SECURITY_STATUS sspi_status = SEC_E_OK; | |
| CERT_CONTEXT *ccert_context = NULL; | |
| @@ -1411,24 +1413,24 @@ schannel_connect_step3(struct connectdata *conn, int sockindex) | |
| bool incache; | |
| struct Curl_schannel_cred *old_cred = NULL; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | incache = !(Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL, |
| + | Curl_ssl_sessionid_lock(data); |
| + | incache = !(Curl_ssl_getsessionid(data, conn, (void **)&old_cred, NULL, |
| sockindex)); | |
| if(incache) { | |
| if(old_cred != BACKEND->cred) { | |
| DEBUGF(infof(data, | |
| "schannel: old credential handle is stale, removing\n")); | |
| /* we're not taking old_cred ownership here, no refcount++ is needed */ | |
| - | Curl_ssl_delsessionid(conn, (void *)old_cred); |
| + | Curl_ssl_delsessionid(data, (void *)old_cred); |
| incache = FALSE; | |
| } | |
| } | |
| if(!incache) { | |
| - | result = Curl_ssl_addsessionid(conn, (void *)BACKEND->cred, |
| + | result = Curl_ssl_addsessionid(data, conn, (void *)BACKEND->cred, |
| sizeof(struct Curl_schannel_cred), | |
| sockindex); | |
| if(result) { | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf(data, "schannel: failed to store credential handle"); | |
| return result; | |
| } | |
| @@ -1439,7 +1441,7 @@ schannel_connect_step3(struct connectdata *conn, int sockindex) | |
| "schannel: stored credential handle in session cache\n")); | |
| } | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| if(data->set.ssl.certinfo) { | |
| @@ -1476,11 +1478,10 @@ schannel_connect_step3(struct connectdata *conn, int sockindex) | |
| } | |
| static CURLcode | |
| - | schannel_connect_common(struct connectdata *conn, int sockindex, |
| - | bool nonblocking, bool *done) |
| + | schannel_connect_common(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex, bool nonblocking, bool *done) |
| { | |
| CURLcode result; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| timediff_t timeout_ms; | |
| @@ -1502,7 +1503,7 @@ schannel_connect_common(struct connectdata *conn, int sockindex, | |
| return CURLE_OPERATION_TIMEDOUT; | |
| } | |
| - | result = schannel_connect_step1(conn, sockindex); |
| + | result = schannel_connect_step1(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -1557,7 +1558,7 @@ schannel_connect_common(struct connectdata *conn, int sockindex, | |
| * ensuring that a client using select() or epoll() will always | |
| * have a valid fdset to wait on. | |
| */ | |
| - | result = schannel_connect_step2(conn, sockindex); |
| + | result = schannel_connect_step2(data, conn, sockindex); |
| if(result || (nonblocking && | |
| (ssl_connect_2 == connssl->connecting_state || | |
| ssl_connect_2_reading == connssl->connecting_state || | |
| @@ -1567,7 +1568,7 @@ schannel_connect_common(struct connectdata *conn, int sockindex, | |
| } /* repeat step2 until all transactions are done. */ | |
| if(ssl_connect_3 == connssl->connecting_state) { | |
| - | result = schannel_connect_step3(conn, sockindex); |
| + | result = schannel_connect_step3(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -1957,7 +1958,7 @@ schannel_recv(struct Curl_easy *data, int sockindex, | |
| infof(data, "schannel: renegotiating SSL/TLS connection\n"); | |
| connssl->state = ssl_connection_negotiating; | |
| connssl->connecting_state = ssl_connect_2_writing; | |
| - | *err = schannel_connect_common(conn, sockindex, FALSE, &done); |
| + | *err = schannel_connect_common(data, conn, sockindex, FALSE, &done); |
| if(*err) { | |
| infof(data, "schannel: renegotiation failed\n"); | |
| goto cleanup; | |
| @@ -2064,18 +2065,20 @@ schannel_recv(struct Curl_easy *data, int sockindex, | |
| return *err ? -1 : 0; | |
| } | |
| - | static CURLcode Curl_schannel_connect_nonblocking(struct connectdata *conn, |
| - | int sockindex, bool *done) |
| + | static CURLcode schannel_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| + | int sockindex, bool *done) |
| { | |
| - | return schannel_connect_common(conn, sockindex, TRUE, done); |
| + | return schannel_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| - | static CURLcode Curl_schannel_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode schannel_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode result; | |
| bool done = FALSE; | |
| - | result = schannel_connect_common(conn, sockindex, FALSE, &done); |
| + | result = schannel_connect_common(data, conn, sockindex, FALSE, &done); |
| if(result) | |
| return result; | |
| @@ -2084,8 +2087,8 @@ static CURLcode Curl_schannel_connect(struct connectdata *conn, int sockindex) | |
| return CURLE_OK; | |
| } | |
| - | static bool Curl_schannel_data_pending(const struct connectdata *conn, |
| - | int sockindex) |
| + | static bool schannel_data_pending(const struct connectdata *conn, |
| + | int sockindex) |
| { | |
| const struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| @@ -2096,14 +2099,15 @@ static bool Curl_schannel_data_pending(const struct connectdata *conn, | |
| return FALSE; | |
| } | |
| - | static void Curl_schannel_close(struct connectdata *conn, int sockindex) |
| + | static void schannel_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| if(conn->ssl[sockindex].use) | |
| /* if the SSL/TLS channel hasn't been shut down yet, do that now. */ | |
| - | Curl_ssl_shutdown(conn, sockindex); |
| + | Curl_ssl_shutdown(data, conn, sockindex); |
| } | |
| - | static void Curl_schannel_session_free(void *ptr) |
| + | static void schannel_session_free(void *ptr) |
| { | |
| /* this is expected to be called under sessionid lock */ | |
| struct Curl_schannel_cred *cred = ptr; | |
| @@ -2115,12 +2119,12 @@ static void Curl_schannel_session_free(void *ptr) | |
| } | |
| } | |
| - | static int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) |
| + | static int schannel_shutdown(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| /* See https://msdn.microsoft.com/en-us/library/windows/desktop/aa380138.aspx | |
| * Shutting Down an Schannel Connection | |
| */ | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| #ifndef CURL_DISABLE_PROXY | |
| char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : | |
| @@ -2203,14 +2207,9 @@ static int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) | |
| /* free SSPI Schannel API credential handle */ | |
| if(BACKEND->cred) { | |
| - | /* |
| - | * When this function is called from Curl_schannel_close() the connection |
| - | * might not have an associated transfer so the check for conn->data is |
| - | * necessary. |
| - | */ |
| - | Curl_ssl_sessionid_lock(conn); |
| - | Curl_schannel_session_free(BACKEND->cred); |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_lock(data); |
| + | schannel_session_free(BACKEND->cred); |
| + | Curl_ssl_sessionid_unlock(data); |
| BACKEND->cred = NULL; | |
| } | |
| @@ -2232,25 +2231,25 @@ static int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) | |
| return CURLE_OK; | |
| } | |
| - | static int Curl_schannel_init(void) |
| + | static int schannel_init(void) |
| { | |
| return (Curl_sspi_global_init() == CURLE_OK ? 1 : 0); | |
| } | |
| - | static void Curl_schannel_cleanup(void) |
| + | static void schannel_cleanup(void) |
| { | |
| Curl_sspi_global_cleanup(); | |
| } | |
| - | static size_t Curl_schannel_version(char *buffer, size_t size) |
| + | static size_t schannel_version(char *buffer, size_t size) |
| { | |
| size = msnprintf(buffer, size, "Schannel"); | |
| return size; | |
| } | |
| - | static CURLcode Curl_schannel_random(struct Curl_easy *data UNUSED_PARAM, |
| - | unsigned char *entropy, size_t length) |
| + | static CURLcode schannel_random(struct Curl_easy *data UNUSED_PARAM, |
| + | unsigned char *entropy, size_t length) |
| { | |
| HCRYPTPROV hCryptProv = 0; | |
| @@ -2269,10 +2268,10 @@ static CURLcode Curl_schannel_random(struct Curl_easy *data UNUSED_PARAM, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode pkp_pin_peer_pubkey(struct connectdata *conn, int sockindex, |
| + | static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex, |
| const char *pinnedpubkey) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| CERT_CONTEXT *pCertContextServer = NULL; | |
| @@ -2334,12 +2333,12 @@ static CURLcode pkp_pin_peer_pubkey(struct connectdata *conn, int sockindex, | |
| return result; | |
| } | |
| - | static void Curl_schannel_checksum(const unsigned char *input, |
| - | size_t inputlen, |
| - | unsigned char *checksum, |
| - | size_t checksumlen, |
| - | DWORD provType, |
| - | const unsigned int algId) |
| + | static void schannel_checksum(const unsigned char *input, |
| + | size_t inputlen, |
| + | unsigned char *checksum, |
| + | size_t checksumlen, |
| + | DWORD provType, |
| + | const unsigned int algId) |
| { | |
| HCRYPTPROV hProv = 0; | |
| HCRYPTHASH hHash = 0; | |
| @@ -2384,28 +2383,27 @@ static void Curl_schannel_checksum(const unsigned char *input, | |
| CryptReleaseContext(hProv, 0); | |
| } | |
| - | static CURLcode Curl_schannel_md5sum(unsigned char *input, |
| - | size_t inputlen, |
| - | unsigned char *md5sum, |
| - | size_t md5len) |
| + | static CURLcode schannel_md5sum(unsigned char *input, |
| + | size_t inputlen, |
| + | unsigned char *md5sum, |
| + | size_t md5len) |
| { | |
| - | Curl_schannel_checksum(input, inputlen, md5sum, md5len, |
| - | PROV_RSA_FULL, CALG_MD5); |
| + | schannel_checksum(input, inputlen, md5sum, md5len, PROV_RSA_FULL, CALG_MD5); |
| return CURLE_OK; | |
| } | |
| - | static CURLcode Curl_schannel_sha256sum(const unsigned char *input, |
| - | size_t inputlen, |
| - | unsigned char *sha256sum, |
| - | size_t sha256len) |
| + | static CURLcode schannel_sha256sum(const unsigned char *input, |
| + | size_t inputlen, |
| + | unsigned char *sha256sum, |
| + | size_t sha256len) |
| { | |
| - | Curl_schannel_checksum(input, inputlen, sha256sum, sha256len, |
| - | PROV_RSA_AES, CALG_SHA_256); |
| + | schannel_checksum(input, inputlen, sha256sum, sha256len, |
| + | PROV_RSA_AES, CALG_SHA_256); |
| return CURLE_OK; | |
| } | |
| - | static void *Curl_schannel_get_internals(struct ssl_connect_data *connssl, |
| - | CURLINFO info UNUSED_PARAM) |
| + | static void *schannel_get_internals(struct ssl_connect_data *connssl, |
| + | CURLINFO info UNUSED_PARAM) |
| { | |
| (void)info; | |
| return &BACKEND->ctxt->ctxt_handle; | |
| @@ -2419,26 +2417,26 @@ const struct Curl_ssl Curl_ssl_schannel = { | |
| sizeof(struct ssl_backend_data), | |
| - | Curl_schannel_init, /* init */ |
| - | Curl_schannel_cleanup, /* cleanup */ |
| - | Curl_schannel_version, /* version */ |
| + | schannel_init, /* init */ |
| + | schannel_cleanup, /* cleanup */ |
| + | schannel_version, /* version */ |
| Curl_none_check_cxn, /* check_cxn */ | |
| - | Curl_schannel_shutdown, /* shutdown */ |
| - | Curl_schannel_data_pending, /* data_pending */ |
| - | Curl_schannel_random, /* random */ |
| + | schannel_shutdown, /* shutdown */ |
| + | schannel_data_pending, /* data_pending */ |
| + | schannel_random, /* random */ |
| Curl_none_cert_status_request, /* cert_status_request */ | |
| - | Curl_schannel_connect, /* connect */ |
| - | Curl_schannel_connect_nonblocking, /* connect_nonblocking */ |
| - | Curl_schannel_get_internals, /* get_internals */ |
| - | Curl_schannel_close, /* close_one */ |
| + | schannel_connect, /* connect */ |
| + | schannel_connect_nonblocking, /* connect_nonblocking */ |
| + | schannel_get_internals, /* get_internals */ |
| + | schannel_close, /* close_one */ |
| Curl_none_close_all, /* close_all */ | |
| - | Curl_schannel_session_free, /* session_free */ |
| + | schannel_session_free, /* session_free */ |
| Curl_none_set_engine, /* set_engine */ | |
| Curl_none_set_engine_default, /* set_engine_default */ | |
| Curl_none_engines_list, /* engines_list */ | |
| Curl_none_false_start, /* false_start */ | |
| - | Curl_schannel_md5sum, /* md5sum */ |
| - | Curl_schannel_sha256sum /* sha256sum */ |
| + | schannel_md5sum, /* md5sum */ |
| + | schannel_sha256sum /* sha256sum */ |
| }; | |
| #endif /* USE_SCHANNEL */ | |
| @@ -8,7 +8,7 @@ | |
| * \___|\___/|_| \_\_____| | |
| * | |
| * Copyright (C) 2012, Marc Hoersken, <[email protected]>, et al. | |
| - | * Copyright (C) 2012 - 2020, Daniel Stenberg, <[email protected]>, et al. |
| + | * Copyright (C) 2012 - 2021, Daniel Stenberg, <[email protected]>, et al. |
| * | |
| * This software is licensed as described in the file COPYING, which | |
| * you should have received as part of this distribution. The terms | |
| @@ -53,7 +53,8 @@ | |
| extern const struct Curl_ssl Curl_ssl_schannel; | |
| - | CURLcode Curl_verify_certificate(struct connectdata *conn, int sockindex); |
| + | CURLcode Curl_verify_certificate(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex); |
| /* structs to expose only in schannel.c and schannel_verify.c */ | |
| #ifdef EXPOSE_SCHANNEL_INTERNAL_STRUCTS | |
| @@ -79,10 +79,9 @@ static int is_cr_or_lf(char c) | |
| static CURLcode add_certs_to_store(HCERTSTORE trust_store, | |
| const char *ca_file, | |
| - | struct connectdata *conn) |
| + | struct Curl_easy *data) |
| { | |
| CURLcode result; | |
| - | struct Curl_easy *data = conn->data; |
| HANDLE ca_file_handle = INVALID_HANDLE_VALUE; | |
| LARGE_INTEGER file_size; | |
| char *ca_file_buffer = NULL; | |
| @@ -527,10 +526,10 @@ cleanup: | |
| return result; | |
| } | |
| - | CURLcode Curl_verify_certificate(struct connectdata *conn, int sockindex) |
| + | CURLcode Curl_verify_certificate(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| SECURITY_STATUS sspi_status; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| CURLcode result = CURLE_OK; | |
| CERT_CONTEXT *pCertContextServer = NULL; | |
| @@ -584,7 +583,7 @@ CURLcode Curl_verify_certificate(struct connectdata *conn, int sockindex) | |
| } | |
| else { | |
| result = add_certs_to_store(trust_store, SSL_CONN_CONFIG(CAfile), | |
| - | conn); |
| + | data); |
| } | |
| } | |
| @@ -675,7 +674,7 @@ CURLcode Curl_verify_certificate(struct connectdata *conn, int sockindex) | |
| if(result == CURLE_OK) { | |
| if(SSL_CONN_CONFIG(verifyhost)) { | |
| - | result = verify_host(conn->data, pCertContextServer, conn_hostname); |
| + | result = verify_host(data, pCertContextServer, conn_hostname); |
| } | |
| } | |
| @@ -1291,9 +1291,9 @@ static CURLcode sectransp_version_from_curl(SSLProtocol *darwinver, | |
| #endif | |
| static CURLcode | |
| - | set_ssl_version_min_max(struct connectdata *conn, int sockindex) |
| + | set_ssl_version_min_max(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| long ssl_version = SSL_CONN_CONFIG(version); | |
| @@ -1387,10 +1387,10 @@ set_ssl_version_min_max(struct connectdata *conn, int sockindex) | |
| } | |
| - | static CURLcode sectransp_connect_step1(struct connectdata *conn, |
| + | static CURLcode sectransp_connect_step1(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -1478,7 +1478,7 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn, | |
| case CURL_SSLVERSION_TLSv1_2: | |
| case CURL_SSLVERSION_TLSv1_3: | |
| { | |
| - | CURLcode result = set_ssl_version_min_max(conn, sockindex); |
| + | CURLcode result = set_ssl_version_min_max(data, conn, sockindex); |
| if(result != CURLE_OK) | |
| return result; | |
| break; | |
| @@ -1527,7 +1527,7 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn, | |
| case CURL_SSLVERSION_TLSv1_2: | |
| case CURL_SSLVERSION_TLSv1_3: | |
| { | |
| - | CURLcode result = set_ssl_version_min_max(conn, sockindex); |
| + | CURLcode result = set_ssl_version_min_max(data, conn, sockindex); |
| if(result != CURLE_OK) | |
| return result; | |
| break; | |
| @@ -1952,12 +1952,12 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn, | |
| char *ssl_sessionid; | |
| size_t ssl_sessionid_len; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, (void **)&ssl_sessionid, |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, (void **)&ssl_sessionid, |
| &ssl_sessionid_len, sockindex)) { | |
| /* we got a session id, use it! */ | |
| err = SSLSetPeerID(backend->ssl_ctx, ssl_sessionid, ssl_sessionid_len); | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| if(err != noErr) { | |
| failf(data, "SSL: SSLSetPeerID() failed: OSStatus %d", err); | |
| return CURLE_SSL_CONNECT_ERROR; | |
| @@ -1976,14 +1976,14 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn, | |
| err = SSLSetPeerID(backend->ssl_ctx, ssl_sessionid, ssl_sessionid_len); | |
| if(err != noErr) { | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf(data, "SSL: SSLSetPeerID() failed: OSStatus %d", err); | |
| return CURLE_SSL_CONNECT_ERROR; | |
| } | |
| - | result = Curl_ssl_addsessionid(conn, ssl_sessionid, ssl_sessionid_len, |
| - | sockindex); |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | result = Curl_ssl_addsessionid(data, conn, ssl_sessionid, |
| + | ssl_sessionid_len, sockindex); |
| + | Curl_ssl_sessionid_unlock(data); |
| if(result) { | |
| failf(data, "failed to store ssl session"); | |
| return result; | |
| @@ -2379,9 +2379,9 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, | |
| #endif /* SECTRANSP_PINNEDPUBKEY */ | |
| static CURLcode | |
| - | sectransp_connect_step2(struct connectdata *conn, int sockindex) |
| + | sectransp_connect_step2(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| OSStatus err; | |
| @@ -2418,7 +2418,7 @@ sectransp_connect_step2(struct connectdata *conn, int sockindex) | |
| return result; | |
| } | |
| /* the documentation says we need to call SSLHandshake() again */ | |
| - | return sectransp_connect_step2(conn, sockindex); |
| + | return sectransp_connect_step2(data, conn, sockindex); |
| /* Problem with encrypt / decrypt */ | |
| case errSSLPeerDecodeError: | |
| @@ -2711,10 +2711,10 @@ sectransp_connect_step2(struct connectdata *conn, int sockindex) | |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| /* This should be called during step3 of the connection at the earliest */ | |
| static void | |
| - | show_verbose_server_cert(struct connectdata *conn, |
| + | show_verbose_server_cert(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| CFArrayRef server_certs = NULL; | |
| @@ -2817,10 +2817,9 @@ show_verbose_server_cert(struct connectdata *conn, | |
| #endif /* !CURL_DISABLE_VERBOSE_STRINGS */ | |
| static CURLcode | |
| - | sectransp_connect_step3(struct connectdata *conn, |
| + | sectransp_connect_step3(struct Curl_easy *data, struct connectdata *conn, |
| int sockindex) | |
| { | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| /* There is no step 3! | |
| @@ -2828,7 +2827,7 @@ sectransp_connect_step3(struct connectdata *conn, | |
| * server certificates. */ | |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| if(data->set.verbose) | |
| - | show_verbose_server_cert(conn, sockindex); |
| + | show_verbose_server_cert(data, conn, sockindex); |
| #endif | |
| connssl->connecting_state = ssl_connect_done; | |
| @@ -2839,13 +2838,13 @@ static Curl_recv sectransp_recv; | |
| static Curl_send sectransp_send; | |
| static CURLcode | |
| - | sectransp_connect_common(struct connectdata *conn, |
| + | sectransp_connect_common(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool nonblocking, | |
| bool *done) | |
| { | |
| CURLcode result; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| int what; | |
| @@ -2866,7 +2865,7 @@ sectransp_connect_common(struct connectdata *conn, | |
| return CURLE_OPERATION_TIMEDOUT; | |
| } | |
| - | result = sectransp_connect_step1(conn, sockindex); |
| + | result = sectransp_connect_step1(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -2920,7 +2919,7 @@ sectransp_connect_common(struct connectdata *conn, | |
| * before step2 has completed while ensuring that a client using select() | |
| * or epoll() will always have a valid fdset to wait on. | |
| */ | |
| - | result = sectransp_connect_step2(conn, sockindex); |
| + | result = sectransp_connect_step2(data, conn, sockindex); |
| if(result || (nonblocking && | |
| (ssl_connect_2 == connssl->connecting_state || | |
| ssl_connect_2_reading == connssl->connecting_state || | |
| @@ -2931,7 +2930,7 @@ sectransp_connect_common(struct connectdata *conn, | |
| if(ssl_connect_3 == connssl->connecting_state) { | |
| - | result = sectransp_connect_step3(conn, sockindex); |
| + | result = sectransp_connect_step3(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -2951,18 +2950,20 @@ sectransp_connect_common(struct connectdata *conn, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode Curl_sectransp_connect_nonblocking(struct connectdata *conn, |
| - | int sockindex, bool *done) |
| + | static CURLcode sectransp_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| + | int sockindex, bool *done) |
| { | |
| - | return sectransp_connect_common(conn, sockindex, TRUE, done); |
| + | return sectransp_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| - | static CURLcode Curl_sectransp_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode sectransp_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode result; | |
| bool done = FALSE; | |
| - | result = sectransp_connect_common(conn, sockindex, FALSE, &done); |
| + | result = sectransp_connect_common(data, conn, sockindex, FALSE, &done); |
| if(result) | |
| return result; | |
| @@ -2972,11 +2973,14 @@ static CURLcode Curl_sectransp_connect(struct connectdata *conn, int sockindex) | |
| return CURLE_OK; | |
| } | |
| - | static void Curl_sectransp_close(struct connectdata *conn, int sockindex) |
| + | static void sectransp_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| + | (void) data; |
| + | |
| if(backend->ssl_ctx) { | |
| (void)SSLClose(backend->ssl_ctx); | |
| #if CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS | |
| @@ -2994,11 +2998,11 @@ static void Curl_sectransp_close(struct connectdata *conn, int sockindex) | |
| backend->ssl_sockfd = 0; | |
| } | |
| - | static int Curl_sectransp_shutdown(struct connectdata *conn, int sockindex) |
| + | static int sectransp_shutdown(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| - | struct Curl_easy *data = conn->data; |
| ssize_t nread; | |
| int what; | |
| int rc; | |
| @@ -3012,7 +3016,7 @@ static int Curl_sectransp_shutdown(struct connectdata *conn, int sockindex) | |
| return 0; | |
| #endif | |
| - | Curl_sectransp_close(conn, sockindex); |
| + | sectransp_close(data, conn, sockindex); |
| rc = 0; | |
| @@ -3050,7 +3054,7 @@ static int Curl_sectransp_shutdown(struct connectdata *conn, int sockindex) | |
| return rc; | |
| } | |
| - | static void Curl_sectransp_session_free(void *ptr) |
| + | static void sectransp_session_free(void *ptr) |
| { | |
| /* ST, as of iOS 5 and Mountain Lion, has no public method of deleting a | |
| cached session ID inside the Security framework. There is a private | |
| @@ -3061,7 +3065,7 @@ static void Curl_sectransp_session_free(void *ptr) | |
| Curl_safefree(ptr); | |
| } | |
| - | static size_t Curl_sectransp_version(char *buffer, size_t size) |
| + | static size_t sectransp_version(char *buffer, size_t size) |
| { | |
| return msnprintf(buffer, size, "SecureTransport"); | |
| } | |
| @@ -3074,7 +3078,7 @@ static size_t Curl_sectransp_version(char *buffer, size_t size) | |
| * 0 means the connection has been closed | |
| * -1 means the connection status is unknown | |
| */ | |
| - | static int Curl_sectransp_check_cxn(struct connectdata *conn) |
| + | static int sectransp_check_cxn(struct connectdata *conn) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[FIRSTSOCKET]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -3090,8 +3094,8 @@ static int Curl_sectransp_check_cxn(struct connectdata *conn) | |
| return 0; | |
| } | |
| - | static bool Curl_sectransp_data_pending(const struct connectdata *conn, |
| - | int connindex) |
| + | static bool sectransp_data_pending(const struct connectdata *conn, |
| + | int connindex) |
| { | |
| const struct ssl_connect_data *connssl = &conn->ssl[connindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -3108,8 +3112,8 @@ static bool Curl_sectransp_data_pending(const struct connectdata *conn, | |
| return false; | |
| } | |
| - | static CURLcode Curl_sectransp_random(struct Curl_easy *data UNUSED_PARAM, |
| - | unsigned char *entropy, size_t length) |
| + | static CURLcode sectransp_random(struct Curl_easy *data UNUSED_PARAM, |
| + | unsigned char *entropy, size_t length) |
| { | |
| /* arc4random_buf() isn't available on cats older than Lion, so let's | |
| do this manually for the benefit of the older cats. */ | |
| @@ -3128,27 +3132,27 @@ static CURLcode Curl_sectransp_random(struct Curl_easy *data UNUSED_PARAM, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode Curl_sectransp_md5sum(unsigned char *tmp, /* input */ |
| - | size_t tmplen, |
| - | unsigned char *md5sum, /* output */ |
| - | size_t md5len) |
| + | static CURLcode sectransp_md5sum(unsigned char *tmp, /* input */ |
| + | size_t tmplen, |
| + | unsigned char *md5sum, /* output */ |
| + | size_t md5len) |
| { | |
| (void)md5len; | |
| (void)CC_MD5(tmp, (CC_LONG)tmplen, md5sum); | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode Curl_sectransp_sha256sum(const unsigned char *tmp, /* input */ |
| - | size_t tmplen, |
| - | unsigned char *sha256sum, /* output */ |
| - | size_t sha256len) |
| + | static CURLcode sectransp_sha256sum(const unsigned char *tmp, /* input */ |
| + | size_t tmplen, |
| + | unsigned char *sha256sum, /* output */ |
| + | size_t sha256len) |
| { | |
| assert(sha256len >= CURL_SHA256_DIGEST_LENGTH); | |
| (void)CC_SHA256(tmp, (CC_LONG)tmplen, sha256sum); | |
| return CURLE_OK; | |
| } | |
| - | static bool Curl_sectransp_false_start(void) |
| + | static bool sectransp_false_start(void) |
| { | |
| #if CURL_BUILD_MAC_10_9 || CURL_BUILD_IOS_7 | |
| if(SSLSetSessionOption != NULL) | |
| @@ -3198,7 +3202,7 @@ static ssize_t sectransp_send(struct Curl_easy *data, | |
| *curlcode = CURLE_AGAIN; | |
| return -1L; | |
| default: | |
| - | failf(conn->data, "SSLWrite() returned error %d", err); |
| + | failf(data, "SSLWrite() returned error %d", err); |
| *curlcode = CURLE_SEND_ERROR; | |
| return -1L; | |
| } | |
| @@ -3262,7 +3266,7 @@ static ssize_t sectransp_recv(struct Curl_easy *data, | |
| Leopard's headers */ | |
| case -9841: | |
| if(SSL_CONN_CONFIG(CAfile) && SSL_CONN_CONFIG(verifypeer)) { | |
| - | CURLcode result = verify_cert(SSL_CONN_CONFIG(CAfile), conn->data, |
| + | CURLcode result = verify_cert(SSL_CONN_CONFIG(CAfile), data, |
| backend->ssl_ctx); | |
| if(result) | |
| return result; | |
| @@ -3278,8 +3282,8 @@ static ssize_t sectransp_recv(struct Curl_easy *data, | |
| return (ssize_t)processed; | |
| } | |
| - | static void *Curl_sectransp_get_internals(struct ssl_connect_data *connssl, |
| - | CURLINFO info UNUSED_PARAM) |
| + | static void *sectransp_get_internals(struct ssl_connect_data *connssl, |
| + | CURLINFO info UNUSED_PARAM) |
| { | |
| struct ssl_backend_data *backend = connssl->backend; | |
| (void)info; | |
| @@ -3299,24 +3303,24 @@ const struct Curl_ssl Curl_ssl_sectransp = { | |
| Curl_none_init, /* init */ | |
| Curl_none_cleanup, /* cleanup */ | |
| - | Curl_sectransp_version, /* version */ |
| - | Curl_sectransp_check_cxn, /* check_cxn */ |
| - | Curl_sectransp_shutdown, /* shutdown */ |
| - | Curl_sectransp_data_pending, /* data_pending */ |
| - | Curl_sectransp_random, /* random */ |
| + | sectransp_version, /* version */ |
| + | sectransp_check_cxn, /* check_cxn */ |
| + | sectransp_shutdown, /* shutdown */ |
| + | sectransp_data_pending, /* data_pending */ |
| + | sectransp_random, /* random */ |
| Curl_none_cert_status_request, /* cert_status_request */ | |
| - | Curl_sectransp_connect, /* connect */ |
| - | Curl_sectransp_connect_nonblocking, /* connect_nonblocking */ |
| - | Curl_sectransp_get_internals, /* get_internals */ |
| - | Curl_sectransp_close, /* close_one */ |
| + | sectransp_connect, /* connect */ |
| + | sectransp_connect_nonblocking, /* connect_nonblocking */ |
| + | sectransp_get_internals, /* get_internals */ |
| + | sectransp_close, /* close_one */ |
| Curl_none_close_all, /* close_all */ | |
| - | Curl_sectransp_session_free, /* session_free */ |
| + | sectransp_session_free, /* session_free */ |
| Curl_none_set_engine, /* set_engine */ | |
| Curl_none_set_engine_default, /* set_engine_default */ | |
| Curl_none_engines_list, /* engines_list */ | |
| - | Curl_sectransp_false_start, /* false_start */ |
| - | Curl_sectransp_md5sum, /* md5sum */ |
| - | Curl_sectransp_sha256sum /* sha256sum */ |
| + | sectransp_false_start, /* false_start */ |
| + | sectransp_md5sum, /* md5sum */ |
| + | sectransp_sha256sum /* sha256sum */ |
| }; | |
| #ifdef __clang__ | |
| @@ -291,7 +291,8 @@ ssl_connect_init_proxy(struct connectdata *conn, int sockindex) | |
| #endif | |
| CURLcode | |
| - | Curl_ssl_connect(struct connectdata *conn, int sockindex) |
| + | Curl_ssl_connect(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| CURLcode result; | |
| @@ -303,26 +304,27 @@ Curl_ssl_connect(struct connectdata *conn, int sockindex) | |
| } | |
| #endif | |
| - | if(!ssl_prefs_check(conn->data)) |
| + | if(!ssl_prefs_check(data)) |
| return CURLE_SSL_CONNECT_ERROR; | |
| /* mark this is being ssl-enabled from here on. */ | |
| conn->ssl[sockindex].use = TRUE; | |
| conn->ssl[sockindex].state = ssl_connection_negotiating; | |
| - | result = Curl_ssl->connect_blocking(conn, sockindex); |
| + | result = Curl_ssl->connect_blocking(data, conn, sockindex); |
| if(!result) | |
| - | Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */ |
| + | Curl_pgrsTime(data, TIMER_APPCONNECT); /* SSL is connected */ |
| return result; | |
| } | |
| CURLcode | |
| - | Curl_ssl_connect_nonblocking(struct connectdata *conn, int sockindex, |
| - | bool *done) |
| + | Curl_ssl_connect_nonblocking(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex, bool *done) |
| { | |
| CURLcode result; | |
| + | |
| #ifndef CURL_DISABLE_PROXY | |
| if(conn->bits.proxy_ssl_connected[sockindex]) { | |
| result = ssl_connect_init_proxy(conn, sockindex); | |
| @@ -330,47 +332,46 @@ Curl_ssl_connect_nonblocking(struct connectdata *conn, int sockindex, | |
| return result; | |
| } | |
| #endif | |
| - | if(!ssl_prefs_check(conn->data)) |
| + | if(!ssl_prefs_check(data)) |
| return CURLE_SSL_CONNECT_ERROR; | |
| /* mark this is being ssl requested from here on. */ | |
| conn->ssl[sockindex].use = TRUE; | |
| - | result = Curl_ssl->connect_nonblocking(conn, sockindex, done); |
| + | result = Curl_ssl->connect_nonblocking(data, conn, sockindex, done); |
| if(!result && *done) | |
| - | Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */ |
| + | Curl_pgrsTime(data, TIMER_APPCONNECT); /* SSL is connected */ |
| return result; | |
| } | |
| /* | |
| * Lock shared SSL session data | |
| */ | |
| - | void Curl_ssl_sessionid_lock(struct connectdata *conn) |
| + | void Curl_ssl_sessionid_lock(struct Curl_easy *data) |
| { | |
| - | if(SSLSESSION_SHARED(conn->data)) |
| - | Curl_share_lock(conn->data, |
| - | CURL_LOCK_DATA_SSL_SESSION, CURL_LOCK_ACCESS_SINGLE); |
| + | if(SSLSESSION_SHARED(data)) |
| + | Curl_share_lock(data, CURL_LOCK_DATA_SSL_SESSION, CURL_LOCK_ACCESS_SINGLE); |
| } | |
| /* | |
| * Unlock shared SSL session data | |
| */ | |
| - | void Curl_ssl_sessionid_unlock(struct connectdata *conn) |
| + | void Curl_ssl_sessionid_unlock(struct Curl_easy *data) |
| { | |
| - | if(SSLSESSION_SHARED(conn->data)) |
| - | Curl_share_unlock(conn->data, CURL_LOCK_DATA_SSL_SESSION); |
| + | if(SSLSESSION_SHARED(data)) |
| + | Curl_share_unlock(data, CURL_LOCK_DATA_SSL_SESSION); |
| } | |
| /* | |
| * Check if there's a session ID for the given connection in the cache, and if | |
| * there's one suitable, it is provided. Returns TRUE when no entry matched. | |
| */ | |
| - | bool Curl_ssl_getsessionid(struct connectdata *conn, |
| + | bool Curl_ssl_getsessionid(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| void **ssl_sessionid, | |
| size_t *idsize, /* set 0 if unknown */ | |
| int sockindex) | |
| { | |
| struct Curl_ssl_session *check; | |
| - | struct Curl_easy *data = conn->data; |
| size_t i; | |
| long *general_age; | |
| bool no_match = TRUE; | |
| @@ -457,10 +458,9 @@ void Curl_ssl_kill_session(struct Curl_ssl_session *session) | |
| /* | |
| * Delete the given session ID from the cache. | |
| */ | |
| - | void Curl_ssl_delsessionid(struct connectdata *conn, void *ssl_sessionid) |
| + | void Curl_ssl_delsessionid(struct Curl_easy *data, void *ssl_sessionid) |
| { | |
| size_t i; | |
| - | struct Curl_easy *data = conn->data; |
| for(i = 0; i < data->set.general_ssl.max_ssl_sessions; i++) { | |
| struct Curl_ssl_session *check = &data->state.session[i]; | |
| @@ -478,13 +478,13 @@ void Curl_ssl_delsessionid(struct connectdata *conn, void *ssl_sessionid) | |
| * layer. Curl_XXXX_session_free() will be called to free/kill the session ID | |
| * later on. | |
| */ | |
| - | CURLcode Curl_ssl_addsessionid(struct connectdata *conn, |
| + | CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| void *ssl_sessionid, | |
| size_t idsize, | |
| int sockindex) | |
| { | |
| size_t i; | |
| - | struct Curl_easy *data = conn->data; /* the mother of all structs */ |
| struct Curl_ssl_session *store = &data->state.session[0]; | |
| long oldest_age = data->state.session[0].age; /* zero if unused */ | |
| char *clone_host; | |
| @@ -624,16 +624,18 @@ int Curl_ssl_getsock(struct connectdata *conn, | |
| /* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_SECTRANSP || USE_NSS */ | |
| #endif | |
| - | void Curl_ssl_close(struct connectdata *conn, int sockindex) |
| + | void Curl_ssl_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| DEBUGASSERT((sockindex <= 1) && (sockindex >= -1)); | |
| - | Curl_ssl->close_one(conn, sockindex); |
| + | Curl_ssl->close_one(data, conn, sockindex); |
| conn->ssl[sockindex].state = ssl_connection_none; | |
| } | |
| - | CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex) |
| + | CURLcode Curl_ssl_shutdown(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| - | if(Curl_ssl->shut_down(conn, sockindex)) |
| + | if(Curl_ssl->shut_down(data, conn, sockindex)) |
| return CURLE_SSL_SHUTDOWN_FAILED; | |
| conn->ssl[sockindex].use = FALSE; /* get back to ordinary socket usage */ | |
| @@ -1080,9 +1082,11 @@ int Curl_none_init(void) | |
| void Curl_none_cleanup(void) | |
| { } | |
| - | int Curl_none_shutdown(struct connectdata *conn UNUSED_PARAM, |
| + | int Curl_none_shutdown(struct Curl_easy *data UNUSED_PARAM, |
| + | struct connectdata *conn UNUSED_PARAM, |
| int sockindex UNUSED_PARAM) | |
| { | |
| + | (void)data; |
| (void)conn; | |
| (void)sockindex; | |
| return 0; | |
| @@ -1188,19 +1192,21 @@ static int multissl_init(void) | |
| return Curl_ssl->init(); | |
| } | |
| - | static CURLcode multissl_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode multissl_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| if(multissl_setup(NULL)) | |
| return CURLE_FAILED_INIT; | |
| - | return Curl_ssl->connect_blocking(conn, sockindex); |
| + | return Curl_ssl->connect_blocking(data, conn, sockindex); |
| } | |
| - | static CURLcode multissl_connect_nonblocking(struct connectdata *conn, |
| + | static CURLcode multissl_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, bool *done) | |
| { | |
| if(multissl_setup(NULL)) | |
| return CURLE_FAILED_INIT; | |
| - | return Curl_ssl->connect_nonblocking(conn, sockindex, done); |
| + | return Curl_ssl->connect_nonblocking(data, conn, sockindex, done); |
| } | |
| static void *multissl_get_internals(struct ssl_connect_data *connssl, | |
| @@ -1211,11 +1217,12 @@ static void *multissl_get_internals(struct ssl_connect_data *connssl, | |
| return Curl_ssl->get_internals(connssl, info); | |
| } | |
| - | static void multissl_close(struct connectdata *conn, int sockindex) |
| + | static void multissl_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| if(multissl_setup(NULL)) | |
| return; | |
| - | Curl_ssl->close_one(conn, sockindex); |
| + | Curl_ssl->close_one(data, conn, sockindex); |
| } | |
| static const struct Curl_ssl Curl_ssl_multi = { | |
| @@ -7,7 +7,7 @@ | |
| * | (__| |_| | _ <| |___ | |
| * \___|\___/|_| \_\_____| | |
| * | |
| - | * Copyright (C) 1998 - 2020, Daniel Stenberg, <[email protected]>, et al. |
| + | * Copyright (C) 1998 - 2021, Daniel Stenberg, <[email protected]>, et al. |
| * | |
| * This software is licensed as described in the file COPYING, which | |
| * you should have received as part of this distribution. The terms | |
| @@ -47,7 +47,8 @@ struct Curl_ssl { | |
| size_t (*version)(char *buffer, size_t size); | |
| int (*check_cxn)(struct connectdata *cxn); | |
| - | int (*shut_down)(struct connectdata *conn, int sockindex); |
| + | int (*shut_down)(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex); |
| bool (*data_pending)(const struct connectdata *conn, | |
| int connindex); | |
| @@ -56,11 +57,14 @@ struct Curl_ssl { | |
| size_t length); | |
| bool (*cert_status_request)(void); | |
| - | CURLcode (*connect_blocking)(struct connectdata *conn, int sockindex); |
| - | CURLcode (*connect_nonblocking)(struct connectdata *conn, int sockindex, |
| + | CURLcode (*connect_blocking)(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex); |
| + | CURLcode (*connect_nonblocking)(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex, |
| bool *done); | |
| void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info); | |
| - | void (*close_one)(struct connectdata *conn, int sockindex); |
| + | void (*close_one)(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex); |
| void (*close_all)(struct Curl_easy *data); | |
| void (*session_free)(void *ptr); | |
| @@ -82,7 +86,8 @@ extern const struct Curl_ssl *Curl_ssl; | |
| int Curl_none_init(void); | |
| void Curl_none_cleanup(void); | |
| - | int Curl_none_shutdown(struct connectdata *conn, int sockindex); |
| + | int Curl_none_shutdown(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex); |
| int Curl_none_check_cxn(struct connectdata *conn); | |
| CURLcode Curl_none_random(struct Curl_easy *data, unsigned char *entropy, | |
| size_t length); | |
| @@ -165,15 +170,19 @@ int Curl_ssl_backend(void); | |
| #ifdef USE_SSL | |
| int Curl_ssl_init(void); | |
| void Curl_ssl_cleanup(void); | |
| - | CURLcode Curl_ssl_connect(struct connectdata *conn, int sockindex); |
| - | CURLcode Curl_ssl_connect_nonblocking(struct connectdata *conn, |
| + | CURLcode Curl_ssl_connect(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex); |
| + | CURLcode Curl_ssl_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool *done); | |
| /* tell the SSL stuff to close down all open information regarding | |
| connections (and thus session ID caching etc) */ | |
| void Curl_ssl_close_all(struct Curl_easy *data); | |
| - | void Curl_ssl_close(struct connectdata *conn, int sockindex); |
| - | CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex); |
| + | void Curl_ssl_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex); |
| + | CURLcode Curl_ssl_shutdown(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex); |
| CURLcode Curl_ssl_set_engine(struct Curl_easy *data, const char *engine); | |
| /* Sets engine as default for all SSL operations */ | |
| CURLcode Curl_ssl_set_engine_default(struct Curl_easy *data); | |
| @@ -205,10 +214,10 @@ CURLcode Curl_ssl_push_certinfo(struct Curl_easy *data, int certnum, | |
| * The purpose of explicitly locking SSL session cache data is to allow | |
| * individual SSL engines to manage session lifetime in their specific way. | |
| */ | |
| - | void Curl_ssl_sessionid_lock(struct connectdata *conn); |
| + | void Curl_ssl_sessionid_lock(struct Curl_easy *data); |
| /* Unlock session cache mutex */ | |
| - | void Curl_ssl_sessionid_unlock(struct connectdata *conn); |
| + | void Curl_ssl_sessionid_unlock(struct Curl_easy *data); |
| /* extract a session ID | |
| * Sessionid mutex must be locked (see Curl_ssl_sessionid_lock). | |
| @@ -216,7 +225,8 @@ void Curl_ssl_sessionid_unlock(struct connectdata *conn); | |
| * is properly taken (e.g. its refcount is incremented | |
| * under sessionid mutex). | |
| */ | |
| - | bool Curl_ssl_getsessionid(struct connectdata *conn, |
| + | bool Curl_ssl_getsessionid(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| void **ssl_sessionid, | |
| size_t *idsize, /* set 0 if unknown */ | |
| int sockindex); | |
| @@ -225,7 +235,8 @@ bool Curl_ssl_getsessionid(struct connectdata *conn, | |
| * Caller must ensure that it has properly shared ownership of this sessionid | |
| * object with cache (e.g. incrementing refcount on success) | |
| */ | |
| - | CURLcode Curl_ssl_addsessionid(struct connectdata *conn, |
| + | CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| void *ssl_sessionid, | |
| size_t idsize, | |
| int sockindex); | |
| @@ -242,7 +253,7 @@ void Curl_ssl_kill_session(struct Curl_ssl_session *session); | |
| * take sessionid object ownership from sessionid cache | |
| * (e.g. decrement refcount). | |
| */ | |
| - | void Curl_ssl_delsessionid(struct connectdata *conn, void *ssl_sessionid); |
| + | void Curl_ssl_delsessionid(struct Curl_easy *data, void *ssl_sessionid); |
| /* get N random bytes into the buffer */ | |
| CURLcode Curl_ssl_random(struct Curl_easy *data, unsigned char *buffer, | |
| @@ -267,10 +278,10 @@ bool Curl_ssl_false_start(void); | |
| /* When SSL support is not present, just define away these function calls */ | |
| #define Curl_ssl_init() 1 | |
| #define Curl_ssl_cleanup() Curl_nop_stmt | |
| - | #define Curl_ssl_connect(x,y) CURLE_NOT_BUILT_IN |
| + | #define Curl_ssl_connect(x,y,z) CURLE_NOT_BUILT_IN |
| #define Curl_ssl_close_all(x) Curl_nop_stmt | |
| - | #define Curl_ssl_close(x,y) Curl_nop_stmt |
| - | #define Curl_ssl_shutdown(x,y) CURLE_NOT_BUILT_IN |
| + | #define Curl_ssl_close(x,y,z) Curl_nop_stmt |
| + | #define Curl_ssl_shutdown(x,y,z) CURLE_NOT_BUILT_IN |
| #define Curl_ssl_set_engine(x,y) CURLE_NOT_BUILT_IN | |
| #define Curl_ssl_set_engine_default(x) CURLE_NOT_BUILT_IN | |
| #define Curl_ssl_engines_list(x) NULL | |
| @@ -280,7 +291,7 @@ bool Curl_ssl_false_start(void); | |
| #define Curl_ssl_data_pending(x,y) 0 | |
| #define Curl_ssl_check_cxn(x) 0 | |
| #define Curl_ssl_free_certinfo(x) Curl_nop_stmt | |
| - | #define Curl_ssl_connect_nonblocking(x,y,z) CURLE_NOT_BUILT_IN |
| + | #define Curl_ssl_connect_nonblocking(x,y,z,w) CURLE_NOT_BUILT_IN |
| #define Curl_ssl_kill_session(x) Curl_nop_stmt | |
| #define Curl_ssl_random(x,y,z) ((void)x, CURLE_NOT_BUILT_IN) | |
| #define Curl_ssl_cert_status_request() FALSE | |
| @@ -217,11 +217,10 @@ static int do_file_type(const char *type) | |
| * layer and do all necessary magic. | |
| */ | |
| static CURLcode | |
| - | wolfssl_connect_step1(struct connectdata *conn, |
| + | wolfssl_connect_step1(struct Curl_easy *data, struct connectdata *conn, |
| int sockindex) | |
| { | |
| char *ciphers; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| SSL_METHOD* req_method = NULL; | |
| @@ -516,12 +515,12 @@ wolfssl_connect_step1(struct connectdata *conn, | |
| if(SSL_SET_OPTION(primary.sessionid)) { | |
| void *ssl_sessionid = NULL; | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { |
| + | Curl_ssl_sessionid_lock(data); |
| + | if(!Curl_ssl_getsessionid(data, conn, &ssl_sessionid, NULL, sockindex)) { |
| /* we got a session id, use it! */ | |
| if(!SSL_set_session(backend->handle, ssl_sessionid)) { | |
| char error_buffer[WOLFSSL_MAX_ERROR_SZ]; | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf(data, "SSL: SSL_set_session failed: %s", | |
| ERR_error_string(SSL_get_error(backend->handle, 0), | |
| error_buffer)); | |
| @@ -530,7 +529,7 @@ wolfssl_connect_step1(struct connectdata *conn, | |
| /* Informational message */ | |
| infof(data, "SSL re-using session ID\n"); | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| /* pass the raw socket into the SSL layer */ | |
| @@ -545,11 +544,10 @@ wolfssl_connect_step1(struct connectdata *conn, | |
| static CURLcode | |
| - | wolfssl_connect_step2(struct connectdata *conn, |
| + | wolfssl_connect_step2(struct Curl_easy *data, struct connectdata *conn, |
| int sockindex) | |
| { | |
| int ret = -1; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| #ifndef CURL_DISABLE_PROXY | |
| @@ -761,11 +759,10 @@ wolfssl_connect_step2(struct connectdata *conn, | |
| static CURLcode | |
| - | wolfssl_connect_step3(struct connectdata *conn, |
| + | wolfssl_connect_step3(struct Curl_easy *data, struct connectdata *conn, |
| int sockindex) | |
| { | |
| CURLcode result = CURLE_OK; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| @@ -778,27 +775,27 @@ wolfssl_connect_step3(struct connectdata *conn, | |
| our_ssl_sessionid = SSL_get_session(backend->handle); | |
| - | Curl_ssl_sessionid_lock(conn); |
| - | incache = !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, |
| + | Curl_ssl_sessionid_lock(data); |
| + | incache = !(Curl_ssl_getsessionid(data, conn, &old_ssl_sessionid, NULL, |
| sockindex)); | |
| if(incache) { | |
| if(old_ssl_sessionid != our_ssl_sessionid) { | |
| infof(data, "old SSL session ID is stale, removing\n"); | |
| - | Curl_ssl_delsessionid(conn, old_ssl_sessionid); |
| + | Curl_ssl_delsessionid(data, old_ssl_sessionid); |
| incache = FALSE; | |
| } | |
| } | |
| if(!incache) { | |
| - | result = Curl_ssl_addsessionid(conn, our_ssl_sessionid, |
| + | result = Curl_ssl_addsessionid(data, conn, our_ssl_sessionid, |
| 0 /* unknown size */, sockindex); | |
| if(result) { | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| failf(data, "failed to store ssl session"); | |
| return result; | |
| } | |
| } | |
| - | Curl_ssl_sessionid_unlock(conn); |
| + | Curl_ssl_sessionid_unlock(data); |
| } | |
| connssl->connecting_state = ssl_connect_done; | |
| @@ -840,11 +837,14 @@ static ssize_t wolfssl_send(struct Curl_easy *data, | |
| return rc; | |
| } | |
| - | static void wolfssl_close(struct connectdata *conn, int sockindex) |
| + | static void wolfssl_close(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| + | (void) data; |
| + | |
| if(backend->handle) { | |
| (void)SSL_shutdown(backend->handle); | |
| SSL_free(backend->handle); | |
| @@ -942,12 +942,15 @@ static bool wolfssl_data_pending(const struct connectdata *conn, | |
| * This function is called to shut down the SSL layer but keep the | |
| * socket open (CCC - Clear Command Channel) | |
| */ | |
| - | static int wolfssl_shutdown(struct connectdata *conn, int sockindex) |
| + | static int wolfssl_shutdown(struct Curl_easy *data, struct connectdata *conn, |
| + | int sockindex) |
| { | |
| int retval = 0; | |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| struct ssl_backend_data *backend = connssl->backend; | |
| + | (void) data; |
| + | |
| if(backend->handle) { | |
| SSL_free(backend->handle); | |
| backend->handle = NULL; | |
| @@ -957,13 +960,13 @@ static int wolfssl_shutdown(struct connectdata *conn, int sockindex) | |
| static CURLcode | |
| - | wolfssl_connect_common(struct connectdata *conn, |
| + | wolfssl_connect_common(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, | |
| bool nonblocking, | |
| bool *done) | |
| { | |
| CURLcode result; | |
| - | struct Curl_easy *data = conn->data; |
| struct ssl_connect_data *connssl = &conn->ssl[sockindex]; | |
| curl_socket_t sockfd = conn->sock[sockindex]; | |
| int what; | |
| @@ -984,7 +987,7 @@ wolfssl_connect_common(struct connectdata *conn, | |
| return CURLE_OPERATION_TIMEDOUT; | |
| } | |
| - | result = wolfssl_connect_step1(conn, sockindex); |
| + | result = wolfssl_connect_step1(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -1039,7 +1042,7 @@ wolfssl_connect_common(struct connectdata *conn, | |
| * ensuring that a client using select() or epoll() will always | |
| * have a valid fdset to wait on. | |
| */ | |
| - | result = wolfssl_connect_step2(conn, sockindex); |
| + | result = wolfssl_connect_step2(data, conn, sockindex); |
| if(result || (nonblocking && | |
| (ssl_connect_2 == connssl->connecting_state || | |
| ssl_connect_2_reading == connssl->connecting_state || | |
| @@ -1048,7 +1051,7 @@ wolfssl_connect_common(struct connectdata *conn, | |
| } /* repeat step2 until all transactions are done. */ | |
| if(ssl_connect_3 == connssl->connecting_state) { | |
| - | result = wolfssl_connect_step3(conn, sockindex); |
| + | result = wolfssl_connect_step3(data, conn, sockindex); |
| if(result) | |
| return result; | |
| } | |
| @@ -1069,19 +1072,21 @@ wolfssl_connect_common(struct connectdata *conn, | |
| } | |
| - | static CURLcode wolfssl_connect_nonblocking(struct connectdata *conn, |
| + | static CURLcode wolfssl_connect_nonblocking(struct Curl_easy *data, |
| + | struct connectdata *conn, |
| int sockindex, bool *done) | |
| { | |
| - | return wolfssl_connect_common(conn, sockindex, TRUE, done); |
| + | return wolfssl_connect_common(data, conn, sockindex, TRUE, done); |
| } | |
| - | static CURLcode wolfssl_connect(struct connectdata *conn, int sockindex) |
| + | static CURLcode wolfssl_connect(struct Curl_easy *data, |
| + | struct connectdata *conn, int sockindex) |
| { | |
| CURLcode result; | |
| bool done = FALSE; | |
| - | result = wolfssl_connect_common(conn, sockindex, FALSE, &done); |
| + | result = wolfssl_connect_common(data, conn, sockindex, FALSE, &done); |
| if(result) | |
| return result; | |