commit c9d74f3109633c891d8c1691117cf894a423268d
author Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com> Mon Jul 31 17:25:44 2023 +0100
committer Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com> Tue Aug 22 10:39:56 2023 +0100
tree 84d2390d7c8d255eda32700afb3653b8b96df6e7
parent 0eb6673a8083223bd25e55f3ce10c844a7d0ecc6

Refactor AttributeType in mbedtls_x509_dn_gets

Signed-off-by: Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com>

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index 87f4820..c5eca2a 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -833,9 +833,9 @@
     unsigned char c, merge = 0;
     const mbedtls_x509_name *name;
     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;
-    int is_numericoid = 0;
+    int print_hexstring;
 
     memset(s, 0, sizeof(s));
 
@@ -854,28 +854,21 @@
             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) {
-            ret = mbedtls_oid_get_numeric_string(numericoid,MBEDTLS_X509_MAX_DN_NAME_SIZE,&name->oid);
-            if (ret > 0) {
+        if ((ret = mbedtls_oid_get_attr_short_name(&name->oid, &short_name)) == 0) {
+            ret = mbedtls_snprintf(p, n, "%s=", short_name);
+        } else {
+            if ((ret = mbedtls_oid_get_numeric_string(numericoid,256,&name->oid)) > 0) {
                 ret = mbedtls_snprintf(p, n, "%s=", numericoid);
+                print_hexstring = 1;
             } else {
                 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)
             s[0] = '#';