ci: adapt to configure requiring an explicit TLS choice

7 files changed, 74 insertions, 69 deletions

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 8f7288854..2f6276be7 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -58,23 +58,23 @@ stages:
         default:
           name: default
           install: jsonlint
-          configure: --enable-debug
+          configure: --enable-debug --with-openssl
         disable_ipv6:
           name: w/o IPv6
-          configure: --disable-ipv6
+          configure: --disable-ipv6 --with-openssl
         disable_http_smtp_imap:
           name: w/o HTTP/SMTP/IMAP
-          configure: --disable-http --disable-smtp --disable-imap
+          configure: --disable-http --disable-smtp --disable-imap --without-openssl
         disable_thredres:
           name: sync resolver
-          configure: --disable-threaded-resolver
-        http_only:
-          name: HTTP only
-          configure: --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp
+          configure: --disable-threaded-resolver --with-openssl
+        https_only:
+          name: HTTPS only
+          configure: --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --with-openssl
         torture:
           name: torture
           install: libnghttp2-dev
-          configure: --enable-debug --disable-shared --disable-threaded-resolver
+          configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl
           tests: -n -t --shallow=40 !FTP
     steps:
     - script: sudo apt-get update && sudo apt-get install -y stunnel4 python3-impacket libzstd-dev libbrotli-dev $(install)
@@ -114,68 +114,68 @@ stages:
     strategy:
       matrix:
         msys2_mingw32_debug_openssl:
-          name: 32-bit OpenSSL and MQTT
+          name: 32-bit OpenSSL
           container_img: mback2k/curl-docker-winbuildenv-msys2-mingw32:ltsc2019
           container_cmd: C:\msys64\usr\bin\sh
           prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2
-          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --with-libssh2
+          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --with-libssh2 --with-openssl
           tests: ~571 ~612 ~1056 ~1299 !SCP
         msys2_mingw64_debug_openssl:
-          name: 64-bit OpenSSL and MQTT
+          name: 64-bit OpenSSL
           container_img: mback2k/curl-docker-winbuildenv-msys2-mingw64:ltsc2019
           container_cmd: C:\msys64\usr\bin\sh
           prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2
-          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh2
+          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh2 --with-openssl
           tests: ~571 ~612 ~1056 ~1299 !SCP
-        msys1_mingw_debug_openssl:
-          name: 32-bit OpenSSL (legacy)
+        msys1_mingw_debug:
+          name: 32-bit (legacy)
           container_img: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019
           container_cmd: C:\MinGW\msys\1.0\bin\sh
-          configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug
+          configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug --without-ssl
           tests: ~203 ~1056 ~1143
-        msys1_mingw32_debug_openssl:
-          name: 32-bit OpenSSL w/o zlib
+        msys1_mingw32_debug:
+          name: 32-bit w/o zlib
           container_img: mback2k/curl-docker-winbuildenv-msys1-mingw32:ltsc2019
           container_cmd: C:\MinGW\msys\1.0\bin\sh
-          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --without-zlib
+          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --without-zlib --without-ssl
           tests: ~203 ~1056 ~1143 ~1299
-        msys1_mingw64_debug_openssl:
-          name: 64-bit OpenSSL w/o zlib
+        msys1_mingw64_debug:
+          name: 64-bit w/o zlib
           container_img: mback2k/curl-docker-winbuildenv-msys1-mingw64:ltsc2019
           container_cmd: C:\MinGW\msys\1.0\bin\sh
-          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --without-zlib
+          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --without-zlib --without-ssl
           tests: ~203 ~1056 ~1143 ~1299
         msys2_mingw32_debug_schannel:
           name: 32-bit Schannel/SSPI/WinIDN
           container_img: mback2k/curl-docker-winbuildenv-msys2-mingw32:ltsc2019
           container_cmd: C:\msys64\usr\bin\sh
           prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2
-          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --with-libssh2
+          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2
           tests: ~165 ~310 ~571 ~612 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 !SCP
         msys2_mingw64_debug_schannel:
           name: 64-bit Schannel/SSPI/WinIDN
           container_img: mback2k/curl-docker-winbuildenv-msys2-mingw64:ltsc2019
           container_cmd: C:\msys64\usr\bin\sh
           prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2
-          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --with-libssh2
+          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2
           tests: ~165 ~310 ~571 ~612 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 !SCP
         msys1_mingw_debug_schannel:
           name: 32-bit Schannel/SSPI/WinIDN (legacy)
           container_img: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019
           container_cmd: C:\MinGW\msys\1.0\bin\sh
