mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-01 13:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Accept any valid oid in string_to_names

Browse Source 
Instead of using x509_attrs, use generic oid conversion.

Signed-off-by: Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com>
This commit is contained in:
Agathiyan Bragadeesh 2023-08-11 11:48:26 +01:00
parent af70c7dce7
commit f88bd5ac86
1 changed files with 19 additions and 24 deletions

43
library/x509_create.c

@ -130,34 +130,27 @@ static const x509_attr_descriptor_t *x509_attr_descr_from_name(const char *name,
return cur; return cur;
} }
static const x509_attr_descriptor_t *x509_attr_descr_from_numericoid(const char *numericoid, static char *x509_oid_from_numericoid(const char *numericoid,
size_t numericoid_len) size_t numericoid_len)
{ {
const x509_attr_descriptor_t *cur; char *oid;
mbedtls_asn1_buf *oid = mbedtls_calloc(1, sizeof(mbedtls_asn1_buf)); mbedtls_asn1_buf *oid_buf = mbedtls_calloc(1, sizeof(mbedtls_asn1_buf));
int ret; int ret;
ret = mbedtls_oid_from_numeric_string(oid, numericoid, numericoid_len); ret = mbedtls_oid_from_numeric_string(oid_buf, numericoid, numericoid_len);
if ((ret == MBEDTLS_ERR_X509_ALLOC_FAILED) || (ret == MBEDTLS_ERR_ASN1_INVALID_DATA)) { if (ret != 0) {
mbedtls_free(oid->p); if(ret != MBEDTLS_ERR_ASN1_ALLOC_FAILED) {
mbedtls_free(oid); mbedtls_free(oid_buf->p);
return NULL;
}
for (cur = x509_attrs; cur->oid != NULL; cur++) {
if (strlen(cur->oid) == oid->len &&
strncmp(cur->oid, (const char *) oid->p, oid->len) == 0) {
break;
} }
} mbedtls_free(oid_buf);
mbedtls_free(oid->p);
mbedtls_free(oid);
if (cur->oid == NULL) {
return NULL; return NULL;
} }
oid = calloc(1, oid_buf->len + 1);
return cur; memcpy(oid, oid_buf->p, oid_buf->len);
oid[oid_buf->len + 1] = '\0';
mbedtls_free(oid_buf->p);
mbedtls_free(oid_buf);
return oid;
} }
static int hex_to_int(char c) static int hex_to_int(char c)
@ -266,7 +259,7 @@ int mbedtls_x509_string_to_names(mbedtls_asn1_named_data **head, const char *nam
int parse_ret = 0; int parse_ret = 0;
const char *s = name, *c = s; const char *s = name, *c = s;
const char *end = s + strlen(s); const char *end = s + strlen(s);
const char *oid = NULL; char *oid = NULL;
const x509_attr_descriptor_t *attr_descr = NULL; const x509_attr_descriptor_t *attr_descr = NULL;
int in_attr_type = 1; int in_attr_type = 1;
int tag; int tag;
@ -280,16 +273,17 @@ int mbedtls_x509_string_to_names(mbedtls_asn1_named_data **head, const char *nam
while (c <= end) { while (c <= end) {
if (in_attr_type && *c == '=') { if (in_attr_type && *c == '=') {
if ((attr_descr = x509_attr_descr_from_name(s, c - s)) == NULL) { if ((attr_descr = x509_attr_descr_from_name(s, c - s)) == NULL) {
if ((attr_descr = x509_attr_descr_from_numericoid(s, c - s)) == NULL) { if ((oid = x509_oid_from_numericoid(s, c - s)) == NULL) {
return MBEDTLS_ERR_X509_UNKNOWN_OID; return MBEDTLS_ERR_X509_UNKNOWN_OID;
} else { } else {
numericoid = 1; numericoid = 1;
} }
} else { } else {
oid = malloc(strlen(attr_descr->oid));
strcpy(oid,attr_descr->oid);
numericoid = 0; numericoid = 0;
} }
oid = attr_descr->oid;
s = c + 1; s = c + 1;
in_attr_type = 0; in_attr_type = 0;
} }
@ -317,6 +311,7 @@ int mbedtls_x509_string_to_names(mbedtls_asn1_named_data **head, const char *nam
mbedtls_asn1_store_named_data(head, oid, strlen(oid), mbedtls_asn1_store_named_data(head, oid, strlen(oid),
(unsigned char *) data, (unsigned char *) data,
data_len); data_len);
mbedtls_free(oid);
if (cur == NULL) { if (cur == NULL) {
return MBEDTLS_ERR_X509_ALLOC_FAILED; return MBEDTLS_ERR_X509_ALLOC_FAILED;
} }