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

Another noemailDN fix.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-10-27 17:53:06 +00:00
parent e7156ff2e8
commit 9b55da73ca
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/ca.c
View File

@ -238,7 +238,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
int verbose, X509_REQ *req, char *ext_sect, CONF *conf, int verbose, X509_REQ *req, char *ext_sect, CONF *conf,
unsigned long certopt, unsigned long nameopt, int default_op, unsigned long certopt, unsigned long nameopt, int default_op,
int ext_copy); int ext_copy);
static X509_NAME *do_subject(char *subject, int email_dn); static X509_NAME *do_subject(char *subject);
static int do_revoke(X509 *x509, TXT_DB *db, int ext, char *extval); static int do_revoke(X509 *x509, TXT_DB *db, int ext, char *extval);
static int get_certificate_status(const char *ser_status, TXT_DB *db); static int get_certificate_status(const char *ser_status, TXT_DB *db);
static int do_updatedb(TXT_DB *db); static int do_updatedb(TXT_DB *db);
@ -1859,7 +1859,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
if (subj) if (subj)
{ {
X509_NAME *n = do_subject(subj, email_dn); X509_NAME *n = do_subject(subj);
if (!n) if (!n)
{ {
@ -2993,7 +2993,7 @@ int make_revoked(X509_REVOKED *rev, char *str)
return ret; return ret;
} }
static X509_NAME *do_subject(char *subject, int email_dn) static X509_NAME *do_subject(char *subject)
{ {
X509_NAME *n = NULL; X509_NAME *n = NULL;
@ -3042,9 +3042,6 @@ static X509_NAME *do_subject(char *subject, int email_dn)
continue; continue;
} }
if ((nid == NID_pkcs9_emailAddress) && (email_dn == 0))
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, MBSTRING_ASC, (unsigned char*)ne_value, -1,-1,0))
{ {
X509_NAME_free(n); X509_NAME_free(n);