luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls: fix SecureTransport + BearSSL cmake unity builds

Browse Source 
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
This commit is contained in:
Viktor Szakats 2024-04-23 16:34:39 +02:00
parent 7860f575fe
commit f33ee2e73b
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vtls/bearssl.c
View File

@ -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;

8
lib/vtls/sectransp.c
View File

@ -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;
}