More X509_ATTRIBUTE changes.

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

diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index 520b11883f73f75d9b2c52b86053e969239877c7..0ec6ae28ce889e4af48774c8270d620d7f3e534c 100644 (file)
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -66,6 +66,54 @@
 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 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);
+
+
+/* This is the global mask for the mbstring functions: this is use to
+ * mask out certain types (such as BMPString and UTF8String) because
+ * certain software (e.g. Netscape) has problems with them.
+ */
+
+static long global_mask = 0xFFFFFFFFL;
+
+void ASN1_STRING_set_default_mask(unsigned long mask)
+{
+       global_mask = mask;
+}
+
+unsigned long ASN1_STRING_get_default_mask(void)
+{
+       return global_mask;
+}
+
+/* This function sets the default to various "flavours" of configuration.
+ * based on an ASCII string. Currently this is:
+ * MASK:XXXX : a numerical mask value.
+ * nobmp : Don't use BMPStrings (just Printable, T61).
+ * pkix : PKIX recommendation in RFC2459.
+ * utf8only : only use UTF8Strings (RFC2459 recommendation for 2004).
+ * default:   the default value, Printable, T61, BMP.
+ */
+
+int ASN1_STRING_set_default_mask_asc(char *p)
+{
+       unsigned long mask;
+       char *end;
+       if(!strncmp(p, "MASK:", 5)) {
+               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, "pkix"))
+                       mask = ~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 
 
 /* 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 


@@ -77,15 +125,18 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
 {
        ASN1_STRING_TABLE *tbl;
        ASN1_STRING *str = NULL;
 {
        ASN1_STRING_TABLE *tbl;
        ASN1_STRING *str = NULL;

+       unsigned long mask;

        int ret;
        if(!out) out = &str;
        int ret;
        if(!out) out = &str;

-       if(!stable) ASN1_STRING_TABLE_add_standard();

        tbl = ASN1_STRING_TABLE_get(nid);
        tbl = ASN1_STRING_TABLE_get(nid);

-       if(tbl) ret = ASN1_mbstring_ncopy(out, in, inlen, inform, tbl->mask,
+       if(tbl) {
+               mask = tbl->mask;
+               if(!(tbl->flags & STABLE_NO_MASK)) mask &= global_mask;
+               ret = ASN1_mbstring_ncopy(out, in, inlen, inform, tbl->mask,

                                        tbl->minsize, tbl->maxsize);
                                        tbl->minsize, tbl->maxsize);

-       else ret = ASN1_mbstring_copy(out, in, inlen, inform, 0);
+       } else ret = ASN1_mbstring_copy(out, in, inlen, inform, DIRSTRING_TYPE & global_mask);

        if(ret <= 0) return NULL;
        if(ret <= 0) return NULL;

-       return str;
+       return *out;

 }
 
 /* Now the tables and helper functions for the string table:
 }
 
 /* Now the tables and helper functions for the string table:


@@ -102,53 +153,48 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
 #define ub_title                       64
 #define ub_email_address               128
 
 #define ub_title                       64
 #define ub_email_address               128
 

+/* This table must be kept in NID order */
+

 static ASN1_STRING_TABLE tbl_standard[] = {
 static ASN1_STRING_TABLE tbl_standard[] = {

-{NID_name,                     1, ub_name, 0, 0},
-{NID_surname,                  1, ub_name, 0, 0},
-{NID_givenName,                        1, ub_name, 0, 0},
-{NID_initials,                 1, ub_name, 0, 0},
-{NID_commonName,               1, ub_common_name, 0, 0},
-{NID_localityName,             1, ub_locality_name, 0, 0},
-{NID_stateOrProvinceName,      1, ub_state_name, 0, 0},
-{NID_organizationName,         1, ub_organization_name, 0, 0},
-{NID_organizationalUnitName,   1, ub_organization_unit_name, 0, 0},
-{NID_dnQualifier,              -1, -1, B_ASN1_PRINTABLESTRING, 0},
-{NID_countryName,              2, 2, B_ASN1_PRINTABLESTRING, 0},
-{NID_pkcs9_emailAddress,       1, ub_email_address, B_ASN1_IA5STRING, 0},
-{NID_undef, 0, 0, 0, 0}
+{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_name,                     1, ub_name, DIRSTRING_TYPE, 0},
+{NID_dnQualifier,              -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK}

 };
 
 };
 

