libcurl: update to 8.2.0

2 files changed, 14 insertions, 14 deletions

diff --git a/libs/libcurl/src/vssh/libssh2.c b/libs/libcurl/src/vssh/libssh2.c
index 115d90de89..0cb7a8b0a7 100644
--- a/libs/libcurl/src/vssh/libssh2.c
+++ b/libs/libcurl/src/vssh/libssh2.c
@@ -100,11 +100,9 @@
 

 /* Local functions: */

 static const char *sftp_libssh2_strerror(unsigned long err);

-#ifdef CURL_LIBSSH2_DEBUG

 static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc);

 static LIBSSH2_REALLOC_FUNC(my_libssh2_realloc);

 static LIBSSH2_FREE_FUNC(my_libssh2_free);

-#endif

 static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data);

 static CURLcode ssh_connect(struct Curl_easy *data, bool *done);

 static CURLcode ssh_multi_statemach(struct Curl_easy *data, bool *done);

@@ -284,8 +282,6 @@ static CURLcode libssh2_session_error_to_CURLE(int err)
   return CURLE_SSH;

 }

 

-#ifdef CURL_LIBSSH2_DEBUG

-

 static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc)

 {

   (void)abstract; /* arg not used */

@@ -305,8 +301,6 @@ static LIBSSH2_FREE_FUNC(my_libssh2_free)
     free(ptr);

 }

 

-#endif

-

 /*

  * SSH State machine related code

  */

@@ -895,6 +889,7 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data)
     }

 

     if(found) {

+      int rc;

       infof(data, "Found host %s in %s",

             conn->host.name, data->set.str[STRING_SSH_KNOWNHOSTS]);

 

@@ -944,9 +939,15 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data)
       }

 

       infof(data, "Set \"%s\" as SSH hostkey type", hostkey_method);

-      result = libssh2_session_error_to_CURLE(

-        libssh2_session_method_pref(

-          sshc->ssh_session, LIBSSH2_METHOD_HOSTKEY, hostkey_method));

+      rc = libssh2_session_method_pref(sshc->ssh_session,

+                                       LIBSSH2_METHOD_HOSTKEY, hostkey_method);

+      if(rc) {

+        char *errmsg = NULL;

+        int errlen;

+        libssh2_session_last_error(sshc->ssh_session, &errmsg, &errlen, 0);

+        failf(data, "libssh2: %s", errmsg);

+        result = libssh2_session_error_to_CURLE(rc);

+      }

     }

     else {

       infof(data, "Did not find host %s in %s",

@@ -3268,13 +3269,12 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
   sock = conn->sock[FIRSTSOCKET];

 #endif /* CURL_LIBSSH2_DEBUG */

 

-#ifdef CURL_LIBSSH2_DEBUG

+  /* libcurl MUST to set custom memory functions so that the kbd_callback

+     funciton's memory allocations can be properled freed */

   sshc->ssh_session = libssh2_session_init_ex(my_libssh2_malloc,

                                               my_libssh2_free,

                                               my_libssh2_realloc, data);

-#else

-  sshc->ssh_session = libssh2_session_init_ex(NULL, NULL, NULL, data);

-#endif

+

   if(!sshc->ssh_session) {

     failf(data, "Failure initialising ssh session");

     return CURLE_FAILED_INIT;

diff --git a/libs/libcurl/src/vssh/wolfssh.c b/libs/libcurl/src/vssh/wolfssh.c
index 269199c221..f0ea484e71 100644
--- a/libs/libcurl/src/vssh/wolfssh.c
+++ b/libs/libcurl/src/vssh/wolfssh.c
@@ -277,7 +277,7 @@ static ssize_t wsftp_send(struct Curl_easy *data, int sockindex,
     return -1;

   }

   DEBUGASSERT(rc == (int)len);

-  infof(data, "sent %zd bytes SFTP from offset %zd",

+  infof(data, "sent %zu bytes SFTP from offset %" CURL_FORMAT_CURL_OFF_T,

         len, sshc->offset);

   sshc->offset += len;

   return (ssize_t)rc;