As ftruncate is not availabe on all platforms, switch back to

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

diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index a51ae43d9628525b89f295b55626510866a87ac9..5ec4d2fb1fefab4aca7605414d271e620b38f2ec 100644 (file)
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -103,7 +103,7 @@ 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"))
+       } else if(!strcmp(p, "nombstr"))
                         mask = ~(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING);
        else if(!strcmp(p, "pkix"))
                        mask = ~B_ASN1_T61STRING;
@@ -163,11 +163,14 @@ 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_name,                     1, ub_name, DIRSTRING_TYPE, 0},
-{NID_dnQualifier,              -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+{NID_dnQualifier,              -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK}
 };
 
 static int sk_table_cmp(ASN1_STRING_TABLE **a, ASN1_STRING_TABLE **b)