Update zlib and curl libraries

driver/connect.c

@@ -23,7 +23,9 @@
 #ifndef CURL_STATICLIB
 #error "dynamically linked cURL library is not supported"
 #else
-#include "../lib/curl_base64.h"
+/* "../lib/curl_base64.h" redefines the function(s) since 8.3.0 */
+extern CURLcode Curl_base64_decode(const char *src,
+                            unsigned char **outptr, size_t *outlen);
 #endif /*! CURL_STATICLIB*/
 
 /* HTTP headers default for every request */

libs/curl/.circleci/config.yml

@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2021, Daniel Stenberg, <[email protected]>, et al.
+# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -18,59 +18,240 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
+# SPDX-License-Identifier: curl
+#
 ###########################################################################
 
 # View these jobs in the browser: https://app.circleci.com/pipelines/github/curl/curl
 
-# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
+# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/configuration-reference/
 version: 2.1
 
 commands:
   configure:
     steps:
       - run:
           command: |
-            ./buildconf
-            ./configure --enable-warnings --enable-werror --with-openssl
+            autoreconf -fi
+            ./configure --enable-warnings --enable-werror --with-openssl \
+              || { tail -1000 config.log; false; }
+
+  configure-openssl-no-verbose:
+    steps:
+      - run:
+          command: |
+            autoreconf -fi
+            ./configure --disable-verbose --enable-werror --with-openssl \
+              || { tail -1000 config.log; false; }
+
+  configure-no-proxy:
+    steps:
+      - run:
+          command: |
+            autoreconf -fi
+            ./configure --disable-proxy --enable-werror --with-openssl \
+              || { tail -1000 config.log; false; }
+
+  install-cares:
+    steps:
+      - run:
+          command: |
+            sudo apt-get update && sudo apt-get install -y libc-ares-dev
+
+  install-libssh:
+    steps:
+      - run:
+          command: |
+            sudo apt-get update && sudo apt-get install -y libssh-dev
+
+  install-deps:
+    steps:
+      - run:
+          command: |
+            sudo apt-get update && sudo apt-get install -y libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev python3-pip libpsl-dev
+            sudo python3 -m pip install impacket
+
+  configure-libssh:
+    steps:
+      - run:
+          command: |
+            autoreconf -fi
+            ./configure --enable-warnings --enable-werror --with-openssl --with-libssh \
+              || { tail -1000 config.log; false; }
+
+  install-wolfssl:
+    steps:
+      - run:
+          command: |
+            source .github/scripts/VERSIONS
+            echo "Installing wolfSSL $WOLFSSL_VER"
+            curl -LOsSf --retry 6 --retry-connrefused --max-time 999 https://github.com/wolfSSL/wolfssl/archive/v$WOLFSSL_VER-stable.tar.gz
+            tar -xzf v$WOLFSSL_VER-stable.tar.gz
+            cd wolfssl-$WOLFSSL_VER-stable
+            ./autogen.sh
+            ./configure --enable-tls13 --enable-all --enable-harden --prefix=$HOME/wssl
+            make install
+
+  install-wolfssh:
+    steps:
+      - run:
+          command: |
+            source .github/scripts/VERSIONS
+            echo "Installing wolfSSH $WOLFSSH_VER"
+            curl -LOsSf --retry 6 --retry-connrefused --max-time 999 https://github.com/wolfSSL/wolfssh/archive/v$WOLFSSH_VER-stable.tar.gz
+            tar -xzf v$WOLFSSH_VER-stable.tar.gz
+            cd wolfssh-$WOLFSSH_VER-stable
+            ./autogen.sh
+            ./configure --with-wolfssl=$HOME/wssl --prefix=$HOME/wssh --enable-scp --enable-sftp --disable-examples
+            make install
+
+  configure-cares:
+    steps:
+      - run:
+          command: |
+            autoreconf -fi
+            ./configure --enable-warnings --enable-werror --with-openssl --enable-ares \
+              || { tail -1000 config.log; false; }
+
+  configure-wolfssh:
+    steps:
+      - run:
+          command: |
+            autoreconf -fi
+            LDFLAGS="-Wl,-rpath,$HOME/wssh/lib" ./configure --enable-warnings --enable-werror --with-wolfssl=$HOME/wssl --with-wolfssh=$HOME/wssh \
+              || { tail -1000 config.log; false; }
+
+  configure-cares-debug:
+    steps:
+      - run:
+          command: |
+            autoreconf -fi
+            ./configure --enable-debug --enable-werror --with-openssl --enable-ares \
+              || { tail -1000 config.log; false; }
 
   build:
     steps:
-      - run: make V=1
-      - run: make V=1 examples
+      - run: make -j3 V=1
+      - run: make -j3 V=1 examples
 
   test:
     steps:
-      - run: make V=1 test-ci
+      - run: make -j3 V=1 test-ci TFLAGS='-j14'
 
 executors:
   ubuntu:
     machine:
-      image: ubuntu-2004:202010-01
+      image: ubuntu-2004:2024.01.1
 
 jobs:
   basic:
     executor: ubuntu
     steps:
       - checkout
+      - install-deps
       - configure
       - build
       - test
 
+  no-verbose:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-deps
+      - configure-openssl-no-verbose
+      - build
+
+  wolfssh:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-deps
+      - install-wolfssl
+      - install-wolfssh
+      - configure-wolfssh
+      - build
+
+  no-proxy:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-deps
+      - configure-no-proxy
+      - build
+      - test
+
+  cares:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-deps
+      - install-cares
+      - configure-cares
+      - build
+      - test
+
+  libssh:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-deps
+      - install-libssh
+      - configure-libssh
+      - build
+      - test
+
   arm:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:2024.01.1
     resource_class: arm.medium
     steps:
       - checkout
+      - install-deps
       - configure
       - build
       - test
 
+  arm-cares:
+    machine:
+      image: ubuntu-2004:2024.01.1
+    resource_class: arm.medium
+    steps:
+      - checkout
+      - install-deps
+      - install-cares
+      - configure-cares-debug
+      - build
+      - test
+
 workflows:
   x86-openssl:
     jobs:
       - basic
 
+  openssl-c-ares:
+    jobs:
+      - cares
+
+  openssl-libssh:
+    jobs:
+      - libssh
+
+  openssl-no-proxy:
+    jobs:
+      - no-proxy
+
+  openssl-no-verbose:
+    jobs:
+      - no-verbose
+
+  wolfssl-wolfssh:
+    jobs:
+      - wolfssh
+
   arm-openssl:
     jobs:
       - arm
+
+  arm-openssl-c-ares:
+    jobs:
+      - arm-cares