-          configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug --enable-sspi --without-ssl --with-schannel --with-winidn
+          configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug --enable-sspi --with-schannel --with-winidn
           tests: ~203 ~305 ~310 ~311 ~312 ~313 ~404 ~1056 ~1143 ~2034 ~2035 ~2037 ~2038 ~2041 ~2042 ~2048 ~3000 ~3001
         msys1_mingw32_debug_schannel:
           name: 32-bit Schannel/SSPI/WinIDN w/o zlib
           container_img: mback2k/curl-docker-winbuildenv-msys1-mingw32:ltsc2019
           container_cmd: C:\MinGW\msys\1.0\bin\sh
-          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --without-zlib
+          configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib
           tests: ~203 ~310 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001
         msys1_mingw64_debug_schannel:
           name: 64-bit Schannel/SSPI/WinIDN w/o zlib
           container_img: mback2k/curl-docker-winbuildenv-msys1-mingw64:ltsc2019
           container_cmd: C:\MinGW\msys\1.0\bin\sh
-          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64  --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --without-zlib
+          configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64  --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib
           tests: ~203 ~310 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001
     container:
       image: $(container_img)
diff --git a/.cirrus.yml b/.cirrus.yml
index e17234f07..3ac607630 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -52,7 +52,7 @@ task:
         export CXXFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined,integer -Wformat -Werror=format-security -Werror=array-bounds -g";
         export LDFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined,integer" ;;
       esac
-    - ./configure --prefix="${HOME}"/install --enable-debug --with-libssh2 --with-brotli --with-gssapi --with-libidn2 --enable-manual --enable-ldap --enable-ldaps --with-librtmp --with-libmetalink --with-libpsl --with-nghttp2 || { tail -300 config.log; false; }
+    - ./configure --prefix="${HOME}"/install --enable-debug --with-openssl --with-libssh2 --with-brotli --with-gssapi --with-libidn2 --enable-manual --enable-ldap --enable-ldaps --with-librtmp --with-libmetalink --with-libpsl --with-nghttp2 || { tail -300 config.log; false; }
   compile_script:
     - make V=1
   test_script:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index b3fe55ab7..4132bc3f8 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -21,26 +21,27 @@ jobs:
         build:
         - name: normal
           install: nghttp2
+          configure: --without-ssl
           macosx-version-min: 10.9
         - name: debug
           install: nghttp2
-          configure: --enable-debug --enable-mqtt
+          configure: --enable-debug --without-ssl
           macosx-version-min: 10.9
         - name: libssh2
           install: nghttp2 libssh2
-          configure: --enable-debug --with-libssh2
+          configure: --enable-debug --with-libssh2 --without-ssl
           macosx-version-min: 10.9
         - name: c-ares
           install: nghttp2
-          configure: --enable-debug --enable-ares
+          configure: --enable-debug --enable-ares --without-ssl
           macosx-version-min: 10.9
         - name: HTTP only
           install: nghttp2
           configure: --enable-debug --enable-maintainer-mode --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets --disable-shared --without-brotli --without-gssapi --without-libidn2 --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib
           macosx-version-min: 10.15
         - name: SecureTransport metalink
-          install: nghttp2 openssl libmetalink
-          configure: --enable-debug --without-ssl --with-secure-transport --with-libmetalink
+          install: nghttp2 libmetalink
+          configure: --enable-debug --with-secure-transport --with-libmetalink
           macosx-version-min: 10.8
         - name: OpenSSL metalink
           install: nghttp2 openssl libmetalink
@@ -52,17 +53,17 @@ jobs:
           macosx-version-min: 10.9
         - name: torture
           install: nghttp2 openssl
-          configure: --enable-debug --disable-shared --disable-threaded-resolver
+          configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=/usr/local/opt/openssl
           tflags: -n -t --shallow=25 !FTP
           macosx-version-min: 10.9
         - name: torture-ftp
           install: nghttp2 openssl
-          configure: --enable-debug --disable-shared --disable-threaded-resolver
+          configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=/usr/local/opt/openssl
           tflags: -n -t --shallow=20 FTP
           macosx-version-min: 10.9
         - name: macOS 10.15
-          install: nghttp2 libmetalink libssh2
-          configure: --enable-debug --disable-ldap
+          install: nghttp2 libmetalink libssh2 openssl
+          configure: --enable-debug --disable-ldap --with-openssl=/usr/local/opt/openssl
           macosx-version-min: 10.15
     steps:
     - run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
diff --git a/.lgtm.yml b/.lgtm.yml
index c97528684..35a84722f 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -28,4 +28,4 @@ extraction:
       - rm -f CMakeLists.txt
       - ./buildconf
     configure: # enable as many optional features as possible
