apps/openssl.cnf and the documentation say it's "nombstr",
but crypto/asn1/a_strnid.c had "nombchar".
This commit is contained in:
parent
63da21c01b
commit
d2b6c3f31f
@ -500,7 +500,7 @@ bad:
|
|||||||
p = CONF_get_string(req_conf, SECTION, STRING_MASK);
|
p = CONF_get_string(req_conf, SECTION, STRING_MASK);
|
||||||
|
|
||||||
if(p && !ASN1_STRING_set_default_mask_asc(p)) {
|
if(p && !ASN1_STRING_set_default_mask_asc(p)) {
|
||||||
BIO_printf(bio_err, "Invalid global string mask setting %s", p);
|
BIO_printf(bio_err, "Invalid global string mask setting %s\n", p);
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ int ASN1_STRING_set_default_mask_asc(char *p)
|
|||||||
if(!p[5]) return 0;
|
if(!p[5]) return 0;
|
||||||
mask = strtoul(p + 5, &end, 0);
|
mask = strtoul(p + 5, &end, 0);
|
||||||
if(*end) return 0;
|
if(*end) return 0;
|
||||||
} else if(!strcmp(p, "nombchar"))
|
} else if(!strcmp(p, "nombstr"))
|
||||||
mask = ~(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING);
|
mask = ~(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING);
|
||||||
else if(!strcmp(p, "pkix"))
|
else if(!strcmp(p, "pkix"))
|
||||||
mask = ~B_ASN1_T61STRING;
|
mask = ~B_ASN1_T61STRING;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user