libcurl: update to 8.12.1

4 files changed, 40 insertions, 177 deletions

diff --git a/libs/libcurl/src/vssh/libssh.c b/libs/libcurl/src/vssh/libssh.c
index 2e84fbeea8..87ed34ee62 100644
--- a/libs/libcurl/src/vssh/libssh.c
+++ b/libs/libcurl/src/vssh/libssh.c
@@ -161,6 +161,7 @@ const struct Curl_handler Curl_handler_scp = {
   ZERO_NULL,                    /* write_resp_hd */

   ZERO_NULL,                    /* connection_check */

   ZERO_NULL,                    /* attach connection */

+  ZERO_NULL,                    /* follow */

   PORT_SSH,                     /* defport */

   CURLPROTO_SCP,                /* protocol */

   CURLPROTO_SCP,                /* family */

@@ -189,6 +190,7 @@ const struct Curl_handler Curl_handler_sftp = {
   ZERO_NULL,                            /* write_resp_hd */

   ZERO_NULL,                            /* connection_check */

   ZERO_NULL,                            /* attach connection */

+  ZERO_NULL,                            /* follow */

   PORT_SSH,                             /* defport */

   CURLPROTO_SFTP,                       /* protocol */

   CURLPROTO_SFTP,                       /* family */

@@ -340,17 +342,11 @@ static int myssh_is_known(struct Curl_easy *data)
   struct curl_khkey *knownkeyp = NULL;

   curl_sshkeycallback func =

     data->set.ssh_keyfunc;

-

-#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,9,0)

   struct ssh_knownhosts_entry *knownhostsentry = NULL;

   struct curl_khkey knownkey;

-#endif

 

-#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,8,0)

   rc = ssh_get_server_publickey(sshc->ssh_session, &pubkey);

-#else

-  rc = ssh_get_publickey(sshc->ssh_session, &pubkey);

-#endif

+

   if(rc != SSH_OK)

     return rc;

 

@@ -386,7 +382,6 @@ static int myssh_is_known(struct Curl_easy *data)
 

   if(data->set.str[STRING_SSH_KNOWNHOSTS]) {

 

-#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,9,0)

     /* Get the known_key from the known hosts file */

     vstate = ssh_session_get_known_hosts_entry(sshc->ssh_session,

                                                &knownhostsentry);

@@ -444,22 +439,6 @@ static int myssh_is_known(struct Curl_easy *data)
       break;

     }

 

-#else

-    vstate = ssh_is_server_known(sshc->ssh_session);

-    switch(vstate) {

-    case SSH_SERVER_KNOWN_OK:

-      keymatch = CURLKHMATCH_OK;

-      break;

-    case SSH_SERVER_FILE_NOT_FOUND:

-    case SSH_SERVER_NOT_KNOWN:

-      keymatch = CURLKHMATCH_MISSING;

-      break;

-    default:

-      keymatch = CURLKHMATCH_MISMATCH;

-      break;

-    }

-#endif

-

     if(func) { /* use callback to determine action */

       rc = ssh_pki_export_pubkey_base64(pubkey, &found_base64);

       if(rc != SSH_OK)

@@ -476,18 +455,14 @@ static int myssh_is_known(struct Curl_easy *data)
         foundkey.keytype = CURLKHTYPE_RSA1;

         break;

       case SSH_KEYTYPE_ECDSA:

-#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,9,0)

       case SSH_KEYTYPE_ECDSA_P256:

       case SSH_KEYTYPE_ECDSA_P384:

       case SSH_KEYTYPE_ECDSA_P521:

-#endif

         foundkey.keytype = CURLKHTYPE_ECDSA;

         break;

-#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,7,0)

       case SSH_KEYTYPE_ED25519:

         foundkey.keytype = CURLKHTYPE_ED25519;

         break;

-#endif

       case SSH_KEYTYPE_DSS:

         foundkey.keytype = CURLKHTYPE_DSS;

         break;

@@ -504,11 +479,7 @@ static int myssh_is_known(struct Curl_easy *data)
 

       switch(rc) {

       case CURLKHSTAT_FINE_ADD_TO_FILE:

-#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,8,0)

         rc = ssh_session_update_known_hosts(sshc->ssh_session);

-#else

-        rc = ssh_write_knownhost(sshc->ssh_session);

-#endif

         if(rc != SSH_OK) {

           goto cleanup;

         }

@@ -539,11 +510,9 @@ cleanup:
   if(hash)

     ssh_clean_pubkey_hash(&hash);

   ssh_key_free(pubkey);

-#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,9,0)

   if(knownhostsentry) {

     ssh_knownhosts_entry_free(knownhostsentry);

   }

-#endif

   return rc;

 }

 

@@ -1846,7 +1815,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       }

 

       rc = ssh_scp_push_file(sshc->scp_session, protop->path,

-                             data->state.infilesize,

+                             (size_t)data->state.infilesize,

                              (int)data->set.new_file_perms);

       if(rc != SSH_OK) {

         err_msg = ssh_get_error(sshc->ssh_session);

diff --git a/libs/libcurl/src/vssh/libssh2.c b/libs/libcurl/src/vssh/libssh2.c
index ee3847324b..a75397e95c 100644
--- a/libs/libcurl/src/vssh/libssh2.c
+++ b/libs/libcurl/src/vssh/libssh2.c
@@ -83,15 +83,6 @@
 #include "curl_memory.h"

 #include "memdebug.h"

 

-#if LIBSSH2_VERSION_NUM >= 0x010206

-/* libssh2_sftp_statvfs and friends were added in 1.2.6 */

-#define HAS_STATVFS_SUPPORT 1

-#endif

-

-#define sftp_libssh2_realpath(s,p,t,m)                          \

-  libssh2_sftp_symlink_ex((s), (p), curlx_uztoui(strlen(p)),    \

-                          (t), (m), LIBSSH2_SFTP_REALPATH)

-

 /* Local functions: */

 static const char *sftp_libssh2_strerror(unsigned long err);

 static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc);

@@ -139,6 +130,7 @@ const struct Curl_handler Curl_handler_scp = {
   ZERO_NULL,                            /* write_resp_hd */

   ZERO_NULL,                            /* connection_check */

   ssh_attach,                           /* attach */

+  ZERO_NULL,                            /* follow */

   PORT_SSH,                             /* defport */

   CURLPROTO_SCP,                        /* protocol */

   CURLPROTO_SCP,                        /* family */

@@ -169,6 +161,7 @@ const struct Curl_handler Curl_handler_sftp = {
   ZERO_NULL,                            /* write_resp_hd */

   ZERO_NULL,                            /* connection_check */

   ssh_attach,                           /* attach */

+  ZERO_NULL,                            /* follow */

   PORT_SSH,                             /* defport */

   CURLPROTO_SFTP,                       /* protocol */

   CURLPROTO_SFTP,                       /* family */

@@ -387,8 +380,6 @@ static void state(struct Curl_easy *data, sshstate nowstate)
   sshc->state = nowstate;

 }

 

-

-#ifdef HAVE_LIBSSH2_KNOWNHOST_API

 static int sshkeycallback(CURL *easy,

                           const struct curl_khkey *knownkey, /* known */

                           const struct curl_khkey *foundkey, /* found */

@@ -403,37 +394,7 @@ static int sshkeycallback(CURL *easy,
   /* we only allow perfect matches, and we reject everything else */

   return (match != CURLKHMATCH_OK) ? CURLKHSTAT_REJECT : CURLKHSTAT_FINE;

 }

-#endif

-

-/*

- * Earlier libssh2 versions did not have the ability to seek to 64-bit

- * positions with 32-bit size_t.

- */

-#ifdef HAVE_LIBSSH2_SFTP_SEEK64

-#define SFTP_SEEK(x,y) libssh2_sftp_seek64(x, (libssh2_uint64_t)y)

-#else

-#define SFTP_SEEK(x,y) libssh2_sftp_seek(x, (size_t)y)

-#endif

 

-/*

- * Earlier libssh2 versions did not do SCP properly beyond 32-bit sizes on

- * 32-bit architectures so we check of the necessary function is present.

- */

-#ifndef HAVE_LIBSSH2_SCP_SEND64

-#define SCP_SEND(a,b,c,d) libssh2_scp_send_ex(a, b, (int)(c), (size_t)d, 0, 0)

-#else

-#define SCP_SEND(a,b,c,d) libssh2_scp_send64(a, b, (int)(c),            \

-                                             (libssh2_int64_t)d, 0, 0)

-#endif

-

-/*

- * libssh2 1.2.8 fixed the problem with 32-bit ints used for sockets on win64.

- */

-#ifdef HAVE_LIBSSH2_SESSION_HANDSHAKE

-#define session_startup(x,y) libssh2_session_handshake(x, y)

-#else

-#define session_startup(x,y) libssh2_session_startup(x, (int)y)

-#endif

 static enum curl_khtype convert_ssh2_keytype(int sshkeytype)

 {

   enum curl_khtype keytype = CURLKHTYPE_UNKNOWN;

@@ -475,7 +436,6 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
   int rc = 0;

   CURLcode result = CURLE_OK;

 

-#ifdef HAVE_LIBSSH2_KNOWNHOST_API

   if(data->set.str[STRING_SSH_KNOWNHOSTS]) {

     /* we are asked to verify the host against a file */

     struct connectdata *conn = data->conn;

@@ -535,7 +495,6 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
         /* no check means failure! */

         rc = CURLKHSTAT_REJECT;

       else {

-#ifdef HAVE_LIBSSH2_KNOWNHOST_CHECKP

         keycheck = libssh2_knownhost_checkp(sshc->kh,

                                             conn->host.name,

                                             (conn->remote_port != PORT_SSH) ?

@@ -545,15 +504,6 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
                                             LIBSSH2_KNOWNHOST_KEYENC_RAW|

                                             keybit,

                                             &host);

-#else

-        keycheck = libssh2_knownhost_check(sshc->kh,

-                                           conn->host.name,

-                                           remotekey, keylen,

-                                           LIBSSH2_KNOWNHOST_TYPE_PLAIN|

-                                           LIBSSH2_KNOWNHOST_KEYENC_RAW|

-                                           keybit,

-                                           &host);

-#endif

 

         infof(data, "SSH host check: %d, key: %s", keycheck,

               (keycheck <= LIBSSH2_KNOWNHOST_CHECK_MISMATCH) ?

@@ -637,9 +587,6 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
       break;

     }

   }

-#else /* HAVE_LIBSSH2_KNOWNHOST_API */

-  (void)data;

-#endif

   return result;

 }

 

@@ -817,8 +764,6 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data)
 {

   CURLcode result = CURLE_OK;

 

-#ifdef HAVE_LIBSSH2_KNOWNHOST_API

-

 #ifdef LIBSSH2_KNOWNHOST_KEY_ED25519

   static const char * const hostkey_method_ssh_ed25519

     = "ssh-ed25519";

@@ -914,12 +859,10 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data)
         break;

 #endif

       case LIBSSH2_KNOWNHOST_KEY_SSHRSA:

-#ifdef HAVE_LIBSSH2_VERSION

         if(libssh2_version(0x010900))

           /* since 1.9.0 libssh2_session_method_pref() works as expected */

           hostkey_method = hostkey_method_ssh_rsa_all;

         else

-#endif

           /* old libssh2 which cannot correctly remove unsupported methods due

            * to bug in src/kex.c or does not support the new methods anyways.

            */

@@ -954,8 +897,6 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data)
     }

   }

 

