vssh: drop support for wolfSSH

The implementation was incomplete and lesser than the other backends. No one ever reported a bug or requested enhancements for this, indicating that this backend was never used. Closes #18700
2026-01-18 17:21:26 +01:00 · 2025-09-24 06:52:52 +02:00
parent 22b9f77e38
commit b011e3fcfb
21 changed files with 13 additions and 1458 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,20 +61,6 @@ commands:
            ./configure --disable-dependency-tracking --enable-tls13 --enable-all --enable-harden --prefix=$HOME/wssl
            make install

-  install-wolfssh:
-    steps:
-      - run:
-          command: |
-            # renovate: datasource=github-tags depName=wolfSSL/wolfssh versioning=semver extractVersion=^v?(?<version>.+)-stable$ registryUrl=https://github.com
-            WOLFSSH_VERSION=1.4.19
-            echo "Installing wolfSSH $WOLFSSH_VERSION"
-            curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 6 --retry-connrefused \
-              --location "https://github.com/wolfSSL/wolfssh/archive/v$WOLFSSH_VERSION-stable.tar.gz" | tar -xz
-            cd wolfssh-$WOLFSSH_VERSION-stable
-            ./autogen.sh
-            ./configure --disable-dependency-tracking --with-wolfssl=$HOME/wssl --prefix=$HOME/wssh --enable-scp --enable-sftp --disable-term --disable-examples
-            make install
-
  configure:
    steps:
      - run:
@@ -120,16 +106,6 @@ commands:
              --with-openssl --enable-ares \
              || { tail -1000 config.log; false; }

-  configure-wolfssh:
-    steps:
-      - run:
-          command: |
-            autoreconf -fi
-            LDFLAGS="-Wl,-rpath,$HOME/wssh/lib" \
-            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-werror --enable-warnings \
-              --with-wolfssl=$HOME/wssl --with-wolfssh=$HOME/wssh \
-              || { tail -1000 config.log; false; }
-
  configure-cares-debug:
    steps:
      - run:
@@ -171,16 +147,6 @@ jobs:
      - configure-openssl-no-verbose
      - build

-  wolfssh:
-    executor: ubuntu
-    steps:
-      - checkout
-      - install-deps
-      - install-wolfssl
-      - install-wolfssh
-      - configure-wolfssh
-      - build
-
  no-proxy:
    executor: ubuntu
    steps:
@@ -254,10 +220,6 @@ workflows:
    jobs:
      - no-verbose

-  wolfssl-wolfssh:
-    jobs:
-      - wolfssh
-
  arm-openssl:
    jobs:
      - arm
