1 files changed, 103 insertions, 72 deletions

diff --git a/src/lib/libcrypto/asn1/a_strnid.c b/src/lib/libcrypto/asn1/a_strnid.c
index 6c59dcc8ec..d1b804aec1 100644
--- a/src/lib/libcrypto/asn1/a_strnid.c
+++ b/src/lib/libcrypto/asn1/a_strnid.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -66,7 +66,7 @@
 static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
 static void st_free(ASN1_STRING_TABLE *tbl);
 static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
-                        const ASN1_STRING_TABLE * const *b);
+    const ASN1_STRING_TABLE * const *b);
 
 
 /* This is the global mask for the mbstring functions: this is use to
@@ -76,12 +76,14 @@ static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
 
 static unsigned long global_mask = 0xFFFFFFFFL;
 
-void ASN1_STRING_set_default_mask(unsigned long mask)
+void
+ASN1_STRING_set_default_mask(unsigned long mask)
 {
         global_mask = mask;
 }
 
-unsigned long ASN1_STRING_get_default_mask(void)
+unsigned long
+ASN1_STRING_get_default_mask(void)
 {
         return global_mask;
 }
@@ -95,47 +97,59 @@ unsigned long ASN1_STRING_get_default_mask(void)
  * default:   the default value, Printable, T61, BMP.
  */
 
-int ASN1_STRING_set_default_mask_asc(const char *p)
+int
+ASN1_STRING_set_default_mask_asc(const char *p)
 {
         unsigned long mask;
         char *end;
-        if(!strncmp(p, "MASK:", 5)) {
-                if(!p[5]) return 0;
+
+        if (!strncmp(p, "MASK:", 5)) {
+                if (!p[5])
+                        return 0;
                 mask = strtoul(p + 5, &end, 0);
-                if(*end) return 0;
-        } else if(!strcmp(p, "nombstr"))
-                         mask = ~((unsigned long)(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING));
-        else if(!strcmp(p, "pkix"))
-                        mask = ~((unsigned long)B_ASN1_T61STRING);
-        else if(!strcmp(p, "utf8only")) mask = B_ASN1_UTF8STRING;
-        else if(!strcmp(p, "default"))
-            mask = 0xFFFFFFFFL;
-        else return 0;
+                if (*end)
+                        return 0;
+        } else if (!strcmp(p, "nombstr"))
+                mask = ~((unsigned long)(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING));
+        else if (!strcmp(p, "pkix"))
+                mask = ~((unsigned long)B_ASN1_T61STRING);
+        else if (!strcmp(p, "utf8only"))
+                mask = B_ASN1_UTF8STRING;
+        else if (!strcmp(p, "default"))
+                mask = 0xFFFFFFFFL;
+        else
+                return 0;
         ASN1_STRING_set_default_mask(mask);
         return 1;
 }
 
 /* The following function generates an ASN1_STRING based on limits in a table.
- * Frequently the types and length of an ASN1_STRING are restricted by a 
+ * Frequently the types and length of an ASN1_STRING are restricted by a
  * corresponding OID. For example certificates and certificate requests.
  */
 
-ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
-                                        int inlen, int inform, int nid)
+ASN1_STRING *
+ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in, int inlen,
+    int inform, int nid)
 {
         ASN1_STRING_TABLE *tbl;
         ASN1_STRING *str = NULL;
         unsigned long mask;
         int ret;
-        if(!out) out = &str;
+        if (!out)
+                out = &str;
         tbl = ASN1_STRING_TABLE_get(nid);
-        if(tbl) {
+        if (tbl) {
                 mask = tbl->mask;
-                if(!(tbl->flags & STABLE_NO_MASK)) mask &= global_mask;
+                if (!(tbl->flags & STABLE_NO_MASK))
+                        mask &= global_mask;
                 ret = ASN1_mbstring_ncopy(out, in, inlen, inform, mask,
-                                        tbl->minsize, tbl->maxsize);
-        } else ret = ASN1_mbstring_copy(out, in, inlen, inform, DIRSTRING_TYPE & global_mask);
-        if(ret <= 0) return NULL;
+                    tbl->minsize, tbl->maxsize);
+        } else
+                ret = ASN1_mbstring_copy(out, in, inlen, inform,
+                    DIRSTRING_TYPE & global_mask);
+        if (ret <= 0)
+                return NULL;
         return *out;
 }
 