-      command: ./configure --enable-ares --with-libssh2 --with-gssapi --with-librtmp --with-libmetalink
+      command: ./configure --enable-ares --with-libssh2 --with-gssapi --with-librtmp --with-libmetalink --with-openssl
diff --git a/.travis.yml b/.travis.yml
index 3ccf800f3..18bc79ff0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ addons:
 jobs:
   include:
   - env:
-    - T=normal C="--with-gssapi --with-libssh2" CHECKSRC=1
+    - T=normal C="--with-openssl --with-gssapi --with-libssh2" CHECKSRC=1
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     addons:
       apt:
@@ -64,7 +64,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=normal C=--with-libssh
+    - T=normal C="--with-openssl --with-libssh"
     # Avoid bionic, its pre-release libssh version triggers deprecation warnings.
     dist: focal
     addons:
@@ -83,12 +83,12 @@ jobs:
         - libssh-dev
         - ninja-build
   - env:
-    - T=normal C="--enable-ares"
+    - T=normal C="--enable-ares --with-openssl"
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
   - env:
-    - T=normal C="--disable-proxy"
+    - T=normal C="--disable-proxy --with-openssl"
   - env:
-    - T=normal C="--disable-verbose" CPPFLAGS="-Wno-variadic-macros" NOTESTS=1
+    - T=normal C="--disable-verbose --with-openssl" CPPFLAGS="-Wno-variadic-macros" NOTESTS=1
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     addons:
       apt:
@@ -115,7 +115,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug HYPER="yes" C="--with-hyper=$HOME/hyper" LD_LIBRARY_PATH=$HOME/hyper/target/debug:/usr/local/lib TFLAGS="1 to 29"
+    - T=debug HYPER="yes" C="--with-hyper=$HOME/hyper --with-openssl" LD_LIBRARY_PATH=$HOME/hyper/target/debug:/usr/local/lib TFLAGS="1 to 29"
     addons:
       apt:
         <<: *common_apt
@@ -125,7 +125,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug-rustls RUSTLS_VERSION="v0.4.0" C="--with-rustls=$HOME/crust --without-ssl"
+    - T=debug-rustls RUSTLS_VERSION="v0.4.0" C="--with-rustls=$HOME/crust"
     addons:
       apt:
         <<: *common_apt
@@ -149,7 +149,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=novalgrind NGTCP2=yes GNUTLS=yes C="PKG_CONFIG_PATH=$HOME/ngbuild --without-ssl --with-gnutls=$HOME/ngbuild --with-ngtcp2=$HOME/ngbuild --with-nghttp3=$HOME/ngbuild" NOTESTS=
+    - T=novalgrind NGTCP2=yes GNUTLS=yes C="PKG_CONFIG_PATH=$HOME/ngbuild  --with-gnutls=$HOME/ngbuild --with-ngtcp2=$HOME/ngbuild --with-nghttp3=$HOME/ngbuild" NOTESTS=
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     addons:
       apt:
@@ -170,7 +170,7 @@ jobs:
         - libtasn1-6-dev
         - nettle-dev
   - env:
-    - T=debug-wolfssl C="--with-wolfssl --without-ssl" WOLFSSL="yes"
+    - T=debug-wolfssl C="--with-wolfssl" WOLFSSL="yes"
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     addons:
       apt:
@@ -192,7 +192,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug-mesalink C="--with-mesalink --without-ssl" MESALINK=yes
+    - T=debug-mesalink C="--with-mesalink" MESALINK=yes
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     addons:
       apt:
@@ -203,7 +203,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug
+    - T=debug C="--with-openssl"
     - &clang OVERRIDE_CC="CC=clang-9" OVERRIDE_CXX="CXX=clang++-9"
     compiler: clang
     addons:
@@ -215,7 +215,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug C="--enable-hsts --disable-alt-svc"
+    - T=debug C="--enable-hsts --disable-alt-svc --with-openssl"
     - *clang
     compiler: clang
     addons:
@@ -227,7 +227,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug C="--with-mbedtls --without-ssl"
+    - T=debug C="--with-mbedtls"
     - *clang
     compiler: clang
     addons:
@@ -240,7 +240,7 @@ jobs:
         - libzstd-dev
         - libmbedtls-dev
   - env:
-    - T=debug C="--with-gnutls --without-ssl"
+    - T=debug C="--with-gnutls"
     - *clang
     compiler: clang
     addons:
@@ -253,7 +253,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug C="--with-nss --without-ssl" NOTESTS=1 CPPFLAGS="-isystem /usr/include/nss"
+    - T=debug C="--with-nss" NOTESTS=1 CPPFLAGS="-isystem /usr/include/nss"
     - *clang
     compiler: clang
     addons:
