feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

X509 NAME ENTRY create: ensure existing object is not lost

Browse Source 
wolfSSL_X509_NAME_ENTRY_create_by_txt and
wolfSSL_X509_NAME_ENTRY_create_by_NID:
 - object field was being reused if it existed but lost on error
 - extracted common code
 - store object only on success, ie object is not NULL
This commit is contained in:
Sean Parkinson
2023-05-22 10:52:51 +10:00
parent d8e4c78960
commit 403acadf1a
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/x509.c
View File

@ -11383,6 +11383,31 @@ err:
return ne; return ne;
} }
static void wolfssl_x509_name_entry_set(WOLFSSL_X509_NAME_ENTRY* ne,
int nid, int type, const unsigned char *data, int dataSz)
{
WOLFSSL_ASN1_OBJECT* object;
ne->nid = nid;
/* Reuse the object if already available. */
object = wolfSSL_OBJ_nid2obj_ex(nid, ne->object);
if (object != NULL) {
/* Set the object when no error. */
ne->object = object;
}
ne->value = wolfSSL_ASN1_STRING_type_new(type);
if (ne->value != NULL) {
if (wolfSSL_ASN1_STRING_set(ne->value, (const void*)data,
dataSz) == WOLFSSL_SUCCESS) {
ne->set = 1;
}
else {
/* Free the ASN1_STRING if it is not set. */
wolfSSL_ASN1_STRING_free(ne->value);
ne->value = NULL;
}
}
}
/* Create a new WOLFSSL_X509_NAME_ENTRY structure based on the text passed /* Create a new WOLFSSL_X509_NAME_ENTRY structure based on the text passed
* in. Returns NULL on failure */ * in. Returns NULL on failure */
@ -11415,20 +11440,8 @@ err:
return NULL; return NULL;
} }
} }
ne->nid = nid;
ne->object = wolfSSL_OBJ_nid2obj_ex(nid, ne->object); wolfssl_x509_name_entry_set(ne, nid, type, data, dataSz);
ne->value = wolfSSL_ASN1_STRING_type_new(type);
if (ne->value != NULL) {
if (wolfSSL_ASN1_STRING_set(ne->value, (const void*)data,
dataSz) == WOLFSSL_SUCCESS) {
ne->set = 1;
}
else {
/* Free the ASN1_STRING if it is not set. */
wolfSSL_ASN1_STRING_free(ne->value);
ne->value = NULL;
}
}
} }
return ne; return ne;
@ -11469,20 +11482,7 @@ err:
ne = *out; ne = *out;
} }
ne->nid = nid; wolfssl_x509_name_entry_set(ne, nid, type, data, dataSz);
ne->object = wolfSSL_OBJ_nid2obj_ex(nid, ne->object);
ne->value = wolfSSL_ASN1_STRING_type_new(type);
if (ne->value != NULL) {
if (wolfSSL_ASN1_STRING_set(ne->value, (const void*)data, dataSz)
== WOLFSSL_SUCCESS) {
ne->set = 1;
}
else {
/* Free the ASN1_STRING if it is not set. */
wolfSSL_ASN1_STRING_free(ne->value);
ne->value = NULL;
}
}
return ne; return ne;
} }