libcurl: update to 8.9.0

1 files changed, 6 insertions, 6 deletions

diff --git a/libs/libcurl/src/socks_gssapi.c b/libs/libcurl/src/socks_gssapi.c
index a592caad5b..c302ddf5bb 100644
--- a/libs/libcurl/src/socks_gssapi.c
+++ b/libs/libcurl/src/socks_gssapi.c
@@ -172,7 +172,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
 

   (void)curlx_nonblock(sock, FALSE);

 

-  /* As long as we need to keep sending some context info, and there's no  */

+  /* As long as we need to keep sending some context info, and there is no  */

   /* errors, keep sending it...                                            */

   for(;;) {

     gss_major_status = Curl_gss_init_sec_context(data,

@@ -201,7 +201,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
     if(gss_send_token.length) {

       socksreq[0] = 1;    /* GSS-API subnegotiation version */

       socksreq[1] = 1;    /* authentication message type */

-      us_length = htons((short)gss_send_token.length);

+      us_length = htons((unsigned short)gss_send_token.length);

       memcpy(socksreq + 2, &us_length, sizeof(short));

 

       nwritten = Curl_conn_cf_send(cf->next, data, (char *)socksreq, 4, &code);

@@ -306,7 +306,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
                    gss_minor_status, "gss_inquire_context")) {

     gss_delete_sec_context(&gss_status, &gss_context, NULL);

     gss_release_name(&gss_status, &gss_client_name);

-    failf(data, "Failed to determine user name.");

+    failf(data, "Failed to determine username.");

     return CURLE_COULDNT_CONNECT;

   }

   gss_major_status = gss_display_name(&gss_minor_status, gss_client_name,

@@ -316,7 +316,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
     gss_delete_sec_context(&gss_status, &gss_context, NULL);

     gss_release_name(&gss_status, &gss_client_name);

     gss_release_buffer(&gss_status, &gss_send_token);

-    failf(data, "Failed to determine user name.");

+    failf(data, "Failed to determine username.");

     return CURLE_COULDNT_CONNECT;

   }

   user = malloc(gss_send_token.length + 1);

@@ -377,7 +377,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
    *

    * The token is produced by encapsulating an octet containing the

    * required protection level using gss_seal()/gss_wrap() with conf_req

-   * set to FALSE.  The token is verified using gss_unseal()/

+   * set to FALSE. The token is verified using gss_unseal()/

    * gss_unwrap().

    *

    */

@@ -406,7 +406,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
     }

     gss_release_buffer(&gss_status, &gss_send_token);

 

-    us_length = htons((short)gss_w_token.length);

+    us_length = htons((unsigned short)gss_w_token.length);

     memcpy(socksreq + 2, &us_length, sizeof(short));

   }