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

Refactor AttributeType in mbedtls_x509_dn_gets

Browse Source 
Signed-off-by: Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com>
This commit is contained in:
Agathiyan Bragadeesh 2023-07-31 17:25:44 +01:00
parent 0eb6673a80
commit c9d74f3109
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/x509.c
View File

@ -833,9 +833,9 @@ int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn)
unsigned char c, merge = 0; unsigned char c, merge = 0;
const mbedtls_x509_name *name; const mbedtls_x509_name *name;
const char *short_name = NULL; const char *short_name = NULL;
char numericoid[MBEDTLS_X509_MAX_DN_NAME_SIZE]; char numericoid[256];
char s[MBEDTLS_X509_MAX_DN_NAME_SIZE], *p; char s[MBEDTLS_X509_MAX_DN_NAME_SIZE], *p;
int is_numericoid = 0; int print_hexstring;
memset(s, 0, sizeof(s)); memset(s, 0, sizeof(s));
@ -854,28 +854,21 @@ int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn)
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
} }
is_numericoid = (name->val.tag == MBEDTLS_ASN1_BIT_STRING) || (name->val.tag == MBEDTLS_ASN1_OCTET_STRING); print_hexstring = (name->val.tag == MBEDTLS_ASN1_BIT_STRING) || (name->val.tag == MBEDTLS_ASN1_OCTET_STRING);
if(is_numericoid) { if ((ret = mbedtls_oid_get_attr_short_name(&name->oid, &short_name)) == 0) {
ret = mbedtls_oid_get_numeric_string(numericoid,MBEDTLS_X509_MAX_DN_NAME_SIZE,&name->oid); ret = mbedtls_snprintf(p, n, "%s=", short_name);
if (ret > 0) { } else {
if ((ret = mbedtls_oid_get_numeric_string(numericoid,256,&name->oid)) > 0) {
ret = mbedtls_snprintf(p, n, "%s=", numericoid); ret = mbedtls_snprintf(p, n, "%s=", numericoid);
print_hexstring = 1;
} else { } else {
ret = mbedtls_snprintf(p, n, "\?\?="); ret = mbedtls_snprintf(p, n, "\?\?=");
} }
MBEDTLS_X509_SAFE_SNPRINTF;
}
else {
ret = mbedtls_oid_get_attr_short_name(&name->oid, &short_name);
if (ret == 0) {
ret = mbedtls_snprintf(p, n, "%s=", short_name);
} else {
ret = mbedtls_snprintf(p, n, "\?\?=");
}
MBEDTLS_X509_SAFE_SNPRINTF;
} }
MBEDTLS_X509_SAFE_SNPRINTF;
if(is_numericoid) { if(print_hexstring) {
#if defined(MBEDTLS_ASN1_WRITE_C) #if defined(MBEDTLS_ASN1_WRITE_C)
s[0] = '#'; s[0] = '#';