generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New options to allow req to accept UTF8 strings as input.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-10-26 12:40:38 +00:00
parent a41477f92e
commit 1fc6d41bf6
3 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -12,6 +12,10 @@
*) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7 *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
+) applies to 0.9.7 only +) applies to 0.9.7 only
+) New command line and configuration option 'utf8' for the req command.
This allows field values to be specified as UTF8 strings.
[Steve Henson]
+) Add -multi and -mr options to "openssl speed" - giving multiple parallel +) Add -multi and -mr options to "openssl speed" - giving multiple parallel
runs for the former and machine-readable output for the latter. runs for the former and machine-readable output for the latter.
[Ben Laurie] [Ben Laurie]

68
apps/req.c
View File

@ -84,6 +84,7 @@
#define V3_EXTENSIONS "x509_extensions" #define V3_EXTENSIONS "x509_extensions"
#define REQ_EXTENSIONS "req_extensions" #define REQ_EXTENSIONS "req_extensions"
#define STRING_MASK "string_mask" #define STRING_MASK "string_mask"
#define UTF8_IN "utf8"
#define DEFAULT_KEY_LENGTH 512 #define DEFAULT_KEY_LENGTH 512
#define MIN_KEY_LENGTH 384 #define MIN_KEY_LENGTH 384
@ -110,18 +111,21 @@
* require. This format is wrong * require. This format is wrong
*/ */
static int make_REQ(X509_REQ *req,EVP_PKEY *pkey,char *dn,int attribs); static int make_REQ(X509_REQ *req,EVP_PKEY *pkey,char *dn,int attribs,
static int build_subject(X509_REQ *req, char *subj); unsigned long chtype);
static int build_subject(X509_REQ *req, char *subj, unsigned long chtype);
static int prompt_info(X509_REQ *req, static int prompt_info(X509_REQ *req,
STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect, STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect,
STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs); STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs,
unsigned long chtype);
static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk, static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk,
STACK_OF(CONF_VALUE) *attr, int attribs); STACK_OF(CONF_VALUE) *attr, int attribs,
unsigned long chtype);
static int add_attribute_object(X509_REQ *req, char *text, static int add_attribute_object(X509_REQ *req, char *text,
char *def, char *value, int nid, int n_min, char *def, char *value, int nid, int n_min,
int n_max); int n_max, unsigned long chtype);
static int add_DN_object(X509_NAME *n, char *text, char *def, char *value, static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
int nid,int n_min,int n_max); int nid,int n_min,int n_max, unsigned long chtype);
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
static void MS_CALLBACK req_cb(int p,int n,void *arg); static void MS_CALLBACK req_cb(int p,int n,void *arg);
#endif #endif
@ -169,6 +173,7 @@ int MAIN(int argc, char **argv)
char *p; char *p;
char *subj = NULL; char *subj = NULL;
const EVP_MD *md_alg=NULL,*digest=EVP_md5(); const EVP_MD *md_alg=NULL,*digest=EVP_md5();
unsigned long chtype = MBSTRING_ASC;
#ifndef MONOLITH #ifndef MONOLITH
MS_STATIC char config_name[256]; MS_STATIC char config_name[256];
#endif #endif
@ -338,6 +343,8 @@ int MAIN(int argc, char **argv)
noout=1; noout=1;
else if (strcmp(*argv,"-verbose") == 0) else if (strcmp(*argv,"-verbose") == 0)
verbose=1; verbose=1;
else if (strcmp(*argv,"-utf8") == 0)
chtype = MBSTRING_UTF8;
else if (strcmp(*argv,"-nameopt") == 0) else if (strcmp(*argv,"-nameopt") == 0)
{ {
if (--argc < 1) goto bad; if (--argc < 1) goto bad;
@ -433,6 +440,7 @@ bad:
BIO_printf(bio_err," have been reported as requiring\n"); BIO_printf(bio_err," have been reported as requiring\n");
BIO_printf(bio_err," -extensions .. specify certificate extension section (override value in config file)\n"); BIO_printf(bio_err," -extensions .. specify certificate extension section (override value in config file)\n");
BIO_printf(bio_err," -reqexts .. specify request extension section (override value in config file)\n"); BIO_printf(bio_err," -reqexts .. specify request extension section (override value in config file)\n");
BIO_printf(bio_err," -utf8 input characters are UTF8 (default ASCII)\n");
goto end; goto end;
} }
@ -564,6 +572,16 @@ bad:
goto end; goto end;
} }
if (chtype != MBSTRING_UTF8)
{
p = NCONF_get_string(req_conf, SECTION, UTF8_IN);
if (!p)
ERR_clear_error();
else if (!strcmp(p, "yes"))
chtype = MBSTRING_UTF8;
}
if(!req_exts) if(!req_exts)
{ {
req_exts = NCONF_get_string(req_conf, SECTION, REQ_EXTENSIONS); req_exts = NCONF_get_string(req_conf, SECTION, REQ_EXTENSIONS);
@ -767,7 +785,7 @@ loop:
goto end; goto end;
} }
i=make_REQ(req,pkey,subj,!x509); i=make_REQ(req,pkey,subj,!x509, chtype);
subj=NULL; /* done processing '-subj' option */ subj=NULL; /* done processing '-subj' option */
if ((kludge > 0) && !sk_X509_ATTRIBUTE_num(req->req_info->attributes)) if ((kludge > 0) && !sk_X509_ATTRIBUTE_num(req->req_info->attributes))
{ {
@ -859,7 +877,7 @@ loop:
print_name(bio_err, "old subject=", X509_REQ_get_subject_name(req), nmflag); print_name(bio_err, "old subject=", X509_REQ_get_subject_name(req), nmflag);
} }
if (build_subject(req, subj) == 0) if (build_subject(req, subj, chtype) == 0)
{ {
BIO_printf(bio_err, "ERROR: cannot modify subject\n"); BIO_printf(bio_err, "ERROR: cannot modify subject\n");
ex=1; ex=1;
@ -1027,7 +1045,8 @@ end:
EXIT(ex); EXIT(ex);
} }
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int attribs) static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int attribs,
unsigned long chtype)
{ {
int ret=0,i; int ret=0,i;
char no_prompt = 0; char no_prompt = 0;
@ -1073,13 +1092,13 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int attribs)
if (!X509_REQ_set_version(req,0L)) goto err; /* version 1 */ if (!X509_REQ_set_version(req,0L)) goto err; /* version 1 */
if (no_prompt) if (no_prompt)
i = auto_info(req, dn_sk, attr_sk, attribs); i = auto_info(req, dn_sk, attr_sk, attribs, chtype);
else else
{ {
if (subj) if (subj)
i = build_subject(req, subj); i = build_subject(req, subj, chtype);
else else
i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs); i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs, chtype);
} }
if(!i) goto err; if(!i) goto err;
@ -1090,7 +1109,7 @@ err:
return(ret); return(ret);
} }
static int build_subject(X509_REQ *req, char *subject) static int build_subject(X509_REQ *req, char *subject, unsigned long chtype)
{ {
X509_NAME *n = NULL; X509_NAME *n = NULL;
@ -1139,7 +1158,7 @@ static int build_subject(X509_REQ *req, char *subject)
continue; continue;
} }
if (!X509_NAME_add_entry_by_NID(n, nid, MBSTRING_ASC, (unsigned char*)ne_value, -1,-1,0)) if (!X509_NAME_add_entry_by_NID(n, nid, chtype, (unsigned char*)ne_value, -1,-1,0))
{ {
X509_NAME_free(n); X509_NAME_free(n);
return 0; return 0;
@ -1155,7 +1174,8 @@ static int build_subject(X509_REQ *req, char *subject)
static int prompt_info(X509_REQ *req, static int prompt_info(X509_REQ *req,
STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect, STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect,
STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs) STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs,
unsigned long chtype)
{ {
int i; int i;
char *p,*q; char *p,*q;
@ -1228,7 +1248,7 @@ start: for (;;)
n_max = -1; n_max = -1;
if (!add_DN_object(subj,v->value,def,value,nid, if (!add_DN_object(subj,v->value,def,value,nid,
n_min,n_max)) n_min,n_max, chtype))
return 0; return 0;
} }
if (X509_NAME_entry_count(subj) == 0) if (X509_NAME_entry_count(subj) == 0)
@ -1284,7 +1304,7 @@ start2: for (;;)
n_max = -1; n_max = -1;
if (!add_attribute_object(req, if (!add_attribute_object(req,
v->value,def,value,nid,n_min,n_max)) v->value,def,value,nid,n_min,n_max, chtype))
return 0; return 0;
} }
} }
@ -1300,7 +1320,7 @@ start2: for (;;)
} }
static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk, static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
STACK_OF(CONF_VALUE) *attr_sk, int attribs) STACK_OF(CONF_VALUE) *attr_sk, int attribs, unsigned long chtype)
{ {
int i; int i;
char *p,*q; char *p,*q;
@ -1328,7 +1348,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
if(*p) type = p; if(*p) type = p;
break; break;
} }
if (!X509_NAME_add_entry_by_txt(subj,type, MBSTRING_ASC, if (!X509_NAME_add_entry_by_txt(subj,type, chtype,
(unsigned char *) v->value,-1,-1,0)) return 0; (unsigned char *) v->value,-1,-1,0)) return 0;
} }
@ -1343,7 +1363,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++) for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++)
{ {
v=sk_CONF_VALUE_value(attr_sk,i); v=sk_CONF_VALUE_value(attr_sk,i);
if(!X509_REQ_add1_attr_by_txt(req, v->name, MBSTRING_ASC, if(!X509_REQ_add1_attr_by_txt(req, v->name, chtype,
(unsigned char *)v->value, -1)) return 0; (unsigned char *)v->value, -1)) return 0;
} }
} }
@ -1352,7 +1372,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
static int add_DN_object(X509_NAME *n, char *text, char *def, char *value, static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
int nid, int n_min, int n_max) int nid, int n_min, int n_max, unsigned long chtype)
{ {
int i,ret=0; int i,ret=0;
MS_STATIC char buf[1024]; MS_STATIC char buf[1024];
@ -1400,7 +1420,7 @@ start:
ebcdic2ascii(buf, buf, i); ebcdic2ascii(buf, buf, i);
#endif #endif
if(!req_check_len(i, n_min, n_max)) goto start; if(!req_check_len(i, n_min, n_max)) goto start;
if (!X509_NAME_add_entry_by_NID(n,nid, MBSTRING_ASC, if (!X509_NAME_add_entry_by_NID(n,nid, chtype,
(unsigned char *) buf, -1,-1,0)) goto err; (unsigned char *) buf, -1,-1,0)) goto err;
ret=1; ret=1;
err: err:
@ -1409,7 +1429,7 @@ err:
static int add_attribute_object(X509_REQ *req, char *text, static int add_attribute_object(X509_REQ *req, char *text,
char *def, char *value, int nid, int n_min, char *def, char *value, int nid, int n_min,
int n_max) int n_max, unsigned long chtype)
{ {
int i; int i;
static char buf[1024]; static char buf[1024];
@ -1459,7 +1479,7 @@ start:
#endif #endif
if(!req_check_len(i, n_min, n_max)) goto start; if(!req_check_len(i, n_min, n_max)) goto start;
if(!X509_REQ_add1_attr_by_NID(req, nid, MBSTRING_ASC, if(!X509_REQ_add1_attr_by_NID(req, nid, chtype,
(unsigned char *)buf, -1)) { (unsigned char *)buf, -1)) {
BIO_printf(bio_err, "Error adding attribute\n"); BIO_printf(bio_err, "Error adding attribute\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);

15
doc/apps/req.pod
View File

@ -36,6 +36,7 @@ B<openssl> B<req>
[B<-newhdr>] [B<-newhdr>]
[B<-extensions section>] [B<-extensions section>]
[B<-reqexts section>] [B<-reqexts section>]
[B<-utf8>]
[B<-batch>] [B<-batch>]
[B<-verbose>] [B<-verbose>]
@ -193,6 +194,13 @@ request extensions. This allows several different sections to
be used in the same configuration file to specify requests for be used in the same configuration file to specify requests for
a variety of purposes. a variety of purposes.
=item B<-utf8>
this option causes field values to be interpreted as UTF8 strings, by
default they are interpreted as ASCII. This means that the field
values, whether prompted from a terminal or obtained from a
configuration file, must be valid UTF8 strings.
=item B<-asn1-kludge> =item B<-asn1-kludge>
by default the B<req> command outputs certificate requests containing by default the B<req> command outputs certificate requests containing
@ -317,6 +325,13 @@ if set to the value B<no> this disables prompting of certificate fields
and just takes values from the config file directly. It also changes the and just takes values from the config file directly. It also changes the
expected format of the B<distinguished_name> and B<attributes> sections. expected format of the B<distinguished_name> and B<attributes> sections.
=item B<utf8>
if set to the value B<yes> then field values to be interpreted as UTF8
strings, by default they are interpreted as ASCII. This means that
the field values, whether prompted from a terminal or obtained from a
configuration file, must be valid UTF8 strings.
=item B<attributes> =item B<attributes>
this specifies the section containing any request attributes: its format this specifies the section containing any request attributes: its format