-#endif /* HAVE_LIBSSH2_KNOWNHOST_API */

-

   return result;

 }

 

@@ -1092,12 +1033,10 @@ static CURLcode sftp_quote(struct Curl_easy *data,
     state(data, SSH_SFTP_QUOTE_UNLINK);

     return result;

   }

-#ifdef HAS_STATVFS_SUPPORT

   else if(strncasecompare(cmd, "statvfs ", 8)) {

     state(data, SSH_SFTP_QUOTE_STATVFS);

     return result;

   }

-#endif

 

   failf(data, "Unknown SFTP command");

   Curl_safefree(sshc->quote_path1);

@@ -1262,7 +1201,8 @@ sftp_upload_init(struct Curl_easy *data,
       Curl_pgrsSetUploadSize(data, data->state.infilesize);

     }

 

-    SFTP_SEEK(sshc->sftp_handle, data->state.resume_from);

+    libssh2_sftp_seek64(sshc->sftp_handle,

+                        (libssh2_uint64_t)data->state.resume_from);

   }

   if(data->state.infilesize > 0) {

     data->req.size = data->state.infilesize;

@@ -1563,7 +1503,7 @@ sftp_download_stat(struct Curl_easy *data,
         size = to - from + 1;

       }

 

-      SFTP_SEEK(sshc->sftp_handle, from);

+      libssh2_sftp_seek64(sshc->sftp_handle, (libssh2_uint64_t)from);

     }

     data->req.size = size;

     data->req.maxdownload = size;

