doh: cleanups
—
$ git checkout -f 435dd8aa6e192f11750980165f9eb01e14a71356
Previous HEAD position was b1f0b8f601 pop3: fix multi-line with LIST arg
HEAD is now at 435dd8aa6e doh: cleanups
$ 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/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_ca_embed.c
Removing src/tool_ca_embed.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_soc.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:125: installing './compile'
configure.ac:437: installing './config.guess'
configure.ac:437: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: 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.10.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... /usr/bin/caddy
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 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 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 pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
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 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 sys/eventfd.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 for arc4random... no
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... 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 for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for fseeko... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking whether to enable the threaded resolver... yes
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
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 the SHA-512/256 hash algorithm... 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
CFLAGS extras:
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.10.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: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2
$ 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-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-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-gsasl.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-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'
CC slist_wc.o
CC tool_binmode.o
CC terminal.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_soc.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_helpers.o
CC tool_help.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
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC tool_hugehelp.o
CC tool_ca_embed.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[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'
| @@ -231,7 +231,7 @@ purpose. This code also implements the opportunistic (``--ech true``) or hard-fa | |
| Other than that, the main additions are in ``lib/doh.c`` | |
| where we re-use ``dohprobe()`` to retrieve an HTTPS RR value for the target | |
| - | domain. If such a value is found, that is stored using a new ``store_https()`` |
| + | domain. If such a value is found, that is stored using a new ``doh_store_https()`` |
| function in a new field in the ``dohentry`` structure. | |
| The qname for the DoH query is modified if the port number is not 443, as | |
| @@ -46,7 +46,7 @@ | |
| #define DNS_CLASS_IN 0x01 | |
| - | /* local_print_buf truncates if the hex string will be more than this */ |
| + | /* doh_print_buf truncates if the hex string will be more than this */ |
| #define LOCAL_PB_HEXMAX 400 | |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| @@ -82,11 +82,11 @@ struct curl_trc_feat Curl_doh_trc = { | |
| /* @unittest 1655 | |
| */ | |
| - | UNITTEST DOHcode doh_encode(const char *host, |
| - | DNStype dnstype, |
| - | unsigned char *dnsp, /* buffer */ |
| - | size_t len, /* buffer size */ |
| - | size_t *olen) /* output length */ |
| + | UNITTEST DOHcode doh_req_encode(const char *host, |
| + | DNStype dnstype, |
| + | unsigned char *dnsp, /* buffer */ |
| + | size_t len, /* buffer size */ |
| + | size_t *olen) /* output length */ |
| { | |
| const size_t hostlen = strlen(host); | |
| unsigned char *orig = dnsp; | |
| @@ -192,9 +192,9 @@ doh_write_cb(const void *contents, size_t size, size_t nmemb, void *userp) | |
| } | |
| #if defined(USE_HTTPSRR) && defined(DEBUGBUILD) | |
| - | static void local_print_buf(struct Curl_easy *data, |
| - | const char *prefix, |
| - | unsigned char *buf, size_t len) |
| + | static void doh_print_buf(struct Curl_easy *data, |
| + | const char *prefix, |
| + | unsigned char *buf, size_t len) |
| { | |
| unsigned char hexstr[LOCAL_PB_HEXMAX]; | |
| size_t hlen = LOCAL_PB_HEXMAX; | |
| @@ -214,7 +214,7 @@ static void local_print_buf(struct Curl_easy *data, | |
| /* called from multi.c when this DoH transfer is complete */ | |
| static int doh_done(struct Curl_easy *doh, CURLcode result) | |
| { | |
| - | struct Curl_easy *data; |
| + | struct Curl_easy *data; /* the transfer that asked for the DoH probe */ |
| data = Curl_multi_get_handle(doh->multi, doh->set.dohfor_mid); | |
| if(!data) { | |
| @@ -223,7 +223,7 @@ static int doh_done(struct Curl_easy *doh, CURLcode result) | |
| DEBUGASSERT(0); | |
| } | |
| else { | |
| - | struct dohdata *dohp = data->req.doh; |
| + | struct doh_probes *dohp = data->req.doh; |
| /* one of the DoH request done for the 'data' transfer is now complete! */ | |
| dohp->pending--; | |
| infof(doh, "a DoH request is completed, %u to go", dohp->pending); | |
| @@ -231,9 +231,7 @@ static int doh_done(struct Curl_easy *doh, CURLcode result) | |
| infof(doh, "DoH request %s", curl_easy_strerror(result)); | |
| if(!dohp->pending) { | |
| - | /* DoH completed */ |
| - | curl_slist_free_all(dohp->headers); |
| - | dohp->headers = NULL; |
| + | /* DoH completed, run the transfer picking up the results */ |
| Curl_expire(data, 0, EXPIRE_RUN_NOW); | |
| } | |
| } | |
| @@ -249,24 +247,24 @@ do { \ | |
| goto error; \ | |
| } while(0) | |
| - | static CURLcode dohprobe(struct Curl_easy *data, |
| - | struct dnsprobe *p, DNStype dnstype, |
| - | const char *host, |
| - | const char *url, CURLM *multi, |
| - | struct curl_slist *headers) |
| + | static CURLcode doh_run_probe(struct Curl_easy *data, |
| + | struct doh_probe *p, DNStype dnstype, |
| + | const char *host, |
| + | const char *url, CURLM *multi, |
| + | struct curl_slist *headers) |
| { | |
| struct Curl_easy *doh = NULL; | |
| CURLcode result = CURLE_OK; | |
| timediff_t timeout_ms; | |
| - | DOHcode d = doh_encode(host, dnstype, p->dohbuffer, sizeof(p->dohbuffer), |
| - | &p->dohlen); |
| + | DOHcode d = doh_req_encode(host, dnstype, p->req_body, sizeof(p->req_body), |
| + | &p->req_body_len); |
| if(d) { | |
| failf(data, "Failed to encode DoH packet [%d]", d); | |
| return CURLE_OUT_OF_MEMORY; | |
| } | |
| p->dnstype = dnstype; | |
| - | Curl_dyn_init(&p->serverdoh, DYN_DOH_RESPONSE); |
| + | Curl_dyn_init(&p->resp_body, DYN_DOH_RESPONSE); |
| timeout_ms = Curl_timeleft(data, NULL, TRUE); | |
| if(timeout_ms <= 0) { | |
| @@ -275,127 +273,126 @@ static CURLcode dohprobe(struct Curl_easy *data, | |
| } | |
| /* Curl_open() is the internal version of curl_easy_init() */ | |
| result = Curl_open(&doh); | |
| - | if(!result) { |
| - | /* pass in the struct pointer via a local variable to please coverity and |
| - | the gcc typecheck helpers */ |
| - | struct dynbuf *resp = &p->serverdoh; |
| - | doh->state.internal = true; |
| + | if(result) |
| + | goto error; |
| + | |
| + | /* pass in the struct pointer via a local variable to please coverity and |
| + | the gcc typecheck helpers */ |
| + | doh->state.internal = true; |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| - | doh->state.feat = &Curl_doh_trc; |
| + | doh->state.feat = &Curl_doh_trc; |
| #endif | |
| - | ERROR_CHECK_SETOPT(CURLOPT_URL, url); |
| - | ERROR_CHECK_SETOPT(CURLOPT_DEFAULT_PROTOCOL, "https"); |
| - | ERROR_CHECK_SETOPT(CURLOPT_WRITEFUNCTION, doh_write_cb); |
| - | ERROR_CHECK_SETOPT(CURLOPT_WRITEDATA, resp); |
| - | ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDS, p->dohbuffer); |
| - | ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDSIZE, (long)p->dohlen); |
| - | ERROR_CHECK_SETOPT(CURLOPT_HTTPHEADER, headers); |
| + | ERROR_CHECK_SETOPT(CURLOPT_URL, url); |
| + | ERROR_CHECK_SETOPT(CURLOPT_DEFAULT_PROTOCOL, "https"); |
| + | ERROR_CHECK_SETOPT(CURLOPT_WRITEFUNCTION, doh_write_cb); |
| + | ERROR_CHECK_SETOPT(CURLOPT_WRITEDATA, &p->resp_body); |
| + | ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDS, p->req_body); |
| + | ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDSIZE, (long)p->req_body_len); |
| + | ERROR_CHECK_SETOPT(CURLOPT_HTTPHEADER, headers); |
| #ifdef USE_HTTP2 | |
| - | ERROR_CHECK_SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); |
| - | ERROR_CHECK_SETOPT(CURLOPT_PIPEWAIT, 1L); |
| + | ERROR_CHECK_SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); |
| + | ERROR_CHECK_SETOPT(CURLOPT_PIPEWAIT, 1L); |
| #endif | |
| #ifndef DEBUGBUILD | |
| - | /* enforce HTTPS if not debug */ |
| - | ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTPS); |
| + | /* enforce HTTPS if not debug */ |
| + | ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTPS); |
| #else | |
| - | /* in debug mode, also allow http */ |
| - | ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS); |
| + | /* in debug mode, also allow http */ |
| + | ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS); |
| #endif | |
| - | ERROR_CHECK_SETOPT(CURLOPT_TIMEOUT_MS, (long)timeout_ms); |
| - | ERROR_CHECK_SETOPT(CURLOPT_SHARE, data->share); |
| - | if(data->set.err && data->set.err != stderr) |
| - | ERROR_CHECK_SETOPT(CURLOPT_STDERR, data->set.err); |
| - | if(Curl_trc_ft_is_verbose(data, &Curl_doh_trc)) |
| - | ERROR_CHECK_SETOPT(CURLOPT_VERBOSE, 1L); |
| - | if(data->set.no_signal) |
| - | ERROR_CHECK_SETOPT(CURLOPT_NOSIGNAL, 1L); |
| - | |
| - | ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYHOST, |
| - | data->set.doh_verifyhost ? 2L : 0L); |
| - | ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYPEER, |
| - | data->set.doh_verifypeer ? 1L : 0L); |
| - | ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYSTATUS, |
| - | data->set.doh_verifystatus ? 1L : 0L); |
| - | |
| - | /* Inherit *some* SSL options from the user's transfer. This is a |
| - | best-guess as to which options are needed for compatibility. #3661 |
| - | |
| - | Note DoH does not inherit the user's proxy server so proxy SSL settings |
| - | have no effect and are not inherited. If that changes then two new |
| - | options should be added to check doh proxy insecure separately, |
| - | CURLOPT_DOH_PROXY_SSL_VERIFYHOST and CURLOPT_DOH_PROXY_SSL_VERIFYPEER. |
| - | */ |
| - | if(data->set.ssl.falsestart) |
| - | ERROR_CHECK_SETOPT(CURLOPT_SSL_FALSESTART, 1L); |
| - | if(data->set.str[STRING_SSL_CAFILE]) { |
| - | ERROR_CHECK_SETOPT(CURLOPT_CAINFO, |
| - | data->set.str[STRING_SSL_CAFILE]); |
| - | } |
| - | if(data->set.blobs[BLOB_CAINFO]) { |
| - | ERROR_CHECK_SETOPT(CURLOPT_CAINFO_BLOB, |
| - | data->set.blobs[BLOB_CAINFO]); |
| - | } |
| - | if(data->set.str[STRING_SSL_CAPATH]) { |
| - | ERROR_CHECK_SETOPT(CURLOPT_CAPATH, |
| - | data->set.str[STRING_SSL_CAPATH]); |
| - | } |
| - | if(data->set.str[STRING_SSL_CRLFILE]) { |
| - | ERROR_CHECK_SETOPT(CURLOPT_CRLFILE, |
| - | data->set.str[STRING_SSL_CRLFILE]); |
| - | } |
| - | if(data->set.ssl.certinfo) |
| - | ERROR_CHECK_SETOPT(CURLOPT_CERTINFO, 1L); |
| - | if(data->set.ssl.fsslctx) |
| - | ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_FUNCTION, data->set.ssl.fsslctx); |
| - | if(data->set.ssl.fsslctxp) |
| - | ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_DATA, data->set.ssl.fsslctxp); |
| - | if(data->set.fdebug) |
| - | ERROR_CHECK_SETOPT(CURLOPT_DEBUGFUNCTION, data->set.fdebug); |
| - | if(data->set.debugdata) |
| - | ERROR_CHECK_SETOPT(CURLOPT_DEBUGDATA, data->set.debugdata); |
| - | if(data->set.str[STRING_SSL_EC_CURVES]) { |
| - | ERROR_CHECK_SETOPT(CURLOPT_SSL_EC_CURVES, |
| - | data->set.str[STRING_SSL_EC_CURVES]); |
| - | } |
| - | |
| - | { |
| - | long mask = |
| - | (data->set.ssl.enable_beast ? |
| - | CURLSSLOPT_ALLOW_BEAST : 0) | |
| - | (data->set.ssl.no_revoke ? |
| - | CURLSSLOPT_NO_REVOKE : 0) | |
| - | (data->set.ssl.no_partialchain ? |
| - | CURLSSLOPT_NO_PARTIALCHAIN : 0) | |
| - | (data->set.ssl.revoke_best_effort ? |
| - | CURLSSLOPT_REVOKE_BEST_EFFORT : 0) | |
| - | (data->set.ssl.native_ca_store ? |
| - | CURLSSLOPT_NATIVE_CA : 0) | |
| - | (data->set.ssl.auto_client_cert ? |
| - | CURLSSLOPT_AUTO_CLIENT_CERT : 0); |
| - | |
| - | (void)curl_easy_setopt(doh, CURLOPT_SSL_OPTIONS, mask); |
| - | } |
| + | ERROR_CHECK_SETOPT(CURLOPT_TIMEOUT_MS, (long)timeout_ms); |
| + | ERROR_CHECK_SETOPT(CURLOPT_SHARE, data->share); |
| + | if(data->set.err && data->set.err != stderr) |
| + | ERROR_CHECK_SETOPT(CURLOPT_STDERR, data->set.err); |
| + | if(Curl_trc_ft_is_verbose(data, &Curl_doh_trc)) |
| + | ERROR_CHECK_SETOPT(CURLOPT_VERBOSE, 1L); |
| + | if(data->set.no_signal) |
| + | ERROR_CHECK_SETOPT(CURLOPT_NOSIGNAL, 1L); |
| + | |
| + | ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYHOST, |
| + | data->set.doh_verifyhost ? 2L : 0L); |
| + | ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYPEER, |
| + | data->set.doh_verifypeer ? 1L : 0L); |
| + | ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYSTATUS, |
| + | data->set.doh_verifystatus ? 1L : 0L); |
| + | |
| + | /* Inherit *some* SSL options from the user's transfer. This is a |
| + | best-guess as to which options are needed for compatibility. #3661 |
| + | |
| + | Note DoH does not inherit the user's proxy server so proxy SSL settings |
| + | have no effect and are not inherited. If that changes then two new |
| + | options should be added to check doh proxy insecure separately, |
| + | CURLOPT_DOH_PROXY_SSL_VERIFYHOST and CURLOPT_DOH_PROXY_SSL_VERIFYPEER. |
| + | */ |
| + | if(data->set.ssl.falsestart) |
| + | ERROR_CHECK_SETOPT(CURLOPT_SSL_FALSESTART, 1L); |
| + | if(data->set.str[STRING_SSL_CAFILE]) { |
| + | ERROR_CHECK_SETOPT(CURLOPT_CAINFO, |
| + | data->set.str[STRING_SSL_CAFILE]); |
| + | } |
| + | if(data->set.blobs[BLOB_CAINFO]) { |
| + | ERROR_CHECK_SETOPT(CURLOPT_CAINFO_BLOB, |
| + | data->set.blobs[BLOB_CAINFO]); |
| + | } |
| + | if(data->set.str[STRING_SSL_CAPATH]) { |
| + | ERROR_CHECK_SETOPT(CURLOPT_CAPATH, |
| + | data->set.str[STRING_SSL_CAPATH]); |
| + | } |
| + | if(data->set.str[STRING_SSL_CRLFILE]) { |
| + | ERROR_CHECK_SETOPT(CURLOPT_CRLFILE, |
| + | data->set.str[STRING_SSL_CRLFILE]); |
| + | } |
| + | if(data->set.ssl.certinfo) |
| + | ERROR_CHECK_SETOPT(CURLOPT_CERTINFO, 1L); |
| + | if(data->set.ssl.fsslctx) |
| + | ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_FUNCTION, data->set.ssl.fsslctx); |
| + | if(data->set.ssl.fsslctxp) |
| + | ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_DATA, data->set.ssl.fsslctxp); |
| + | if(data->set.fdebug) |
| + | ERROR_CHECK_SETOPT(CURLOPT_DEBUGFUNCTION, data->set.fdebug); |
| + | if(data->set.debugdata) |
| + | ERROR_CHECK_SETOPT(CURLOPT_DEBUGDATA, data->set.debugdata); |
| + | if(data->set.str[STRING_SSL_EC_CURVES]) { |
| + | ERROR_CHECK_SETOPT(CURLOPT_SSL_EC_CURVES, |
| + | data->set.str[STRING_SSL_EC_CURVES]); |
| + | } |
| - | doh->set.fmultidone = doh_done; |
| - | doh->set.dohfor_mid = data->mid; /* for which transfer this is done */ |
| + | { |
| + | long mask = |
| + | (data->set.ssl.enable_beast ? |
| + | CURLSSLOPT_ALLOW_BEAST : 0) | |
| + | (data->set.ssl.no_revoke ? |
| + | CURLSSLOPT_NO_REVOKE : 0) | |
| + | (data->set.ssl.no_partialchain ? |
| + | CURLSSLOPT_NO_PARTIALCHAIN : 0) | |
| + | (data->set.ssl.revoke_best_effort ? |
| + | CURLSSLOPT_REVOKE_BEST_EFFORT : 0) | |
| + | (data->set.ssl.native_ca_store ? |
| + | CURLSSLOPT_NATIVE_CA : 0) | |
| + | (data->set.ssl.auto_client_cert ? |
| + | CURLSSLOPT_AUTO_CLIENT_CERT : 0); |
| + | |
| + | (void)curl_easy_setopt(doh, CURLOPT_SSL_OPTIONS, mask); |
| + | } |
| - | /* DoH handles must not inherit private_data. The handles may be passed to |
| - | the user via callbacks and the user will be able to identify them as |
| - | internal handles because private data is not set. The user can then set |
| - | private_data via CURLOPT_PRIVATE if they so choose. */ |
| - | DEBUGASSERT(!doh->set.private_data); |
| + | doh->set.fmultidone = doh_done; |
| + | doh->set.dohfor_mid = data->mid; /* for which transfer this is done */ |
| - | if(curl_multi_add_handle(multi, doh)) |
| - | goto error; |
| + | /* DoH handles must not inherit private_data. The handles may be passed to |
| + | the user via callbacks and the user will be able to identify them as |
| + | internal handles because private data is not set. The user can then set |
| + | private_data via CURLOPT_PRIVATE if they so choose. */ |
| + | DEBUGASSERT(!doh->set.private_data); |
| - | p->easy_mid = doh->mid; |
| - | } |
| - | else |
| + | if(curl_multi_add_handle(multi, doh)) |
| goto error; | |
| + | |
| + | p->easy_mid = doh->mid; |
| return CURLE_OK; | |
| error: | |
| Curl_close(&doh); | |
| + | p->easy_mid = -1; |
| return result; | |
| } | |
| @@ -410,7 +407,7 @@ struct Curl_addrinfo *Curl_doh(struct Curl_easy *data, | |
| int *waitp) | |
| { | |
| CURLcode result = CURLE_OK; | |
| - | struct dohdata *dohp; |
| + | struct doh_probes *dohp; |
| struct connectdata *conn = data->conn; | |
| size_t i; | |
| #ifdef USE_HTTPSRR | |
| @@ -427,27 +424,27 @@ struct Curl_addrinfo *Curl_doh(struct Curl_easy *data, | |
| DEBUGASSERT(conn); | |
| /* start clean, consider allocating this struct on demand */ | |
| - | dohp = data->req.doh = calloc(1, sizeof(struct dohdata)); |
| + | dohp = data->req.doh = calloc(1, sizeof(struct doh_probes)); |
| if(!dohp) | |
| return NULL; | |
| - | for(i = 0; i < DOH_PROBE_SLOTS; ++i) { |
| + | for(i = 0; i < DOH_SLOT_COUNT; ++i) { |
| dohp->probe[i].easy_mid = -1; | |
| } | |
| conn->bits.doh = TRUE; | |
| dohp->host = hostname; | |
| dohp->port = port; | |
| - | dohp->headers = |
| + | dohp->req_hds = |
| curl_slist_append(NULL, | |
| "Content-Type: application/dns-message"); | |
| - | if(!dohp->headers) |
| + | if(!dohp->req_hds) |
| goto error; | |
| /* create IPv4 DoH request */ | |
| - | result = dohprobe(data, &dohp->probe[DOH_PROBE_SLOT_IPADDR_V4], |
| - | DNS_TYPE_A, hostname, data->set.str[STRING_DOH], |
| - | data->multi, dohp->headers); |
| + | result = doh_run_probe(data, &dohp->probe[DOH_SLOT_IPV4], |
| + | DNS_TYPE_A, hostname, data->set.str[STRING_DOH], |
| + | data->multi, dohp->req_hds); |
| if(result) | |
| goto error; | |
| dohp->pending++; | |
| @@ -455,9 +452,9 @@ struct Curl_addrinfo *Curl_doh(struct Curl_easy *data, | |
| #ifdef USE_IPV6 | |
| if((conn->ip_version != CURL_IPRESOLVE_V4) && Curl_ipv6works(data)) { | |
| /* create IPv6 DoH request */ | |
| - | result = dohprobe(data, &dohp->probe[DOH_PROBE_SLOT_IPADDR_V6], |
| - | DNS_TYPE_AAAA, hostname, data->set.str[STRING_DOH], |
| - | data->multi, dohp->headers); |
| + | result = doh_run_probe(data, &dohp->probe[DOH_SLOT_IPV6], |
| + | DNS_TYPE_AAAA, hostname, data->set.str[STRING_DOH], |
| + | data->multi, dohp->req_hds); |
| if(result) | |
| goto error; | |
| dohp->pending++; | |
| @@ -484,9 +481,9 @@ struct Curl_addrinfo *Curl_doh(struct Curl_easy *data, | |
| qname = aprintf("_%d._https.%s", port, hostname); | |
| if(!qname) | |
| goto error; | |
| - | result = dohprobe(data, &dohp->probe[DOH_PROBE_SLOT_HTTPS], |
| - | DNS_TYPE_HTTPS, qname, data->set.str[STRING_DOH], |
| - | data->multi, dohp->headers); |
| + | result = doh_run_probe(data, &dohp->probe[DOH_SLOT_HTTPS_RR], |
| + | DNS_TYPE_HTTPS, qname, data->set.str[STRING_DOH], |
| + | data->multi, dohp->req_hds); |
| Curl_safefree(qname); | |
| if(result) | |
| goto error; | |
| @@ -502,8 +499,8 @@ error: | |
| return NULL; | |
| } | |
| - | static DOHcode skipqname(const unsigned char *doh, size_t dohlen, |
| - | unsigned int *indexp) |
| + | static DOHcode doh_skipqname(const unsigned char *doh, size_t dohlen, |
| + | unsigned int *indexp) |
| { | |
| unsigned char length; | |
| do { | |
| @@ -526,12 +523,13 @@ static DOHcode skipqname(const unsigned char *doh, size_t dohlen, | |
| return DOH_OK; | |
| } | |
| - | static unsigned short get16bit(const unsigned char *doh, unsigned int index) |
| + | static unsigned short doh_get16bit(const unsigned char *doh, |
| + | unsigned int index) |
| { | |
| return (unsigned short)((doh[index] << 8) | doh[index + 1]); | |
| } | |
| - | static unsigned int get32bit(const unsigned char *doh, unsigned int index) |
| + | static unsigned int doh_get32bit(const unsigned char *doh, unsigned int index) |
| { | |
| /* make clang and gcc optimize this to bswap by incrementing | |
| the pointer first. */ | |
| @@ -544,7 +542,8 @@ static unsigned int get32bit(const unsigned char *doh, unsigned int index) | |
| ((unsigned)doh[2] << 8) | doh[3]; | |
| } | |
| - | static DOHcode store_a(const unsigned char *doh, int index, struct dohentry *d) |
| + | static DOHcode doh_store_a(const unsigned char *doh, int index, |
| + | struct dohentry *d) |
| { | |
| /* silently ignore addresses over the limit */ | |
| if(d->numaddr < DOH_MAX_ADDR) { | |
| @@ -556,9 +555,8 @@ static DOHcode store_a(const unsigned char *doh, int index, struct dohentry *d) | |
| return DOH_OK; | |
| } | |
| - | static DOHcode store_aaaa(const unsigned char *doh, |
| - | int index, |
| - | struct dohentry *d) |
| + | static DOHcode doh_store_aaaa(const unsigned char *doh, int index, |
| + | struct dohentry *d) |
| { | |
| /* silently ignore addresses over the limit */ | |
| if(d->numaddr < DOH_MAX_ADDR) { | |
| @@ -571,10 +569,8 @@ static DOHcode store_aaaa(const unsigned char *doh, | |
| } | |
| #ifdef USE_HTTPSRR | |
| - | static DOHcode store_https(const unsigned char *doh, |
| - | int index, |
| - | struct dohentry *d, |
| - | uint16_t len) |
| + | static DOHcode doh_store_https(const unsigned char *doh, int index, |
| + | struct dohentry *d, uint16_t len) |
| { | |
| /* silently ignore RRs over the limit */ | |
| if(d->numhttps_rrs < DOH_MAX_HTTPS) { | |
| @@ -589,10 +585,8 @@ static DOHcode store_https(const unsigned char *doh, | |
| } | |
| #endif | |
| - | static DOHcode store_cname(const unsigned char *doh, |
| - | size_t dohlen, |
| - | unsigned int index, |
| - | struct dohentry *d) |
| + | static DOHcode doh_store_cname(const unsigned char *doh, size_t dohlen, |
| + | unsigned int index, struct dohentry *d) |
| { | |
| struct dynbuf *c; | |
| unsigned int loop = 128; /* a valid DNS name can never loop this much */ | |
| @@ -641,12 +635,12 @@ static DOHcode store_cname(const unsigned char *doh, | |
| return DOH_OK; | |
| } | |
| - | static DOHcode rdata(const unsigned char *doh, |
| - | size_t dohlen, |
| - | unsigned short rdlength, |
| - | unsigned short type, |
| - | int index, |
| - | struct dohentry *d) |
| + | static DOHcode doh_rdata(const unsigned char *doh, |
| + | size_t dohlen, |
| + | unsigned short rdlength, |
| + | unsigned short type, |
| + | int index, |
| + | struct dohentry *d) |
| { | |
| /* RDATA | |
| - A (TYPE 1): 4 bytes | |
| @@ -659,26 +653,26 @@ static DOHcode rdata(const unsigned char *doh, | |
| case DNS_TYPE_A: | |
| if(rdlength != 4) | |
| return DOH_DNS_RDATA_LEN; | |
| - | rc = store_a(doh, index, d); |
| + | rc = doh_store_a(doh, index, d); |
| if(rc) | |
| return rc; | |
| break; | |
| case DNS_TYPE_AAAA: | |
| if(rdlength != 16) | |
| return DOH_DNS_RDATA_LEN; | |
| - | rc = store_aaaa(doh, index, d); |
| + | rc = doh_store_aaaa(doh, index, d); |
| if(rc) | |
| return rc; | |
| break; | |
| #ifdef USE_HTTPSRR | |
| case DNS_TYPE_HTTPS: | |
| - | rc = store_https(doh, index, d, rdlength); |
| + | rc = doh_store_https(doh, index, d, rdlength); |
| if(rc) | |
| return rc; | |
| break; | |
| #endif | |
| case DNS_TYPE_CNAME: | |
| - | rc = store_cname(doh, dohlen, (unsigned int)index, d); |
| + | rc = doh_store_cname(doh, dohlen, (unsigned int)index, d); |
| if(rc) | |
| return rc; | |
| break; | |
| @@ -702,10 +696,10 @@ UNITTEST void de_init(struct dohentry *de) | |
| } | |
| - | UNITTEST DOHcode doh_decode(const unsigned char *doh, |
| - | size_t dohlen, |
| - | DNStype dnstype, |
| - | struct dohentry *d) |
| + | UNITTEST DOHcode doh_resp_decode(const unsigned char *doh, |
| + | size_t dohlen, |
| + | DNStype dnstype, |
| + | struct dohentry *d) |
| { | |
| unsigned char rcode; | |
| unsigned short qdcount; | |
| @@ -725,9 +719,9 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| if(rcode) | |
| return DOH_DNS_BAD_RCODE; /* bad rcode */ | |
| - | qdcount = get16bit(doh, 4); |
| + | qdcount = doh_get16bit(doh, 4); |
| while(qdcount) { | |
| - | rc = skipqname(doh, dohlen, &index); |
| + | rc = doh_skipqname(doh, dohlen, &index); |
| if(rc) | |
| return rc; /* bad qname */ | |
| if(dohlen < (index + 4)) | |
| @@ -736,19 +730,19 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| qdcount--; | |
| } | |
| - | ancount = get16bit(doh, 6); |
| + | ancount = doh_get16bit(doh, 6); |
| while(ancount) { | |
| unsigned short class; | |
| unsigned int ttl; | |
| - | rc = skipqname(doh, dohlen, &index); |
| + | rc = doh_skipqname(doh, dohlen, &index); |
| if(rc) | |
| return rc; /* bad qname */ | |
| if(dohlen < (index + 2)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| - | type = get16bit(doh, index); |
| + | type = doh_get16bit(doh, index); |
| if((type != DNS_TYPE_CNAME) /* may be synthesized from DNAME */ | |
| && (type != DNS_TYPE_DNAME) /* if present, accept and ignore */ | |
| && (type != dnstype)) | |
| @@ -758,7 +752,7 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| if(dohlen < (index + 2)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| - | class = get16bit(doh, index); |
| + | class = doh_get16bit(doh, index); |
| if(DNS_CLASS_IN != class) | |
| return DOH_DNS_UNEXPECTED_CLASS; /* unsupported */ | |
| index += 2; | |
| @@ -766,7 +760,7 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| if(dohlen < (index + 4)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| - | ttl = get32bit(doh, index); |
| + | ttl = doh_get32bit(doh, index); |
| if(ttl < d->ttl) | |
| d->ttl = ttl; | |
| index += 4; | |
| @@ -774,21 +768,21 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| if(dohlen < (index + 2)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| - | rdlength = get16bit(doh, index); |
| + | rdlength = doh_get16bit(doh, index); |
| index += 2; | |
| if(dohlen < (index + rdlength)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| - | rc = rdata(doh, dohlen, rdlength, type, (int)index, d); |
| + | rc = doh_rdata(doh, dohlen, rdlength, type, (int)index, d); |
| if(rc) | |
| - | return rc; /* bad rdata */ |
| + | return rc; /* bad doh_rdata */ |
| index += rdlength; | |
| ancount--; | |
| } | |
| - | nscount = get16bit(doh, 8); |
| + | nscount = doh_get16bit(doh, 8); |
| while(nscount) { | |
| - | rc = skipqname(doh, dohlen, &index); |
| + | rc = doh_skipqname(doh, dohlen, &index); |
| if(rc) | |
| return rc; /* bad qname */ | |
| @@ -800,7 +794,7 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| if(dohlen < (index + 2)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| - | rdlength = get16bit(doh, index); |
| + | rdlength = doh_get16bit(doh, index); |
| index += 2; | |
| if(dohlen < (index + rdlength)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| @@ -808,9 +802,9 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| nscount--; | |
| } | |
| - | arcount = get16bit(doh, 10); |
| + | arcount = doh_get16bit(doh, 10); |
| while(arcount) { | |
| - | rc = skipqname(doh, dohlen, &index); |
| + | rc = doh_skipqname(doh, dohlen, &index); |
| if(rc) | |
| return rc; /* bad qname */ | |
| @@ -822,7 +816,7 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| if(dohlen < (index + 2)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| - | rdlength = get16bit(doh, index); |
| + | rdlength = doh_get16bit(doh, index); |
| index += 2; | |
| if(dohlen < (index + rdlength)) | |
| return DOH_DNS_OUT_OF_RANGE; | |
| @@ -845,8 +839,8 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh, | |
| } | |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| - | static void showdoh(struct Curl_easy *data, |
| - | const struct dohentry *d) |
| + | static void doh_show(struct Curl_easy *data, |
| + | const struct dohentry *d) |
| { | |
| int i; | |
| infof(data, "[DoH] TTL: %u seconds", d->ttl); | |
| @@ -879,8 +873,8 @@ static void showdoh(struct Curl_easy *data, | |
| #ifdef USE_HTTPSRR | |
| for(i = 0; i < d->numhttps_rrs; i++) { | |
| # ifdef DEBUGBUILD | |
| - | local_print_buf(data, "DoH HTTPS", |
| - | d->https_rrs[i].val, d->https_rrs[i].len); |
| + | doh_print_buf(data, "DoH HTTPS", |
| + | d->https_rrs[i].val, d->https_rrs[i].len); |
| # else | |
| infof(data, "DoH HTTPS RR: length %d", d->https_rrs[i].len); | |
| # endif | |
| @@ -891,7 +885,7 @@ static void showdoh(struct Curl_easy *data, | |
| } | |
| } | |
| #else | |
| - | #define showdoh(x,y) |
| + | #define doh_show(x,y) |
| #endif | |
| /* | |
| @@ -1011,7 +1005,7 @@ static CURLcode doh2ai(const struct dohentry *de, const char *hostname, | |
| } | |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| - | static const char *type2name(DNStype dnstype) |
| + | static const char *doh_type2name(DNStype dnstype) |
| { | |
| switch(dnstype) { | |
| case DNS_TYPE_A: | |
| @@ -1056,8 +1050,8 @@ UNITTEST void de_cleanup(struct dohentry *d) | |
| * just after the end of the DNS name encoding on output. (And | |
| * that is why it is an "unsigned char **" :-) | |
| */ | |
| - | static CURLcode local_decode_rdata_name(unsigned char **buf, size_t *remaining, |
| - | char **dnsname) |
| + | static CURLcode doh_decode_rdata_name(unsigned char **buf, size_t *remaining, |
| + | char **dnsname) |
| { | |
| unsigned char *cp = NULL; | |
| int rem = 0; | |
| @@ -1103,8 +1097,8 @@ static CURLcode local_decode_rdata_name(unsigned char **buf, size_t *remaining, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode local_decode_rdata_alpn(unsigned char *rrval, size_t len, |
| - | char **alpns) |
| + | static CURLcode doh_decode_rdata_alpn(unsigned char *rrval, size_t len, |
| + | char **alpns) |
| { | |
| /* | |
| * spec here is as per draft-ietf-dnsop-svcb-https, section-7.1.1 | |
| @@ -1160,7 +1154,7 @@ err: | |
| } | |
| #ifdef DEBUGBUILD | |
| - | static CURLcode test_alpn_escapes(void) |
| + | static CURLcode doh_test_alpn_escapes(void) |
| { | |
| /* we will use an example from draft-ietf-dnsop-svcb, figure 10 */ | |
| static unsigned char example[] = { | |
| @@ -1173,7 +1167,7 @@ static CURLcode test_alpn_escapes(void) | |
| char *aval = NULL; | |
| static const char *expected = "f\\\\oo\\,bar,h2"; | |
| - | if(local_decode_rdata_alpn(example, example_len, &aval) != CURLE_OK) |
| + | if(doh_decode_rdata_alpn(example, example_len, &aval) != CURLE_OK) |
| return CURLE_BAD_CONTENT_ENCODING; | |
| if(strlen(aval) != strlen(expected)) | |
| return CURLE_BAD_CONTENT_ENCODING; | |
| @@ -1183,7 +1177,7 @@ static CURLcode test_alpn_escapes(void) | |
| } | |
| #endif | |
| - | static CURLcode Curl_doh_decode_httpsrr(unsigned char *rrval, size_t len, |
| + | static CURLcode doh_resp_decode_httpsrr(unsigned char *rrval, size_t len, |
| struct Curl_https_rrinfo **hrr) | |
| { | |
| size_t remaining = len; | |
| @@ -1194,7 +1188,7 @@ static CURLcode Curl_doh_decode_httpsrr(unsigned char *rrval, size_t len, | |
| #ifdef DEBUGBUILD | |
| /* a few tests of escaping, should not be here but ok for now */ | |
| - | if(test_alpn_escapes() != CURLE_OK) |
| + | if(doh_test_alpn_escapes() != CURLE_OK) |
| return CURLE_OUT_OF_MEMORY; | |
| #endif | |
| lhrr = calloc(1, sizeof(struct Curl_https_rrinfo)); | |
| @@ -1209,7 +1203,7 @@ static CURLcode Curl_doh_decode_httpsrr(unsigned char *rrval, size_t len, | |
| lhrr->priority = (uint16_t)((cp[0] << 8) + cp[1]); | |
| cp += 2; | |
| remaining -= (uint16_t)2; | |
| - | if(local_decode_rdata_name(&cp, &remaining, &dnsname) != CURLE_OK) |
| + | if(doh_decode_rdata_name(&cp, &remaining, &dnsname) != CURLE_OK) |
| goto err; | |
| lhrr->target = dnsname; | |
| while(remaining >= 4) { | |
| @@ -1219,7 +1213,7 @@ static CURLcode Curl_doh_decode_httpsrr(unsigned char *rrval, size_t len, | |
| cp += 2; | |
| remaining -= 4; | |
| if(pcode == HTTPS_RR_CODE_ALPN) { | |
| - | if(local_decode_rdata_alpn(cp, plen, &lhrr->alpns) != CURLE_OK) |
| + | if(doh_decode_rdata_alpn(cp, plen, &lhrr->alpns) != CURLE_OK) |
| goto err; | |
| } | |
| if(pcode == HTTPS_RR_CODE_NO_DEF_ALPN) | |
| @@ -1268,8 +1262,8 @@ err: | |
| } | |
| # ifdef DEBUGBUILD | |
| - | static void local_print_httpsrr(struct Curl_easy *data, |
| - | struct Curl_https_rrinfo *hrr) |
| + | static void doh_print_httpsrr(struct Curl_easy *data, |
| + | struct Curl_https_rrinfo *hrr) |
| { | |
| DEBUGASSERT(hrr); | |
| infof(data, "HTTPS RR: priority %d, target: %s", | |
| @@ -1283,20 +1277,20 @@ static void local_print_httpsrr(struct Curl_easy *data, | |
| else | |
| infof(data, "HTTPS RR: no_def_alpn not set"); | |
| if(hrr->ipv4hints) { | |
| - | local_print_buf(data, "HTTPS RR: ipv4hints", |
| - | hrr->ipv4hints, hrr->ipv4hints_len); |
| + | doh_print_buf(data, "HTTPS RR: ipv4hints", |
| + | hrr->ipv4hints, hrr->ipv4hints_len); |
| } | |
| else | |
| infof(data, "HTTPS RR: no ipv4hints"); | |
| if(hrr->echconfiglist) { | |
| - | local_print_buf(data, "HTTPS RR: ECHConfigList", |
| - | hrr->echconfiglist, hrr->echconfiglist_len); |
| + | doh_print_buf(data, "HTTPS RR: ECHConfigList", |
| + | hrr->echconfiglist, hrr->echconfiglist_len); |
| } | |
| else | |
| infof(data, "HTTPS RR: no ECHConfigList"); | |
| if(hrr->ipv6hints) { | |
| - | local_print_buf(data, "HTTPS RR: ipv6hint", |
| - | hrr->ipv6hints, hrr->ipv6hints_len); |
| + | doh_print_buf(data, "HTTPS RR: ipv6hint", |
| + | hrr->ipv6hints, hrr->ipv6hints_len); |
| } | |
| else | |
| infof(data, "HTTPS RR: no ipv6hints"); | |
| @@ -1309,52 +1303,45 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data, | |
| struct Curl_dns_entry **dnsp) | |
| { | |
| CURLcode result; | |
| - | struct dohdata *dohp = data->req.doh; |
| + | struct doh_probes *dohp = data->req.doh; |
| *dnsp = NULL; /* defaults to no response */ | |
| if(!dohp) | |
| return CURLE_OUT_OF_MEMORY; | |
| - | if(dohp->probe[DOH_PROBE_SLOT_IPADDR_V4].easy_mid < 0 && |
| - | dohp->probe[DOH_PROBE_SLOT_IPADDR_V6].easy_mid < 0) { |
| + | if(dohp->probe[DOH_SLOT_IPV4].easy_mid < 0 && |
| + | dohp->probe[DOH_SLOT_IPV6].easy_mid < 0) { |
| failf(data, "Could not DoH-resolve: %s", data->state.async.hostname); | |
| return CONN_IS_PROXIED(data->conn)?CURLE_COULDNT_RESOLVE_PROXY: | |
| CURLE_COULDNT_RESOLVE_HOST; | |
| } | |
| else if(!dohp->pending) { | |
| - | #ifndef USE_HTTPSRR |
| - | DOHcode rc[DOH_PROBE_SLOTS] = { |
| - | DOH_OK, DOH_OK |
| - | }; |
| - | #else |
| - | DOHcode rc[DOH_PROBE_SLOTS] = { |
| - | DOH_OK, DOH_OK, DOH_OK |
| - | }; |
| - | #endif |
| + | DOHcode rc[DOH_SLOT_COUNT]; |
| struct dohentry de; | |
| int slot; | |
| + | |
| + | memset(rc, 0, sizeof(rc)); |
| /* remove DoH handles from multi handle and close them */ | |
| Curl_doh_close(data); | |
| /* parse the responses, create the struct and return it! */ | |
| de_init(&de); | |
| - | for(slot = 0; slot < DOH_PROBE_SLOTS; slot++) { |
| - | struct dnsprobe *p = &dohp->probe[slot]; |
| + | for(slot = 0; slot < DOH_SLOT_COUNT; slot++) { |
| + | struct doh_probe *p = &dohp->probe[slot]; |
| if(!p->dnstype) | |
| continue; | |
| - | rc[slot] = doh_decode(Curl_dyn_uptr(&p->serverdoh), |
| - | Curl_dyn_len(&p->serverdoh), |
| - | p->dnstype, |
| - | &de); |
| - | Curl_dyn_free(&p->serverdoh); |
| + | rc[slot] = doh_resp_decode(Curl_dyn_uptr(&p->resp_body), |
| + | Curl_dyn_len(&p->resp_body), |
| + | p->dnstype, &de); |
| + | Curl_dyn_free(&p->resp_body); |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| if(rc[slot]) { | |
| infof(data, "DoH: %s type %s for %s", doh_strerror(rc[slot]), | |
| - | type2name(p->dnstype), dohp->host); |
| + | doh_type2name(p->dnstype), dohp->host); |
| } | |
| #endif | |
| } /* next slot */ | |
| result = CURLE_COULDNT_RESOLVE_HOST; /* until we know better */ | |
| - | if(!rc[DOH_PROBE_SLOT_IPADDR_V4] || !rc[DOH_PROBE_SLOT_IPADDR_V6]) { |
| + | if(!rc[DOH_SLOT_IPV4] || !rc[DOH_SLOT_IPV6]) { |
| /* we have an address, of one kind or other */ | |
| struct Curl_dns_entry *dns; | |
| struct Curl_addrinfo *ai; | |
| @@ -1362,7 +1349,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data, | |
| if(Curl_trc_ft_is_verbose(data, &Curl_doh_trc)) { | |
| infof(data, "[DoH] hostname: %s", dohp->host); | |
| - | showdoh(data, &de); |
| + | doh_show(data, &de); |
| } | |
| result = doh2ai(&de, dohp->host, dohp->port, &ai); | |
| @@ -1395,7 +1382,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data, | |
| #ifdef USE_HTTPSRR | |
| if(de.numhttps_rrs > 0 && result == CURLE_OK && *dnsp) { | |
| struct Curl_https_rrinfo *hrr = NULL; | |
| - | result = Curl_doh_decode_httpsrr(de.https_rrs->val, de.https_rrs->len, |
| + | result = doh_resp_decode_httpsrr(de.https_rrs->val, de.https_rrs->len, |
| &hrr); | |
| if(result) { | |
| infof(data, "Failed to decode HTTPS RR"); | |
| @@ -1403,7 +1390,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data, | |
| } | |
| infof(data, "Some HTTPS RR to process"); | |
| # ifdef DEBUGBUILD | |
| - | local_print_httpsrr(data, hrr); |
| + | doh_print_httpsrr(data, hrr); |
| # endif | |
| (*dnsp)->hinfo = hrr; | |
| } | |
| @@ -1411,7 +1398,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data, | |
| /* All done */ | |
| de_cleanup(&de); | |
| - | Curl_safefree(data->req.doh); |
| + | Curl_doh_cleanup(data); |
| return result; | |
| } /* !dohp->pending */ | |
| @@ -1422,12 +1409,12 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data, | |
| void Curl_doh_close(struct Curl_easy *data) | |
| { | |
| - | struct dohdata *doh = data->req.doh; |
| + | struct doh_probes *doh = data->req.doh; |
| if(doh && data->multi) { | |
| struct Curl_easy *probe_data; | |
| curl_off_t mid; | |
| size_t slot; | |
| - | for(slot = 0; slot < DOH_PROBE_SLOTS; slot++) { |
| + | for(slot = 0; slot < DOH_SLOT_COUNT; slot++) { |
| mid = doh->probe[slot].easy_mid; | |
| if(mid < 0) | |
| continue; | |
| @@ -1450,11 +1437,11 @@ void Curl_doh_close(struct Curl_easy *data) | |
| void Curl_doh_cleanup(struct Curl_easy *data) | |
| { | |
| - | struct dohdata *doh = data->req.doh; |
| + | struct doh_probes *doh = data->req.doh; |
| if(doh) { | |
| Curl_doh_close(data); | |
| - | curl_slist_free_all(doh->headers); |
| - | data->req.doh->headers = NULL; |
| + | curl_slist_free_all(doh->req_hds); |
| + | data->req.doh->req_hds = NULL; |
| Curl_safefree(data->req.doh); | |
| } | |
| } | |
| @@ -59,18 +59,39 @@ typedef enum { | |
| } DNStype; | |
| /* one of these for each DoH request */ | |
| - | struct dnsprobe { |
| + | struct doh_probe { |
| curl_off_t easy_mid; /* multi id of easy handle doing the lookup */ | |
| DNStype dnstype; | |
| - | unsigned char dohbuffer[512]; |
| - | size_t dohlen; |
| - | struct dynbuf serverdoh; |
| + | unsigned char req_body[512]; |
| + | size_t req_body_len; |
| + | struct dynbuf resp_body; |
| }; | |
| - | struct dohdata { |
| - | struct curl_slist *headers; |
| - | struct dnsprobe probe[DOH_PROBE_SLOTS]; |
| - | unsigned int pending; /* still outstanding requests */ |
| + | enum doh_slot_num { |
| + | /* Explicit values for first two symbols so as to match hard-coded |
| + | * constants in existing code |
| + | */ |
| + | DOH_SLOT_IPV4 = 0, /* make 'V4' stand out for readability */ |
| + | DOH_SLOT_IPV6 = 1, /* 'V6' likewise */ |
| + | |
| + | /* Space here for (possibly build-specific) additional slot definitions */ |
| + | #ifdef USE_HTTPSRR |
| + | DOH_SLOT_HTTPS_RR = 2, /* for HTTPS RR */ |
| + | #endif |
| + | |
| + | /* for example */ |
| + | /* #ifdef WANT_DOH_FOOBAR_TXT */ |
| + | /* DOH_PROBE_SLOT_FOOBAR_TXT, */ |
| + | /* #endif */ |
| + | |
| + | /* AFTER all slot definitions, establish how many we have */ |
| + | DOH_SLOT_COUNT |
| + | }; |
| + | |
| + | struct doh_probes { |
| + | struct curl_slist *req_hds; |
| + | struct doh_probe probe[DOH_SLOT_COUNT]; |
| + | unsigned int pending; /* still outstanding probes */ |
| int port; | |
| const char *host; | |
| }; | |
| @@ -144,15 +165,15 @@ void Curl_doh_close(struct Curl_easy *data); | |
| void Curl_doh_cleanup(struct Curl_easy *data); | |
| #ifdef UNITTESTS | |
| - | UNITTEST DOHcode doh_encode(const char *host, |
| - | DNStype dnstype, |
| - | unsigned char *dnsp, /* buffer */ |
| - | size_t len, /* buffer size */ |
| - | size_t *olen); /* output length */ |
| - | UNITTEST DOHcode doh_decode(const unsigned char *doh, |
| - | size_t dohlen, |
| - | DNStype dnstype, |
| - | struct dohentry *d); |
| + | UNITTEST DOHcode doh_req_encode(const char *host, |
| + | DNStype dnstype, |
| + | unsigned char *dnsp, /* buffer */ |
| + | size_t len, /* buffer size */ |
| + | size_t *olen); /* output length */ |
| + | UNITTEST DOHcode doh_resp_decode(const unsigned char *doh, |
| + | size_t dohlen, |
| + | DNStype dnstype, |
| + | struct dohentry *d); |
| UNITTEST void de_init(struct dohentry *d); | |
| UNITTEST void de_cleanup(struct dohentry *d); | |
| @@ -32,6 +32,9 @@ | |
| /* forward declarations */ | |
| struct UserDefined; | |
| + | #ifndef CURL_DISABLE_DOH |
| + | struct doh_probes; |
| + | #endif |
| enum expect100 { | |
| EXP100_SEND_DATA, /* enough waiting, just send the body now */ | |
| @@ -114,7 +117,7 @@ struct SingleRequest { | |
| struct TELNET *telnet; | |
| } p; | |
| #ifndef CURL_DISABLE_DOH | |
| - | struct dohdata *doh; /* DoH specific data for this request */ |
| + | struct doh_probes *doh; /* DoH specific data for this request */ |
| #endif | |
| #ifndef CURL_DISABLE_COOKIES | |
| unsigned char setcookies; | |
| @@ -622,27 +622,6 @@ struct easy_pollset { | |
| unsigned char actions[MAX_SOCKSPEREASYHANDLE]; | |
| }; | |
| - | enum doh_slots { |
| - | /* Explicit values for first two symbols so as to match hard-coded |
| - | * constants in existing code |
| - | */ |
| - | DOH_PROBE_SLOT_IPADDR_V4 = 0, /* make 'V4' stand out for readability */ |
| - | DOH_PROBE_SLOT_IPADDR_V6 = 1, /* 'V6' likewise */ |
| - | |
| - | /* Space here for (possibly build-specific) additional slot definitions */ |
| - | #ifdef USE_HTTPSRR |
| - | DOH_PROBE_SLOT_HTTPS = 2, /* for HTTPS RR */ |
| - | #endif |
| - | |
| - | /* for example */ |
| - | /* #ifdef WANT_DOH_FOOBAR_TXT */ |
| - | /* DOH_PROBE_SLOT_FOOBAR_TXT, */ |
| - | /* #endif */ |
| - | |
| - | /* AFTER all slot definitions, establish how many we have */ |
| - | DOH_PROBE_SLOTS |
| - | }; |
| - | |
| /* | |
| * Specific protocol handler. | |
| */ | |
| @@ -17,7 +17,7 @@ unittest | |
| DoH | |
| </features> | |
| <name> | |
| - | unit test for doh_encode |
| + | unit test for doh_req_encode |
| </name> | |
| </client> | |
| </testcase> | |
| @@ -161,8 +161,8 @@ UNITTEST_START | |
| unsigned char *p; | |
| for(i = 0; i < sizeof(req) / sizeof(req[0]); i++) { | |
| - | DOHcode rc = doh_encode(req[i].name, req[i].type, |
| - | buffer, sizeof(buffer), &size); |
| + | DOHcode rc = doh_req_encode(req[i].name, req[i].type, |
| + | buffer, sizeof(buffer), &size); |
| if(rc != req[i].rc) { | |
| fprintf(stderr, "req %zu: Expected return code %d got %d\n", i, | |
| req[i].rc, rc); | |
| @@ -190,8 +190,8 @@ UNITTEST_START | |
| size_t len; | |
| int u; | |
| de_init(&d); | |
| - | rc = doh_decode((const unsigned char *)resp[i].packet, resp[i].size, |
| - | resp[i].type, &d); |
| + | rc = doh_resp_decode((const unsigned char *)resp[i].packet, resp[i].size, |
| + | resp[i].type, &d); |
| if(rc != resp[i].rc) { | |
| fprintf(stderr, "resp %zu: Expected return code %d got %d\n", i, | |
| resp[i].rc, rc); | |
| @@ -245,7 +245,7 @@ UNITTEST_START | |
| struct dohentry d; | |
| DOHcode rc; | |
| memset(&d, 0, sizeof(d)); | |
| - | rc = doh_decode((const unsigned char *)full49, i, DNS_TYPE_A, &d); |
| + | rc = doh_resp_decode((const unsigned char *)full49, i, DNS_TYPE_A, &d); |
| if(!rc) { | |
| /* none of them should work */ | |
| fprintf(stderr, "%zu: %d\n", i, rc); | |
| @@ -258,8 +258,8 @@ UNITTEST_START | |
| struct dohentry d; | |
| DOHcode rc; | |
| memset(&d, 0, sizeof(d)); | |
| - | rc = doh_decode((const unsigned char *)&full49[i], sizeof(full49)-i-1, |
| - | DNS_TYPE_A, &d); |
| + | rc = doh_resp_decode((const unsigned char *)&full49[i], sizeof(full49)-i-1, |
| + | DNS_TYPE_A, &d); |
| if(!rc) { | |
| /* none of them should work */ | |
| fprintf(stderr, "2 %zu: %d\n", i, rc); | |
| @@ -272,8 +272,8 @@ UNITTEST_START | |
| struct dohentry d; | |
| struct dohaddr *a; | |
| memset(&d, 0, sizeof(d)); | |
| - | rc = doh_decode((const unsigned char *)full49, sizeof(full49)-1, |
| - | DNS_TYPE_A, &d); |
| + | rc = doh_resp_decode((const unsigned char *)full49, sizeof(full49)-1, |
| + | DNS_TYPE_A, &d); |
| fail_if(d.numaddr != 1, "missing address"); | |
| a = &d.addr[0]; | |
| p = &a->ip.v4[0]; | |
| @@ -108,9 +108,9 @@ do { | |
| victim.canary1 = 87; /* magic numbers, arbitrarily picked */ | |
| victim.canary2 = 35; | |
| victim.canary3 = 41; | |
| - | d = doh_encode(name, DNS_TYPE_A, victim.dohbuffer, |
| - | sizeof(struct demo), /* allow room for overflow */ |
| - | &olen); |
| + | d = doh_req_encode(name, DNS_TYPE_A, victim.dohbuffer, |
| + | sizeof(struct demo), /* allow room for overflow */ |
| + | &olen); |
| fail_unless(d == playlist[i].expected_result, | |
| "result returned was not as expected"); | |
| @@ -151,31 +151,31 @@ do { | |
| DOHcode ret2; | |
| size_t olen; | |
| - | DOHcode ret = doh_encode(sunshine1, dnstype, buffer, buflen, &olen1); |
| + | DOHcode ret = doh_req_encode(sunshine1, dnstype, buffer, buflen, &olen1); |
| fail_unless(ret == DOH_OK, "sunshine case 1 should pass fine"); | |
| fail_if(olen1 == magic1, "olen has not been assigned properly"); | |
| fail_unless(olen1 > strlen(sunshine1), "bad out length"); | |
| /* with a trailing dot, the response should have the same length */ | |
| olen2 = magic1; | |
| - | ret2 = doh_encode(dotshine1, dnstype, buffer, buflen, &olen2); |
| + | ret2 = doh_req_encode(dotshine1, dnstype, buffer, buflen, &olen2); |
| fail_unless(ret2 == DOH_OK, "dotshine case should pass fine"); | |
| fail_if(olen2 == magic1, "olen has not been assigned properly"); | |
| fail_unless(olen1 == olen2, "olen should not grow for a trailing dot"); | |
| /* add one letter, the response should be one longer */ | |
| olen2 = magic1; | |
| - | ret2 = doh_encode(sunshine2, dnstype, buffer, buflen, &olen2); |
| + | ret2 = doh_req_encode(sunshine2, dnstype, buffer, buflen, &olen2); |
| fail_unless(ret2 == DOH_OK, "sunshine case 2 should pass fine"); | |
| fail_if(olen2 == magic1, "olen has not been assigned properly"); | |
| fail_unless(olen1 + 1 == olen2, "olen should grow with the hostname"); | |
| /* pass a short buffer, should fail */ | |
| - | ret = doh_encode(sunshine1, dnstype, buffer, olen1 - 1, &olen); |
| + | ret = doh_req_encode(sunshine1, dnstype, buffer, olen1 - 1, &olen); |
| fail_if(ret == DOH_OK, "short buffer should have been noticed"); | |
| /* pass a minimum buffer, should succeed */ | |
| - | ret = doh_encode(sunshine1, dnstype, buffer, olen1, &olen); |
| + | ret = doh_req_encode(sunshine1, dnstype, buffer, olen1, &olen); |
| fail_unless(ret == DOH_OK, "minimal length buffer should be long enough"); | |
| fail_unless(olen == olen1, "bad buffer length"); | |
| } while(0); | |