-int ASN1_STRING_TABLE_add_standard(void)
+static int sk_table_cmp(ASN1_STRING_TABLE **a, ASN1_STRING_TABLE **b)

 {
 {

-       static int done = 0;
-       ASN1_STRING_TABLE *tmp;
-       if(done) return 1;
-       if(!stable) stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp);
-       if(!stable) {
-               ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD_STANDARD,
-                                               ERR_R_MALLOC_FAILURE);
-               return 0;
-       }
-       for(tmp = tbl_standard; tmp->nid != NID_undef; tmp++) {
-               if(!sk_ASN1_STRING_TABLE_push(stable, tmp)) {
-                       ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD_STANDARD,
-                                                       ERR_R_MALLOC_FAILURE);
-                       return 0;
-               }
-       }
-       return 1;
+       return (*a)->nid - (*b)->nid;

 }
 
 }
 

-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)

 {
 {

-       return (*a)->nid - (*b)->nid;
+       return a->nid - b->nid;

 }
 
 ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
 {
        int idx;
 }
 
 ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
 {
        int idx;

+       ASN1_STRING_TABLE *ttmp;

        ASN1_STRING_TABLE fnd;
        fnd.nid = nid;
        ASN1_STRING_TABLE fnd;
        fnd.nid = 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);
+       if(ttmp) return ttmp;
+       if(!stable) return NULL;

        idx = sk_ASN1_STRING_TABLE_find(stable, &fnd);
        if(idx < 0) return NULL;
        return sk_ASN1_STRING_TABLE_value(stable, idx);
        idx = sk_ASN1_STRING_TABLE_find(stable, &fnd);
        if(idx < 0) return NULL;
        return sk_ASN1_STRING_TABLE_value(stable, idx);


@@ -160,6 +206,7 @@ int ASN1_STRING_TABLE_add(int nid,
 {
        ASN1_STRING_TABLE *tmp;
        char new_nid = 0;
 {
        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) {
                ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, ERR_R_MALLOC_FAILURE);
        if(!stable) stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp);
        if(!stable) {
                ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, ERR_R_MALLOC_FAILURE);


@@ -172,14 +219,13 @@ int ASN1_STRING_TABLE_add(int nid,
                                                        ERR_R_MALLOC_FAILURE);
                        return 0;
                }
                                                        ERR_R_MALLOC_FAILURE);
                        return 0;
                }

-               tmp->flags = STABLE_FLAGS_MALLOC;
+               tmp->flags = flags | STABLE_FLAGS_MALLOC;

                tmp->nid = nid;
                new_nid = 1;
                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;
        tmp->mask = mask;
        if(minsize != -1) tmp->minsize = minsize;
        if(maxsize != -1) tmp->maxsize = maxsize;
        tmp->mask = mask;

-       tmp->flags = flags & ~STABLE_FLAGS_MALLOC;

        if(new_nid) sk_ASN1_STRING_TABLE_push(stable, tmp);
        return 1;
 }
        if(new_nid) sk_ASN1_STRING_TABLE_push(stable, tmp);
        return 1;
 }


@@ -188,6 +234,7 @@ void ASN1_STRING_TABLE_cleanup(void)
 {
        STACK_OF(ASN1_STRING_TABLE) *tmp;
        tmp = stable;
 {
        STACK_OF(ASN1_STRING_TABLE) *tmp;
        tmp = stable;

+       if(!tmp) return;

        stable = NULL;
        sk_ASN1_STRING_TABLE_pop_free(tmp, st_free);
 }
        stable = NULL;
        sk_ASN1_STRING_TABLE_pop_free(tmp, st_free);
 }