--- a/.github/scripts/cmp-config.pl
+++ b/.github/scripts/cmp-config.pl
@@ -56,7 +56,6 @@ my %remove = (
    '#define HAVE_LIBSSH' => 1,
    '#define HAVE_LIBSSH2 1' => 1,
    '#define HAVE_LIBSSL 1' => 1,
-    '#define HAVE_LIBWOLFSSH' => 1,
    '#define HAVE_LIBZSTD 1' => 1,
    '#define HAVE_NGHTTP2_NGHTTP2_H 1' => 1,
    '#define HAVE_NGHTTP3_NGHTTP3_H 1' => 1,
@@ -78,7 +77,6 @@ my %remove = (
    '#define HAVE_SYS_STAT_H 1' => 1,
    '#define HAVE_SYS_XATTR_H 1' => 1,
    '#define HAVE_UNICODE_UIDNA_H 1' => 1,
-    '#define HAVE_WOLFSSH_SSH_H 1' => 1,
    '#define HAVE_WOLFSSL_SET_QUIC_USE_LEGACY_CODEPOINT 1' => 1,
    '#define HAVE_ZSTD 1' => 1,
    '#define HAVE_ZSTD_H 1' => 1,
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -41,8 +41,6 @@ env:
  LIBRESSL_VERSION: 4.1.0
  # renovate: datasource=github-tags depName=wolfSSL/wolfssl versioning=semver extractVersion=^v?(?<version>.+)-stable$ registryUrl=https://github.com
  WOLFSSL_VERSION: 5.8.2
-  # renovate: datasource=github-tags depName=wolfSSL/wolfssh versioning=semver extractVersion=^v?(?<version>.+)-stable$ registryUrl=https://github.com
-  WOLFSSH_VERSION: 1.4.19
  # renovate: datasource=github-tags depName=Mbed-TLS/mbedtls versioning=semver registryUrl=https://github.com
  MBEDTLS_VERSION: 3.6.4
  # renovate: datasource=github-tags depName=awslabs/aws-lc versioning=semver registryUrl=https://github.com
@@ -94,8 +92,8 @@ jobs:

          - name: 'wolfssl-opensslextra valgrind'
            install_packages: valgrind
-            install_steps: wolfssl-opensslextra wolfssh
-            configure: LDFLAGS=-Wl,-rpath,/home/runner/wolfssl-opensslextra/lib --with-wolfssl=/home/runner/wolfssl-opensslextra --with-wolfssh=/home/runner/wolfssh --enable-ech --enable-debug
+            install_steps: wolfssl-opensslextra
+            configure: LDFLAGS=-Wl,-rpath,/home/runner/wolfssl-opensslextra/lib --with-wolfssl=/home/runner/wolfssl-opensslextra --enable-ech --enable-debug

          - name: 'mbedtls valgrind'
            install_packages: libnghttp2-dev libidn2-dev libldap-dev valgrind
@@ -186,7 +184,7 @@ jobs:
              --disable-dict --disable-gopher --disable-ldap --disable-telnet
              --disable-imap --disable-pop3 --disable-smtp
              --without-librtmp --disable-rtsp
-              --without-libssh2 --without-libssh --without-wolfssh
+              --without-libssh2 --without-libssh
              --disable-tftp --disable-ftp --disable-file --disable-smb

          - name: 'openssl torture !FTP'
@@ -405,31 +403,10 @@ jobs:
            --location "https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}-stable.tar.gz" | tar -xz
          cd "wolfssl-${WOLFSSL_VERSION}-stable"
          ./autogen.sh
-          ./configure --disable-dependency-tracking --enable-tls13 --enable-harden --enable-wolfssh --enable-ech --enable-opensslextra \
+          ./configure --disable-dependency-tracking --enable-tls13 --enable-harden --enable-ech --enable-opensslextra \
            --disable-benchmark --disable-crypttests --disable-examples --prefix=/home/runner/wolfssl-opensslextra
          make install

-      - name: 'cache wolfssh'
-        if: ${{ contains(matrix.build.install_steps, 'wolfssh') }}
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
-        id: cache-wolfssh
-        env:
-          cache-name: cache-wolfssh
-        with:
-          path: ~/wolfssh
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.WOLFSSH_VERSION }}-${{ env.WOLFSSL_VERSION }}
-
-      - name: 'build wolfssh'
-        if: ${{ contains(matrix.build.install_steps, 'wolfssh') && steps.cache-wolfssh.outputs.cache-hit != 'true' }}
-        run: |
-          curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 6 --retry-connrefused \
-            --location "https://github.com/wolfSSL/wolfssh/archive/v${WOLFSSH_VERSION}-stable.tar.gz" | tar -xz
-          cd "wolfssh-${WOLFSSH_VERSION}-stable"
-          ./autogen.sh
-          ./configure --disable-dependency-tracking --with-wolfssl=/home/runner/wolfssl-opensslextra --enable-scp --enable-sftp --disable-term \
-            --disable-examples --prefix=/home/runner/wolfssh
-          make install
-
      - name: 'cache mbedtls'
        if: ${{ contains(matrix.build.install_steps, 'mbedtls') }}
        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
@@ -691,9 +668,6 @@ jobs:
          TFLAGS: '${{ matrix.build.tflags }}'
        run: |
          if [ "${TEST_TARGET}" = 'test-ci' ]; then
