From: Sergey Markelov <sergey@solidstatenetworks.com>
Date: Fri, 21 May 2021 23:44:15 +0000 (-0700)
Subject: NSS: make colons, commas and spaces valid separators in cipher list
X-Git-Tag: curl-7_77_0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96adbf5cdb6f36665af2583083454e4ae38292f0;p=thirdparty%2Fcurl.git

NSS: make colons, commas and spaces valid separators in cipher list

Fixes #7110
Closes #7115
---

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index 63f51fd799..2aa4bdaa13 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -337,7 +337,7 @@ static SECStatus set_ciphers(struct Curl_easy *data, PRFileDesc * model,
     while((*cipher) && (ISSPACE(*cipher)))
       ++cipher;
 
-    cipher_list = strchr(cipher, ',');
+    cipher_list = strpbrk(cipher, ":, ");
     if(cipher_list) {
       *cipher_list++ = '\0';
     }