openssl: fix indents - white space edits only
—
$ git checkout -f e4cd1ffed155ca912a156f1fff24ea4473ccda95
Previous HEAD position was 01114f6efd ftplistparser: move out private data from public struct
HEAD is now at e4cd1ffed1 openssl: fix indents - white space edits only
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/curl.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.plist
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-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-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_log.lo
Removing lib/libcurl_la-curl_log.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-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-h2h3.lo
Removing lib/libcurl_la-h2h3.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-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-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-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_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gskit.lo
Removing lib/vtls/libcurl_la-gskit.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-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-nss.lo
Removing lib/vtls/libcurl_la-nss.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_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 test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/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/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:123: installing './compile'
configure.ac:416: installing './config.guess'
configure.ac:416: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking 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.1.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, httpd tests disabled
configure: apxs not in PATH, httpd tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking if compiler is LCC... no
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking if compiler 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 for windows.h... no
checking whether build target is a native Windows one... no
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation and SystemConfiguration framework... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for 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 library containing psl_builtin... -lpsl
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_set_local_window_size in -lnghttp2... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for sys/uio.h... yes
checking for 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 arpa/tftp.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for compiler support of C99 variadic macro style... yes
checking for compiler support of old gcc variadic macro style... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for 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 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 sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for 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 string.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking if connect can be linked... yes
checking if connect is prototyped... yes
checking if connect is compilable... yes
checking if connect usage allowed... yes
checking if connect might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for ws2tcpip.h... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking for stdlib.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if 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 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 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 for signal.h... yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking for setjmp.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if 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 fnmatch... yes
checking for fchmod... yes
checking for fork... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for arc4random... no
checking deeper for arc4random... but still no
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable cryptographic authentication methods... yes
checking whether to support NTLM... yes
checking whether to enable NTLM delegation to winbind's helper... no
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... 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 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 lib/libcurl.plist
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 packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.1.0-DEV
SSL: no (--with-{openssl,gnutls,nss,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 libcurl: Shared=no, Static=yes
Built-in manual: enabled
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
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, --with-hyper)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe
configure: WARNING: unrecognized options: --disable-docs
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
configure: WARNING: unrecognized options: --disable-docs
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.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_log.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-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-h2h3.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-http2.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-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-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gskit.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-nss.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_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.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_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_filetime.o
CC tool_easysrc.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
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_stderr.o
CC tool_strdup.o
CC tool_setopt.o
CC tool_sleep.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 tool_hugehelp.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/nonblock.o
CC ../lib/warnless.o
CC ../lib/curl_multibyte.o
CC ../lib/version_win32.o
CC ../lib/dynbuf.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'
| @@ -360,8 +360,8 @@ static int asn1_object_dump(ASN1_OBJECT *a, char *buf, size_t len) | |
| } | |
| static void X509V3_ext(struct Curl_easy *data, | |
| - | int certnum, |
| - | CONST_EXTS STACK_OF(X509_EXTENSION) *exts) |
| + | int certnum, |
| + | CONST_EXTS STACK_OF(X509_EXTENSION) *exts) |
| { | |
| int i; | |
| @@ -617,7 +617,7 @@ CURLcode Curl_ossl_certchain(struct Curl_easy *data, SSL *ssl) | |
| FREE_PKEY_PARAM_BIGNUM(q); | |
| FREE_PKEY_PARAM_BIGNUM(g); | |
| FREE_PKEY_PARAM_BIGNUM(pub_key); | |
| - | } |
| + | } |
| break; | |
| } | |
| } | |
| @@ -840,9 +840,9 @@ ossl_log_tls12_secret(const SSL *ssl, bool *keylog_done) | |
| if(!session || *keylog_done) | |
| return; | |
| - | #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ |
| - | !(defined(LIBRESSL_VERSION_NUMBER) && \ |
| - | LIBRESSL_VERSION_NUMBER < 0x20700000L) |
| + | #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ |
| + | !(defined(LIBRESSL_VERSION_NUMBER) && \ |
| + | LIBRESSL_VERSION_NUMBER < 0x20700000L) |
| /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that | |
| * we have a valid SSL context if we have a non-NULL session. */ | |
| SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE); | |
| @@ -1148,7 +1148,7 @@ SSL_CTX_use_certificate_blob(SSL_CTX *ctx, const struct curl_blob *blob, | |
| } | |
| ret = SSL_CTX_use_certificate(ctx, x); | |
| - | end: |
| + | end: |
| X509_free(x); | |
| BIO_free(in); | |
| return ret; | |
| @@ -1156,7 +1156,7 @@ SSL_CTX_use_certificate_blob(SSL_CTX *ctx, const struct curl_blob *blob, | |
| static int | |
| SSL_CTX_use_PrivateKey_blob(SSL_CTX *ctx, const struct curl_blob *blob, | |
| - | int type, const char *key_passwd) |
| + | int type, const char *key_passwd) |
| { | |
| int ret = 0; | |
| EVP_PKEY *pkey = NULL; | |
| @@ -1179,7 +1179,7 @@ SSL_CTX_use_PrivateKey_blob(SSL_CTX *ctx, const struct curl_blob *blob, | |
| } | |
| ret = SSL_CTX_use_PrivateKey(ctx, pkey); | |
| EVP_PKEY_free(pkey); | |
| - | end: |
| + | end: |
| BIO_free(in); | |
| return ret; | |
| } | |
| @@ -1190,8 +1190,8 @@ SSL_CTX_use_certificate_chain_blob(SSL_CTX *ctx, const struct curl_blob *blob, | |
| { | |
| /* SSL_CTX_add1_chain_cert introduced in OpenSSL 1.0.2 */ | |
| #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* OpenSSL 1.0.2 or later */ \ | |
| - | !(defined(LIBRESSL_VERSION_NUMBER) && \ |
| - | (LIBRESSL_VERSION_NUMBER < 0x2090100fL)) /* LibreSSL 2.9.1 or later */ |
| + | !(defined(LIBRESSL_VERSION_NUMBER) && \ |
| + | (LIBRESSL_VERSION_NUMBER < 0x2090100fL)) /* LibreSSL 2.9.1 or later */ |
| int ret = 0; | |
| X509 *x = NULL; | |
| void *passwd_callback_userdata = (void *)key_passwd; | |
| @@ -1242,7 +1242,7 @@ SSL_CTX_use_certificate_chain_blob(SSL_CTX *ctx, const struct curl_blob *blob, | |
| ret = 0; | |
| } | |
| - | end: |
| + | end: |
| X509_free(x); | |
| BIO_free(in); | |
| return ret; | |
| @@ -1289,7 +1289,7 @@ int cert_stuff(struct Curl_easy *data, | |
| /* SSL_CTX_use_certificate_chain_file() only works on PEM files */ | |
| cert_use_result = cert_blob ? | |
| SSL_CTX_use_certificate_chain_blob(ctx, cert_blob, key_passwd) : | |
| - | SSL_CTX_use_certificate_chain_file(ctx, cert_file); |
| + | SSL_CTX_use_certificate_chain_file(ctx, cert_file); |
| if(cert_use_result != 1) { | |
| failf(data, | |
| "could not load PEM client certificate from %s, " OSSL_PACKAGE | |
| @@ -1310,7 +1310,7 @@ int cert_stuff(struct Curl_easy *data, | |
| cert_use_result = cert_blob ? | |
| SSL_CTX_use_certificate_blob(ctx, cert_blob, | |
| file_type, key_passwd) : | |
| - | SSL_CTX_use_certificate_file(ctx, cert_file, file_type); |
| + | SSL_CTX_use_certificate_file(ctx, cert_file, file_type); |
| if(cert_use_result != 1) { | |
| failf(data, | |
| "could not load ASN1 client certificate from %s, " OSSL_PACKAGE | |
| @@ -1324,67 +1324,67 @@ int cert_stuff(struct Curl_easy *data, | |
| break; | |
| case SSL_FILETYPE_ENGINE: | |
| #if defined(USE_OPENSSL_ENGINE) && defined(ENGINE_CTRL_GET_CMD_FROM_NAME) | |
| - | { |
| - | /* Implicitly use pkcs11 engine if none was provided and the |
| - | * cert_file is a PKCS#11 URI */ |
| - | if(!data->state.engine) { |
| - | if(is_pkcs11_uri(cert_file)) { |
| - | if(ossl_set_engine(data, "pkcs11") != CURLE_OK) { |
| - | return 0; |
| - | } |
| + | { |
| + | /* Implicitly use pkcs11 engine if none was provided and the |
| + | * cert_file is a PKCS#11 URI */ |
| + | if(!data->state.engine) { |
| + | if(is_pkcs11_uri(cert_file)) { |
| + | if(ossl_set_engine(data, "pkcs11") != CURLE_OK) { |
| + | return 0; |
| } | |
| } | |
| + | } |
| - | if(data->state.engine) { |
| - | const char *cmd_name = "LOAD_CERT_CTRL"; |
| - | struct { |
| - | const char *cert_id; |
| - | X509 *cert; |
| - | } params; |
| - | |
| - | params.cert_id = cert_file; |
| - | params.cert = NULL; |
| + | if(data->state.engine) { |
| + | const char *cmd_name = "LOAD_CERT_CTRL"; |
| + | struct { |
| + | const char *cert_id; |
| + | X509 *cert; |
| + | } params; |
| - | /* Does the engine supports LOAD_CERT_CTRL ? */ |
| - | if(!ENGINE_ctrl(data->state.engine, ENGINE_CTRL_GET_CMD_FROM_NAME, |
| - | 0, (void *)cmd_name, NULL)) { |
| - | failf(data, "ssl engine does not support loading certificates"); |
| - | return 0; |
| - | } |
| + | params.cert_id = cert_file; |
| + | params.cert = NULL; |
| - | /* Load the certificate from the engine */ |
| - | if(!ENGINE_ctrl_cmd(data->state.engine, cmd_name, |
| - | 0, ¶ms, NULL, 1)) { |
| - | failf(data, "ssl engine cannot load client cert with id" |
| - | " '%s' [%s]", cert_file, |
| - | ossl_strerror(ERR_get_error(), error_buffer, |
| - | sizeof(error_buffer))); |
| - | return 0; |
| - | } |
| + | /* Does the engine supports LOAD_CERT_CTRL ? */ |
| + | if(!ENGINE_ctrl(data->state.engine, ENGINE_CTRL_GET_CMD_FROM_NAME, |
| + | 0, (void *)cmd_name, NULL)) { |
| + | failf(data, "ssl engine does not support loading certificates"); |
| + | return 0; |
| + | } |
| - | if(!params.cert) { |
| - | failf(data, "ssl engine didn't initialized the certificate " |
| - | "properly."); |
| - | return 0; |
| - | } |
| + | /* Load the certificate from the engine */ |
| + | if(!ENGINE_ctrl_cmd(data->state.engine, cmd_name, |
| + | 0, ¶ms, NULL, 1)) { |
| + | failf(data, "ssl engine cannot load client cert with id" |
| + | " '%s' [%s]", cert_file, |
| + | ossl_strerror(ERR_get_error(), error_buffer, |
| + | sizeof(error_buffer))); |
| + | return 0; |
| + | } |
| - | if(SSL_CTX_use_certificate(ctx, params.cert) != 1) { |
| - | failf(data, "unable to set client certificate [%s]", |
| - | ossl_strerror(ERR_get_error(), error_buffer, |
| - | sizeof(error_buffer))); |
| - | return 0; |
| - | } |
| - | X509_free(params.cert); /* we don't need the handle any more... */ |
| + | if(!params.cert) { |
| + | failf(data, "ssl engine didn't initialized the certificate " |
| + | "properly."); |
| + | return 0; |
| } | |
| - | else { |
| - | failf(data, "crypto engine not set, can't load certificate"); |
| + | |
| + | if(SSL_CTX_use_certificate(ctx, params.cert) != 1) { |
| + | failf(data, "unable to set client certificate [%s]", |
| + | ossl_strerror(ERR_get_error(), error_buffer, |
| + | sizeof(error_buffer))); |
| return 0; | |
| } | |
| + | X509_free(params.cert); /* we don't need the handle any more... */ |
| } | |
| - | break; |
| + | else { |
| + | failf(data, "crypto engine not set, can't load certificate"); |
| + | return 0; |
| + | } |
| + | } |
| + | break; |
| #else | |
| - | failf(data, "file type ENG for certificate not implemented"); |
| - | return 0; |
| + | failf(data, "file type ENG for certificate not implemented"); |
| + | return 0; |
| #endif | |
| case SSL_FILETYPE_PKCS12: | |
| @@ -1491,7 +1491,7 @@ int cert_stuff(struct Curl_easy *data, | |
| } | |
| cert_done = 1; | |
| - | fail: |
| + | fail: |
| EVP_PKEY_free(pri); | |
| X509_free(x509); | |
| sk_X509_pop_free(ca, X509_free); | |
| @@ -1519,7 +1519,7 @@ int cert_stuff(struct Curl_easy *data, | |
| case SSL_FILETYPE_ASN1: | |
| cert_use_result = key_blob ? | |
| SSL_CTX_use_PrivateKey_blob(ctx, key_blob, file_type, key_passwd) : | |
| - | SSL_CTX_use_PrivateKey_file(ctx, key_file, file_type); |
| + | SSL_CTX_use_PrivateKey_file(ctx, key_file, file_type); |
| if(cert_use_result != 1) { | |
| failf(data, "unable to set private key file: '%s' type %s", | |
| key_file?key_file:"(memory blob)", key_type?key_type:"PEM"); | |
| @@ -1528,57 +1528,57 @@ int cert_stuff(struct Curl_easy *data, | |
| break; | |
| case SSL_FILETYPE_ENGINE: | |
| #ifdef USE_OPENSSL_ENGINE | |
| - | { /* XXXX still needs some work */ |
| - | EVP_PKEY *priv_key = NULL; |
| - | |
| - | /* Implicitly use pkcs11 engine if none was provided and the |
| - | * key_file is a PKCS#11 URI */ |
| - | if(!data->state.engine) { |
| - | if(is_pkcs11_uri(key_file)) { |
| - | if(ossl_set_engine(data, "pkcs11") != CURLE_OK) { |
| - | return 0; |
| - | } |
| - | } |
| - | } |
| + | { |
| + | EVP_PKEY *priv_key = NULL; |
| - | if(data->state.engine) { |
| - | UI_METHOD *ui_method = |
| - | UI_create_method((char *)"curl user interface"); |
| - | if(!ui_method) { |
| - | failf(data, "unable do create " OSSL_PACKAGE |
| - | " user-interface method"); |
| - | return 0; |
| - | } |
| - | UI_method_set_opener(ui_method, UI_method_get_opener(UI_OpenSSL())); |
| - | UI_method_set_closer(ui_method, UI_method_get_closer(UI_OpenSSL())); |
| - | UI_method_set_reader(ui_method, ssl_ui_reader); |
| - | UI_method_set_writer(ui_method, ssl_ui_writer); |
| - | /* the typecast below was added to please mingw32 */ |
| - | priv_key = (EVP_PKEY *) |
| - | ENGINE_load_private_key(data->state.engine, key_file, |
| - | ui_method, |
| - | key_passwd); |
| - | UI_destroy_method(ui_method); |
| - | if(!priv_key) { |
| - | failf(data, "failed to load private key from crypto engine"); |
| + | /* Implicitly use pkcs11 engine if none was provided and the |
| + | * key_file is a PKCS#11 URI */ |
| + | if(!data->state.engine) { |
| + | if(is_pkcs11_uri(key_file)) { |
| + | if(ossl_set_engine(data, "pkcs11") != CURLE_OK) { |
| return 0; | |
| } | |
| - | if(SSL_CTX_use_PrivateKey(ctx, priv_key) != 1) { |
| - | failf(data, "unable to set private key"); |
| - | EVP_PKEY_free(priv_key); |
| - | return 0; |
| - | } |
| - | EVP_PKEY_free(priv_key); /* we don't need the handle any more... */ |
| } | |
| - | else { |
| - | failf(data, "crypto engine not set, can't load private key"); |
| + | } |
| + | |
| + | if(data->state.engine) { |
| + | UI_METHOD *ui_method = |
| + | UI_create_method((char *)"curl user interface"); |
| + | if(!ui_method) { |
| + | failf(data, "unable do create " OSSL_PACKAGE |
| + | " user-interface method"); |
| return 0; | |
| } | |
| + | UI_method_set_opener(ui_method, UI_method_get_opener(UI_OpenSSL())); |
| + | UI_method_set_closer(ui_method, UI_method_get_closer(UI_OpenSSL())); |
| + | UI_method_set_reader(ui_method, ssl_ui_reader); |
| + | UI_method_set_writer(ui_method, ssl_ui_writer); |
| + | /* the typecast below was added to please mingw32 */ |
| + | priv_key = (EVP_PKEY *) |
| + | ENGINE_load_private_key(data->state.engine, key_file, |
| + | ui_method, |
| + | key_passwd); |
| + | UI_destroy_method(ui_method); |
| + | if(!priv_key) { |
| + | failf(data, "failed to load private key from crypto engine"); |
| + | return 0; |
| + | } |
| + | if(SSL_CTX_use_PrivateKey(ctx, priv_key) != 1) { |
| + | failf(data, "unable to set private key"); |
| + | EVP_PKEY_free(priv_key); |
| + | return 0; |
| + | } |
| + | EVP_PKEY_free(priv_key); /* we don't need the handle any more... */ |
| } | |
| - | break; |
| + | else { |
| + | failf(data, "crypto engine not set, can't load private key"); |
| + | return 0; |
| + | } |
| + | } |
| + | break; |
| #else | |
| - | failf(data, "file type ENG for private key not supported"); |
| - | return 0; |
| + | failf(data, "file type ENG for private key not supported"); |
| + | return 0; |
| #endif | |
| case SSL_FILETYPE_PKCS12: | |
| if(!cert_done) { | |
| @@ -1607,8 +1607,8 @@ int cert_stuff(struct Curl_easy *data, | |
| EVP_PKEY_free(pktmp); | |
| } | |
| - | #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_IS_BORINGSSL) && \ |
| - | !defined(OPENSSL_NO_DEPRECATED_3_0) |
| + | #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_IS_BORINGSSL) && \ |
| + | !defined(OPENSSL_NO_DEPRECATED_3_0) |
| { | |
| /* If RSA is used, don't check the private key if its flags indicate | |
| * it doesn't support it. */ | |
| @@ -1746,8 +1746,8 @@ static int ossl_init(void) | |
| /* Global cleanup */ | |
| static void ossl_cleanup(void) | |
| { | |
| - | #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ |
| - | !defined(LIBRESSL_VERSION_NUMBER) |
| + | #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ |
| + | !defined(LIBRESSL_VERSION_NUMBER) |
| /* OpenSSL 1.1 deprecates all these cleanup functions and | |
| turns them into no-ops in OpenSSL 1.0 compatibility mode */ | |
| #else | |
| @@ -1930,7 +1930,7 @@ static int ossl_shutdown(struct Curl_cfilter *cf, | |
| we do not send one. Let's hope other servers do the same... */ | |
| if(data->set.ftp_ccc == CURLFTPSSL_CCC_ACTIVE) | |
| - | (void)SSL_shutdown(backend->handle); |
| + | (void)SSL_shutdown(backend->handle); |
| #endif | |
| if(backend->handle) { | |
| @@ -2031,7 +2031,7 @@ static void ossl_close_all(struct Curl_easy *data) | |
| #else | |
| (void)data; | |
| #endif | |
| - | #if !defined(HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED) && \ |
| + | #if !defined(HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED) && \ |
| defined(HAVE_ERR_REMOVE_THREAD_STATE) | |
| /* OpenSSL 1.0.1 and 1.0.2 build an error queue that is stored per-thread | |
| so we need to clean it here in case the thread will be killed. All OpenSSL | |
| @@ -2059,7 +2059,7 @@ static bool subj_alt_hostcheck(struct Curl_easy *data, | |
| #endif | |
| if(Curl_cert_hostcheck(match_pattern, matchlen, hostname, hostlen)) { | |
| infof(data, " subjectAltName: host \"%s\" matched cert's \"%s\"", | |
| - | dispname, match_pattern); |
| + | dispname, match_pattern); |
| return TRUE; | |
| } | |
| return FALSE; | |
| @@ -2303,7 +2303,7 @@ ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, | |
| } | |
| #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \ | |
| - | !defined(OPENSSL_NO_OCSP) |
| + | !defined(OPENSSL_NO_OCSP) |
| static CURLcode verifystatus(struct Curl_cfilter *cf, | |
| struct Curl_easy *data) | |
| { | |
| @@ -2477,81 +2477,81 @@ static const char *ssl_msg_type(int ssl_ver, int msg) | |
| #ifdef SSL2_VERSION_MAJOR | |
| if(ssl_ver == SSL2_VERSION_MAJOR) { | |
| switch(msg) { | |
| - | case SSL2_MT_ERROR: |
| - | return "Error"; |
| - | case SSL2_MT_CLIENT_HELLO: |
| - | return "Client hello"; |
| - | case SSL2_MT_CLIENT_MASTER_KEY: |
| - | return "Client key"; |
| - | case SSL2_MT_CLIENT_FINISHED: |
| - | return "Client finished"; |
| - | case SSL2_MT_SERVER_HELLO: |
| - | return "Server hello"; |
| - | case SSL2_MT_SERVER_VERIFY: |
| - | return "Server verify"; |
| - | case SSL2_MT_SERVER_FINISHED: |
| - | return "Server finished"; |
| - | case SSL2_MT_REQUEST_CERTIFICATE: |
| - | return "Request CERT"; |
| - | case SSL2_MT_CLIENT_CERTIFICATE: |
| - | return "Client CERT"; |
| + | case SSL2_MT_ERROR: |
| + | return "Error"; |
| + | case SSL2_MT_CLIENT_HELLO: |
| + | return "Client hello"; |
| + | case SSL2_MT_CLIENT_MASTER_KEY: |
| + | return "Client key"; |
| + | case SSL2_MT_CLIENT_FINISHED: |
| + | return "Client finished"; |
| + | case SSL2_MT_SERVER_HELLO: |
| + | return "Server hello"; |
| + | case SSL2_MT_SERVER_VERIFY: |
| + | return "Server verify"; |
| + | case SSL2_MT_SERVER_FINISHED: |
| + | return "Server finished"; |
| + | case SSL2_MT_REQUEST_CERTIFICATE: |
| + | return "Request CERT"; |
| + | case SSL2_MT_CLIENT_CERTIFICATE: |
| + | return "Client CERT"; |
| } | |
| } | |
| else | |
| #endif | |
| if(ssl_ver == SSL3_VERSION_MAJOR) { | |
| switch(msg) { | |
| - | case SSL3_MT_HELLO_REQUEST: |
| - | return "Hello request"; |
| - | case SSL3_MT_CLIENT_HELLO: |
| - | return "Client hello"; |
| - | case SSL3_MT_SERVER_HELLO: |
| - | return "Server hello"; |
| + | case SSL3_MT_HELLO_REQUEST: |
| + | return "Hello request"; |
| + | case SSL3_MT_CLIENT_HELLO: |
| + | return "Client hello"; |
| + | case SSL3_MT_SERVER_HELLO: |
| + | return "Server hello"; |
| #ifdef SSL3_MT_NEWSESSION_TICKET | |
| - | case SSL3_MT_NEWSESSION_TICKET: |
| - | return "Newsession Ticket"; |
| - | #endif |
| - | case SSL3_MT_CERTIFICATE: |
| - | return "Certificate"; |
| - | case SSL3_MT_SERVER_KEY_EXCHANGE: |
| - | return "Server key exchange"; |
| - | case SSL3_MT_CLIENT_KEY_EXCHANGE: |
| - | return "Client key exchange"; |
| - | case SSL3_MT_CERTIFICATE_REQUEST: |
| - | return "Request CERT"; |
| - | case SSL3_MT_SERVER_DONE: |
| - | return "Server finished"; |
| - | case SSL3_MT_CERTIFICATE_VERIFY: |
| - | return "CERT verify"; |
| - | case SSL3_MT_FINISHED: |
| - | return "Finished"; |
| + | case SSL3_MT_NEWSESSION_TICKET: |
| + | return "Newsession Ticket"; |
| + | #endif |
| + | case SSL3_MT_CERTIFICATE: |
| + | return "Certificate"; |
| + | case SSL3_MT_SERVER_KEY_EXCHANGE: |
| + | return "Server key exchange"; |
| + | case SSL3_MT_CLIENT_KEY_EXCHANGE: |
| + | return "Client key exchange"; |
| + | case SSL3_MT_CERTIFICATE_REQUEST: |
| + | return "Request CERT"; |
| + | case SSL3_MT_SERVER_DONE: |
| + | return "Server finished"; |
| + | case SSL3_MT_CERTIFICATE_VERIFY: |
| + | return "CERT verify"; |
| + | case SSL3_MT_FINISHED: |
| + | return "Finished"; |
| #ifdef SSL3_MT_CERTIFICATE_STATUS | |
| - | case SSL3_MT_CERTIFICATE_STATUS: |
| - | return "Certificate Status"; |
| + | case SSL3_MT_CERTIFICATE_STATUS: |
| + | return "Certificate Status"; |
| #endif | |
| #ifdef SSL3_MT_ENCRYPTED_EXTENSIONS | |
| - | case SSL3_MT_ENCRYPTED_EXTENSIONS: |
| - | return "Encrypted Extensions"; |
| + | case SSL3_MT_ENCRYPTED_EXTENSIONS: |
| + | return "Encrypted Extensions"; |
| #endif | |
| #ifdef SSL3_MT_SUPPLEMENTAL_DATA | |
| - | case SSL3_MT_SUPPLEMENTAL_DATA: |
| - | return "Supplemental data"; |
| + | case SSL3_MT_SUPPLEMENTAL_DATA: |
| + | return "Supplemental data"; |
| #endif | |
| #ifdef SSL3_MT_END_OF_EARLY_DATA | |
| - | case SSL3_MT_END_OF_EARLY_DATA: |
| - | return "End of early data"; |
| + | case SSL3_MT_END_OF_EARLY_DATA: |
| + | return "End of early data"; |
| #endif | |
| #ifdef SSL3_MT_KEY_UPDATE | |
| - | case SSL3_MT_KEY_UPDATE: |
| - | return "Key update"; |
| + | case SSL3_MT_KEY_UPDATE: |
| + | return "Key update"; |
| #endif | |
| #ifdef SSL3_MT_NEXT_PROTO | |
| - | case SSL3_MT_NEXT_PROTO: |
| - | return "Next protocol"; |
| + | case SSL3_MT_NEXT_PROTO: |
| + | return "Next protocol"; |
| #endif | |
| #ifdef SSL3_MT_MESSAGE_HASH | |
| - | case SSL3_MT_MESSAGE_HASH: |
| - | return "Message hash"; |
| + | case SSL3_MT_MESSAGE_HASH: |
| + | return "Message hash"; |
| #endif | |
| } | |
| } | |
| @@ -2596,7 +2596,7 @@ static void ossl_trace(int direction, int ssl_ver, int content_type, | |
| if(!data || !data->set.fdebug || (direction && direction != 1)) | |
| return; | |
| - | switch(ssl_ver) { |
| + | switch(ssl_ver) { |
| #ifdef SSL2_VERSION /* removed in recent versions */ | |
| case SSL2_VERSION: | |
| verstr = "SSLv2"; | |
| @@ -2701,8 +2701,8 @@ static void ossl_trace(int direction, int ssl_ver, int content_type, | |
| /* Check for OpenSSL 1.0.2 which has ALPN support. */ | |
| #undef HAS_ALPN | |
| - | #if OPENSSL_VERSION_NUMBER >= 0x10002000L \ |
| - | && !defined(OPENSSL_NO_TLSEXT) |
| + | #if OPENSSL_VERSION_NUMBER >= 0x10002000L \ |
| + | && !defined(OPENSSL_NO_TLSEXT) |
| # define HAS_ALPN 1 | |
| #endif | |
| @@ -2724,22 +2724,22 @@ set_ssl_version_min_max(struct Curl_cfilter *cf, SSL_CTX *ctx) | |
| long ossl_ssl_version_max = 0; | |
| #endif | |
| switch(curl_ssl_version_min) { | |
| - | case CURL_SSLVERSION_TLSv1: /* TLS 1.x */ |
| - | case CURL_SSLVERSION_TLSv1_0: |
| - | ossl_ssl_version_min = TLS1_VERSION; |
| - | break; |
| - | case CURL_SSLVERSION_TLSv1_1: |
| - | ossl_ssl_version_min = TLS1_1_VERSION; |
| - | break; |
| - | case CURL_SSLVERSION_TLSv1_2: |
| - | ossl_ssl_version_min = TLS1_2_VERSION; |
| - | break; |
| - | case CURL_SSLVERSION_TLSv1_3: |
| + | case CURL_SSLVERSION_TLSv1: /* TLS 1.x */ |
| + | case CURL_SSLVERSION_TLSv1_0: |
| + | ossl_ssl_version_min = TLS1_VERSION; |
| + | break; |
| + | case CURL_SSLVERSION_TLSv1_1: |
| + | ossl_ssl_version_min = TLS1_1_VERSION; |
| + | break; |
| + | case CURL_SSLVERSION_TLSv1_2: |
| + | ossl_ssl_version_min = TLS1_2_VERSION; |
| + | break; |
| + | case CURL_SSLVERSION_TLSv1_3: |
| #ifdef TLS1_3_VERSION | |
| - | ossl_ssl_version_min = TLS1_3_VERSION; |
| - | break; |
| + | ossl_ssl_version_min = TLS1_3_VERSION; |
| + | break; |
| #else | |
| - | return CURLE_NOT_BUILT_IN; |
| + | return CURLE_NOT_BUILT_IN; |
| #endif | |
| } | |
| @@ -2760,29 +2760,29 @@ set_ssl_version_min_max(struct Curl_cfilter *cf, SSL_CTX *ctx) | |
| /* convert curl max SSL version option to OpenSSL constant */ | |
| switch(curl_ssl_version_max) { | |
| - | case CURL_SSLVERSION_MAX_TLSv1_0: |
| - | ossl_ssl_version_max = TLS1_VERSION; |
| - | break; |
| - | case CURL_SSLVERSION_MAX_TLSv1_1: |
| - | ossl_ssl_version_max = TLS1_1_VERSION; |
| - | break; |
| - | case CURL_SSLVERSION_MAX_TLSv1_2: |
| - | ossl_ssl_version_max = TLS1_2_VERSION; |
| - | break; |
| + | case CURL_SSLVERSION_MAX_TLSv1_0: |
| + | ossl_ssl_version_max = TLS1_VERSION; |
| + | break; |
| + | case CURL_SSLVERSION_MAX_TLSv1_1: |
| + | ossl_ssl_version_max = TLS1_1_VERSION; |
| + | break; |
| + | case CURL_SSLVERSION_MAX_TLSv1_2: |
| + | ossl_ssl_version_max = TLS1_2_VERSION; |
| + | break; |
| #ifdef TLS1_3_VERSION | |
| - | case CURL_SSLVERSION_MAX_TLSv1_3: |
| - | ossl_ssl_version_max = TLS1_3_VERSION; |
| - | break; |
| + | case CURL_SSLVERSION_MAX_TLSv1_3: |
| + | ossl_ssl_version_max = TLS1_3_VERSION; |
| + | break; |
| #endif | |
| - | case CURL_SSLVERSION_MAX_NONE: /* none selected */ |
| - | case CURL_SSLVERSION_MAX_DEFAULT: /* max selected */ |
| - | default: |
| - | /* SSL_CTX_set_max_proto_version states that: |
| - | setting the maximum to 0 will enable |
| - | protocol versions up to the highest version |
| - | supported by the library */ |
| - | ossl_ssl_version_max = 0; |
| - | break; |
| + | case CURL_SSLVERSION_MAX_NONE: /* none selected */ |
| + | case CURL_SSLVERSION_MAX_DEFAULT: /* max selected */ |
| + | default: |
| + | /* SSL_CTX_set_max_proto_version states that: |
| + | setting the maximum to 0 will enable |
| + | protocol versions up to the highest version |
| + | supported by the library */ |
| + | ossl_ssl_version_max = 0; |
| + | break; |
| } | |
| if(!SSL_CTX_set_max_proto_version(ctx, ossl_ssl_version_max)) { | |
| @@ -2814,63 +2814,63 @@ set_ssl_version_min_max_legacy(ctx_option_t *ctx_options, | |
| (void) data; /* In case it's unused. */ | |
| switch(ssl_version) { | |
| - | case CURL_SSLVERSION_TLSv1_3: |
| + | case CURL_SSLVERSION_TLSv1_3: |
| #ifdef TLS1_3_VERSION | |
| - | { |
| - | struct ssl_connect_data *connssl = cf->ctx; |
| - | DEBUGASSERT(connssl->backend); |
| - | SSL_CTX_set_max_proto_version(connssl->backend->ctx, TLS1_3_VERSION); |
| - | *ctx_options |= SSL_OP_NO_TLSv1_2; |
| - | } |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | DEBUGASSERT(connssl->backend); |
| + | SSL_CTX_set_max_proto_version(connssl->backend->ctx, TLS1_3_VERSION); |
| + | *ctx_options |= SSL_OP_NO_TLSv1_2; |
| + | } |
| #else | |
| - | (void)ctx_options; |
| - | failf(data, OSSL_PACKAGE " was built without TLS 1.3 support"); |
| - | return CURLE_NOT_BUILT_IN; |
| + | (void)ctx_options; |
| + | failf(data, OSSL_PACKAGE " was built without TLS 1.3 support"); |
| + | return CURLE_NOT_BUILT_IN; |
| #endif | |
| - | /* FALLTHROUGH */ |
| - | case CURL_SSLVERSION_TLSv1_2: |
| + | /* FALLTHROUGH */ |
| + | case CURL_SSLVERSION_TLSv1_2: |
| #if OPENSSL_VERSION_NUMBER >= 0x1000100FL | |
| - | *ctx_options |= SSL_OP_NO_TLSv1_1; |
| + | *ctx_options |= SSL_OP_NO_TLSv1_1; |
| #else | |
| - | failf(data, OSSL_PACKAGE " was built without TLS 1.2 support"); |
| - | return CURLE_NOT_BUILT_IN; |
| + | failf(data, OSSL_PACKAGE " was built without TLS 1.2 support"); |
| + | return CURLE_NOT_BUILT_IN; |
| #endif | |
| - | /* FALLTHROUGH */ |
| - | case CURL_SSLVERSION_TLSv1_1: |
| + | /* FALLTHROUGH */ |
| + | case CURL_SSLVERSION_TLSv1_1: |
| #if OPENSSL_VERSION_NUMBER >= 0x1000100FL | |
| - | *ctx_options |= SSL_OP_NO_TLSv1; |
| + | *ctx_options |= SSL_OP_NO_TLSv1; |
| #else | |
| - | failf(data, OSSL_PACKAGE " was built without TLS 1.1 support"); |
| - | return CURLE_NOT_BUILT_IN; |
| + | failf(data, OSSL_PACKAGE " was built without TLS 1.1 support"); |
| + | return CURLE_NOT_BUILT_IN; |
| #endif | |
| - | /* FALLTHROUGH */ |
| - | case CURL_SSLVERSION_TLSv1_0: |
| - | case CURL_SSLVERSION_TLSv1: |
| - | break; |
| + | /* FALLTHROUGH */ |
| + | case CURL_SSLVERSION_TLSv1_0: |
| + | case CURL_SSLVERSION_TLSv1: |
| + | break; |
| } | |
| switch(ssl_version_max) { | |
| - | case CURL_SSLVERSION_MAX_TLSv1_0: |
| + | case CURL_SSLVERSION_MAX_TLSv1_0: |
| #if OPENSSL_VERSION_NUMBER >= 0x1000100FL | |
| - | *ctx_options |= SSL_OP_NO_TLSv1_1; |
| + | *ctx_options |= SSL_OP_NO_TLSv1_1; |
| #endif | |
| - | /* FALLTHROUGH */ |
| - | case CURL_SSLVERSION_MAX_TLSv1_1: |
| + | /* FALLTHROUGH */ |
| + | case CURL_SSLVERSION_MAX_TLSv1_1: |
| #if OPENSSL_VERSION_NUMBER >= 0x1000100FL | |
| - | *ctx_options |= SSL_OP_NO_TLSv1_2; |
| + | *ctx_options |= SSL_OP_NO_TLSv1_2; |
| #endif | |
| - | /* FALLTHROUGH */ |
| - | case CURL_SSLVERSION_MAX_TLSv1_2: |
| + | /* FALLTHROUGH */ |
| + | case CURL_SSLVERSION_MAX_TLSv1_2: |
| #ifdef TLS1_3_VERSION | |
| - | *ctx_options |= SSL_OP_NO_TLSv1_3; |
| + | *ctx_options |= SSL_OP_NO_TLSv1_3; |
| #endif | |
| - | break; |
| - | case CURL_SSLVERSION_MAX_TLSv1_3: |
| + | break; |
| + | case CURL_SSLVERSION_MAX_TLSv1_3: |
| #ifdef TLS1_3_VERSION | |
| - | break; |
| + | break; |
| #else | |
| - | failf(data, OSSL_PACKAGE " was built without TLS 1.3 support"); |
| - | return CURLE_NOT_BUILT_IN; |
| + | failf(data, OSSL_PACKAGE " was built without TLS 1.3 support"); |
| + | return CURLE_NOT_BUILT_IN; |
| #endif | |
| } | |
| return CURLE_OK; | |
| @@ -3363,11 +3363,11 @@ CURLcode Curl_ssl_setup_x509_store(struct Curl_cfilter *cf, | |
| or no source is provided and we are falling back to openssl's built-in | |
| default. */ | |
| cache_criteria_met = (data->set.general_ssl.ca_cache_timeout != 0) && | |
| - | conn_config->verifypeer && |
| - | !conn_config->CApath && |
| - | !conn_config->ca_info_blob && |
| - | !ssl_config->primary.CRLfile && |
| - | !ssl_config->native_ca_store; |
| + | conn_config->verifypeer && |
| + | !conn_config->CApath && |
| + | !conn_config->ca_info_blob && |
| + | !ssl_config->primary.CRLfile && |
| + | !ssl_config->native_ca_store; |
| cached_store = get_cached_x509_store(cf, data); | |
| if(cached_store && cache_criteria_met && X509_STORE_up_ref(cached_store)) { | |
| @@ -3549,34 +3549,34 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, | |
| #endif | |
| switch(ssl_version) { | |
| - | case CURL_SSLVERSION_SSLv2: |
| - | case CURL_SSLVERSION_SSLv3: |
| - | return CURLE_NOT_BUILT_IN; |
| + | case CURL_SSLVERSION_SSLv2: |
| + | case CURL_SSLVERSION_SSLv3: |
| + | return CURLE_NOT_BUILT_IN; |
| /* "--tlsv<x.y>" options mean TLS >= version <x.y> */ | |
| - | case CURL_SSLVERSION_DEFAULT: |
| - | case CURL_SSLVERSION_TLSv1: /* TLS >= version 1.0 */ |
| - | case CURL_SSLVERSION_TLSv1_0: /* TLS >= version 1.0 */ |
| - | case CURL_SSLVERSION_TLSv1_1: /* TLS >= version 1.1 */ |
| - | case CURL_SSLVERSION_TLSv1_2: /* TLS >= version 1.2 */ |
| - | case CURL_SSLVERSION_TLSv1_3: /* TLS >= version 1.3 */ |
| - | /* asking for any TLS version as the minimum, means no SSL versions |
| - | allowed */ |
| - | ctx_options |= SSL_OP_NO_SSLv2; |
| - | ctx_options |= SSL_OP_NO_SSLv3; |
| + | case CURL_SSLVERSION_DEFAULT: |
| + | case CURL_SSLVERSION_TLSv1: /* TLS >= version 1.0 */ |
| + | case CURL_SSLVERSION_TLSv1_0: /* TLS >= version 1.0 */ |
| + | case CURL_SSLVERSION_TLSv1_1: /* TLS >= version 1.1 */ |
| + | case CURL_SSLVERSION_TLSv1_2: /* TLS >= version 1.2 */ |
| + | case CURL_SSLVERSION_TLSv1_3: /* TLS >= version 1.3 */ |
| + | /* asking for any TLS version as the minimum, means no SSL versions |
| + | allowed */ |
| + | ctx_options |= SSL_OP_NO_SSLv2; |
| + | ctx_options |= SSL_OP_NO_SSLv3; |
| #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) /* 1.1.0 */ | |
| - | result = set_ssl_version_min_max(cf, backend->ctx); |
| + | result = set_ssl_version_min_max(cf, backend->ctx); |
| #else | |
| - | result = set_ssl_version_min_max_legacy(&ctx_options, cf, data); |
| + | result = set_ssl_version_min_max_legacy(&ctx_options, cf, data); |
| #endif | |
| - | if(result != CURLE_OK) |
| - | return result; |
| - | break; |
| + | if(result != CURLE_OK) |
| + | return result; |
| + | break; |
| - | default: |
| - | failf(data, "Unrecognized parameter passed via CURLOPT_SSLVERSION"); |
| - | return CURLE_SSL_CONNECT_ERROR; |
| + | default: |
| + | failf(data, "Unrecognized parameter passed via CURLOPT_SSLVERSION"); |
| + | return CURLE_SSL_CONNECT_ERROR; |
| } | |
| SSL_CTX_set_options(backend->ctx, ctx_options); | |
| @@ -3693,7 +3693,8 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, | |
| * an internal session cache. | |
| */ | |
| SSL_CTX_set_session_cache_mode(backend->ctx, | |
| - | SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL); |
| + | SSL_SESS_CACHE_CLIENT | |
| + | SSL_SESS_CACHE_NO_INTERNAL); |
| SSL_CTX_sess_set_new_cb(backend->ctx, ossl_new_session_cb); | |
| /* give application a chance to interfere with SSL set up. */ | |
| @@ -3720,7 +3721,7 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, | |
| SSL_set_app_data(backend->handle, cf); | |
| #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \ | |
| - | !defined(OPENSSL_NO_OCSP) |
| + | !defined(OPENSSL_NO_OCSP) |
| if(conn_config->verifystatus) | |
| SSL_set_tlsext_status_type(backend->handle, TLSEXT_STATUSTYPE_ocsp); | |
| #endif | |
| @@ -3884,17 +3885,17 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf, | |
| error_buffer */ | |
| strcpy(error_buffer, "SSL certificate verification failed"); | |
| } | |
| - | #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \ |
| - | !defined(LIBRESSL_VERSION_NUMBER) && \ |
| - | !defined(OPENSSL_IS_BORINGSSL)) |
| + | #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \ |
| + | !defined(LIBRESSL_VERSION_NUMBER) && \ |
| + | !defined(OPENSSL_IS_BORINGSSL)) |
| /* SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED is only available on | |
| OpenSSL version above v1.1.1, not LibreSSL nor BoringSSL */ | |
| else if((lib == ERR_LIB_SSL) && | |
| (reason == SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED)) { | |
| - | /* If client certificate is required, communicate the |
| - | error to client */ |
| - | result = CURLE_SSL_CLIENTCERT; |
| - | ossl_strerror(errdetail, error_buffer, sizeof(error_buffer)); |
| + | /* If client certificate is required, communicate the |
| + | error to client */ |
| + | result = CURLE_SSL_CLIENTCERT; |
| + | ossl_strerror(errdetail, error_buffer, sizeof(error_buffer)); |
| } | |
| #endif | |
| else { | |
| @@ -3978,7 +3979,7 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, X509* cert, | |
| /* Thanks to Viktor Dukhovni on the OpenSSL mailing list */ | |
| /* https://groups.google.com/group/mailing.openssl.users/browse_thread | |
| - | /thread/d61858dae102c6c7 */ |
| + | /thread/d61858dae102c6c7 */ |
| len1 = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(cert), NULL); | |
| if(len1 < 1) | |
| break; /* failed */ | |
| @@ -4199,7 +4200,7 @@ static CURLcode servercert(struct Curl_cfilter *cf, | |
| } | |
| #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \ | |
| - | !defined(OPENSSL_NO_OCSP) |
| + | !defined(OPENSSL_NO_OCSP) |
| if(conn_config->verifystatus) { | |
| result = verifystatus(cf, data); | |
| if(result) { | |
| @@ -4247,7 +4248,7 @@ static CURLcode ossl_connect_step3(struct Curl_cfilter *cf, | |
| */ | |
| result = servercert(cf, data, conn_config->verifypeer || | |
| - | conn_config->verifyhost); |
| + | conn_config->verifyhost); |
| if(!result) | |
| connssl->connecting_state = ssl_connect_done; | |
| @@ -4433,35 +4434,35 @@ static ssize_t ossl_send(struct Curl_cfilter *cf, | |
| rc = -1; | |
| goto out; | |
| case SSL_ERROR_SYSCALL: | |
| - | { |
| - | int sockerr = SOCKERRNO; |
| + | { |
| + | int sockerr = SOCKERRNO; |
| - | if(backend->io_result == CURLE_AGAIN) { |
| - | *curlcode = CURLE_AGAIN; |
| - | rc = -1; |
| - | goto out; |
| - | } |
| - | sslerror = ERR_get_error(); |
| - | if(sslerror) |
| - | ossl_strerror(sslerror, error_buffer, sizeof(error_buffer)); |
| - | else if(sockerr) |
| - | Curl_strerror(sockerr, error_buffer, sizeof(error_buffer)); |
| - | else { |
| - | strncpy(error_buffer, SSL_ERROR_to_str(err), sizeof(error_buffer)); |
| - | error_buffer[sizeof(error_buffer) - 1] = '\0'; |
| - | } |
| - | failf(data, OSSL_PACKAGE " SSL_write: %s, errno %d", |
| - | error_buffer, sockerr); |
| - | *curlcode = CURLE_SEND_ERROR; |
| + | if(backend->io_result == CURLE_AGAIN) { |
| + | *curlcode = CURLE_AGAIN; |
| rc = -1; | |
| goto out; | |
| } | |
| + | sslerror = ERR_get_error(); |
| + | if(sslerror) |
| + | ossl_strerror(sslerror, error_buffer, sizeof(error_buffer)); |
| + | else if(sockerr) |
| + | Curl_strerror(sockerr, error_buffer, sizeof(error_buffer)); |
| + | else { |
| + | strncpy(error_buffer, SSL_ERROR_to_str(err), sizeof(error_buffer)); |
| + | error_buffer[sizeof(error_buffer) - 1] = '\0'; |
| + | } |
| + | failf(data, OSSL_PACKAGE " SSL_write: %s, errno %d", |
| + | error_buffer, sockerr); |
| + | *curlcode = CURLE_SEND_ERROR; |
| + | rc = -1; |
| + | goto out; |
| + | } |
| case SSL_ERROR_SSL: { | |
| /* A failure in the SSL library occurred, usually a protocol error. | |
| The OpenSSL error queue contains more information on the error. */ | |
| struct Curl_cfilter *cf_ssl_next = Curl_ssl_cf_get_ssl(cf->next); | |
| struct ssl_connect_data *connssl_next = cf_ssl_next? | |
| - | cf_ssl_next->ctx : NULL; |
| + | cf_ssl_next->ctx : NULL; |
| sslerror = ERR_get_error(); | |
| if(ERR_GET_LIB(sslerror) == ERR_LIB_SSL && | |
| ERR_GET_REASON(sslerror) == SSL_R_BIO_NOT_SET && | |
| @@ -4490,7 +4491,7 @@ static ssize_t ossl_send(struct Curl_cfilter *cf, | |
| } | |
| *curlcode = CURLE_OK; | |
| - | out: |
| + | out: |
| return (ssize_t)rc; /* number of bytes */ | |
| } | |
| @@ -4592,7 +4593,7 @@ static ssize_t ossl_recv(struct Curl_cfilter *cf, | |
| } | |
| } | |
| - | out: |
| + | out: |
| return nread; | |
| } | |
| @@ -4714,7 +4715,7 @@ static CURLcode ossl_sha256sum(const unsigned char *tmp, /* input */ | |
| static bool ossl_cert_status_request(void) | |
| { | |
| #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \ | |
| - | !defined(OPENSSL_NO_OCSP) |
| + | !defined(OPENSSL_NO_OCSP) |
| return TRUE; | |
| #else | |
| return FALSE; | |
| @@ -4728,7 +4729,7 @@ static void *ossl_get_internals(struct ssl_connect_data *connssl, | |
| struct ssl_backend_data *backend = connssl->backend; | |
| DEBUGASSERT(backend); | |
| return info == CURLINFO_TLS_SESSION ? | |
| - | (void *)backend->ctx : (void *)backend->handle; |
| + | (void *)backend->ctx : (void *)backend->handle; |
| } | |
| static void ossl_free_multi_ssl_backend_data( | |