From: Viktor Szakats <commit@vsz.me>
Date: Tue, 23 Apr 2024 14:34:39 +0000 (+0200)
Subject: tls: fix SecureTransport + BearSSL cmake unity builds
X-Git-Tag: curl-8_8_0~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f33ee2e73bd228c61d71706a61a030d2096fee33;p=thirdparty%2Fcurl.git

tls: fix SecureTransport + BearSSL cmake unity builds

Avoid clashing static function names by namespacing them.

Pointed-out-by: Jan Venekamp
Ref: https://github.com/curl/curl/pull/13442#discussion_r1576350700
Closes #13450
---

diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
index e9e2ce86cc..0d28d26f14 100644
--- a/lib/vtls/bearssl.c
+++ b/lib/vtls/bearssl.c
@@ -489,7 +489,7 @@ static const struct st_cipher ciphertable[] = {
 #define NUM_OF_CIPHERS (sizeof(ciphertable) / sizeof(ciphertable[0]))
 #define CIPHER_NAME_BUF_LEN 64
 
-static bool is_separator(char c)
+static bool bearssl_is_separator(char c)
 {
   /* Return whether character is a cipher list separator. */
   switch(c) {
@@ -521,12 +521,12 @@ static CURLcode bearssl_set_selected_ciphers(struct Curl_easy *data,
     size_t clen;
 
     /* Extract the next cipher name from the ciphers string */
-    while(is_separator(*cipher_start))
+    while(bearssl_is_separator(*cipher_start))
       ++cipher_start;
     if(!*cipher_start)
       break;
     cipher_end = cipher_start;
-    while(*cipher_end && !is_separator(*cipher_end))
+    while(*cipher_end && !bearssl_is_separator(*cipher_end))
       ++cipher_end;
 
     clen = cipher_end - cipher_start;
diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c
index b7fc7c0222..26162ff25c 100644
--- a/lib/vtls/sectransp.c
+++ b/lib/vtls/sectransp.c
@@ -1453,7 +1453,7 @@ static bool is_cipher_suite_strong(SSLCipherSuite suite_num)
   return true;
 }
 
-static bool is_separator(char c)
+static bool sectransp_is_separator(char c)
 {
   /* Return whether character is a cipher list separator. */
   switch(c) {
@@ -1547,7 +1547,7 @@ static CURLcode sectransp_set_selected_ciphers(struct Curl_easy *data,
   if(!ciphers)
     return CURLE_OK;
 
-  while(is_separator(*ciphers))     /* Skip initial separators. */
+  while(sectransp_is_separator(*ciphers))  /* Skip initial separators. */
     ciphers++;
   if(!*ciphers)
     return CURLE_OK;
@@ -1561,14 +1561,14 @@ static CURLcode sectransp_set_selected_ciphers(struct Curl_easy *data,
     size_t i;
 
     /* Skip separators */
-    while(is_separator(*cipher_start))
+    while(sectransp_is_separator(*cipher_start))
       cipher_start++;
     if(*cipher_start == '\0') {
       break;
     }
     /* Find last position of a cipher in the ciphers string */
     cipher_end = cipher_start;
-    while(*cipher_end != '\0' && !is_separator(*cipher_end)) {
+    while(*cipher_end != '\0' && !sectransp_is_separator(*cipher_end)) {
       ++cipher_end;
     }