I don't remember what my thinking was with str_compat.h. Maybe it'll

[openssl.git] / crypto / asn1 / a_strnid.c

diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index a51ae43d9628525b89f295b55626510866a87ac9..613bbc4a7da9b9416f2654ffd6ee213f2c78a436 100644 (file)
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -65,8 +65,9 @@
 
 static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
 static void st_free(ASN1_STRING_TABLE *tbl);
-static int sk_table_cmp(ASN1_STRING_TABLE **a, ASN1_STRING_TABLE **b);
-static int table_cmp(ASN1_STRING_TABLE *a, ASN1_STRING_TABLE *b);
+static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
+                       const ASN1_STRING_TABLE * const *b);
+static int table_cmp(const void *a, const void *b);
 
 
 /* This is the global mask for the mbstring functions: this is use to
@@ -74,7 +75,7 @@ static int table_cmp(ASN1_STRING_TABLE *a, ASN1_STRING_TABLE *b);
  * certain software (e.g. Netscape) has problems with them.
  */
 
-static long global_mask = 0xFFFFFFFFL;
+static unsigned long global_mask = 0xFFFFFFFFL;
 
 void ASN1_STRING_set_default_mask(unsigned long mask)
 {
@@ -103,10 +104,10 @@ int ASN1_STRING_set_default_mask_asc(char *p)
                if(!p[5]) return 0;
                mask = strtoul(p + 5, &end, 0);
                if(*end) return 0;
-       } else if(!strcmp(p, "nombchar"))
-                        mask = ~(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING);
+       } else if(!strcmp(p, "nombstr"))
+                        mask = ~((unsigned long)(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING));
        else if(!strcmp(p, "pkix"))
-                       mask = ~B_ASN1_T61STRING;
+                       mask = ~((unsigned long)B_ASN1_T61STRING);
        else if(!strcmp(p, "utf8only")) mask = B_ASN1_UTF8STRING;
        else if(!strcmp(p, "default"))
            mask = 0xFFFFFFFFL;
@@ -132,7 +133,7 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
        if(tbl) {
                mask = tbl->mask;
                if(!(tbl->flags & STABLE_NO_MASK)) mask &= global_mask;
-               ret = ASN1_mbstring_ncopy(out, in, inlen, inform, tbl->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;
@@ -142,7 +143,7 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
 /* Now the tables and helper functions for the string table:
  */
 
-/* size limits: this stuff is taken straight from RFC2459 */
+/* size limits: this stuff is taken straight from RFC3280 */
 
 #define ub_name                                32768
 #define ub_common_name                 64
@@ -152,6 +153,8 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
 #define ub_organization_unit_name      64
 #define ub_title                       64
 #define ub_email_address               128
+#define ub_serial_number               64
+
 
 /* This table must be kept in NID order */
 
@@ -163,21 +166,30 @@ static ASN1_STRING_TABLE tbl_standard[] = {
 {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(ASN1_STRING_TABLE **a, ASN1_STRING_TABLE **b)
+static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
+                       const ASN1_STRING_TABLE * const *b)
 {
        return (*a)->nid - (*b)->nid;
 }
 
-static int table_cmp(ASN1_STRING_TABLE *a, ASN1_STRING_TABLE *b)
+static int table_cmp(const void *a, const void *b)
 {
-       return a->nid - b->nid;
+       const ASN1_STRING_TABLE *sa = a, *sb = b;
+       return sa->nid - sb->nid;
 }
 
 ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
@@ -189,7 +201,7 @@ ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
        ttmp = (ASN1_STRING_TABLE *) OBJ_bsearch((char *)&fnd,
                                        (char *)tbl_standard, 
                        sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE),
-                       sizeof(ASN1_STRING_TABLE), (int(*)())table_cmp);
+                       sizeof(ASN1_STRING_TABLE), table_cmp);
        if(ttmp) return ttmp;
        if(!stable) return NULL;
        idx = sk_ASN1_STRING_TABLE_find(stable, &fnd);
@@ -210,7 +222,7 @@ int ASN1_STRING_TABLE_add(int nid,
                return 0;
        }
        if(!(tmp = ASN1_STRING_TABLE_get(nid))) {
-               tmp = Malloc(sizeof(ASN1_STRING_TABLE));
+               tmp = OPENSSL_malloc(sizeof(ASN1_STRING_TABLE));
                if(!tmp) {
                        ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD,
                                                        ERR_R_MALLOC_FAILURE);
@@ -238,7 +250,41 @@ void ASN1_STRING_TABLE_cleanup(void)
 
 static void st_free(ASN1_STRING_TABLE *tbl)
 {
-       if(tbl->flags & STABLE_FLAGS_MALLOC) Free(tbl);
+       if(tbl->flags & STABLE_FLAGS_MALLOC) OPENSSL_free(tbl);
 }
 
+
 IMPLEMENT_STACK_OF(ASN1_STRING_TABLE)
+
+#ifdef STRING_TABLE_TEST
+
+main()
+{
+       ASN1_STRING_TABLE *tmp;
+       int i, last_nid = -1;
+
+       for (tmp = tbl_standard, i = 0;
+               i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++)
+               {
+                       if (tmp->nid < last_nid)
+                               {
+                               last_nid = 0;
+                               break;
+                               }
+                       last_nid = tmp->nid;
+               }
+
+       if (last_nid != 0)
+               {
+               printf("Table order OK\n");
+               exit(0);
+               }
+
+       for (tmp = tbl_standard, i = 0;
+               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));
+
+}
+
+#endif