vtls: TLS session storage overhaul
—
$ git checkout -f fb22459dc176d50c36fb8996e4a7980bc098cc35
Previous HEAD position was c8e0cd1de8 http3: quiche+ngtcp2 improvements
HEAD is now at fb22459dc1 vtls: TLS session storage overhaul
$ 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/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/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
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-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.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_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_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_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.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-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-dllmain.lo
Removing lib/libcurl_la-dllmain.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.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-fopen.lo
Removing lib/libcurl_la-fopen.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-headers.lo
Removing lib/libcurl_la-headers.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-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-http1.lo
Removing lib/libcurl_la-http1.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.lo
Removing lib/libcurl_la-idn.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-macos.lo
Removing lib/libcurl_la-macos.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-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.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-request.lo
Removing lib/libcurl_la-request.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-timediff.lo
Removing lib/libcurl_la-timediff.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-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
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-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.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/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.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-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.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-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.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 lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.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/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
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/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
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:124: installing './compile'
configure.ac:426: installing './config.guess'
configure.ac:426: installing './config.sub'
configure.ac:124: installing './install-sh'
configure.ac:130: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
$ 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 HTTPSRR support... 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 that grep -E works... yes
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 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 stdatomic.h... yes
checking if _Atomic is available... yes
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... 8.8.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
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 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 windres... no
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 compiler version... gcc '1100' (raw: '11')
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 whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
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
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 whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... 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 build documentation... no
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 whether build target is a native Windows one... (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... 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 sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... 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 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... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
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 nghttp2_session_get_stream_local_window_size in -lnghttp2... 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 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 netinet/udp.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 fcntl.h... 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 stdbool.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 size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/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 time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... 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 in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
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 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 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 whether build target is a native Windows one... (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/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 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 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 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 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 for sys/types.h... (cached) yes
checking for sys/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_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 memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
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 for sys/types.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 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 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 ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fnmatch... yes
checking for fseeko... 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 sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
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 for dirent.h... yes
checking for opendir... 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 basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
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 binding connections locally... yes
checking whether to support the form 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... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
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/config
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 tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/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: 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
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.8.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--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)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP IPFS IPNS MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
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-asyn-ares.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.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_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_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-dllmain.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.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-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-ftp.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.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-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.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-idn.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-macos.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-nonblock.lo
CC libcurl_la-noproxy.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-request.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-timediff.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-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.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-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.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 vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.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 docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC tool_binmode.o
CC slist_wc.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_see.o
CC tool_cb_rea.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC tool_hugehelp.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.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'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
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'
| @@ -345,6 +345,8 @@ struct ssl_general_config { | |
| int ca_cache_timeout; /* Certificate store cache timeout (seconds) */ | |
| }; | |
| + | typedef void Curl_ssl_sessionid_dtor(void *sessionid, size_t idsize); |
| + | |
| /* information stored about one single SSL session */ | |
| struct Curl_ssl_session { | |
| char *name; /* host name for which this ID was used */ | |
| @@ -352,6 +354,7 @@ struct Curl_ssl_session { | |
| const char *scheme; /* protocol scheme used */ | |
| void *sessionid; /* as returned from the SSL layer */ | |
| size_t idsize; /* if known, otherwise 0 */ | |
| + | Curl_ssl_sessionid_dtor *sessionid_free; /* free `sessionid` callback */ |
| long age; /* just a number, the higher the more recent */ | |
| int remote_port; /* remote port */ | |
| int conn_to_port; /* remote port for the connection (may be -1) */ | |
| @@ -1992,9 +1992,8 @@ static int quic_ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) | |
| ctx = cf? cf->ctx : NULL; | |
| data = cf? CF_DATA_CURRENT(cf) : NULL; | |
| if(cf && data && ctx) { | |
| - | CURLcode result = Curl_ossl_add_session(cf, data, &ctx->peer, |
| - | ssl_sessionid); |
| - | return result? 0 : 1; |
| + | Curl_ossl_add_session(cf, data, &ctx->peer, ssl_sessionid); |
| + | return 1; |
| } | |
| return 0; | |
| } | |
| @@ -830,7 +830,7 @@ static CURLcode bearssl_run_until(struct Curl_cfilter *cf, | |
| CURL_TRC_CF(data, cf, "ssl_recv(len=%zu) -> %zd, %d", len, ret, result); | |
| if(ret == 0) { | |
| failf(data, "SSL: EOF without close notify"); | |
| - | return CURLE_READ_ERROR; |
| + | return CURLE_RECV_ERROR; |
| } | |
| if(ret <= 0) { | |
| return result; | |
| @@ -873,6 +873,12 @@ static CURLcode bearssl_connect_step2(struct Curl_cfilter *cf, | |
| return ret; | |
| } | |
| + | static void bearssl_session_free(void *sessionid, size_t idsize) |
| + | { |
| + | (void)idsize; |
| + | free(sessionid); |
| + | } |
| + | |
| static CURLcode bearssl_connect_step3(struct Curl_cfilter *cf, | |
| struct Curl_easy *data) | |
| { | |
| @@ -896,7 +902,6 @@ static CURLcode bearssl_connect_step3(struct Curl_cfilter *cf, | |
| if(ssl_config->primary.sessionid) { | |
| bool incache; | |
| - | bool added = FALSE; |
| void *oldsession; | |
| br_ssl_session_parameters *session; | |
| @@ -909,13 +914,12 @@ static CURLcode bearssl_connect_step3(struct Curl_cfilter *cf, | |
| &oldsession, NULL)); | |
| if(incache) | |
| Curl_ssl_delsessionid(data, oldsession); | |
| - | ret = Curl_ssl_addsessionid(cf, data, &connssl->peer, session, 0, &added); |
| + | |
| + | ret = Curl_ssl_addsessionid(cf, data, &connssl->peer, session, 0, |
| + | bearssl_session_free); |
| Curl_ssl_sessionid_unlock(data); | |
| - | if(!added) |
| - | free(session); |
| - | if(ret) { |
| - | return CURLE_OUT_OF_MEMORY; |
| - | } |
| + | if(ret) |
| + | return ret; |
| } | |
| connssl->connecting_state = ssl_connect_done; | |
| @@ -1174,11 +1178,6 @@ static void bearssl_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| } | |
| } | |
| - | static void bearssl_session_free(void *ptr) |
| - | { |
| - | free(ptr); |
| - | } |
| - | |
| static CURLcode bearssl_sha256sum(const unsigned char *input, | |
| size_t inputlen, | |
| unsigned char *sha256sum, | |
| @@ -1211,7 +1210,6 @@ const struct Curl_ssl Curl_ssl_bearssl = { | |
| bearssl_get_internals, /* get_internals */ | |
| bearssl_close, /* close_one */ | |
| Curl_none_close_all, /* close_all */ | |
| - | bearssl_session_free, /* session_free */ |
| Curl_none_set_engine, /* set_engine */ | |
| Curl_none_set_engine_default, /* set_engine_default */ | |
| Curl_none_engines_list, /* engines_list */ | |
| @@ -532,6 +532,88 @@ CURLcode Curl_gtls_client_trust_setup(struct Curl_cfilter *cf, | |
| return CURLE_OK; | |
| } | |
| + | static void gtls_sessionid_free(void *sessionid, size_t idsize) |
| + | { |
| + | (void)idsize; |
| + | free(sessionid); |
| + | } |
| + | |
| + | static CURLcode gtls_update_session_id(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | gnutls_session_t session) |
| + | { |
| + | struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data); |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | CURLcode result = CURLE_OK; |
| + | |
| + | if(ssl_config->primary.sessionid) { |
| + | /* we always unconditionally get the session id here, as even if we |
| + | already got it from the cache and asked to use it in the connection, it |
| + | might've been rejected and then a new one is in use now and we need to |
| + | detect that. */ |
| + | void *connect_sessionid; |
| + | size_t connect_idsize = 0; |
| + | |
| + | /* get the session ID data size */ |
| + | gnutls_session_get_data(session, NULL, &connect_idsize); |
| + | connect_sessionid = malloc(connect_idsize); /* get a buffer for it */ |
| + | if(!connect_sessionid) { |
| + | return CURLE_OUT_OF_MEMORY; |
| + | } |
| + | else { |
| + | bool incache; |
| + | void *ssl_sessionid; |
| + | |
| + | /* extract session ID to the allocated buffer */ |
| + | gnutls_session_get_data(session, connect_sessionid, &connect_idsize); |
| + | |
| + | DEBUGF(infof(data, "get session id (len=%zu) and store in cache", |
| + | connect_idsize)); |
| + | Curl_ssl_sessionid_lock(data); |
| + | incache = !(Curl_ssl_getsessionid(cf, data, &connssl->peer, |
| + | &ssl_sessionid, NULL)); |
| + | 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(data, ssl_sessionid); |
| + | } |
| + | |
| + | /* store this session id, takes ownership */ |
| + | result = Curl_ssl_addsessionid(cf, data, &connssl->peer, |
| + | connect_sessionid, connect_idsize, |
| + | gtls_sessionid_free); |
| + | Curl_ssl_sessionid_unlock(data); |
| + | } |
| + | } |
| + | return result; |
| + | } |
| + | |
| + | static int gtls_handshake_cb(gnutls_session_t session, unsigned int htype, |
| + | unsigned when, unsigned int incoming, |
| + | const gnutls_datum_t *msg) |
| + | { |
| + | struct Curl_cfilter *cf = gnutls_session_get_ptr(session); |
| + | |
| + | (void)msg; |
| + | (void)incoming; |
| + | if(when) { /* after message has been processed */ |
| + | struct Curl_easy *data = CF_DATA_CURRENT(cf); |
| + | if(data) { |
| + | DEBUGF(infof(data, "handshake: %s message type %d", |
| + | incoming? "incoming" : "outgoing", htype)); |
| + | switch(htype) { |
| + | case GNUTLS_HANDSHAKE_NEW_SESSION_TICKET: { |
| + | gtls_update_session_id(cf, data, session); |
| + | break; |
| + | } |
| + | default: |
| + | break; |
| + | } |
| + | } |
| + | } |
| + | return 0; |
| + | } |
| + | |
| static CURLcode gtls_client_init(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| struct ssl_peer *peer, | |
| @@ -828,10 +910,13 @@ CURLcode Curl_gtls_ctx_init(struct gtls_ctx *gctx, | |
| Curl_ssl_sessionid_lock(data); | |
| if(!Curl_ssl_getsessionid(cf, data, peer, &ssl_sessionid, &ssl_idsize)) { | |
| /* we got a session id, use it! */ | |
| - | gnutls_session_set_data(gctx->session, ssl_sessionid, ssl_idsize); |
| + | int rc; |
| - | /* Informational message */ |
| - | infof(data, "SSL reusing session ID"); |
| + | rc = gnutls_session_set_data(gctx->session, ssl_sessionid, ssl_idsize); |
| + | if(rc < 0) |
| + | infof(data, "SSL failed to set session ID"); |
| + | else |
| + | infof(data, "SSL reusing session ID (size=%zu)", ssl_idsize); |
| } | |
| Curl_ssl_sessionid_unlock(data); | |
| } | |
| @@ -869,6 +954,9 @@ gtls_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| if(result) | |
| return result; | |
| + | gnutls_handshake_set_hook_function(backend->gtls.session, |
| + | GNUTLS_HANDSHAKE_ANY, GNUTLS_HOOK_POST, |
| + | gtls_handshake_cb); |
| /* register callback functions and handle to send and receive data. */ | |
| gnutls_transport_set_ptr(backend->gtls.session, cf); | |
| @@ -1403,49 +1491,10 @@ static CURLcode gtls_verifyserver(struct Curl_cfilter *cf, | |
| Curl_alpn_set_negotiated(cf, data, NULL, 0); | |
| } | |
| - | if(ssl_config->primary.sessionid) { |
| - | /* we always unconditionally get the session id here, as even if we |
| - | already got it from the cache and asked to use it in the connection, it |
| - | might've been rejected and then a new one is in use now and we need to |
| - | detect that. */ |
| - | void *connect_sessionid; |
| - | size_t connect_idsize = 0; |
| - | |
| - | /* get the session ID data size */ |
| - | gnutls_session_get_data(session, NULL, &connect_idsize); |
| - | connect_sessionid = malloc(connect_idsize); /* get a buffer for it */ |
| - | |
| - | if(connect_sessionid) { |
| - | bool incache; |
| - | bool added = FALSE; |
| - | void *ssl_sessionid; |
| - | |
| - | /* extract session ID to the allocated buffer */ |
| - | gnutls_session_get_data(session, connect_sessionid, &connect_idsize); |
| - | |
| - | Curl_ssl_sessionid_lock(data); |
| - | incache = !(Curl_ssl_getsessionid(cf, data, &connssl->peer, |
| - | &ssl_sessionid, NULL)); |
| - | 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(data, ssl_sessionid); |
| - | } |
| - | |
| - | /* store this session id */ |
| - | result = Curl_ssl_addsessionid(cf, data, &connssl->peer, |
| - | connect_sessionid, connect_idsize, |
| - | &added); |
| - | Curl_ssl_sessionid_unlock(data); |
| - | if(!added) |
| - | free(connect_sessionid); |
| - | if(result) { |
| - | result = CURLE_OUT_OF_MEMORY; |
| - | } |
| - | } |
| - | else |
| - | result = CURLE_OUT_OF_MEMORY; |
| - | } |
| + | /* Only on TLSv1.2 or lower do we have the session id now. For |
| + | * TLSv1.3 we get it via a SESSION_TICKET message that arrives later. */ |
| + | if(gnutls_protocol_get_version(session) < GNUTLS_TLS1_3) |
| + | result = gtls_update_session_id(cf, data, session); |
| out: | |
| return result; | |
| @@ -1734,11 +1783,6 @@ out: | |
| return ret; | |
| } | |
| - | static void gtls_session_free(void *ptr) |
| - | { |
| - | free(ptr); |
| - | } |
| - | |
| static size_t gtls_version(char *buffer, size_t size) | |
| { | |
| return msnprintf(buffer, size, "GnuTLS/%s", gnutls_check_version(NULL)); | |
| @@ -1805,7 +1849,6 @@ const struct Curl_ssl Curl_ssl_gnutls = { | |
| gtls_get_internals, /* get_internals */ | |
| gtls_close, /* close_one */ | |
| Curl_none_close_all, /* close_all */ | |
| - | gtls_session_free, /* session_free */ |
| Curl_none_set_engine, /* set_engine */ | |
| Curl_none_set_engine_default, /* set_engine_default */ | |
| Curl_none_engines_list, /* engines_list */ | |
| @@ -1033,6 +1033,13 @@ pinnedpubkey_error: | |
| return CURLE_OK; | |
| } | |
| + | static void mbedtls_session_free(void *sessionid, size_t idsize) |
| + | { |
| + | (void)idsize; |
| + | mbedtls_ssl_session_free(sessionid); |
| + | free(sessionid); |
| + | } |
| + | |
| static CURLcode | |
| mbed_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| @@ -1049,7 +1056,6 @@ mbed_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| int ret; | |
| mbedtls_ssl_session *our_ssl_sessionid; | |
| void *old_ssl_sessionid = NULL; | |
| - | bool added = FALSE; |
| our_ssl_sessionid = malloc(sizeof(mbedtls_ssl_session)); | |
| if(!our_ssl_sessionid) | |
| @@ -1073,16 +1079,11 @@ mbed_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| Curl_ssl_delsessionid(data, old_ssl_sessionid); | |
| retcode = Curl_ssl_addsessionid(cf, data, &connssl->peer, | |
| - | our_ssl_sessionid, 0, &added); |
| + | our_ssl_sessionid, 0, |
| + | mbedtls_session_free); |
| Curl_ssl_sessionid_unlock(data); | |
| - | if(!added) { |
| - | mbedtls_ssl_session_free(our_ssl_sessionid); |
| - | free(our_ssl_sessionid); |
| - | } |
| - | if(retcode) { |
| - | failf(data, "failed to store ssl session"); |
| + | if(retcode) |
| return retcode; | |
| - | } |
| } | |
| connssl->connecting_state = ssl_connect_done; | |
| @@ -1176,12 +1177,6 @@ static ssize_t mbed_recv(struct Curl_cfilter *cf, struct Curl_easy *data, | |
| return len; | |
| } | |
| - | static void mbedtls_session_free(void *ptr) |
| - | { |
| - | mbedtls_ssl_session_free(ptr); |
| - | free(ptr); |
| - | } |
| - | |
| static size_t mbedtls_version(char *buffer, size_t size) | |
| { | |
| #ifdef MBEDTLS_VERSION_C | |
| @@ -1460,7 +1455,6 @@ const struct Curl_ssl Curl_ssl_mbedtls = { | |
| mbedtls_get_internals, /* get_internals */ | |
| mbedtls_close, /* close_one */ | |
| mbedtls_close_all, /* close_all */ | |
| - | mbedtls_session_free, /* session_free */ |
| Curl_none_set_engine, /* set_engine */ | |
| Curl_none_set_engine_default, /* set_engine_default */ | |
| Curl_none_engines_list, /* engines_list */ | |
| @@ -2074,10 +2074,11 @@ static int ossl_shutdown(struct Curl_cfilter *cf, | |
| return retval; | |
| } | |
| - | static void ossl_session_free(void *ptr) |
| + | static void ossl_session_free(void *sessionid, size_t idsize) |
| { | |
| /* free the ID */ | |
| - | SSL_SESSION_free(ptr); |
| + | (void)idsize; |
| + | SSL_SESSION_free(sessionid); |
| } | |
| /* | |
| @@ -2935,52 +2936,45 @@ ossl_set_ssl_version_min_max_legacy(ctx_option_t *ctx_options, | |
| CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| const struct ssl_peer *peer, | |
| - | SSL_SESSION *ssl_sessionid) |
| + | SSL_SESSION *session) |
| { | |
| const struct ssl_config_data *config; | |
| bool isproxy; | |
| - | CURLcode result = CURLE_WRITE_ERROR; |
| + | bool added = FALSE; |
| if(!cf || !data) | |
| - | return result; |
| + | goto out; |
| isproxy = Curl_ssl_cf_is_proxy(cf); | |
| config = Curl_ssl_cf_get_config(cf, data); | |
| if(config->primary.sessionid) { | |
| bool incache; | |
| - | bool added = FALSE; |
| - | void *old_ssl_sessionid = NULL; |
| + | void *old_session = NULL; |
| Curl_ssl_sessionid_lock(data); | |
| if(isproxy) | |
| incache = FALSE; | |
| else | |
| incache = !(Curl_ssl_getsessionid(cf, data, peer, | |
| - | &old_ssl_sessionid, NULL)); |
| - | if(incache) { |
| - | if(old_ssl_sessionid != ssl_sessionid) { |
| - | infof(data, "old SSL session ID is stale, removing"); |
| - | Curl_ssl_delsessionid(data, old_ssl_sessionid); |
| - | incache = FALSE; |
| - | } |
| + | &old_session, NULL)); |
| + | if(incache && (old_session != session)) { |
| + | infof(data, "old SSL session ID is stale, removing"); |
| + | Curl_ssl_delsessionid(data, old_session); |
| + | incache = FALSE; |
| } | |
| if(!incache) { | |
| - | if(!Curl_ssl_addsessionid(cf, data, peer, ssl_sessionid, |
| - | 0 /* unknown size */, &added)) { |
| - | if(added) { |
| - | /* the session has been put into the session cache */ |
| - | result = CURLE_OK; |
| - | } |
| - | } |
| - | else |
| - | failf(data, "failed to store ssl session"); |
| + | added = TRUE; |
| + | Curl_ssl_addsessionid(cf, data, peer, session, 0, ossl_session_free); |
| } | |
| Curl_ssl_sessionid_unlock(data); | |
| } | |
| - | return result; |
| + | out: |
| + | if(!added) |
| + | ossl_session_free(session, 0); |
| + | return CURLE_OK; |
| } | |
| /* The "new session" callback must return zero if the session can be removed | |
| @@ -2991,13 +2985,12 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) | |
| struct Curl_cfilter *cf; | |
| struct Curl_easy *data; | |
| struct ssl_connect_data *connssl; | |
| - | CURLcode result; |
| cf = (struct Curl_cfilter*) SSL_get_app_data(ssl); | |
| connssl = cf? cf->ctx : NULL; | |
| data = connssl? CF_DATA_CURRENT(cf) : NULL; | |
| - | result = Curl_ossl_add_session(cf, data, &connssl->peer, ssl_sessionid); |
| - | return result? 0 : 1; |
| + | Curl_ossl_add_session(cf, data, &connssl->peer, ssl_sessionid); |
| + | return 1; |
| } | |
| static CURLcode load_cacert_from_memory(X509_STORE *store, | |
| @@ -5291,7 +5284,6 @@ const struct Curl_ssl Curl_ssl_openssl = { | |
| ossl_get_internals, /* get_internals */ | |
| ossl_close, /* close_one */ | |
| ossl_close_all, /* close_all */ | |
| - | ossl_session_free, /* session_free */ |
| ossl_set_engine, /* set_engine */ | |
| ossl_set_engine_default, /* set_engine_default */ | |
| ossl_engines_list, /* engines_list */ | |
| @@ -100,7 +100,7 @@ CURLcode Curl_ossl_ctx_configure(struct Curl_cfilter *cf, | |
| SSL_CTX *ssl_ctx); | |
| /* | |
| - | * Add a new session to the cache. |
| + | * Add a new session to the cache. Takes ownership of the session. |
| */ | |
| CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| @@ -742,7 +742,6 @@ const struct Curl_ssl Curl_ssl_rustls = { | |
| cr_get_internals, /* get_internals */ | |
| cr_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 */ | |
| @@ -1675,6 +1675,28 @@ add_cert_to_certinfo(const CERT_CONTEXT *ccert_context, bool reverse_order, | |
| return args->result == CURLE_OK; | |
| } | |
| + | static void schannel_session_free(void *sessionid, size_t idsize) |
| + | { |
| + | /* this is expected to be called under sessionid lock */ |
| + | struct Curl_schannel_cred *cred = sessionid; |
| + | |
| + | (void)idsize; |
| + | if(cred) { |
| + | cred->refcount--; |
| + | if(cred->refcount == 0) { |
| + | s_pSecFn->FreeCredentialsHandle(&cred->cred_handle); |
| + | curlx_unicodefree(cred->sni_hostname); |
| + | #ifdef HAS_CLIENT_CERT_PATH |
| + | if(cred->client_cert_store) { |
| + | CertCloseStore(cred->client_cert_store, 0); |
| + | cred->client_cert_store = NULL; |
| + | } |
| + | #endif |
| + | Curl_safefree(cred); |
| + | } |
| + | } |
| + | } |
| + | |
| static CURLcode | |
| schannel_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| @@ -1752,7 +1774,6 @@ schannel_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| /* save the current session data for possible reuse */ | |
| if(ssl_config->primary.sessionid) { | |
| bool incache; | |
| - | bool added = FALSE; |
| struct Curl_schannel_cred *old_cred = NULL; | |
| Curl_ssl_sessionid_lock(data); | |
| @@ -1768,20 +1789,15 @@ schannel_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| } | |
| } | |
| if(!incache) { | |
| + | /* Up ref count since call takes ownership */ |
| + | backend->cred->refcount++; |
| result = Curl_ssl_addsessionid(cf, data, &connssl->peer, backend->cred, | |
| sizeof(struct Curl_schannel_cred), | |
| - | &added); |
| + | schannel_session_free); |
| if(result) { | |
| Curl_ssl_sessionid_unlock(data); | |
| - | failf(data, "schannel: failed to store credential handle"); |
| return result; | |
| } | |
| - | else if(added) { |
| - | /* this cred session is now also referenced by sessionid cache */ |
| - | backend->cred->refcount++; |
| - | DEBUGF(infof(data, |
| - | "schannel: stored credential handle in session cache")); |
| - | } |
| } | |
| Curl_ssl_sessionid_unlock(data); | |
| } | |
| @@ -2456,27 +2472,6 @@ static bool schannel_data_pending(struct Curl_cfilter *cf, | |
| return FALSE; | |
| } | |
| - | static void schannel_session_free(void *ptr) |
| - | { |
| - | /* this is expected to be called under sessionid lock */ |
| - | struct Curl_schannel_cred *cred = ptr; |
| - | |
| - | if(cred) { |
| - | cred->refcount--; |
| - | if(cred->refcount == 0) { |
| - | s_pSecFn->FreeCredentialsHandle(&cred->cred_handle); |
| - | curlx_unicodefree(cred->sni_hostname); |
| - | #ifdef HAS_CLIENT_CERT_PATH |
| - | if(cred->client_cert_store) { |
| - | CertCloseStore(cred->client_cert_store, 0); |
| - | cred->client_cert_store = NULL; |
| - | } |
| - | #endif |
| - | Curl_safefree(cred); |
| - | } |
| - | } |
| - | } |
| - | |
| /* shut down the SSL connection and clean up related memory. | |
| this function can be called multiple times on the same connection including | |
| if the SSL connection failed (eg connection made but failed handshake). */ | |
| @@ -2560,7 +2555,7 @@ static int schannel_shutdown(struct Curl_cfilter *cf, | |
| /* free SSPI Schannel API credential handle */ | |
| if(backend->cred) { | |
| Curl_ssl_sessionid_lock(data); | |
| - | schannel_session_free(backend->cred); |
| + | schannel_session_free(backend->cred, 0); |
| Curl_ssl_sessionid_unlock(data); | |
| backend->cred = NULL; | |
| } | |
| @@ -2923,7 +2918,6 @@ const struct Curl_ssl Curl_ssl_schannel = { | |
| schannel_get_internals, /* get_internals */ | |
| schannel_close, /* close_one */ | |
| Curl_none_close_all, /* close_all */ | |
| - | 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 */ | |
| @@ -1636,6 +1636,18 @@ static CURLcode sectransp_set_selected_ciphers(struct Curl_easy *data, | |
| return CURLE_OK; | |
| } | |
| + | static void sectransp_session_free(void *sessionid, size_t idsize) |
| + | { |
| + | /* 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 |
| + | function that does this, but I don't want to have to explain to you why I |
| + | got your application rejected from the App Store due to the use of a |
| + | private API, so the best we can do is free up our own char array that we |
| + | created way back in sectransp_connect_step1... */ |
| + | (void)idsize; |
| + | Curl_safefree(sessionid); |
| + | } |
| + | |
| static CURLcode sectransp_connect_step1(struct Curl_cfilter *cf, | |
| struct Curl_easy *data) | |
| { | |
| @@ -2078,12 +2090,11 @@ static CURLcode sectransp_connect_step1(struct Curl_cfilter *cf, | |
| } | |
| result = Curl_ssl_addsessionid(cf, data, &connssl->peer, ssl_sessionid, | |
| - | ssl_sessionid_len, NULL); |
| + | ssl_sessionid_len, |
| + | sectransp_session_free); |
| Curl_ssl_sessionid_unlock(data); | |
| - | if(result) { |
| - | failf(data, "failed to store ssl session"); |
| + | if(result) |
| return result; | |
| - | } |
| } | |
| } | |
| @@ -3225,17 +3236,6 @@ static int sectransp_shutdown(struct Curl_cfilter *cf, | |
| return rc; | |
| } | |
| - | 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 |
| - | function that does this, but I don't want to have to explain to you why I |
| - | got your application rejected from the App Store due to the use of a |
| - | private API, so the best we can do is free up our own char array that we |
| - | created way back in sectransp_connect_step1... */ |
| - | Curl_safefree(ptr); |
| - | } |
| - | |
| static size_t sectransp_version(char *buffer, size_t size) | |
| { | |
| return msnprintf(buffer, size, "SecureTransport"); | |
| @@ -3469,7 +3469,6 @@ const struct Curl_ssl Curl_ssl_sectransp = { | |
| sectransp_get_internals, /* get_internals */ | |
| sectransp_close, /* close_one */ | |
| Curl_none_close_all, /* close_all */ | |
| - | 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 */ | |
| @@ -605,9 +605,10 @@ void Curl_ssl_kill_session(struct Curl_ssl_session *session) | |
| /* defensive check */ | |
| /* free the ID the SSL-layer specific way */ | |
| - | Curl_ssl->session_free(session->sessionid); |
| + | session->sessionid_free(session->sessionid, session->idsize); |
| session->sessionid = NULL; | |
| + | session->sessionid_free = NULL; |
| session->age = 0; /* fresh */ | |
| Curl_free_primary_ssl_config(&session->ssl_config); | |
| @@ -645,42 +646,41 @@ CURLcode Curl_ssl_addsessionid(struct Curl_cfilter *cf, | |
| const struct ssl_peer *peer, | |
| void *ssl_sessionid, | |
| size_t idsize, | |
| - | bool *added) |
| + | Curl_ssl_sessionid_dtor *sessionid_free_cb) |
| { | |
| struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data); | |
| struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); | |
| size_t i; | |
| struct Curl_ssl_session *store; | |
| long oldest_age; | |
| - | char *clone_host; |
| - | char *clone_conn_to_host; |
| + | char *clone_host = NULL; |
| + | char *clone_conn_to_host = NULL; |
| int conn_to_port; | |
| long *general_age; | |
| + | CURLcode result = CURLE_OUT_OF_MEMORY; |
| - | if(added) |
| - | *added = FALSE; |
| + | DEBUGASSERT(ssl_sessionid); |
| + | DEBUGASSERT(sessionid_free_cb); |
| - | if(!data->state.session) |
| + | if(!data->state.session) { |
| + | sessionid_free_cb(ssl_sessionid, idsize); |
| return CURLE_OK; | |
| + | } |
| store = &data->state.session[0]; | |
| oldest_age = data->state.session[0].age; /* zero if unused */ | |
| - | (void)ssl_config; |
| DEBUGASSERT(ssl_config->primary.sessionid); | |
| + | (void)ssl_config; |
| clone_host = strdup(peer->hostname); | |
| if(!clone_host) | |
| - | return CURLE_OUT_OF_MEMORY; /* bail out */ |
| + | goto out; |
| if(cf->conn->bits.conn_to_host) { | |
| clone_conn_to_host = strdup(cf->conn->conn_to_host.name); | |
| - | if(!clone_conn_to_host) { |
| - | free(clone_host); |
| - | return CURLE_OUT_OF_MEMORY; /* bail out */ |
| - | } |
| + | if(!clone_conn_to_host) |
| + | goto out; |
| } | |
| - | else |
| - | clone_conn_to_host = NULL; |
| if(cf->conn->bits.conn_to_port) | |
| conn_to_port = cf->conn->conn_to_port; | |
| @@ -713,34 +713,43 @@ CURLcode Curl_ssl_addsessionid(struct Curl_cfilter *cf, | |
| store = &data->state.session[i]; /* use this slot */ | |
| /* now init the session struct wisely */ | |
| + | if(!clone_ssl_primary_config(conn_config, &store->ssl_config)) { |
| + | Curl_free_primary_ssl_config(&store->ssl_config); |
| + | store->sessionid = NULL; /* let caller free sessionid */ |
| + | goto out; |
| + | } |
| store->sessionid = ssl_sessionid; | |
| store->idsize = idsize; | |
| + | store->sessionid_free = sessionid_free_cb; |
| store->age = *general_age; /* set current age */ | |
| /* free it if there's one already present */ | |
| free(store->name); | |
| free(store->conn_to_host); | |
| store->name = clone_host; /* clone host name */ | |
| + | clone_host = NULL; |
| store->conn_to_host = clone_conn_to_host; /* clone connect to host name */ | |
| + | clone_conn_to_host = NULL; |
| store->conn_to_port = conn_to_port; /* connect to port number */ | |
| /* port number */ | |
| store->remote_port = peer->port; | |
| store->scheme = cf->conn->handler->scheme; | |
| store->transport = peer->transport; | |
| - | if(!clone_ssl_primary_config(conn_config, &store->ssl_config)) { |
| - | Curl_free_primary_ssl_config(&store->ssl_config); |
| - | store->sessionid = NULL; /* let caller free sessionid */ |
| - | free(clone_host); |
| - | free(clone_conn_to_host); |
| - | return CURLE_OUT_OF_MEMORY; |
| - | } |
| - | |
| - | if(added) |
| - | *added = TRUE; |
| + | result = CURLE_OK; |
| - | DEBUGF(infof(data, "Added Session ID to cache for %s://%s:%d [%s]", |
| - | store->scheme, store->name, store->remote_port, |
| - | Curl_ssl_cf_is_proxy(cf) ? "PROXY" : "server")); |
| + | out: |
| + | free(clone_host); |
| + | free(clone_conn_to_host); |
| + | if(result) { |
| + | failf(data, "Failed to add Session ID to cache for %s://%s:%d [%s]", |
| + | store->scheme, store->name, store->remote_port, |
| + | Curl_ssl_cf_is_proxy(cf) ? "PROXY" : "server"); |
| + | sessionid_free_cb(ssl_sessionid, idsize); |
| + | return result; |
| + | } |
| + | CURL_TRC_CF(data, cf, "Added Session ID to cache for %s://%s:%d [%s]", |
| + | store->scheme, store->name, store->remote_port, |
| + | Curl_ssl_cf_is_proxy(cf) ? "PROXY" : "server"); |
| return CURLE_OK; | |
| } | |
| @@ -1323,7 +1332,6 @@ static const struct Curl_ssl Curl_ssl_multi = { | |
| multissl_get_internals, /* get_internals */ | |
| multissl_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 */ | |
| @@ -123,7 +123,6 @@ struct Curl_ssl { | |
| void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info); | |
| void (*close)(struct Curl_cfilter *cf, struct Curl_easy *data); | |
| void (*close_all)(struct Curl_easy *data); | |
| - | void (*session_free)(void *ptr); |
| CURLcode (*set_engine)(struct Curl_easy *data, const char *engine); | |
| CURLcode (*set_engine_default)(struct Curl_easy *data); | |
| @@ -186,13 +185,15 @@ bool Curl_ssl_getsessionid(struct Curl_cfilter *cf, | |
| * Sessionid mutex must be locked (see Curl_ssl_sessionid_lock). | |
| * Caller must ensure that it has properly shared ownership of this sessionid | |
| * object with cache (e.g. incrementing refcount on success) | |
| + | * Call takes ownership of `ssl_sessionid`, using `sessionid_free_cb` |
| + | * to destroy it in case of failure or later removal. |
| */ | |
| CURLcode Curl_ssl_addsessionid(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| const struct ssl_peer *peer, | |
| void *ssl_sessionid, | |
| size_t idsize, | |
| - | bool *added); |
| + | Curl_ssl_sessionid_dtor *sessionid_free_cb); |
| #include "openssl.h" /* OpenSSL versions */ | |
| #include "gtls.h" /* GnuTLS versions */ | |
| @@ -1058,6 +1058,13 @@ wolfssl_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| } | |
| + | static void wolfssl_session_free(void *sessionid, size_t idsize) |
| + | { |
| + | (void)idsize; |
| + | wolfSSL_SESSION_free(sessionid); |
| + | } |
| + | |
| + | |
| static CURLcode | |
| wolfssl_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| @@ -1071,42 +1078,27 @@ wolfssl_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| DEBUGASSERT(backend); | |
| if(ssl_config->primary.sessionid) { | |
| - | bool incache; |
| - | bool added = FALSE; |
| - | void *old_ssl_sessionid = NULL; |
| /* wolfSSL_get1_session allocates memory that has to be freed. */ | |
| WOLFSSL_SESSION *our_ssl_sessionid = wolfSSL_get1_session(backend->handle); | |
| if(our_ssl_sessionid) { | |
| + | void *old_ssl_sessionid = NULL; |
| + | bool incache; |
| Curl_ssl_sessionid_lock(data); | |
| incache = !(Curl_ssl_getsessionid(cf, data, &connssl->peer, | |
| &old_ssl_sessionid, NULL)); | |
| if(incache) { | |
| - | if(old_ssl_sessionid != our_ssl_sessionid) { |
| - | infof(data, "old SSL session ID is stale, removing"); |
| - | Curl_ssl_delsessionid(data, old_ssl_sessionid); |
| - | incache = FALSE; |
| - | } |
| + | Curl_ssl_delsessionid(data, old_ssl_sessionid); |
| } | |
| - | if(!incache) { |
| - | result = Curl_ssl_addsessionid(cf, data, &connssl->peer, |
| - | our_ssl_sessionid, 0, NULL); |
| - | if(result) { |
| - | Curl_ssl_sessionid_unlock(data); |
| - | wolfSSL_SESSION_free(our_ssl_sessionid); |
| - | failf(data, "failed to store ssl session"); |
| - | return result; |
| - | } |
| - | else { |
| - | added = TRUE; |
| - | } |
| - | } |
| + | /* call takes ownership of `our_ssl_sessionid` */ |
| + | result = Curl_ssl_addsessionid(cf, data, &connssl->peer, |
| + | our_ssl_sessionid, 0, |
| + | wolfssl_session_free); |
| Curl_ssl_sessionid_unlock(data); | |
| - | |
| - | if(!added) { |
| - | /* If the session info wasn't added to the cache, free our copy. */ |
| - | wolfSSL_SESSION_free(our_ssl_sessionid); |
| + | if(result) { |
| + | failf(data, "failed to store ssl session"); |
| + | return result; |
| } | |
| } | |
| } | |
| @@ -1240,12 +1232,6 @@ static ssize_t wolfssl_recv(struct Curl_cfilter *cf, | |
| } | |
| - | static void wolfssl_session_free(void *ptr) |
| - | { |
| - | wolfSSL_SESSION_free(ptr); |
| - | } |
| - | |
| - | |
| static size_t wolfssl_version(char *buffer, size_t size) | |
| { | |
| #if LIBWOLFSSL_VERSION_HEX >= 0x03006000 | |
| @@ -1525,7 +1511,6 @@ const struct Curl_ssl Curl_ssl_wolfssl = { | |
| wolfssl_get_internals, /* get_internals */ | |
| wolfssl_close, /* close_one */ | |
| Curl_none_close_all, /* close_all */ | |
| - | wolfssl_session_free, /* session_free */ |
| Curl_none_set_engine, /* set_engine */ | |
| Curl_none_set_engine_default, /* set_engine_default */ | |
| Curl_none_engines_list, /* engines_list */ | |
| @@ -0,0 +1,104 @@ | |
| + | #!/usr/bin/env python3 |
| + | # -*- coding: utf-8 -*- |
| + | #*************************************************************************** |
| + | # _ _ ____ _ |
| + | # Project ___| | | | _ \| | |
| + | # / __| | | | |_) | | |
| + | # | (__| |_| | _ <| |___ |
| + | # \___|\___/|_| \_\_____| |
| + | # |
| + | # Copyright (C) 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 |
| + | # are also available at https://curl.se/docs/copyright.html. |
| + | # |
| + | # You may opt to use, copy, modify, merge, publish, distribute and/or sell |
| + | # copies of the Software, and permit persons to whom the Software is |
| + | # furnished to do so, under the terms of the COPYING file. |
| + | # |
| + | # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
| + | # KIND, either express or implied. |
| + | # |
| + | # SPDX-License-Identifier: curl |
| + | # |
| + | ########################################################################### |
| + | # |
| + | import difflib |
| + | import filecmp |
| + | import json |
| + | import logging |
| + | import os |
| + | from datetime import timedelta |
| + | import pytest |
| + | |
| + | from testenv import Env, CurlClient, LocalClient, ExecResult |
| + | |
| + | |
| + | log = logging.getLogger(__name__) |
| + | |
| + | |
| + | class TestSSLUse: |
| + | |
| + | @pytest.fixture(autouse=True, scope='class') |
| + | def _class_scope(self, env, httpd, nghttpx): |
| + | if env.have_h3(): |
| + | nghttpx.start_if_needed() |
| + | httpd.clear_extra_configs() |
| + | httpd.reload() |
| + | |
| + | def test_17_01_sslinfo_plain(self, env: Env, httpd, nghttpx, repeat): |
| + | proto = 'http/1.1' |
| + | curl = CurlClient(env=env) |
| + | url = f'https://{env.authority_for(env.domain1, proto)}/curltest/sslinfo' |
| + | r = curl.http_get(url=url, alpn_proto=proto) |
| + | assert r.json['HTTPS'] == 'on', f'{r.json}' |
| + | assert 'SSL_SESSION_ID' in r.json, f'{r.json}' |
| + | assert 'SSL_SESSION_RESUMED' in r.json, f'{r.json}' |
| + | assert r.json['SSL_SESSION_RESUMED'] == 'Initial', f'{r.json}' |
| + | |
| + | @pytest.mark.parametrize("tls_max", ['1.2', '1.3']) |
| + | def test_17_02_sslinfo_reconnect(self, env: Env, httpd, nghttpx, tls_max, repeat): |
| + | proto = 'http/1.1' |
| + | count = 3 |
| + | exp_resumed = 'Resumed' |
| + | xargs = ['--sessionid', '--tls-max', tls_max, f'--tlsv{tls_max}'] |
| + | if env.curl_uses_lib('gnutls'): |
| + | if tls_max == '1.3': |
| + | exp_resumed = 'Initial' # 1.2 works in gnutls, but 1.3 does not, TODO |
| + | if env.curl_uses_lib('libressl'): |
| + | if tls_max == '1.3': |
| + | exp_resumed = 'Initial' # 1.2 works in libressl, but 1.3 does not, TODO |
| + | if env.curl_uses_lib('wolfssl'): |
| + | xargs = ['--sessionid', f'--tlsv{tls_max}'] |
| + | if tls_max == '1.3': |
| + | exp_resumed = 'Initial' # 1.2 works in wolfssl, but 1.3 does not, TODO |
| + | if env.curl_uses_lib('rustls-ffi'): |
| + | exp_resumed = 'Initial' # rustls does not support sessions, TODO |
| + | if env.curl_uses_lib('bearssl') and tls_max == '1.3': |
| + | pytest.skip('BearSSL does not support TLSv1.3') |
| + | if env.curl_uses_lib('mbedtls') and tls_max == '1.3': |
| + | pytest.skip('mbedtls does not support TLSv1.3') |
| + | |
| + | curl = CurlClient(env=env) |
| + | # tell the server to close the connection after each request |
| + | urln = f'https://{env.authority_for(env.domain1, proto)}/curltest/sslinfo?'\ |
| + | f'id=[0-{count-1}]&close' |
| + | r = curl.http_download(urls=[urln], alpn_proto=proto, with_stats=True, |
| + | extra_args=xargs) |
| + | r.check_response(count=count, http_status=200) |
| + | # should have used one connection for each request, sessions after |
| + | # first should have been resumed |
| + | assert r.total_connects == count, r.dump_logs() |
| + | for i in range(count): |
| + | dfile = curl.download_file(i) |
| + | assert os.path.exists(dfile) |
| + | with open(dfile) as f: |
| + | djson = json.load(f) |
| + | assert djson['HTTPS'] == 'on', f'{i}: {djson}' |
| + | if i == 0: |
| + | assert djson['SSL_SESSION_RESUMED'] == 'Initial', f'{i}: {djson}' |
| + | else: |
| + | assert djson['SSL_SESSION_RESUMED'] == exp_resumed, f'{i}: {djson}' |
| + | |
| + | |
| @@ -415,9 +415,15 @@ class CurlClient: | |
| return xargs | |
| def http_get(self, url: str, extra_args: Optional[List[str]] = None, | |
| - | def_tracing: bool = True, with_profile: bool = False): |
| - | return self._raw(url, options=extra_args, with_stats=False, |
| - | def_tracing=def_tracing, with_profile=with_profile) |
| + | alpn_proto: Optional[str] = None, |
| + | def_tracing: bool = True, |
| + | with_stats: bool = False, |
| + | with_profile: bool = False): |
| + | return self._raw(url, options=extra_args, |
| + | with_stats=with_stats, |
| + | alpn_proto=alpn_proto, |
| + | def_tracing=def_tracing, |
| + | with_profile=with_profile) |
| def http_download(self, urls: List[str], | |
| alpn_proto: Optional[str] = None, | |
| @@ -397,6 +397,10 @@ class Httpd: | |
| f' Redirect 302 /curltest/echo302 /curltest/echo', | |
| f' Redirect 303 /curltest/echo303 /curltest/echo', | |
| f' Redirect 307 /curltest/echo307 /curltest/echo', | |
| + | f' <Location /curltest/sslinfo>', |
| + | f' SSLOptions StdEnvVars', |
| + | f' SetHandler curltest-sslinfo', |
| + | f' </Location>', |
| f' <Location /curltest/echo>', | |
| f' SetHandler curltest-echo', | |
| f' </Location>', | |
| @@ -40,6 +40,7 @@ static int curltest_echo_handler(request_rec *r); | |
| static int curltest_put_handler(request_rec *r); | |
| static int curltest_tweak_handler(request_rec *r); | |
| static int curltest_1_1_required(request_rec *r); | |
| + | static int curltest_sslinfo_handler(request_rec *r); |
| AP_DECLARE_MODULE(curltest) = { | |
| STANDARD20_MODULE_STUFF, | |
| @@ -88,6 +89,7 @@ static void curltest_hooks(apr_pool_t *pool) | |
| ap_hook_handler(curltest_put_handler, NULL, NULL, APR_HOOK_MIDDLE); | |
| ap_hook_handler(curltest_tweak_handler, NULL, NULL, APR_HOOK_MIDDLE); | |
| ap_hook_handler(curltest_1_1_required, NULL, NULL, APR_HOOK_MIDDLE); | |
| + | ap_hook_handler(curltest_sslinfo_handler, NULL, NULL, APR_HOOK_MIDDLE); |
| } | |
| #define SECS_PER_HOUR (60*60) | |
| @@ -628,3 +630,113 @@ cleanup: | |
| } | |
| return DECLINED; | |
| } | |
| + | |
| + | static int brigade_env_var(request_rec *r, apr_bucket_brigade *bb, |
| + | const char *name) |
| + | { |
| + | const char *s; |
| + | s = apr_table_get(r->subprocess_env, name); |
| + | if(s) |
| + | return apr_brigade_printf(bb, NULL, NULL, ",\n \"%s\": \"%s\"", name, s); |
| + | return 0; |
| + | } |
| + | |
| + | static int curltest_sslinfo_handler(request_rec *r) |
| + | { |
| + | conn_rec *c = r->connection; |
| + | apr_bucket_brigade *bb; |
| + | apr_bucket *b; |
| + | apr_status_t rv; |
| + | apr_array_header_t *args = NULL; |
| + | const char *request_id = NULL; |
| + | int close_conn = 0; |
| + | long l; |
| + | int i; |
| + | |
| + | if(strcmp(r->handler, "curltest-sslinfo")) { |
| + | return DECLINED; |
| + | } |
| + | if(r->method_number != M_GET) { |
| + | return DECLINED; |
| + | } |
| + | |
| + | if(r->args) { |
| + | apr_array_header_t *args = apr_cstr_split(r->args, "&", 1, r->pool); |
| + | for(i = 0; i < args->nelts; ++i) { |
| + | char *s, *val, *arg = APR_ARRAY_IDX(args, i, char*); |
| + | s = strchr(arg, '='); |
| + | if(s) { |
| + | *s = '\0'; |
| + | val = s + 1; |
| + | if(!strcmp("id", arg)) { |
| + | /* just an id for repeated requests with curl's url globbing */ |
| + | request_id = val; |
| + | continue; |
| + | } |
| + | } |
| + | else if(!strcmp("close", arg)) { |
| + | /* we are asked to close the connection */ |
| + | close_conn = 1; |
| + | continue; |
| + | } |
| + | ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "query parameter not " |
| + | "understood: '%s' in %s", |
| + | arg, r->args); |
| + | ap_die(HTTP_BAD_REQUEST, r); |
| + | return OK; |
| + | } |
| + | } |
| + | |
| + | ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "sslinfo: processing"); |
| + | r->status = 200; |
| + | r->clength = -1; |
| + | r->chunked = 1; |
| + | apr_table_unset(r->headers_out, "Content-Length"); |
| + | /* Discourage content-encodings */ |
| + | apr_table_unset(r->headers_out, "Content-Encoding"); |
| + | apr_table_setn(r->subprocess_env, "no-brotli", "1"); |
| + | apr_table_setn(r->subprocess_env, "no-gzip", "1"); |
| + | |
| + | ap_set_content_type(r, "application/json"); |
| + | |
| + | bb = apr_brigade_create(r->pool, c->bucket_alloc); |
| + | |
| + | apr_brigade_puts(bb, NULL, NULL, "{\n \"Name\": \"SSL-Information\""); |
| + | brigade_env_var(r, bb, "HTTPS"); |
| + | brigade_env_var(r, bb, "SSL_PROTOCOL"); |
| + | brigade_env_var(r, bb, "SSL_CIPHER"); |
| + | brigade_env_var(r, bb, "SSL_SESSION_ID"); |
| + | brigade_env_var(r, bb, "SSL_SESSION_RESUMED"); |
| + | brigade_env_var(r, bb, "SSL_SRP_USER"); |
| + | brigade_env_var(r, bb, "SSL_SRP_USERINFO"); |
| + | apr_brigade_puts(bb, NULL, NULL, "}\n"); |
| + | |
| + | /* flush response */ |
| + | b = apr_bucket_flush_create(c->bucket_alloc); |
| + | APR_BRIGADE_INSERT_TAIL(bb, b); |
| + | rv = ap_pass_brigade(r->output_filters, bb); |
| + | if (APR_SUCCESS != rv) goto cleanup; |
| + | |
| + | /* we are done */ |
| + | b = apr_bucket_eos_create(c->bucket_alloc); |
| + | APR_BRIGADE_INSERT_TAIL(bb, b); |
| + | ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "1_1_handler: request read"); |
| + | |
| + | rv = ap_pass_brigade(r->output_filters, bb); |
| + | |
| + | cleanup: |
| + | if(close_conn) |
| + | r->connection->keepalive = AP_CONN_CLOSE; |
| + | if(rv == APR_SUCCESS |
| + | || r->status != HTTP_OK |
| + | || c->aborted) { |
| + | ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, r, "1_1_handler: done"); |
| + | return OK; |
| + | } |
| + | else { |
| + | /* no way to know what type of error occurred */ |
| + | ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, r, "1_1_handler failed"); |
| + | return AP_FILTER_ERROR; |
| + | } |
| + | return DECLINED; |
| + | } |