@@ -1596,7 +1536,8 @@ sftp_download_stat(struct Curl_easy *data,
     data->req.maxdownload = attrs.filesize - data->state.resume_from;

     Curl_pgrsSetDownloadSize(data,

                              attrs.filesize - data->state.resume_from);

-    SFTP_SEEK(sshc->sftp_handle, data->state.resume_from);

+    libssh2_sftp_seek64(sshc->sftp_handle,

+                        (libssh2_uint64_t)data->state.resume_from);

   }

 

   /* Setup the actual download */

@@ -1668,10 +1609,10 @@ static CURLcode sftp_readdir(struct Curl_easy *data,
       return result;

     }

   }

-  else if(rc == 0) {

+  else if(!rc) {

     state(data, SSH_SFTP_READDIR_DONE);

   }

-  else if(rc < 0) {

+  else {

     unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session);

     result = sftp_libssh2_error_to_CURLE(sftperr);

     sshc->actualcode = result ? result : CURLE_SSH;

@@ -1721,7 +1662,8 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
       FALLTHROUGH();

 

     case SSH_S_STARTUP:

-      rc = session_startup(sshc->ssh_session, conn->sock[FIRSTSOCKET]);

+      rc = libssh2_session_handshake(sshc->ssh_session,

+                                     conn->sock[FIRSTSOCKET]);

       if(rc == LIBSSH2_ERROR_EAGAIN) {

         break;

       }

@@ -1876,7 +1818,6 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
       break;

 

     case SSH_AUTH_AGENT_INIT:

-#ifdef HAVE_LIBSSH2_AGENT_API

       if((data->set.ssh_auth_types & CURLSSH_AUTH_AGENT)

          && (strstr(sshc->authlist, "publickey") != NULL)) {

 

@@ -1906,12 +1847,10 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
         }

       }

       else

-#endif /* HAVE_LIBSSH2_AGENT_API */

         state(data, SSH_AUTH_KEY_INIT);

       break;

 

     case SSH_AUTH_AGENT_LIST:

-#ifdef HAVE_LIBSSH2_AGENT_API

       rc = libssh2_agent_list_identities(sshc->ssh_agent);

 

       if(rc == LIBSSH2_ERROR_EAGAIN)

@@ -1925,11 +1864,9 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
         state(data, SSH_AUTH_AGENT);

         sshc->sshagent_prev_identity = NULL;

       }