@@ -158,99 +172,116 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
 /* This table must be kept in NID order */
 
 static const ASN1_STRING_TABLE tbl_standard[] = {
-{NID_commonName,                1, ub_common_name, DIRSTRING_TYPE, 0},
-{NID_countryName,               2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-{NID_localityName,              1, ub_locality_name, DIRSTRING_TYPE, 0},
-{NID_stateOrProvinceName,       1, ub_state_name, DIRSTRING_TYPE, 0},
-{NID_organizationName,          1, ub_organization_name, DIRSTRING_TYPE, 0},
-{NID_organizationalUnitName,    1, ub_organization_unit_name, DIRSTRING_TYPE, 0},
-{NID_pkcs9_emailAddress,        1, ub_email_address, B_ASN1_IA5STRING, STABLE_NO_MASK},
-{NID_pkcs9_unstructuredName,    1, -1, PKCS9STRING_TYPE, 0},
-{NID_pkcs9_challengePassword,   1, -1, PKCS9STRING_TYPE, 0},
-{NID_pkcs9_unstructuredAddress, 1, -1, DIRSTRING_TYPE, 0},
-{NID_givenName,                 1, ub_name, DIRSTRING_TYPE, 0},
-{NID_surname,                   1, ub_name, DIRSTRING_TYPE, 0},
-{NID_initials,                  1, ub_name, DIRSTRING_TYPE, 0},
-{NID_serialNumber,              1, ub_serial_number, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-{NID_friendlyName,              -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
-{NID_name,                      1, ub_name, DIRSTRING_TYPE, 0},
-{NID_dnQualifier,               -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-{NID_domainComponent,           1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
-{NID_ms_csp_name,               -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}
+        {NID_commonName,                1, ub_common_name, DIRSTRING_TYPE, 0},
+        {NID_countryName,               2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+        {NID_localityName,              1, ub_locality_name, DIRSTRING_TYPE, 0},
+        {NID_stateOrProvinceName,       1, ub_state_name, DIRSTRING_TYPE, 0},
+        {NID_organizationName,          1, ub_organization_name, DIRSTRING_TYPE, 0},
+        {NID_organizationalUnitName,    1, ub_organization_unit_name, DIRSTRING_TYPE, 0},
+        {NID_pkcs9_emailAddress,        1, ub_email_address, B_ASN1_IA5STRING, STABLE_NO_MASK},
+        {NID_pkcs9_unstructuredName,    1, -1, PKCS9STRING_TYPE, 0},
+        {NID_pkcs9_challengePassword,   1, -1, PKCS9STRING_TYPE, 0},
+        {NID_pkcs9_unstructuredAddress, 1, -1, DIRSTRING_TYPE, 0},
+        {NID_givenName,                 1, ub_name, DIRSTRING_TYPE, 0},
+        {NID_surname,                   1, ub_name, DIRSTRING_TYPE, 0},
+        {NID_initials,                  1, ub_name, DIRSTRING_TYPE, 0},
+        {NID_serialNumber,              1, ub_serial_number, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+        {NID_friendlyName,              -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
+        {NID_name,                      1, ub_name, DIRSTRING_TYPE, 0},
+        {NID_dnQualifier,               -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+        {NID_domainComponent,           1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
+        {NID_ms_csp_name,               -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}
 };
 
-static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
-                        const ASN1_STRING_TABLE * const *b)
+static int
+sk_table_cmp(const ASN1_STRING_TABLE * const *a,
+    const ASN1_STRING_TABLE * const *b)
 {
         return (*a)->nid - (*b)->nid;
 }
 
 DECLARE_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);
 
-static int table_cmp(const ASN1_STRING_TABLE *a, const ASN1_STRING_TABLE *b)
+static int
+table_cmp(const ASN1_STRING_TABLE *a, const ASN1_STRING_TABLE *b)
 {
         return a->nid - b->nid;
 }
 
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);
 
-ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
+ASN1_STRING_TABLE *
+ASN1_STRING_TABLE_get(int nid)
 {
         int idx;
         ASN1_STRING_TABLE *ttmp;
         ASN1_STRING_TABLE fnd;
+
         fnd.nid = nid;
-        ttmp = OBJ_bsearch_table(&fnd, tbl_standard, 
-                           sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE));
-        if(ttmp) return ttmp;
-        if(!stable) return NULL;
+        ttmp = OBJ_bsearch_table(&fnd, tbl_standard,
+            sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE));
+        if (ttmp)
+                return ttmp;
+        if (!stable)
+                return NULL;
         idx = sk_ASN1_STRING_TABLE_find(stable, &fnd);
-        if(idx < 0) return NULL;
+        if (idx < 0)
+                return NULL;
         return sk_ASN1_STRING_TABLE_value(stable, idx);
 }
-        
-int ASN1_STRING_TABLE_add(int nid,
-                 long minsize, long maxsize, unsigned long mask,
-                                unsigned long flags)
+
+int
+ASN1_STRING_TABLE_add(int nid, long minsize, long maxsize, unsigned long mask,
+    unsigned long flags)
 {
         ASN1_STRING_TABLE *tmp;
         char new_nid = 0;
+
         flags &= ~STABLE_FLAGS_MALLOC;
-        if(!stable) stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp);
-        if(!stable) {
+        if (!stable)
+                stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp);
+        if (!stable) {
                 ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
-        if(!(tmp = ASN1_STRING_TABLE_get(nid))) {
+        if (!(tmp = ASN1_STRING_TABLE_get(nid))) {
                 tmp = malloc(sizeof(ASN1_STRING_TABLE));
-                if(!tmp) {
+                if (!tmp) {
                         ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD,
-                                                        ERR_R_MALLOC_FAILURE);
+                            ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 tmp->flags = flags | STABLE_FLAGS_MALLOC;
                 tmp->nid = nid;
                 new_nid = 1;
         } else tmp->flags = (tmp->flags & STABLE_FLAGS_MALLOC) | flags;
-        if(minsize != -1) tmp->minsize = minsize;
-        if(maxsize != -1) tmp->maxsize = maxsize;
+                if (minsize != -1)
+                tmp->minsize = minsize;
+        if (maxsize != -1)
+                tmp->maxsize = maxsize;
         tmp->mask = mask;
-        if(new_nid) sk_ASN1_STRING_TABLE_push(stable, tmp);
+        if (new_nid)
+                sk_ASN1_STRING_TABLE_push(stable, tmp);
         return 1;
 }
 
-void ASN1_STRING_TABLE_cleanup(void)
+void
+ASN1_STRING_TABLE_cleanup(void)
 {
         STACK_OF(ASN1_STRING_TABLE) *tmp;
+
         tmp = stable;
-        if(!tmp) return;
+        if (!tmp)
+                return;
         stable = NULL;
         sk_ASN1_STRING_TABLE_pop_free(tmp, st_free);
 }
 
-static void st_free(ASN1_STRING_TABLE *tbl)
+static void
+st_free(ASN1_STRING_TABLE *tbl)
 {
-        if(tbl->flags & STABLE_FLAGS_MALLOC) free(tbl);
+        if (tbl->flags & STABLE_FLAGS_MALLOC)
+                free(tbl);
 }
 
 
@@ -264,7 +295,7 @@ main()
         int i, last_nid = -1;
 
         for (tmp = tbl_standard, i = 0;
-            i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++) {
+            i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) {
                 if (tmp->nid < last_nid) {
                         last_nid = 0;
                         break;
@@ -278,9 +309,9 @@ main()
         }
 
         for (tmp = tbl_standard, i = 0;
-            i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++) {
+            i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) {
                 printf("Index %d, NID %d, Name=%s\n", i, tmp->nid,
-                        OBJ_nid2ln(tmp->nid));
+                    OBJ_nid2ln(tmp->nid));
         }
 
 }