@@ -266,7 +266,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=iconv
+    - T=iconv C="--with-openssl"
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
   - env:
     - T=cmake BORINGSSL=yes QUICHE=yes C="-GNinja -DUSE_QUICHE=1 -DOPENSSL_ROOT_DIR=$HOME/boringssl -DCURL_BROTLI=1 -DCURL_ZSTD=1" TFLAGS="https ftps"
@@ -305,6 +305,7 @@ jobs:
         - *common_packages
         - lcov
         - libpsl-dev
+        - libssl-dev
         - libbrotli-dev
         - libzstd-dev
         - libssh2-1-dev
@@ -318,6 +319,7 @@ jobs:
         - *common_packages
         - lcov
         - libpsl-dev
+        - libssl-dev
         - libbrotli-dev
         - libzstd-dev
         - libssh2-1-dev
@@ -345,7 +347,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=tidy
+    - T=tidy C="--with-openssl"
     - *clang
     compiler: clang
     addons:
@@ -358,7 +360,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=scan-build
+    - T=scan-build C="--with-openssl --with-libssh2"
     - *clang
     compiler: clang
     addons:
@@ -366,11 +368,13 @@ jobs:
         <<: *common_apt
         packages:
         - *clang_packages
+        - libssl-dev
+        - libssh2-1-dev
         - libpsl-dev
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug CFLAGS="-fsanitize=address,undefined,signed-integer-overflow -fno-sanitize-recover=undefined,integer -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined,integer" LIBS="-ldl -lubsan" TFLAGS=-n
+    - T=debug CFLAGS="-fsanitize=address,undefined,signed-integer-overflow -fno-sanitize-recover=undefined,integer -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined,integer" LIBS="-ldl -lubsan" TFLAGS=-n C="--with-openssl"
     - *clang
     compiler: clang
     addons:
@@ -382,7 +386,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug C="" TFLAGS=-n
+    - T=debug C="--with-openssl" TFLAGS=-n
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     arch: arm64
     addons:
@@ -400,7 +404,7 @@ jobs:
         - zlib1g-dev
 
   - env:
-    - T=debug C="" TFLAGS=-n
+    - T=debug C="--with-openssl" TFLAGS=-n
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     arch: ppc64le
     addons:
@@ -418,7 +422,7 @@ jobs:
         - zlib1g-dev
 
   - env:
-    - T=debug C="" TFLAGS=-n
+    - T=debug C="--with-openssl" TFLAGS=-n
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     arch: s390x
     addons:
diff --git a/appveyor.yml b/appveyor.yml
index dee5218bc..6cbd5f844 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -232,17 +232,17 @@ environment:
         BUILD_SYSTEM: autotools
         TESTING: ON
         DISABLED_TESTS: "!19 ~1056 !1233"
-        CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --disable-proxy"
+        CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --disable-proxy --with-schannel"
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
         BUILD_SYSTEM: autotools
         TESTING: ON
         DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233"
-        CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver"
+        CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --with-schannel"
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
         BUILD_SYSTEM: autotools
         TESTING: ON
         DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233"
-        CONFIG_ARGS: "--enable-warnings --enable-werror"
+        CONFIG_ARGS: "--enable-warnings --enable-werror --with-schannel"
 
 install:
     - set "PATH=C:\msys64\usr\bin;%PATH%"
diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh
index 0cb5df1fd..a824c1b1e 100755
--- a/scripts/travis/script.sh
+++ b/scripts/travis/script.sh
@@ -36,14 +36,14 @@ if [ "$T" = "coverage" ]; then
 fi
 
 if [ "$T" = "torture" ]; then
-  ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2
+  ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2 --with-openssl
   make
   tests="!TLS-SRP !FTP"
   make "TFLAGS=-n --shallow=20 -t $tests" test-nonflaky
 fi
 
 if [ "$T" = "events" ]; then
-  ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2
+  ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2 --with-openssl
   make
   tests="!TLS-SRP"
   make "TFLAGS=-n -e $tests" test-nonflaky
@@ -123,13 +123,13 @@ fi
 if [ "$T" = "distcheck" ]; then
   # find BOM markers and exit if we do
   ! git grep `printf '\xef\xbb\xbf'`
-  ./configure
+  ./configure --without-ssl
   make
   ./maketgz 99.98.97
   # verify in-tree build - and install it
   tar xf curl-99.98.97.tar.gz
   cd curl-99.98.97
-  ./configure --prefix=$HOME/temp
+  ./configure --prefix=$HOME/temp --without-ssl
   make
   make TFLAGS=1 test
   make install
@@ -142,7 +142,7 @@ if [ "$T" = "distcheck" ]; then
   touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
   mkdir build
   cd build
-  ../curl-99.98.97/configure
+  ../curl-99.98.97/configure --without-ssl
   make
   make TFLAGS='-p 1 1139' test
   # verify cmake build