-#endif

       break;

 

     case SSH_AUTH_AGENT:

-#ifdef HAVE_LIBSSH2_AGENT_API

       /* as prev_identity evolves only after an identity user auth finished we

          can safely request it again as long as EAGAIN is returned here or by

          libssh2_agent_userauth */

@@ -1966,7 +1903,6 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
         state(data, SSH_AUTH_KEY_INIT);

         rc = 0; /* clear rc and continue */

       }

-#endif

       break;

 

     case SSH_AUTH_KEY_INIT:

@@ -2049,8 +1985,10 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
       /*

        * Get the "home" directory

        */

-      rc = sftp_libssh2_realpath(sshc->sftp_session, ".",

-                                 sshp->readdir_filename, CURL_PATH_MAX);

+      rc = libssh2_sftp_symlink_ex(sshc->sftp_session,

+                                   ".", curlx_uztoui(strlen(".")),

+                                   sshp->readdir_filename, CURL_PATH_MAX,

+                                   LIBSSH2_SFTP_REALPATH);

       if(rc == LIBSSH2_ERROR_EAGAIN) {

         break;

       }

@@ -2286,7 +2224,6 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
       state(data, SSH_SFTP_NEXT_QUOTE);

       break;

 

-#ifdef HAS_STATVFS_SUPPORT

     case SSH_SFTP_QUOTE_STATVFS:

     {

       LIBSSH2_SFTP_STATVFS statvfs;

@@ -2349,7 +2286,7 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
       state(data, SSH_SFTP_NEXT_QUOTE);

       break;

     }

-#endif

