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

x_attrib.c: Fix print_hex() function 

- Better handle 0 length input
- Use OPENSSL_buf2hexstr() instead of OPENSSL_buf2hexstr_ex()
  which fixes insufficient length of the allocate buffer.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24771)
This commit is contained in:
Tomas Mraz 2024-07-01 09:52:53 +02:00 committed by Matt Caswell
parent 6cf42ad392
commit b24a8200ab
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/x509/x_attrib.c
View File

@ -60,25 +60,19 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
static int print_hex(BIO *out, unsigned char *buf, int len)
{
int result = -1;
int result = 1;
char *hexbuf;
int hexlen = len * 2 + 1;
hexbuf = OPENSSL_malloc(hexlen);
if (len == 0)
return 1;
hexbuf = OPENSSL_buf2hexstr(buf, len);
if (hexbuf == NULL)
return 0;
result = OPENSSL_buf2hexstr_ex(hexbuf, hexlen, NULL, buf, len, ':');
if (result != 1)
goto err;
if ((result = BIO_puts(out, hexbuf)) <= 0)
goto err;
result = BIO_puts(out, hexbuf) > 0;
OPENSSL_free(hexbuf);
return 1;
err:
OPENSSL_free(hexbuf);
return 0;
return result;
}
static int print_oid(BIO *out, const ASN1_OBJECT *oid) {