-            if [[ "${MATRIX_INSTALL_STEPS}" = *'wolfssh'* ]]; then
-              TFLAGS+=' ~SFTP'  # curl: (79) wolfssh SFTP connect error -1051 / WS_MATCH_KEY_ALGO_E / cannot match key algo with peer
-            fi
            if [[ "${MATRIX_INSTALL_PACKAGES}" = *'valgrind'* ]]; then
              TFLAGS+=' -j6'
              if [[ "${MATRIX_INSTALL_PACKAGES}" = *'heimdal-dev'* ]]; then
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -253,7 +253,7 @@ jobs:
              --disable-ldap --disable-pop3 --without-librtmp --disable-rtsp
              --disable-shared --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets
              --without-brotli --without-gssapi --without-libidn2 --without-libpsl --without-librtmp
-              --without-libssh2 --without-libssh --without-wolfssh
+              --without-libssh2 --without-libssh
              --without-nghttp2 --disable-ntlm --without-ssl --without-zlib --without-zstd

            macos-version-min: '10.15'  # Catalina (2019)
--- a/CMake/FindWolfSSH.cmake
+++ b/CMake/FindWolfSSH.cmake
@@ -1,65 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) 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
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-# Find the wolfSSH library
-#
-# Input variables:
-#
-# - `WOLFSSH_INCLUDE_DIR`:   The wolfSSH include directory.
-# - `WOLFSSH_LIBRARY`:       Path to `wolfssh` library.
-#
-# Result variables:
-#
-# - `WOLFSSH_FOUND`:         System has wolfSSH.
-# - `WOLFSSH_INCLUDE_DIRS`:  The wolfSSH include directories.
-# - `WOLFSSH_LIBRARIES`:     The wolfSSH library names.
-# - `WOLFSSH_VERSION`:       Version of wolfSSH.
-
-find_path(WOLFSSH_INCLUDE_DIR NAMES "wolfssh/ssh.h")
-find_library(WOLFSSH_LIBRARY NAMES "wolfssh" "libwolfssh")
-
-unset(WOLFSSH_VERSION CACHE)
-if(WOLFSSH_INCLUDE_DIR AND EXISTS "${WOLFSSH_INCLUDE_DIR}/wolfssh/version.h")
-  set(_version_regex "#[\t ]*define[\t ]+LIBWOLFSSH_VERSION_STRING[\t ]+\"([^\"]*)\"")
-  file(STRINGS "${WOLFSSH_INCLUDE_DIR}/wolfssh/version.h" _version_str REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1" _version_str "${_version_str}")
-  set(WOLFSSH_VERSION "${_version_str}")
-  unset(_version_regex)
-  unset(_version_str)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(WolfSSH
-  REQUIRED_VARS
-    WOLFSSH_INCLUDE_DIR
-    WOLFSSH_LIBRARY
-  VERSION_VAR
-    WOLFSSH_VERSION
-)
-
-if(WOLFSSH_FOUND)
-  set(WOLFSSH_INCLUDE_DIRS ${WOLFSSH_INCLUDE_DIR})
-  set(WOLFSSH_LIBRARIES    ${WOLFSSH_LIBRARY})
-endif()
-
-mark_as_advanced(WOLFSSH_INCLUDE_DIR WOLFSSH_LIBRARY)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1391,23 +1391,6 @@ if(NOT USE_LIBSSH2 AND CURL_USE_LIBSSH)
  set(USE_LIBSSH ON)
 endif()

-# wolfSSH
-option(CURL_USE_WOLFSSH "Use wolfSSH" OFF)
-mark_as_advanced(CURL_USE_WOLFSSH)
-set(USE_WOLFSSH OFF)
-if(NOT USE_LIBSSH2 AND NOT USE_LIBSSH AND CURL_USE_WOLFSSH)
-  if(USE_WOLFSSL)
-    find_package(WolfSSH)
-    if(WOLFSSH_FOUND)
-      set(CURL_LIBS ${WOLFSSH_LIBRARIES} ${CURL_LIBS})  # keep it before TLS-crypto, compression
-      include_directories(SYSTEM ${WOLFSSH_INCLUDE_DIRS})
-      set(USE_WOLFSSH ON)
-    endif()
-  else()
-    message(WARNING "wolfSSH requires wolfSSL. Skipping.")
-  endif()
-endif()
-
 option(CURL_USE_GSASL "Use libgsasl" OFF)
 mark_as_advanced(CURL_USE_GSASL)
 if(CURL_USE_GSASL)
@@ -2144,8 +2127,8 @@ curl_add_if("SMBS"          NOT CURL_DISABLE_SMB AND _ssl_enabled AND
                            _use_curl_ntlm_core AND (SIZEOF_CURL_OFF_T GREATER 4))
 curl_add_if("SMTP"          NOT CURL_DISABLE_SMTP)
 curl_add_if("SMTPS"         NOT CURL_DISABLE_SMTP AND _ssl_enabled)
-curl_add_if("SCP"           USE_LIBSSH2 OR USE_LIBSSH OR USE_WOLFSSH)
-curl_add_if("SFTP"          USE_LIBSSH2 OR USE_LIBSSH OR USE_WOLFSSH)
+curl_add_if("SCP"           USE_LIBSSH2 OR USE_LIBSSH)
+curl_add_if("SFTP"          USE_LIBSSH2 OR USE_LIBSSH)
 curl_add_if("IPFS"          NOT CURL_DISABLE_IPFS)
 curl_add_if("IPNS"          NOT CURL_DISABLE_IPFS)
 curl_add_if("RTSP"          NOT CURL_DISABLE_RTSP)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,6 @@ CMAKE_DIST =                                    \
 CMake/FindNettle.cmake                         \
 CMake/FindQuiche.cmake                         \
 CMake/FindRustls.cmake                         \
- CMake/FindWolfSSH.cmake                        \
 CMake/FindWolfSSL.cmake                        \
 CMake/FindZstd.cmake                           \
 CMake/Macros.cmake                             \
--- a/configure.ac
+++ b/configure.ac
@@ -2290,12 +2290,6 @@ AS_HELP_STRING([--with-libssh=PATH],[Where to look for libssh, PATH points to th
 AS_HELP_STRING([--with-libssh], [enable libssh]),
  OPT_LIBSSH=$withval, OPT_LIBSSH=no)

-OPT_WOLFSSH=off
-AC_ARG_WITH(wolfssh,dnl
-AS_HELP_STRING([--with-wolfssh=PATH],[Where to look for wolfssh, PATH points to the wolfSSH installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option])
-AS_HELP_STRING([--with-wolfssh], [enable wolfssh]),
-  OPT_WOLFSSH=$withval, OPT_WOLFSSH=no)
-
 if test X"$OPT_LIBSSH2" != Xno; then
  dnl backup the pre-libssh2 variables
  CLEANLDFLAGS="$LDFLAGS"
@@ -2453,28 +2447,6 @@ elif test X"$OPT_LIBSSH" != Xno; then
    CPPFLAGS=$CLEANCPPFLAGS
    LIBS=$CLEANLIBS
  fi
-elif test X"$OPT_WOLFSSH" != Xno; then
-  dnl backup the pre-wolfssh variables
-  CLEANLDFLAGS="$LDFLAGS"
-  CLEANLDFLAGSPC="$LDFLAGSPC"
-  CLEANCPPFLAGS="$CPPFLAGS"
-  CLEANLIBS="$LIBS"
-
-  if test "$OPT_WOLFSSH" != yes; then
-    WOLFCONFIG="$OPT_WOLFSSH/bin/wolfssh-config"
-    WOLFSSH_LIBS=`$WOLFCONFIG --libs`
-    LDFLAGS="$LDFLAGS $WOLFSSH_LIBS"
-    LDFLAGSPC="$LDFLAGSPC $WOLFSSH_LIBS"
-    CPPFLAGS="$CPPFLAGS `$WOLFCONFIG --cflags`"
-  fi
-
-  AC_CHECK_LIB(wolfssh, wolfSSH_Init)
-
-  AC_CHECK_HEADERS(wolfssh/ssh.h,
-    curl_ssh_msg="enabled (wolfSSH)"
-    AC_DEFINE(USE_WOLFSSH, 1, [if wolfSSH is in use])
-    USE_WOLFSSH=1
-  )
 fi

 dnl **********************************************************************
@@ -5501,9 +5473,6 @@ if test "x$USE_LIBSSH" = "x1"; then
  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SCP"
  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SFTP"
 fi
-if test "x$USE_WOLFSSH" = "x1"; then
-  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SFTP"
-fi
 if test "x$CURL_DISABLE_IPFS" != "x1"; then
  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS IPFS IPNS"
 fi
--- a/docs/INSTALL-CMAKE.md
+++ b/docs/INSTALL-CMAKE.md
@@ -363,7 +363,6 @@ Details via CMake
 - `CURL_USE_PKGCONFIG`:                     Enable `pkg-config` to detect dependencies. Default: `ON` for Unix (except Android, Apple devices), vcpkg, MinGW if not cross-compiling.
 - `CURL_USE_RUSTLS`:                        Enable Rustls for SSL/TLS. Default: `OFF`
 - `CURL_USE_SCHANNEL`:                      Enable Windows native SSL/TLS (Schannel). Default: `OFF`
- `CURL_USE_WOLFSSH`:                       Use wolfSSH. Default: `OFF`
 - `CURL_USE_WOLFSSL`:                       Enable wolfSSL for SSL/TLS. Default: `OFF`
 - `CURL_ZLIB`:                              Use zlib (`ON`, `OFF` or `AUTO`). Default: `AUTO`
 - `CURL_ZSTD`:                              Use zstd (`ON`, `OFF` or `AUTO`). Default: `AUTO`
@@ -447,8 +446,6 @@ Details via CMake
 - `RUSTLS_INCLUDE_DIR`:                     The Rustls include directory.
 - `RUSTLS_LIBRARY`:                         Path to `rustls` library.
 - `WATT_ROOT`:                              Set this variable to the root installation of Watt-32.
- `WOLFSSH_INCLUDE_DIR`:                    The wolfSSH include directory.
- `WOLFSSH_LIBRARY`:                        Path to `wolfssh` library.
 - `WOLFSSL_INCLUDE_DIR`:                    The wolfSSL include directory.
 - `WOLFSSL_LIBRARY`:                        Path to `wolfssl` library.
 - `ZSTD_INCLUDE_DIR`:                       The zstd include directory.
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -60,11 +60,9 @@ problems may have been fixed or changed somewhat since this was written.

 9. SFTP and SCP
 9.1 SFTP does not do CURLOPT_POSTQUOTE correct
- 9.2 wolfssh: publickey auth does not work
 9.3 Remote recursive folder creation with SFTP
 9.4 libssh blocking and infinite loop problem
 9.5 Cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!"
- 9.6 wolfssh: all tests fail

 10. Connection
 10.1 --interface with link-scoped IPv6 address
@@ -400,14 +398,6 @@ problems may have been fixed or changed somewhat since this was written.
 report but it cannot be accepted as-is. See
 https://curl.se/bug/view.cgi?id=748

-9.2 wolfssh: publickey auth does not work
-
- When building curl to use the wolfSSH backend for SFTP, the publickey
- authentication does not work. This is simply functionality not written for curl
- yet, the necessary API for make this work is provided by wolfSSH.
-
- See https://github.com/curl/curl/issues/4820
-
 9.3 Remote recursive folder creation with SFTP

 On this servers, the curl fails to create directories on the remote server
@@ -429,12 +419,6 @@ problems may have been fixed or changed somewhat since this was written.

 https://github.com/curl/curl/issues/11244

-9.6 wolfssh: all tests fail
-
- Something fundamental stops them all from working properly.
-
- https://github.com/curl/curl/issues/16794
-
 10. Connection

 10.1 --interface with link-scoped IPv6 address
--- a/docs/tests/FILEFORMAT.md
+++ b/docs/tests/FILEFORMAT.md
@@ -513,7 +513,6 @@ Features testable here are:
 - `wakeup`
 - `win32`
 - `WinIDN`
- `wolfssh`
 - `wolfssl`
 - `xattr`
 - `zstd`
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -127,8 +127,7 @@ LIB_VQUIC_HFILES = \
 LIB_VSSH_CFILES =  \
  vssh/libssh.c    \
  vssh/libssh2.c   \
-  vssh/curl_path.c \
-  vssh/wolfssh.c
+  vssh/curl_path.c

 LIB_VSSH_HFILES =    \
  vssh/curl_path.h   \
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -706,9 +706,6 @@ ${SIZEOF_TIME_T_CODE}
 /* if libssh2 is in use */
 #cmakedefine USE_LIBSSH2 1

-/* if wolfssh is in use */
-#cmakedefine USE_WOLFSSH 1
-
 /* if libpsl is in use */
 #cmakedefine USE_LIBPSL 1

--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -776,7 +776,7 @@
 #  endif
 #endif

-#if defined(USE_LIBSSH2) || defined(USE_LIBSSH) || defined(USE_WOLFSSH)
+#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
 #define USE_SSH
 #endif

--- a/lib/url.c
+++ b/lib/url.c
@@ -1611,7 +1611,7 @@ const struct Curl_handler *Curl_getn_scheme_handler(const char *scheme,
 #else
    NULL,
 #endif
-#if defined(USE_SSH) && !defined(USE_WOLFSSH)
+#if defined(USE_SSH)
    &Curl_handler_scp,
 #else
    NULL,
--- a/lib/version.c
+++ b/lib/version.c
@@ -368,10 +368,8 @@ static const char * const supported_protocols[] = {
 #ifndef CURL_DISABLE_RTSP
  "rtsp",
 #endif
-#if defined(USE_SSH) && !defined(USE_WOLFSSH)
-  "scp",
-#endif
 #ifdef USE_SSH
+  "scp",
  "sftp",
 #endif
 #if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE)
--- a/lib/vssh/ssh.h
+++ b/lib/vssh/ssh.h
@@ -34,9 +34,6 @@
 #define SSH_SUPPRESS_DEPRECATED
 #include <libssh/libssh.h>
 #include <libssh/sftp.h>
-#elif defined(USE_WOLFSSH)
-#include <wolfssh/ssh.h>
-#include <wolfssh/wolfsftp.h>
 #endif

 #include "curl_path.h"
@@ -211,14 +208,6 @@ struct ssh_conn {
  struct libssh2_agent_publickey *sshagent_identity;
  struct libssh2_agent_publickey *sshagent_prev_identity;
  LIBSSH2_KNOWNHOSTS *kh;
-#elif defined(USE_WOLFSSH)
-  CURLcode actualcode;        /* the actual error code */
-  WOLFSSH *ssh_session;
-  WOLFSSH_CTX *ctx;
-  word32 handleSz;
-  byte handle[WOLFSSH_MAX_HANDLE];
-  curl_off_t offset;
-  BIT(initialised);
 #endif /* USE_LIBSSH */
  BIT(authed);                /* the connection has been authenticated fine */
  BIT(acceptfail);            /* used by the SFTP_QUOTE (continue if
--- a/lib/vssh/wolfssh.c
+++ b/lib/vssh/wolfssh.c
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1213,8 +1213,8 @@ curl_easy_setopt_ccsid(CURL *easy, CURLoption tag, ...)
      if(!s) {
        result = CURLE_OUT_OF_MEMORY;
        break;
-        }
      }
+    }
    else {
      /* Data length specified. */
      size_t len;
--- a/scripts/schemetable.c
+++ b/scripts/schemetable.c
@@ -60,7 +60,7 @@ static const struct detail scheme[] = {
  {"rtmps", "#ifdef USE_LIBRTMP" },
  {"rtmpts", "#ifdef USE_LIBRTMP" },
  {"rtsp", "#ifndef CURL_DISABLE_RTSP" },
-  {"scp", "#if defined(USE_SSH) && !defined(USE_WOLFSSH)" },
+  {"scp", "#ifdef USE_SSH" },
  {"sftp", "#ifdef USE_SSH" },
  {"smb", "#if !defined(CURL_DISABLE_SMB) && \\\n"
   "  defined(USE_CURL_NTLM_CORE) && (SIZEOF_CURL_OFF_T > 4)" },
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -639,9 +639,6 @@ sub checksystemfeatures {
                    }
                }
            }
-            if($libcurl =~ /wolfssh/i) {
-                $feature{"wolfssh"} = 1;
-            }
        }
        elsif($_ =~ /^Protocols: (.*)/i) {
            $proto = $1;