+

     case SSH_SFTP_GETINFO:

     {

       if(data->set.get_filetime) {

@@ -2682,8 +2619,9 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
        * directory in the path.

        */

       sshc->ssh_channel =

-        SCP_SEND(sshc->ssh_session, sshp->path, data->set.new_file_perms,

-                 data->state.infilesize);

+        libssh2_scp_send64(sshc->ssh_session, sshp->path,

+                           (int)data->set.new_file_perms,

+                           (libssh2_int64_t)data->state.infilesize, 0, 0);

       if(!sshc->ssh_channel) {

         int ssh_err;

         char *err_msg = NULL;

@@ -2918,14 +2856,11 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
       break;

 

     case SSH_SESSION_FREE:

-#ifdef HAVE_LIBSSH2_KNOWNHOST_API

       if(sshc->kh) {

         libssh2_knownhost_free(sshc->kh);

         sshc->kh = NULL;

       }

-#endif

 

-#ifdef HAVE_LIBSSH2_AGENT_API

       if(sshc->ssh_agent) {

         rc = libssh2_agent_disconnect(sshc->ssh_agent);

         if(rc == LIBSSH2_ERROR_EAGAIN) {

@@ -2946,7 +2881,6 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
         sshc->sshagent_identity = NULL;

         sshc->sshagent_prev_identity = NULL;

       }

-#endif

 

       if(sshc->ssh_session) {

         rc = libssh2_session_free(sshc->ssh_session);

@@ -2968,12 +2902,8 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block)
       DEBUGASSERT(sshc->ssh_channel == NULL);

       DEBUGASSERT(sshc->sftp_session == NULL);

       DEBUGASSERT(sshc->sftp_handle == NULL);

-#ifdef HAVE_LIBSSH2_KNOWNHOST_API

       DEBUGASSERT(sshc->kh == NULL);

-#endif

-#ifdef HAVE_LIBSSH2_AGENT_API

       DEBUGASSERT(sshc->ssh_agent == NULL);

-#endif

 

       Curl_safefree(sshc->rsa_pub);

       Curl_safefree(sshc->rsa);

@@ -3323,14 +3253,11 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
     conn->send[FIRSTSOCKET] = sftp_send;

   }

 

-  if(data->set.ssh_compression) {

-#if LIBSSH2_VERSION_NUM >= 0x010208

-    if(libssh2_session_flag(sshc->ssh_session, LIBSSH2_FLAG_COMPRESS, 1) < 0)

-#endif

-      infof(data, "Failed to enable compression for ssh session");

+  if(data->set.ssh_compression &&

+     libssh2_session_flag(sshc->ssh_session, LIBSSH2_FLAG_COMPRESS, 1) < 0) {

+    infof(data, "Failed to enable compression for ssh session");

   }

 

-#ifdef HAVE_LIBSSH2_KNOWNHOST_API

   if(data->set.str[STRING_SSH_KNOWNHOSTS]) {

     int rc;

     sshc->kh = libssh2_knownhost_init(sshc->ssh_session);

@@ -3348,7 +3275,6 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
       infof(data, "Failed to read known hosts from %s",

             data->set.str[STRING_SSH_KNOWNHOSTS]);

   }

-#endif /* HAVE_LIBSSH2_KNOWNHOST_API */

 

 #ifdef CURL_LIBSSH2_DEBUG

   libssh2_trace(sshc->ssh_session, ~0);

@@ -3759,25 +3685,21 @@ static const char *sftp_libssh2_strerror(unsigned long err)
 

 CURLcode Curl_ssh_init(void)

 {

-#ifdef HAVE_LIBSSH2_INIT

   if(libssh2_init(0)) {

     DEBUGF(fprintf(stderr, "Error: libssh2_init failed\n"));

     return CURLE_FAILED_INIT;

   }

-#endif

   return CURLE_OK;

 }

 

 void Curl_ssh_cleanup(void)

 {

-#ifdef HAVE_LIBSSH2_EXIT

   (void)libssh2_exit();

-#endif

 }

 

 void Curl_ssh_version(char *buffer, size_t buflen)

 {

-  (void)msnprintf(buffer, buflen, "libssh2/%s", CURL_LIBSSH2_VERSION);

+  (void)msnprintf(buffer, buflen, "libssh2/%s", libssh2_version(0));

 }

 

 /* The SSH session is associated with the *CONNECTION* but the callback user

diff --git a/libs/libcurl/src/vssh/ssh.h b/libs/libcurl/src/vssh/ssh.h
index 3178e305bd..4f13ffbb0c 100644
--- a/libs/libcurl/src/vssh/ssh.h
+++ b/libs/libcurl/src/vssh/ssh.h
@@ -201,17 +201,10 @@ struct ssh_conn {
   Curl_send *tls_send;

 #endif

 

-#ifdef HAVE_LIBSSH2_AGENT_API

   LIBSSH2_AGENT *ssh_agent;     /* proxy to ssh-agent/pageant */

-  struct libssh2_agent_publickey *sshagent_identity,

-                                 *sshagent_prev_identity;

-#endif

-

-  /* note that HAVE_LIBSSH2_KNOWNHOST_API is a define set in the libssh2.h

-     header */

-#ifdef HAVE_LIBSSH2_KNOWNHOST_API

+  struct libssh2_agent_publickey *sshagent_identity;

+  struct libssh2_agent_publickey *sshagent_prev_identity;

   LIBSSH2_KNOWNHOSTS *kh;

-#endif

 #elif defined(USE_WOLFSSH)

   WOLFSSH *ssh_session;

   WOLFSSH_CTX *ctx;

@@ -221,43 +214,20 @@ struct ssh_conn {
 #endif /* USE_LIBSSH */

 };

 

-#if defined(USE_LIBSSH2)

-

-/* Feature detection based on version numbers to better work with

-   non-configure platforms */

-

-#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x001000)

-#  error "SCP/SFTP protocols require libssh2 0.16 or later"

+#ifdef USE_LIBSSH

+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 9, 0)

+#  error "SCP/SFTP protocols require libssh 0.9.0 or later"

 #endif

-

-#if LIBSSH2_VERSION_NUM >= 0x010000

-#define HAVE_LIBSSH2_SFTP_SEEK64 1

 #endif

 

-#if LIBSSH2_VERSION_NUM >= 0x010100

-#define HAVE_LIBSSH2_VERSION 1

-#endif

-

-#if LIBSSH2_VERSION_NUM >= 0x010205

-#define HAVE_LIBSSH2_INIT 1

-#define HAVE_LIBSSH2_EXIT 1

-#endif

-

-#if LIBSSH2_VERSION_NUM >= 0x010206

-#define HAVE_LIBSSH2_KNOWNHOST_CHECKP 1

-#define HAVE_LIBSSH2_SCP_SEND64 1

-#endif

+#if defined(USE_LIBSSH2)

 

-#if LIBSSH2_VERSION_NUM >= 0x010208

-#define HAVE_LIBSSH2_SESSION_HANDSHAKE 1

-#endif

+/* Feature detection based on version numbers to better work with

+   non-configure platforms */

 

-#ifdef HAVE_LIBSSH2_VERSION

-/* get it runtime if possible */

-#define CURL_LIBSSH2_VERSION libssh2_version(0)

-#else

-/* use build-time if runtime not possible */

-#define CURL_LIBSSH2_VERSION LIBSSH2_VERSION

+#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x010208)

+#  error "SCP/SFTP protocols require libssh2 1.2.8 or later"

+/* 1.2.8 was released on April 5 2011 */

 #endif

 

 #endif /* USE_LIBSSH2 */

diff --git a/libs/libcurl/src/vssh/wolfssh.c b/libs/libcurl/src/vssh/wolfssh.c
index 377aa99bcc..910e5c6d6d 100644
--- a/libs/libcurl/src/vssh/wolfssh.c
+++ b/libs/libcurl/src/vssh/wolfssh.c
@@ -95,6 +95,7 @@ const struct Curl_handler Curl_handler_scp = {
   ZERO_NULL,                            /* write_resp_hd */

   ZERO_NULL,                            /* connection_check */

   ZERO_NULL,                            /* attach connection */

+  ZERO_NULL,                            /* follow */

   PORT_SSH,                             /* defport */

   CURLPROTO_SCP,                        /* protocol */

   PROTOPT_DIRLOCK | PROTOPT_CLOSEACTION

@@ -125,6 +126,7 @@ const struct Curl_handler Curl_handler_sftp = {
   ZERO_NULL,                            /* write_resp_hd */

   ZERO_NULL,                            /* connection_check */

   ZERO_NULL,                            /* attach connection */

+  ZERO_NULL,                            /* follow */

   PORT_SSH,                             /* defport */

   CURLPROTO_SFTP,                       /* protocol */

   CURLPROTO_SFTP,                       /* family */