libcurl: update to 8.6.0

1 files changed, 19 insertions, 13 deletions

diff --git a/libs/libcurl/src/vtls/bearssl.c b/libs/libcurl/src/vtls/bearssl.c
index 3bda30328c..924802c61f 100644
--- a/libs/libcurl/src/vtls/bearssl.c
+++ b/libs/libcurl/src/vtls/bearssl.c
@@ -509,7 +509,6 @@ static CURLcode bearssl_set_selected_ciphers(struct Curl_easy *data,
 {

   uint16_t selected_ciphers[NUM_OF_CIPHERS];

   size_t selected_count = 0;

-  char cipher_name[CIPHER_NAME_BUF_LEN];

   const char *cipher_start = ciphers;

   const char *cipher_end;

   size_t i, j;

@@ -518,41 +517,48 @@ static CURLcode bearssl_set_selected_ciphers(struct Curl_easy *data,
     return CURLE_SSL_CIPHER;

 

   while(true) {

+    const char *cipher;

+    size_t clen;

+

     /* Extract the next cipher name from the ciphers string */

     while(is_separator(*cipher_start))

       ++cipher_start;

-    if(*cipher_start == '\0')

+    if(!*cipher_start)

       break;

     cipher_end = cipher_start;

-    while(*cipher_end != '\0' && !is_separator(*cipher_end))

+    while(*cipher_end && !is_separator(*cipher_end))

       ++cipher_end;

-    j = cipher_end - cipher_start < CIPHER_NAME_BUF_LEN - 1 ?

-        cipher_end - cipher_start : CIPHER_NAME_BUF_LEN - 1;

-    strncpy(cipher_name, cipher_start, j);

-    cipher_name[j] = '\0';

+

+    clen = cipher_end - cipher_start;

+    cipher = cipher_start;

+

     cipher_start = cipher_end;

 

     /* Lookup the cipher name in the table of available ciphers. If the cipher

        name starts with "TLS_" we do the lookup by IANA name. Otherwise, we try

        to match cipher name by an (OpenSSL) alias. */

-    if(strncasecompare(cipher_name, "TLS_", 4)) {

+    if(strncasecompare(cipher, "TLS_", 4)) {

       for(i = 0; i < NUM_OF_CIPHERS &&

-                 !strcasecompare(cipher_name, ciphertable[i].name); ++i);

+            (strlen(ciphertable[i].name) == clen) &&

+            !strncasecompare(cipher, ciphertable[i].name, clen); ++i);

     }

     else {

       for(i = 0; i < NUM_OF_CIPHERS &&

-                 !strcasecompare(cipher_name, ciphertable[i].alias_name); ++i);

+            (strlen(ciphertable[i].alias_name) == clen) &&

+            !strncasecompare(cipher, ciphertable[i].alias_name, clen); ++i);

     }

     if(i == NUM_OF_CIPHERS) {

-      infof(data, "BearSSL: unknown cipher in list: %s", cipher_name);

+      infof(data, "BearSSL: unknown cipher in list: %.*s",

+            (int)clen, cipher);

       continue;

     }

 

     /* No duplicates allowed */

     for(j = 0; j < selected_count &&

-               selected_ciphers[j] != ciphertable[i].num; j++);

+          selected_ciphers[j] != ciphertable[i].num; j++);

     if(j < selected_count) {

-      infof(data, "BearSSL: duplicate cipher in list: %s", cipher_name);

+      infof(data, "BearSSL: duplicate cipher in list: %.*s",

+            (int)clen, cipher);

       continue;

     }