root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

OPENSSL_hexstr2buf_ex(): Handle zero-length input correctly 

In case of zero-length input the code wrote one byte
before the start of the output buffer. The length
of the output was also reported incorrectly in this case.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24770)

(cherry picked from commit 3f7b355733)
This commit is contained in:
Tomas Mraz 2024-07-01 09:30:56 +02:00
parent e56f195cd3
commit 9ca919f714
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/o_str.c
View File

@ -229,12 +229,14 @@ static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength,
int has_sep = (sep != CH_ZERO); int has_sep = (sep != CH_ZERO);
size_t len = has_sep ? buflen * 3 : 1 + buflen * 2; size_t len = has_sep ? buflen * 3 : 1 + buflen * 2;
if (len == 0)
++len;
if (strlength != NULL) if (strlength != NULL)
*strlength = len; *strlength = len;
if (str == NULL) if (str == NULL)
return 1; return 1;
if (str_n < (unsigned long)len) { if (str_n < len) {
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_TOO_SMALL_BUFFER); ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_TOO_SMALL_BUFFER);
return 0; return 0;
} }
@ -246,7 +248,7 @@ static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength,
if (has_sep) if (has_sep)
*q++ = sep; *q++ = sep;
} }
if (has_sep) if (has_sep && buflen > 0)
--q; --q;
*q = CH_ZERO; *q = CH_ZERO;

7
test/hexstr_test.c
View File

@ -120,9 +120,14 @@ static int test_hexstr_ex_to_from(int test_index)
return TEST_true(OPENSSL_hexstr2buf_ex(buf, sizeof(buf), &len, test->in, ':')) return TEST_true(OPENSSL_hexstr2buf_ex(buf, sizeof(buf), &len, test->in, ':'))
&& TEST_mem_eq(buf, len, test->expected, test->expected_len) && TEST_mem_eq(buf, len, test->expected, test->expected_len)
&& TEST_false(OPENSSL_buf2hexstr_ex(out, 3 * len - 1, NULL, buf, len,
':'))
&& TEST_true(OPENSSL_buf2hexstr_ex(out, sizeof(out), NULL, buf, len, && TEST_true(OPENSSL_buf2hexstr_ex(out, sizeof(out), NULL, buf, len,
':')) ':'))
&& TEST_str_eq(out, test->in); && TEST_str_eq(out, test->in)
&& TEST_true(OPENSSL_buf2hexstr_ex(out, sizeof(out), NULL, buf, 0,
':'))
&& TEST_size_t_eq(strlen(out), 0);
} }
int setup_tests(void) int setup_tests(void)