diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-10-27 17:53:06 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-10-27 17:53:06 +0000 |
| commit | 9b55da73ca195947ed664dbf9f093f05759afdd9 (patch) | |
| tree | 6203b31ac6fe43117140426f4e14078bd99274f4 /apps | |
| parent | e7156ff2e8ac54e0e833751db0aa62164f0fb519 (diff) | |
| download | openssl-9b55da73ca195947ed664dbf9f093f05759afdd9.tar.gz | |
Another noemailDN fix.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ca.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -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, unsigned long certopt, unsigned long nameopt, int default_op, 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 get_certificate_status(const char *ser_status, 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) { - X509_NAME *n = do_subject(subj, email_dn); + X509_NAME *n = do_subject(subj); if (!n) { @@ -2993,7 +2993,7 @@ int make_revoked(X509_REVOKED *rev, char *str) return ret; } -static X509_NAME *do_subject(char *subject, int email_dn) +static X509_NAME *do_subject(char *subject) { X509_NAME *n = NULL; @@ -3042,9 +3042,6 @@ static X509_NAME *do_subject(char *subject, int email_dn) 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)) { X509_NAME_free(n); |