libcurl: update to 8.3.0

3 files changed, 7 insertions, 12 deletions

diff --git a/libs/libcurl/src/vssh/libssh.c b/libs/libcurl/src/vssh/libssh.c
index aae6f5aa54..94a5659055 100644
--- a/libs/libcurl/src/vssh/libssh.c
+++ b/libs/libcurl/src/vssh/libssh.c
@@ -40,9 +40,6 @@
 #ifdef HAVE_ARPA_INET_H

 #include <arpa/inet.h>

 #endif

-#ifdef HAVE_UTSNAME_H

-#include <sys/utsname.h>

-#endif

 #ifdef HAVE_NETDB_H

 #include <netdb.h>

 #endif

@@ -2186,7 +2183,7 @@ static CURLcode myssh_connect(struct Curl_easy *data, bool *done)
     myssh_setup_connection(data, conn);

 

   /* We default to persistent connections. We set this already in this connect

-     function to make the re-use checks properly be able to check this bit. */

+     function to make the reuse checks properly be able to check this bit. */

   connkeep(conn, "SSH default");

 

   if(conn->handler->protocol & CURLPROTO_SCP) {

diff --git a/libs/libcurl/src/vssh/libssh2.c b/libs/libcurl/src/vssh/libssh2.c
index 0cb7a8b0a7..6894b78307 100644
--- a/libs/libcurl/src/vssh/libssh2.c
+++ b/libs/libcurl/src/vssh/libssh2.c
@@ -43,9 +43,6 @@
 #ifdef HAVE_ARPA_INET_H

 #include <arpa/inet.h>

 #endif

-#ifdef HAVE_UTSNAME_H

-#include <sys/utsname.h>

-#endif

 #ifdef HAVE_NETDB_H

 #include <netdb.h>

 #endif

@@ -2537,7 +2534,8 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
           if(from > size) {

             failf(data, "Offset (%"

                   CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"

-                  CURL_FORMAT_CURL_OFF_T ")", from, attrs.filesize);

+                  CURL_FORMAT_CURL_OFF_T ")", from,

+                  (curl_off_t)attrs.filesize);

             return CURLE_BAD_DOWNLOAD_RESUME;

           }

           if(from > to) {

@@ -2563,7 +2561,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
             failf(data, "Offset (%"

                   CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"

                   CURL_FORMAT_CURL_OFF_T ")",

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

+                  data->state.resume_from, (curl_off_t)attrs.filesize);

             return CURLE_BAD_DOWNLOAD_RESUME;

           }

           /* download from where? */

@@ -2573,7 +2571,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
           if((curl_off_t)attrs.filesize < data->state.resume_from) {

             failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T

                   ") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",

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

+                  data->state.resume_from, (curl_off_t)attrs.filesize);

             return CURLE_BAD_DOWNLOAD_RESUME;

           }

         }

@@ -3254,7 +3252,7 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
   }

 

   /* We default to persistent connections. We set this already in this connect

-     function to make the re-use checks properly be able to check this bit. */

+     function to make the reuse checks properly be able to check this bit. */

   connkeep(conn, "SSH default");

 

   sshc = &conn->proto.sshc;

diff --git a/libs/libcurl/src/vssh/wolfssh.c b/libs/libcurl/src/vssh/wolfssh.c
index f0ea484e71..78582e7849 100644
--- a/libs/libcurl/src/vssh/wolfssh.c
+++ b/libs/libcurl/src/vssh/wolfssh.c
@@ -374,7 +374,7 @@ static CURLcode wssh_connect(struct Curl_easy *data, bool *done)
     wssh_setup_connection(data, conn);

 

   /* We default to persistent connections. We set this already in this connect

-     function to make the re-use checks properly be able to check this bit. */

+     function to make the reuse checks properly be able to check this bit. */

   connkeep(conn, "SSH default");

 

   if(conn->handler->protocol & CURLPROTO_SCP) {