libcurl: update to 8.6.0

3 files changed, 99 insertions, 111 deletions

diff --git a/libs/libcurl/src/vssh/libssh.c b/libs/libcurl/src/vssh/libssh.c
index 71a64cd5e8..59b8bf872b 100644
--- a/libs/libcurl/src/vssh/libssh.c
+++ b/libs/libcurl/src/vssh/libssh.c
@@ -31,6 +31,8 @@
 

 #include <limits.h>

 

+/* in 0.10.0 or later, ignore deprecated warnings */

+#define SSH_SUPPRESS_DEPRECATED

 #include <libssh/libssh.h>

 #include <libssh/sftp.h>

 

@@ -89,14 +91,6 @@
 #include "curl_memory.h"

 #include "memdebug.h"

 

-/* in 0.10.0 or later, ignore deprecated warnings */

-#if defined(__GNUC__) &&                        \

-  (LIBSSH_VERSION_MINOR >= 10) ||               \

-  (LIBSSH_VERSION_MAJOR > 0)

-#pragma GCC diagnostic push

-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

-#endif

-

 /* A recent macro provided by libssh. Or make our own. */

 #ifndef SSH_STRING_FREE_CHAR

 #define SSH_STRING_FREE_CHAR(x)                 \

@@ -167,7 +161,7 @@ const struct Curl_handler Curl_handler_scp = {
   ZERO_NULL,                    /* domore_getsock */

   myssh_getsock,                /* perform_getsock */

   scp_disconnect,               /* disconnect */

-  ZERO_NULL,                    /* readwrite */

+  ZERO_NULL,                    /* write_resp */

   ZERO_NULL,                    /* connection_check */

   ZERO_NULL,                    /* attach connection */

   PORT_SSH,                     /* defport */

@@ -194,7 +188,7 @@ const struct Curl_handler Curl_handler_sftp = {
   ZERO_NULL,                            /* domore_getsock */

   myssh_getsock,                        /* perform_getsock */

   sftp_disconnect,                      /* disconnect */

-  ZERO_NULL,                            /* readwrite */

+  ZERO_NULL,                            /* write_resp */

   ZERO_NULL,                            /* connection_check */

   ZERO_NULL,                            /* attach connection */

   PORT_SSH,                             /* defport */

@@ -445,11 +439,8 @@ static int myssh_is_known(struct Curl_easy *data)
       keymatch = CURLKHMATCH_OK;

       break;

     case SSH_KNOWN_HOSTS_OTHER:

-      /* fallthrough */

     case SSH_KNOWN_HOSTS_NOT_FOUND:

-      /* fallthrough */

     case SSH_KNOWN_HOSTS_UNKNOWN:

-      /* fallthrough */

     case SSH_KNOWN_HOSTS_ERROR:

       keymatch = CURLKHMATCH_MISSING;

       break;

@@ -465,7 +456,6 @@ static int myssh_is_known(struct Curl_easy *data)
       keymatch = CURLKHMATCH_OK;

       break;

     case SSH_SERVER_FILE_NOT_FOUND:

-      /* fallthrough */

     case SSH_SERVER_NOT_KNOWN:

       keymatch = CURLKHMATCH_MISSING;

       break;

@@ -629,7 +619,7 @@ restart:
       if(rc < 0)

         return SSH_ERROR;

 

-    /* FALLTHROUGH */

+      FALLTHROUGH();

     case 1:

       sshc->kbd_state = 1;

 

@@ -704,7 +694,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       ssh_set_blocking(sshc->ssh_session, 0);

 

       state(data, SSH_S_STARTUP);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

 

     case SSH_S_STARTUP:

       rc = ssh_connect(sshc->ssh_session);

@@ -719,7 +709,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
 

       state(data, SSH_HOSTKEY);

 

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case SSH_HOSTKEY:

 

       rc = myssh_is_known(data);

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

 

       state(data, SSH_AUTHLIST);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case SSH_AUTHLIST:{

         sshc->authed = FALSE;

 

@@ -910,7 +900,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         break;

       }

       state(data, SSH_AUTH_PASS);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

 

     case SSH_AUTH_PASS:

       rc = ssh_userauth_password(sshc->ssh_session, NULL, conn->passwd);

@@ -973,7 +963,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         break;

       }

       state(data, SSH_SFTP_REALPATH);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case SSH_SFTP_REALPATH:

       /*

        * Get the "home" directory

@@ -1161,22 +1151,22 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       }

       else if(statvfs) {

         #ifdef _MSC_VER

-        #define LIBSSH_VFS_SIZE_MASK "I64u"

+        #define CURL_LIBSSH_VFS_SIZE_MASK "I64u"

         #else

-        #define LIBSSH_VFS_SIZE_MASK PRIu64

+        #define CURL_LIBSSH_VFS_SIZE_MASK PRIu64

         #endif

         char *tmp = aprintf("statvfs:\n"

-                            "f_bsize: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_frsize: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_blocks: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_bfree: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_bavail: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_files: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_ffree: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_favail: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_fsid: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_flag: %" LIBSSH_VFS_SIZE_MASK "\n"

-                            "f_namemax: %" LIBSSH_VFS_SIZE_MASK "\n",

+                            "f_bsize: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_frsize: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_blocks: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_bfree: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_bavail: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_files: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_ffree: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_favail: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_fsid: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_flag: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"

+                            "f_namemax: %" CURL_LIBSSH_VFS_SIZE_MASK "\n",

                             statvfs->f_bsize, statvfs->f_frsize,

                             statvfs->f_blocks, statvfs->f_bfree,

                             statvfs->f_bavail, statvfs->f_files,

@@ -1318,13 +1308,14 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
           }

           /* seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */

           do {

+            char scratch[4*1024];

             size_t readthisamountnow =

-              (data->state.resume_from - passed > data->set.buffer_size) ?

-              (size_t)data->set.buffer_size :

-              curlx_sotouz(data->state.resume_from - passed);

+              (data->state.resume_from - passed >

+                (curl_off_t)sizeof(scratch)) ?

+              sizeof(scratch) : curlx_sotouz(data->state.resume_from - passed);

 

             size_t actuallyread =

-              data->state.fread_func(data->state.buffer, 1,

+              data->state.fread_func(scratch, 1,

                                      readthisamountnow, data->state.in);

 

             passed += actuallyread;

@@ -1370,7 +1361,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       /* we want to use the _sending_ function even when the socket turns

          out readable as the underlying libssh sftp send function will deal

          with both accordingly */

-      conn->cselect_bits = CURL_CSELECT_OUT;

+      data->state.select_bits = CURL_CSELECT_OUT;

 

       /* since we don't really wait for anything at this point, we want the

          state machine to move on as soon as possible so we set a very short

@@ -1560,7 +1551,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       sshc->readdir_longentry = NULL;

 

       state(data, SSH_SFTP_READDIR_BOTTOM);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case SSH_SFTP_READDIR_BOTTOM:

       if(Curl_dyn_addn(&sshc->readdir_buf, "\n", 1))

         result = CURLE_OUT_OF_MEMORY;

@@ -1740,7 +1731,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
     /* we want to use the _receiving_ function even when the socket turns

        out writableable as the underlying libssh recv function will deal

        with both accordingly */

-    conn->cselect_bits = CURL_CSELECT_IN;

+    data->state.select_bits = CURL_CSELECT_IN;

 

     if(result) {

       /* this should never occur; the close state should be entered

@@ -1868,7 +1859,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       /* we want to use the _sending_ function even when the socket turns

          out readable as the underlying libssh scp send function will deal

          with both accordingly */

-      conn->cselect_bits = CURL_CSELECT_OUT;

+      data->state.select_bits = CURL_CSELECT_OUT;

 

       state(data, SSH_STOP);

 

@@ -1884,7 +1875,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         break;

       }

       state(data, SSH_SCP_DOWNLOAD);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

 

     case SSH_SCP_DOWNLOAD:{

         curl_off_t bytecount;

@@ -1908,7 +1899,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         /* we want to use the _receiving_ function even when the socket turns

            out writableable as the underlying libssh recv function will deal

            with both accordingly */

-        conn->cselect_bits = CURL_CSELECT_IN;

+        data->state.select_bits = CURL_CSELECT_IN;

 

         state(data, SSH_STOP);

         break;

@@ -1948,7 +1939,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       ssh_set_blocking(sshc->ssh_session, 0);

 

       state(data, SSH_SESSION_DISCONNECT);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

 

     case SSH_SESSION_DISCONNECT:

       /* during weird times when we've been prematurely aborted, the channel

@@ -1971,7 +1962,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       data->state.most_recent_ftp_entrypath = NULL;

 

       state(data, SSH_SESSION_FREE);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case SSH_SESSION_FREE:

       if(sshc->ssh_session) {

         ssh_free(sshc->ssh_session);

@@ -2022,7 +2013,6 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       break;

 

     case SSH_QUIT:

-      /* fallthrough, just stop! */

     default:

       /* internal error */

       sshc->nextstate = SSH_NO_STATE;

@@ -2613,7 +2603,7 @@ static ssize_t sftp_recv(struct Curl_easy *data, int sockindex,
         return -1;

       }

 

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case 1:

       conn->proto.sshc.sftp_recv_state = 1;

 

@@ -2957,10 +2947,4 @@ void Curl_ssh_version(char *buffer, size_t buflen)
   (void)msnprintf(buffer, buflen, "libssh/%s", ssh_version(0));

 }

 

-#if defined(__GNUC__) &&                        \

-  (LIBSSH_VERSION_MINOR >= 10) ||               \

-  (LIBSSH_VERSION_MAJOR > 0)

-#pragma GCC diagnostic pop

-#endif

-

 #endif                          /* USE_LIBSSH */

diff --git a/libs/libcurl/src/vssh/libssh2.c b/libs/libcurl/src/vssh/libssh2.c
index 430f4e2ef3..32c6764be9 100644
--- a/libs/libcurl/src/vssh/libssh2.c
+++ b/libs/libcurl/src/vssh/libssh2.c
@@ -138,7 +138,7 @@ const struct Curl_handler Curl_handler_scp = {
   ZERO_NULL,                            /* domore_getsock */

   ssh_getsock,                          /* perform_getsock */

   scp_disconnect,                       /* disconnect */

-  ZERO_NULL,                            /* readwrite */

+  ZERO_NULL,                            /* write_resp */

   ZERO_NULL,                            /* connection_check */

   ssh_attach,                           /* attach */

   PORT_SSH,                             /* defport */

@@ -167,7 +167,7 @@ const struct Curl_handler Curl_handler_sftp = {
   ZERO_NULL,                            /* domore_getsock */

   ssh_getsock,                          /* perform_getsock */

   sftp_disconnect,                      /* disconnect */

-  ZERO_NULL,                            /* readwrite */

+  ZERO_NULL,                            /* write_resp */

   ZERO_NULL,                            /* connection_check */

   ssh_attach,                           /* attach */

   PORT_SSH,                             /* defport */

@@ -589,10 +589,9 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
 

     switch(rc) {

     default: /* unknown return codes will equal reject */

-      /* FALLTHROUGH */

     case CURLKHSTAT_REJECT:

       state(data, SSH_SESSION_FREE);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case CURLKHSTAT_DEFER:

       /* DEFER means bail out but keep the SSH_HOSTKEY state */

       result = sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION;

@@ -601,9 +600,8 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
       /* remove old host+key that doesn't match */

       if(host)

         libssh2_knownhost_del(sshc->kh, host);

-        /* FALLTHROUGH */

+      FALLTHROUGH();

     case CURLKHSTAT_FINE:

-        /* FALLTHROUGH */

     case CURLKHSTAT_FINE_ADD_TO_FILE:

       /* proceed */

       if(keycheck != LIBSSH2_KNOWNHOST_CHECK_MATCH) {

@@ -997,7 +995,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
       }

 

       state(data, SSH_S_STARTUP);

-      /* FALLTHROUGH */

+      FALLTHROUGH();

 

     case SSH_S_STARTUP:

       rc = session_startup(sshc->ssh_session, sock);

@@ -1016,7 +1014,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
 

       state(data, SSH_HOSTKEY);

 

-      /* FALLTHROUGH */

+      FALLTHROUGH();

     case SSH_HOSTKEY:

       /*

        * Before we authenticate we should check the hostkey's fingerprint

@@ -1961,22 +1959,22 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
       }

       else if(rc == 0) {

         #ifdef _MSC_VER

-        #define LIBSSH2_VFS_SIZE_MASK "I64u"

+        #define CURL_LIBSSH2_VFS_SIZE_MASK "I64u"

         #else

-        #define LIBSSH2_VFS_SIZE_MASK "llu"

+        #define CURL_LIBSSH2_VFS_SIZE_MASK "llu"

         #endif

         char *tmp = aprintf("statvfs:\n"

-                            "f_bsize: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_frsize: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_blocks: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_bfree: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_bavail: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_files: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_ffree: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_favail: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_fsid: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_flag: %" LIBSSH2_VFS_SIZE_MASK "\n"

-                            "f_namemax: %" LIBSSH2_VFS_SIZE_MASK "\n",

+                            "f_bsize: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_frsize: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_blocks: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_bfree: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_bavail: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_files: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_ffree: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_favail: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_fsid: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_flag: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"

+                            "f_namemax: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n",

                             statvfs.f_bsize, statvfs.f_frsize,

                             statvfs.f_blocks, statvfs.f_bfree,

                             statvfs.f_bavail, statvfs.f_files,

@@ -2160,14 +2158,15 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
           }

           /* seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */

           do {

+            char scratch[4*1024];

             size_t readthisamountnow =

-              (data->state.resume_from - passed > data->set.buffer_size) ?

-              (size_t)data->set.buffer_size :

-              curlx_sotouz(data->state.resume_from - passed);

+              (data->state.resume_from - passed >

+                (curl_off_t)sizeof(scratch)) ?

+              sizeof(scratch) : curlx_sotouz(data->state.resume_from - passed);

 

             size_t actuallyread;

             Curl_set_in_callback(data, true);

-            actuallyread = data->state.fread_func(data->state.buffer, 1,

+            actuallyread = data->state.fread_func(scratch, 1,

                                                   readthisamountnow,

                                                   data->state.in);

             Curl_set_in_callback(data, false);

@@ -2213,7 +2212,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
         /* we want to use the _sending_ function even when the socket turns

            out readable as the underlying libssh2 sftp send function will deal

            with both accordingly */

-        conn->cselect_bits = CURL_CSELECT_OUT;

+        data->state.select_bits = CURL_CSELECT_OUT;

 

         /* since we don't really wait for anything at this point, we want the

            state machine to move on as soon as possible so we set a very short

@@ -2602,7 +2601,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
     /* we want to use the _receiving_ function even when the socket turns

        out writableable as the underlying libssh2 recv function will deal

        with both accordingly */

-    conn->cselect_bits = CURL_CSELECT_IN;

+    data->state.select_bits = CURL_CSELECT_IN;

 

     if(result) {

       /* this should never occur; the close state should be entered

@@ -2757,7 +2756,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
         /* we want to use the _sending_ function even when the socket turns

            out readable as the underlying libssh2 scp send function will deal

            with both accordingly */

-        conn->cselect_bits = CURL_CSELECT_OUT;

+        data->state.select_bits = CURL_CSELECT_OUT;

 

         state(data, SSH_STOP);

       }

@@ -2819,7 +2818,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
       /* we want to use the _receiving_ function even when the socket turns

          out writableable as the underlying libssh2 recv function will deal

          with both accordingly */

-      conn->cselect_bits = CURL_CSELECT_IN;

+      data->state.select_bits = CURL_CSELECT_IN;

 

       if(result) {

         state(data, SSH_SCP_CHANNEL_FREE);

@@ -3024,7 +3023,6 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
       break;

 

     case SSH_QUIT:

-      /* fallthrough, just stop! */

     default:

       /* internal error */

       sshc->nextstate = SSH_NO_STATE;

@@ -3293,6 +3291,27 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
 #ifndef CURL_DISABLE_PROXY

   if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {

     /*

+      Setup libssh2 callbacks to make it read/write TLS from the socket.

+

+      ssize_t

+      recvcb(libssh2_socket_t sock, void *buffer, size_t length,

+      int flags, void **abstract);

+

+      ssize_t

+      sendcb(libssh2_socket_t sock, const void *buffer, size_t length,

+      int flags, void **abstract);

+

+    */

+#if LIBSSH2_VERSION_NUM >= 0x010b01

+    infof(data, "Uses HTTPS proxy");

+    libssh2_session_callback_set2(sshc->ssh_session,

+                                  LIBSSH2_CALLBACK_RECV,

+                                  (libssh2_cb_generic *)ssh_tls_recv);

+    libssh2_session_callback_set2(sshc->ssh_session,

+                                  LIBSSH2_CALLBACK_SEND,

+                                  (libssh2_cb_generic *)ssh_tls_send);

+#else

+    /*

      * This crazy union dance is here to avoid assigning a void pointer a

      * function pointer as it is invalid C. The problem is of course that

      * libssh2 has such an API...

@@ -3312,22 +3331,11 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
     sshsend.sendptr = ssh_tls_send;

 

     infof(data, "Uses HTTPS proxy");

-    /*

-      Setup libssh2 callbacks to make it read/write TLS from the socket.

-

-      ssize_t

-      recvcb(libssh2_socket_t sock, void *buffer, size_t length,

-      int flags, void **abstract);

-

-      ssize_t

-      sendcb(libssh2_socket_t sock, const void *buffer, size_t length,

-      int flags, void **abstract);

-

-    */

     libssh2_session_callback_set(sshc->ssh_session,

                                  LIBSSH2_CALLBACK_RECV, sshrecv.recvp);

     libssh2_session_callback_set(sshc->ssh_session,

                                  LIBSSH2_CALLBACK_SEND, sshsend.sendp);

+#endif

 

     /* Store the underlying TLS recv/send function pointers to be used when

        reading from the proxy */

diff --git a/libs/libcurl/src/vssh/wolfssh.c b/libs/libcurl/src/vssh/wolfssh.c
index 346d1875b0..5583398915 100644
--- a/libs/libcurl/src/vssh/wolfssh.c
+++ b/libs/libcurl/src/vssh/wolfssh.c
@@ -42,6 +42,7 @@
 #include "select.h"

 #include "multiif.h"

 #include "warnless.h"

+#include "strdup.h"

 

 /* The last 3 #include files should be in this order */

 #include "curl_printf.h"

@@ -92,7 +93,7 @@ const struct Curl_handler Curl_handler_scp = {
   ZERO_NULL,                            /* domore_getsock */

   wssh_getsock,                         /* perform_getsock */

   wscp_disconnect,                      /* disconnect */

-  ZERO_NULL,                            /* readwrite */

+  ZERO_NULL,                            /* write_resp */

   ZERO_NULL,                            /* connection_check */

   ZERO_NULL,                            /* attach connection */

   PORT_SSH,                             /* defport */

@@ -121,7 +122,7 @@ const struct Curl_handler Curl_handler_sftp = {
   ZERO_NULL,                            /* domore_getsock */

   wssh_getsock,                         /* perform_getsock */

   wsftp_disconnect,                     /* disconnect */

-  ZERO_NULL,                            /* readwrite */

+  ZERO_NULL,                            /* write_resp */

   ZERO_NULL,                            /* connection_check */

   ZERO_NULL,                            /* attach connection */

   PORT_SSH,                             /* defport */

@@ -512,15 +513,9 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
         return CURLE_OK;

       }

       else if(name && (rc == WS_SUCCESS)) {

-        sshc->homedir = malloc(name->fSz + 1);

-        if(!sshc->homedir) {

+        sshc->homedir = Curl_memdup0(name->fName, name->fSz);

+        if(!sshc->homedir)

           sshc->actualcode = CURLE_OUT_OF_MEMORY;

-        }

-        else {

-          memcpy(sshc->homedir, name->fName, name->fSz);

-          sshc->homedir[name->fSz] = 0;

-          infof(data, "wolfssh SFTP realpath succeeded");

-        }

         wolfSSH_SFTPNAME_list_free(name);

         state(data, SSH_STOP);

         return CURLE_OK;

@@ -646,14 +641,15 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
           }

           /* seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */

           do {

+            char scratch[4*1024];

             size_t readthisamountnow =

-              (data->state.resume_from - passed > data->set.buffer_size) ?

-              (size_t)data->set.buffer_size :

-              curlx_sotouz(data->state.resume_from - passed);

+              (data->state.resume_from - passed >

+                (curl_off_t)sizeof(scratch)) ?

+              sizeof(scratch) : curlx_sotouz(data->state.resume_from - passed);

 

             size_t actuallyread;

             Curl_set_in_callback(data, true);

-            actuallyread = data->state.fread_func(data->state.buffer, 1,

+            actuallyread = data->state.fread_func(scratch, 1,

                                                   readthisamountnow,

                                                   data->state.in);

             Curl_set_in_callback(data, false);

@@ -699,7 +695,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
         /* we want to use the _sending_ function even when the socket turns

            out readable as the underlying libssh2 sftp send function will deal

            with both accordingly */

-        conn->cselect_bits = CURL_CSELECT_OUT;

+        data->state.select_bits = CURL_CSELECT_OUT;

 

         /* since we don't really wait for anything at this point, we want the

            state machine to move on as soon as possible so we set a very short

@@ -795,7 +791,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
       /* we want to use the _receiving_ function even when the socket turns

          out writableable as the underlying libssh2 recv function will deal

          with both accordingly */

-      conn->cselect_bits = CURL_CSELECT_IN;

+      data->state.select_bits = CURL_CSELECT_IN;

 

       if(result) {

         /* this should never occur; the close state should be entered