mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-21 06:50:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

vtls: convert pubkey_pem_to_der to use dynbuf

Browse Source 
... instead of malloc and "manual" buffer stuffing

Closes #15126
This commit is contained in:
Daniel Stenberg 2024-10-02 14:14:18 +02:00
parent 9b0c0d6ade
commit ebd9d67b8a
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/vtls/vtls.c
View File

@ -941,14 +941,17 @@ CURLcode Curl_ssl_random(struct Curl_easy *data,
static CURLcode pubkey_pem_to_der(const char *pem, static CURLcode pubkey_pem_to_der(const char *pem,
unsigned char **der, size_t *der_len) unsigned char **der, size_t *der_len)
{ {
char *stripped_pem, *begin_pos, *end_pos; char *begin_pos, *end_pos;
size_t pem_count, stripped_pem_count = 0, pem_len; size_t pem_count, pem_len;
CURLcode result; CURLcode result;
struct dynbuf pbuf;
/* if no pem, exit. */ /* if no pem, exit. */
if(!pem) if(!pem)
return CURLE_BAD_CONTENT_ENCODING; return CURLE_BAD_CONTENT_ENCODING;
Curl_dyn_init(&pbuf, MAX_PINNED_PUBKEY_SIZE);
begin_pos = strstr(pem, "-----BEGIN PUBLIC KEY-----"); begin_pos = strstr(pem, "-----BEGIN PUBLIC KEY-----");
if(!begin_pos) if(!begin_pos)
return CURLE_BAD_CONTENT_ENCODING; return CURLE_BAD_CONTENT_ENCODING;
@ -968,26 +971,23 @@ static CURLcode pubkey_pem_to_der(const char *pem,
pem_len = end_pos - pem; pem_len = end_pos - pem;
stripped_pem = malloc(pem_len - pem_count + 1);
if(!stripped_pem)
return CURLE_OUT_OF_MEMORY;
/* /*
* Here we loop through the pem array one character at a time between the * Here we loop through the pem array one character at a time between the
* correct indices, and place each character that is not '\n' or '\r' * correct indices, and place each character that is not '\n' or '\r'
* into the stripped_pem array, which should represent the raw base64 string * into the stripped_pem array, which should represent the raw base64 string
*/ */
while(pem_count < pem_len) { while(pem_count < pem_len) {
if('\n' != pem[pem_count] && '\r' != pem[pem_count]) if('\n' != pem[pem_count] && '\r' != pem[pem_count]) {
stripped_pem[stripped_pem_count++] = pem[pem_count]; result = Curl_dyn_addn(&pbuf, &pem[pem_count], 1);
if(result)
return result;
}
++pem_count; ++pem_count;
} }
/* Place the null terminator in the correct place */
stripped_pem[stripped_pem_count] = '\0';
result = Curl_base64_decode(stripped_pem, der, der_len); result = Curl_base64_decode(Curl_dyn_ptr(&pbuf), der, der_len);
Curl_safefree(stripped_pem); Curl_dyn_free(&pbuf);
return result; return result;
} }