Move openssl(1) from /usr/sbin/openssl to /usr/bin/openssl, since it is not

a system/superuser binary. At the same time, move the source code from its
current lib/libssl/src/apps location to a more appropriate home under
usr.bin/openssl.

ok deraadt@ miod@

1 files changed, 2743 insertions, 0 deletions

diff --git a/usr.bin/openssl/ca.c b/usr.bin/openssl/ca.c
new file mode 100644
index 00000000000..c19ecc6616d
--- /dev/null
+++ b/usr.bin/openssl/ca.c
@@ -0,0 +1,2743 @@
+/* $OpenBSD: ca.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+/* The PPKI stuff has been donated by Jeff Barber <jeffb@issl.atl.hp.com> */
+
+#include <sys/types.h>
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "apps.h"
+
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/conf.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/ocsp.h>
+#include <openssl/pem.h>
+#include <openssl/txt_db.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#define BASE_SECTION		"ca"
+
+#define ENV_DEFAULT_CA		"default_ca"
+
+#define STRING_MASK		"string_mask"
+#define UTF8_IN			"utf8"
+
+#define ENV_DIR			"dir"
+#define ENV_CERTS		"certs"
+#define ENV_CRL_DIR		"crl_dir"
+#define ENV_CA_DB		"CA_DB"
+#define ENV_NEW_CERTS_DIR	"new_certs_dir"
+#define ENV_CERTIFICATE 	"certificate"
+#define ENV_SERIAL		"serial"
+#define ENV_CRLNUMBER		"crlnumber"
+#define ENV_CRL			"crl"
+#define ENV_PRIVATE_KEY		"private_key"
+#define ENV_DEFAULT_DAYS 	"default_days"
+#define ENV_DEFAULT_STARTDATE 	"default_startdate"
+#define ENV_DEFAULT_ENDDATE 	"default_enddate"
+#define ENV_DEFAULT_CRL_DAYS 	"default_crl_days"
+#define ENV_DEFAULT_CRL_HOURS 	"default_crl_hours"
+#define ENV_DEFAULT_MD		"default_md"
+#define ENV_DEFAULT_EMAIL_DN	"email_in_dn"
+#define ENV_PRESERVE		"preserve"
+#define ENV_POLICY      	"policy"
+#define ENV_EXTENSIONS      	"x509_extensions"
+#define ENV_CRLEXT      	"crl_extensions"
+#define ENV_MSIE_HACK		"msie_hack"
+#define ENV_NAMEOPT		"name_opt"
+#define ENV_CERTOPT		"cert_opt"
+#define ENV_EXTCOPY		"copy_extensions"
+#define ENV_UNIQUE_SUBJECT	"unique_subject"
+
+#define ENV_DATABASE		"database"
+
+/* Additional revocation information types */
+
+#define REV_NONE		0	/* No addditional information */
+#define REV_CRL_REASON		1	/* Value is CRL reason code */
+#define REV_HOLD		2	/* Value is hold instruction */
+#define REV_KEY_COMPROMISE	3	/* Value is cert key compromise time */
+#define REV_CA_COMPROMISE	4	/* Value is CA key compromise time */
+
+static const char *ca_usage[] = {
+	"usage: ca args\n",
+	"\n",
+	" -verbose        - Talk a lot while doing things\n",
+	" -config file    - A config file\n",
+	" -name arg       - The particular CA definition to use\n",
+	" -gencrl         - Generate a new CRL\n",
+	" -crldays days   - Days is when the next CRL is due\n",
+	" -crlhours hours - Hours is when the next CRL is due\n",
+	" -startdate YYMMDDHHMMSSZ  - certificate validity notBefore\n",
+	" -enddate YYMMDDHHMMSSZ    - certificate validity notAfter (overrides -days)\n",
+	" -days arg       - number of days to certify the certificate for\n",
+	" -md arg         - md to use, one of md2, md5, sha or sha1\n",
+	" -policy arg     - The CA 'policy' to support\n",
+	" -keyfile arg    - private key file\n",
+	" -keyform arg    - private key file format (PEM or ENGINE)\n",
+	" -key arg        - key to decode the private key if it is encrypted\n",
+	" -cert file      - The CA certificate\n",
+	" -selfsign       - sign a certificate with the key associated with it\n",
+	" -in file        - The input PEM encoded certificate request(s)\n",
+	" -out file       - Where to put the output file(s)\n",
+	" -outdir dir     - Where to put output certificates\n",
+	" -infiles ....   - The last argument, requests to process\n",
+	" -spkac file     - File contains DN and signed public key and challenge\n",
+	" -ss_cert file   - File contains a self signed cert to sign\n",
+	" -preserveDN     - Don't re-order the DN\n",
+	" -noemailDN      - Don't add the EMAIL field into certificate' subject\n",
+	" -batch          - Don't ask questions\n",
+	" -msie_hack      - msie modifications to handle all those universal strings\n",
+	" -revoke file    - Revoke a certificate (given in file)\n",
+	" -subj arg       - Use arg instead of request's subject\n",
+	" -utf8           - input characters are UTF8 (default ASCII)\n",
+	" -multivalue-rdn - enable support for multivalued RDNs\n",
+	" -extensions ..  - Extension section (override value in config file)\n",
+	" -extfile file   - Configuration file with X509v3 extentions to add\n",
+	" -crlexts ..     - CRL extension section (override value in config file)\n",
+#ifndef OPENSSL_NO_ENGINE
+	" -engine e       - use engine e, possibly a hardware device.\n",
+#endif
+	" -status serial  - Shows certificate status given the serial number\n",
+	" -updatedb       - Updates db for expired certificates\n",
+	NULL
+};
+
+static void lookup_fail(const char *name, const char *tag);
+static int certify(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509,
+    const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
+    STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj,
+    unsigned long chtype, int multirdn, int email_dn, char *startdate,
+    char *enddate, long days, int batch, char *ext_sect, CONF * conf,
+    int verbose, unsigned long certopt, unsigned long nameopt,
+    int default_op, int ext_copy, int selfsign);
+static int certify_cert(X509 ** xret, char *infile, EVP_PKEY * pkey,
+    X509 * x509, const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
+    STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj,
+    unsigned long chtype, int multirdn, int email_dn, char *startdate,
+    char *enddate, long days, int batch, char *ext_sect, CONF * conf,
+    int verbose, unsigned long certopt, unsigned long nameopt, int default_op,
+    int ext_copy, ENGINE * e);
+static int certify_spkac(X509 ** xret, char *infile, EVP_PKEY * pkey,
+    X509 * x509, const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
+    STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj,
+    unsigned long chtype, int multirdn, int email_dn, char *startdate,
+    char *enddate, long days, char *ext_sect, CONF * conf, int verbose,
+    unsigned long certopt, unsigned long nameopt, int default_op, int ext_copy);
+static void write_new_certificate(BIO * bp, X509 * x, int output_der,
+    int notext);
+static int do_body(X509 ** xret, EVP_PKEY * pkey, X509 * x509,
+    const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
+    STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj,
+    unsigned long chtype, int multirdn, int email_dn, char *startdate,
+    char *enddate, long days, int batch, int verbose, X509_REQ * req,
+    char *ext_sect, CONF * conf, unsigned long certopt, unsigned long nameopt,
+    int default_op, int ext_copy, int selfsign);
+static int do_revoke(X509 * x509, CA_DB * db, int ext, char *extval);
+static int get_certificate_status(const char *ser_status, CA_DB * db);
+static int do_updatedb(CA_DB * db);
+static int check_time_format(const char *str);
+static char * bin2hex(unsigned char *, size_t);
+char *make_revocation_str(int rev_type, char *rev_arg);
+int make_revoked(X509_REVOKED * rev, const char *str);
+int old_entry_print(BIO * bp, ASN1_OBJECT * obj, ASN1_STRING * str);
+static CONF *conf = NULL;
+static CONF *extconf = NULL;
+static char *section = NULL;
+
+static int preserve = 0;
+static int msie_hack = 0;
+
+
+int ca_main(int, char **);
+
+int
+ca_main(int argc, char **argv)
+{
+	ENGINE *e = NULL;
+	char *key = NULL, *passargin = NULL;
+	int create_ser = 0;
+	int free_key = 0;
+	int total = 0;
+	int total_done = 0;
+	int badops = 0;
+	int ret = 1;
+	int email_dn = 1;
+	int req = 0;
+	int verbose = 0;
+	int gencrl = 0;
+	int dorevoke = 0;
+	int doupdatedb = 0;
+	long crldays = 0;
+	long crlhours = 0;
+	long crlsec = 0;
+	long errorline = -1;
+	char *configfile = NULL;
+	char *md = NULL;
+	char *policy = NULL;
+	char *keyfile = NULL;
+	char *certfile = NULL;
+	int keyform = FORMAT_PEM;
+	char *infile = NULL;
+	char *spkac_file = NULL;
+	char *ss_cert_file = NULL;
+	char *ser_status = NULL;
+	EVP_PKEY *pkey = NULL;
+	int output_der = 0;
+	char *outfile = NULL;
+	char *outdir = NULL;
+	char *serialfile = NULL;
+	char *crlnumberfile = NULL;
+	char *extensions = NULL;
+	char *extfile = NULL;
+	char *subj = NULL;
+	unsigned long chtype = MBSTRING_ASC;
+	int multirdn = 0;
+	char *tmp_email_dn = NULL;
+	char *crl_ext = NULL;
+	int rev_type = REV_NONE;
+	char *rev_arg = NULL;
+	BIGNUM *serial = NULL;
+	BIGNUM *crlnumber = NULL;
+	char *startdate = NULL;
+	char *enddate = NULL;
+	long days = 0;
+	int batch = 0;
+	int notext = 0;
+	unsigned long nameopt = 0, certopt = 0;
+	int default_op = 1;
+	int ext_copy = EXT_COPY_NONE;
+	int selfsign = 0;
+	X509 *x509 = NULL, *x509p = NULL;
+	X509 *x = NULL;
+	BIO *in = NULL, *out = NULL, *Sout = NULL, *Cout = NULL;
+	char *dbfile = NULL;
+	CA_DB *db = NULL;
+	X509_CRL *crl = NULL;
+	X509_REVOKED *r = NULL;
+	ASN1_TIME *tmptm;
+	ASN1_INTEGER *tmpser;
+	char *f;
+	const char *p;
+	char *const * pp;
+	int i, j;
+	const EVP_MD *dgst = NULL;
+	STACK_OF(CONF_VALUE) * attribs = NULL;
+	STACK_OF(X509) * cert_sk = NULL;
+	STACK_OF(OPENSSL_STRING) * sigopts = NULL;
+#define BSIZE 256
+	char buf[3][BSIZE];
+#ifndef OPENSSL_NO_ENGINE
+	char *engine = NULL;
+#endif
+	char *tofree = NULL;
+	const char *errstr = NULL;
+	DB_ATTR db_attr;
+
+	conf = NULL;
+	key = NULL;
+	section = NULL;
+
+	preserve = 0;
+	msie_hack = 0;
+
+	argc--;
+	argv++;
+	while (argc >= 1) {
+		if (strcmp(*argv, "-verbose") == 0)
+			verbose = 1;
+		else if (strcmp(*argv, "-config") == 0) {
+			if (--argc < 1)
+				goto bad;
+			configfile = *(++argv);
+		} else if (strcmp(*argv, "-name") == 0) {
+			if (--argc < 1)
+				goto bad;
+			section = *(++argv);
+		} else if (strcmp(*argv, "-subj") == 0) {
+			if (--argc < 1)
+				goto bad;
+			subj = *(++argv);
+			/* preserve=1; */
+		} else if (strcmp(*argv, "-utf8") == 0)
+			chtype = MBSTRING_UTF8;
+		else if (strcmp(*argv, "-create_serial") == 0)
+			create_ser = 1;
+		else if (strcmp(*argv, "-multivalue-rdn") == 0)
+			multirdn = 1;
+		else if (strcmp(*argv, "-startdate") == 0) {
+			if (--argc < 1)
+				goto bad;
+			startdate = *(++argv);
+		} else if (strcmp(*argv, "-enddate") == 0) {
+			if (--argc < 1)
+				goto bad;
+			enddate = *(++argv);
+		} else if (strcmp(*argv, "-days") == 0) {
+			if (--argc < 1)
+				goto bad;
+			days = strtonum(*(++argv), 0, LONG_MAX, &errstr);
+			if (errstr)
+				goto bad;
+		} else if (strcmp(*argv, "-md") == 0) {
+			if (--argc < 1)
+				goto bad;
+			md = *(++argv);
+		} else if (strcmp(*argv, "-policy") == 0) {
+			if (--argc < 1)
+				goto bad;
+			policy = *(++argv);
+		} else if (strcmp(*argv, "-keyfile") == 0) {
+			if (--argc < 1)
+				goto bad;
+			keyfile = *(++argv);
+		} else if (strcmp(*argv, "-keyform") == 0) {
+			if (--argc < 1)
+				goto bad;
+			keyform = str2fmt(*(++argv));
+		} else if (strcmp(*argv, "-passin") == 0) {
+			if (--argc < 1)
+				goto bad;
+			passargin = *(++argv);
+		} else if (strcmp(*argv, "-key") == 0) {
+			if (--argc < 1)
+				goto bad;
+			key = *(++argv);
+		} else if (strcmp(*argv, "-cert") == 0) {
+			if (--argc < 1)
+				goto bad;
+			certfile = *(++argv);
+		} else if (strcmp(*argv, "-selfsign") == 0)
+			selfsign = 1;
+		else if (strcmp(*argv, "-in") == 0) {
+			if (--argc < 1)
+				goto bad;
+			infile = *(++argv);
+			req = 1;
+		} else if (strcmp(*argv, "-out") == 0) {
+			if (--argc < 1)
+				goto bad;
+			outfile = *(++argv);
+		} else if (strcmp(*argv, "-outdir") == 0) {
+			if (--argc < 1)
+				goto bad;
+			outdir = *(++argv);
+		} else if (strcmp(*argv, "-sigopt") == 0) {
+			if (--argc < 1)
+				goto bad;
+			if (!sigopts)
+				sigopts = sk_OPENSSL_STRING_new_null();
+			if (!sigopts ||
+			    !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
+				goto bad;
+		} else if (strcmp(*argv, "-notext") == 0)
+			notext = 1;
+		else if (strcmp(*argv, "-batch") == 0)
+			batch = 1;
+		else if (strcmp(*argv, "-preserveDN") == 0)
+			preserve = 1;
+		else if (strcmp(*argv, "-noemailDN") == 0)
+			email_dn = 0;
+		else if (strcmp(*argv, "-gencrl") == 0)
+			gencrl = 1;
+		else if (strcmp(*argv, "-msie_hack") == 0)
+			msie_hack = 1;
+		else if (strcmp(*argv, "-crldays") == 0) {
+			if (--argc < 1)
+				goto bad;
+			crldays = strtonum(*(++argv), 0, LONG_MAX, &errstr);
+			if (errstr)
+				goto bad;
+		} else if (strcmp(*argv, "-crlhours") == 0) {
+			if (--argc < 1)
+				goto bad;
+			crlhours = strtonum(*(++argv), 0, LONG_MAX, &errstr);
+			if (errstr)
+				goto bad;
+		} else if (strcmp(*argv, "-crlsec") == 0) {
+			if (--argc < 1)
+				goto bad;
+			crlsec = strtonum(*(++argv), 0, LONG_MAX, &errstr);
+			if (errstr)
+				goto bad;
+		} else if (strcmp(*argv, "-infiles") == 0) {
+			argc--;
+			argv++;
+			req = 1;
+			break;
+		} else if (strcmp(*argv, "-ss_cert") == 0) {
+			if (--argc < 1)
+				goto bad;
+			ss_cert_file = *(++argv);
+			req = 1;
+		} else if (strcmp(*argv, "-spkac") == 0) {
+			if (--argc < 1)
+				goto bad;
+			spkac_file = *(++argv);
+			req = 1;
+		} else if (strcmp(*argv, "-revoke") == 0) {
+			if (--argc < 1)
+				goto bad;
+			infile = *(++argv);
+			dorevoke = 1;
+		} else if (strcmp(*argv, "-extensions") == 0) {
+			if (--argc < 1)
+				goto bad;
+			extensions = *(++argv);
+		} else if (strcmp(*argv, "-extfile") == 0) {
+			if (--argc < 1)
+				goto bad;
+			extfile = *(++argv);
+		} else if (strcmp(*argv, "-status") == 0) {
+			if (--argc < 1)
+				goto bad;
+			ser_status = *(++argv);
+		} else if (strcmp(*argv, "-updatedb") == 0) {
+			doupdatedb = 1;
+		} else if (strcmp(*argv, "-crlexts") == 0) {
+			if (--argc < 1)
+				goto bad;
+			crl_ext = *(++argv);
+		} else if (strcmp(*argv, "-crl_reason") == 0) {
+			if (--argc < 1)
+				goto bad;
+			rev_arg = *(++argv);
+			rev_type = REV_CRL_REASON;
+		} else if (strcmp(*argv, "-crl_hold") == 0) {
+			if (--argc < 1)
+				goto bad;
+			rev_arg = *(++argv);
+			rev_type = REV_HOLD;
+		} else if (strcmp(*argv, "-crl_compromise") == 0) {
+			if (--argc < 1)
+				goto bad;
+			rev_arg = *(++argv);
+			rev_type = REV_KEY_COMPROMISE;
+		} else if (strcmp(*argv, "-crl_CA_compromise") == 0) {
+			if (--argc < 1)
+				goto bad;
+			rev_arg = *(++argv);
+			rev_type = REV_CA_COMPROMISE;
+		}
+#ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv, "-engine") == 0) {
+			if (--argc < 1)
+				goto bad;
+			engine = *(++argv);
+		}
+#endif
+		else {
+bad:
+			if (errstr)
+				BIO_printf(bio_err, "invalid argument %s: %s\n",
+				    *argv, errstr);
+			else
+				BIO_printf(bio_err, "unknown option %s\n", *argv);
+			badops = 1;
+			break;
+		}
+		argc--;
+		argv++;
+	}
+
+	if (badops) {
+		const char **pp2;
+
+		for (pp2 = ca_usage; (*pp2 != NULL); pp2++)
+			BIO_printf(bio_err, "%s", *pp2);
+		goto err;
+	}
+	ERR_load_crypto_strings();
+
+	/*****************************************************************/
+	tofree = NULL;
+	if (configfile == NULL)
+		configfile = getenv("OPENSSL_CONF");
+	if (configfile == NULL)
+		configfile = getenv("SSLEAY_CONF");
+	if (configfile == NULL) {
+		if ((tofree = make_config_name()) == NULL) {
+			BIO_printf(bio_err, "error making config file name\n");
+			goto err;
+		}
+		configfile = tofree;
+	}
+	BIO_printf(bio_err, "Using configuration from %s\n", configfile);
+	conf = NCONF_new(NULL);
+	if (NCONF_load(conf, configfile, &errorline) <= 0) {
+		if (errorline <= 0)
+			BIO_printf(bio_err,
+			    "error loading the config file '%s'\n",
+			    configfile);
+		else
+			BIO_printf(bio_err,
+			    "error on line %ld of config file '%s'\n",
+			    errorline, configfile);
+		goto err;
+	}
+	free(tofree);
+	tofree = NULL;
+
+#ifndef OPENSSL_NO_ENGINE
+	e = setup_engine(bio_err, engine, 0);
+#endif
+
+	/* Lets get the config section we are using */
+	if (section == NULL) {
+		section = NCONF_get_string(conf, BASE_SECTION, ENV_DEFAULT_CA);
+		if (section == NULL) {
+			lookup_fail(BASE_SECTION, ENV_DEFAULT_CA);
+			goto err;
+		}
+	}
+	if (conf != NULL) {
+		p = NCONF_get_string(conf, NULL, "oid_file");
+		if (p == NULL)
+			ERR_clear_error();
+		if (p != NULL) {
+			BIO *oid_bio;
+
+			oid_bio = BIO_new_file(p, "r");
+			if (oid_bio == NULL) {
+				/*
+				BIO_printf(bio_err,
+				    "problems opening %s for extra oid's\n", p);
+				ERR_print_errors(bio_err);
+				*/
+				ERR_clear_error();
+			} else {
+				OBJ_create_objects(oid_bio);
+				BIO_free(oid_bio);
+			}
+		}
+		if (!add_oid_section(bio_err, conf)) {
+			ERR_print_errors(bio_err);
+			goto err;
+		}
+	}
+	f = NCONF_get_string(conf, section, STRING_MASK);
+	if (!f)
+		ERR_clear_error();
+
+	if (f && !ASN1_STRING_set_default_mask_asc(f)) {
+		BIO_printf(bio_err,
+		    "Invalid global string mask setting %s\n", f);
+		goto err;
+	}
+	if (chtype != MBSTRING_UTF8) {
+		f = NCONF_get_string(conf, section, UTF8_IN);
+		if (!f)
+			ERR_clear_error();
+		else if (!strcmp(f, "yes"))
+			chtype = MBSTRING_UTF8;
+	}
+	db_attr.unique_subject = 1;
+	p = NCONF_get_string(conf, section, ENV_UNIQUE_SUBJECT);
+	if (p) {
+		db_attr.unique_subject = parse_yesno(p, 1);
+	} else
+		ERR_clear_error();
+
+	in = BIO_new(BIO_s_file());
+	out = BIO_new(BIO_s_file());
+	Sout = BIO_new(BIO_s_file());
+	Cout = BIO_new(BIO_s_file());
+	if ((in == NULL) || (out == NULL) || (Sout == NULL) || (Cout == NULL)) {
+		ERR_print_errors(bio_err);
+		goto err;
+	}
+	/*****************************************************************/
+	/* report status of cert with serial number given on command line */
+	if (ser_status) {
+		if ((dbfile = NCONF_get_string(conf, section,
+		    ENV_DATABASE)) == NULL) {
+			lookup_fail(section, ENV_DATABASE);
+			goto err;
+		}
+		db = load_index(dbfile, &db_attr);
+		if (db == NULL)
+			goto err;
+
+		if (!index_index(db))
+			goto err;
+
+		if (get_certificate_status(ser_status, db) != 1)
+			BIO_printf(bio_err, "Error verifying serial %s!\n",
+			    ser_status);
+		goto err;
+	}
+	/*****************************************************************/
+	/* we definitely need a private key, so let's get it */
+
+	if ((keyfile == NULL) && ((keyfile = NCONF_get_string(conf,
+	    section, ENV_PRIVATE_KEY)) == NULL)) {
+		lookup_fail(section, ENV_PRIVATE_KEY);
+		goto err;
+	}
+	if (!key) {
+		free_key = 1;
+		if (!app_passwd(bio_err, passargin, NULL, &key, NULL)) {
+			BIO_printf(bio_err, "Error getting password\n");
+			goto err;
+		}
+	}
+	pkey = load_key(bio_err, keyfile, keyform, 0, key, e, "CA private key");
+	if (key)
+		OPENSSL_cleanse(key, strlen(key));
+	if (pkey == NULL) {
+		/* load_key() has already printed an appropriate message */
+		goto err;
+	}
+	/*****************************************************************/
+	/* we need a certificate */
+	if (!selfsign || spkac_file || ss_cert_file || gencrl) {
+		if ((certfile == NULL) &&
+		    ((certfile = NCONF_get_string(conf,
+		    section, ENV_CERTIFICATE)) == NULL)) {
+			lookup_fail(section, ENV_CERTIFICATE);
+			goto err;
+		}
+		x509 = load_cert(bio_err, certfile, FORMAT_PEM, NULL, e,
+		    "CA certificate");
+		if (x509 == NULL)
+			goto err;
+
+		if (!X509_check_private_key(x509, pkey)) {
+			BIO_printf(bio_err,
+			    "CA certificate and CA private key do not match\n");
+			goto err;
+		}
+	}
+	if (!selfsign)
+		x509p = x509;
+
+	f = NCONF_get_string(conf, BASE_SECTION, ENV_PRESERVE);
+	if (f == NULL)
+		ERR_clear_error();
+	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
+		preserve = 1;
+	f = NCONF_get_string(conf, BASE_SECTION, ENV_MSIE_HACK);
+	if (f == NULL)
+		ERR_clear_error();
+	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
+		msie_hack = 1;
+
+	f = NCONF_get_string(conf, section, ENV_NAMEOPT);
+
+	if (f) {
+		if (!set_name_ex(&nameopt, f)) {
+			BIO_printf(bio_err,
+			    "Invalid name options: \"%s\"\n", f);
+			goto err;
+		}
+		default_op = 0;
+	} else
+		ERR_clear_error();
+
+	f = NCONF_get_string(conf, section, ENV_CERTOPT);
+
+	if (f) {
+		if (!set_cert_ex(&certopt, f)) {
+			BIO_printf(bio_err,
+			    "Invalid certificate options: \"%s\"\n", f);
+			goto err;
+		}
+		default_op = 0;
+	} else
+		ERR_clear_error();
+
+	f = NCONF_get_string(conf, section, ENV_EXTCOPY);
+
+	if (f) {
+		if (!set_ext_copy(&ext_copy, f)) {
+			BIO_printf(bio_err,
+			    "Invalid extension copy option: \"%s\"\n", f);
+			goto err;
+		}
+	} else
+		ERR_clear_error();
+
+	/*****************************************************************/
+	/* lookup where to write new certificates */
+	if ((outdir == NULL) && (req)) {
+
+		if ((outdir = NCONF_get_string(conf, section,
+		    ENV_NEW_CERTS_DIR)) == NULL) {
+			BIO_printf(bio_err, "there needs to be defined a directory for new certificate to be placed in\n");
+			goto err;
+		}
+		/*
+		 * outdir is a directory spec, but access() for VMS demands a
+		 * filename.  In any case, stat(), below, will catch the
+		 * problem if outdir is not a directory spec, and the fopen()
+		 * or open() will catch an error if there is no write access.
+		 *
+		 * Presumably, this problem could also be solved by using the
+		 * DEC C routines to convert the directory syntax to Unixly,
+		 * and give that to access().  However, time's too short to
+		 * do that just now.
+		 */
+		if (access(outdir, R_OK | W_OK | X_OK) != 0) {
+			BIO_printf(bio_err,
+			    "I am unable to access the %s directory\n", outdir);
+			perror(outdir);
+			goto err;
+		}
+		if (app_isdir(outdir) <= 0) {
+			BIO_printf(bio_err,
+			    "%s need to be a directory\n", outdir);
+			perror(outdir);
+			goto err;
+		}
+	}
+	/*****************************************************************/
+	/* we need to load the database file */
+	if ((dbfile = NCONF_get_string(conf, section, ENV_DATABASE)) == NULL) {
+		lookup_fail(section, ENV_DATABASE);
+		goto err;
+	}
+	db = load_index(dbfile, &db_attr);
+	if (db == NULL)
+		goto err;
+
+	/* Lets check some fields */
+	for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
+		pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
+		if ((pp[DB_type][0] != DB_TYPE_REV) &&
+		    (pp[DB_rev_date][0] != '\0')) {
+			BIO_printf(bio_err, "entry %d: not revoked yet, but has a revocation date\n", i + 1);
+			goto err;
+		}
+		if ((pp[DB_type][0] == DB_TYPE_REV) &&
+		    !make_revoked(NULL, pp[DB_rev_date])) {
+			BIO_printf(bio_err, " in entry %d\n", i + 1);
+			goto err;
+		}
+		if (!check_time_format((char *) pp[DB_exp_date])) {
+			BIO_printf(bio_err, "entry %d: invalid expiry date\n",
+			    i + 1);
+			goto err;
+		}
+		p = pp[DB_serial];
+		j = strlen(p);
+		if (*p == '-') {
+			p++;
+			j--;
+		}
+		if ((j & 1) || (j < 2)) {
+			BIO_printf(bio_err,
+			    "entry %d: bad serial number length (%d)\n",
+			    i + 1, j);
+			goto err;
+		}
+		while (*p) {
+			if (!(((*p >= '0') && (*p <= '9')) ||
+			    ((*p >= 'A') && (*p <= 'F')) ||
+			    ((*p >= 'a') && (*p <= 'f')))) {
+				BIO_printf(bio_err, "entry %d: bad serial number characters, char pos %ld, char is '%c'\n", i + 1, (long) (p - pp[DB_serial]), *p);
+				goto err;
+			}
+			p++;
+		}
+	}
+	if (verbose) {
+		BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);	/* cannot fail */
+		TXT_DB_write(out, db->db);
+		BIO_printf(bio_err, "%d entries loaded from the database\n",
+		    sk_OPENSSL_PSTRING_num(db->db->data));
+		BIO_printf(bio_err, "generating index\n");
+	}
+	if (!index_index(db))
+		goto err;
+
+	/*****************************************************************/
+	/* Update the db file for expired certificates */
+	if (doupdatedb) {
+		if (verbose)
+			BIO_printf(bio_err, "Updating %s ...\n", dbfile);
+
+		i = do_updatedb(db);
+		if (i == -1) {
+			BIO_printf(bio_err, "Malloc failure\n");
+			goto err;
+		} else if (i == 0) {
+			if (verbose)
+				BIO_printf(bio_err,
+				    "No entries found to mark expired\n");
+		} else {
+			if (!save_index(dbfile, "new", db))
+				goto err;
+
+			if (!rotate_index(dbfile, "new", "old"))
+				goto err;
+
+			if (verbose)
+				BIO_printf(bio_err,
+				    "Done. %d entries marked as expired\n", i);
+		}
+	}
+	/*****************************************************************/
+	/* Read extentions config file                                   */
+	if (extfile) {
+		extconf = NCONF_new(NULL);
+		if (NCONF_load(extconf, extfile, &errorline) <= 0) {
+			if (errorline <= 0)
+				BIO_printf(bio_err,
+				    "ERROR: loading the config file '%s'\n",
+				    extfile);
+			else
+				BIO_printf(bio_err,
+				    "ERROR: on line %ld of config file '%s'\n",
+				    errorline, extfile);
+			ret = 1;
+			goto err;
+		}
+		if (verbose)
+			BIO_printf(bio_err,
+			    "Successfully loaded extensions file %s\n",
+			    extfile);
+
+		/* We can have sections in the ext file */
+		if (!extensions && !(extensions = NCONF_get_string(extconf,
+		    "default", "extensions")))
+			extensions = "default";
+	}
+	/*****************************************************************/
+	if (req || gencrl) {
+		if (outfile != NULL) {
+			if (BIO_write_filename(Sout, outfile) <= 0) {
+				perror(outfile);
+				goto err;
+			}
+		} else {
+			BIO_set_fp(Sout, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
+		}
+	}
+	if ((md == NULL) && ((md = NCONF_get_string(conf, section,
+	    ENV_DEFAULT_MD)) == NULL)) {
+		lookup_fail(section, ENV_DEFAULT_MD);
+		goto err;
+	}
+	if (!strcmp(md, "default")) {
+		int def_nid;
+		if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) <= 0) {
+			BIO_puts(bio_err, "no default digest\n");
+			goto err;
+		}
+		md = (char *) OBJ_nid2sn(def_nid);
+	}
+	if ((dgst = EVP_get_digestbyname(md)) == NULL) {
+		BIO_printf(bio_err,
+		    "%s is an unsupported message digest type\n", md);
+		goto err;
+	}
+	if (req) {
+		if ((email_dn == 1) && ((tmp_email_dn = NCONF_get_string(conf,
+		    section, ENV_DEFAULT_EMAIL_DN)) != NULL)) {
+			if (strcmp(tmp_email_dn, "no") == 0)
+				email_dn = 0;
+		}
+		if (verbose)
+			BIO_printf(bio_err, "message digest is %s\n",
+			    OBJ_nid2ln(dgst->type));
+		if ((policy == NULL) && ((policy = NCONF_get_string(conf,
+		    section, ENV_POLICY)) == NULL)) {
+			lookup_fail(section, ENV_POLICY);
+			goto err;
+		}
+		if (verbose)
+			BIO_printf(bio_err, "policy is %s\n", policy);
+
+		if ((serialfile = NCONF_get_string(conf, section,
+		    ENV_SERIAL)) == NULL) {
+			lookup_fail(section, ENV_SERIAL);
+			goto err;
+		}
+		if (!extconf) {
+			/*
+			 * no '-extfile' option, so we look for extensions in
+			 * the main configuration file
+			 */
+			if (!extensions) {
+				extensions = NCONF_get_string(conf, section,
+				    ENV_EXTENSIONS);
+				if (!extensions)
+					ERR_clear_error();
+			}
+			if (extensions) {
+				/* Check syntax of file */
+				X509V3_CTX ctx;
+				X509V3_set_ctx_test(&ctx);
+				X509V3_set_nconf(&ctx, conf);
+				if (!X509V3_EXT_add_nconf(conf, &ctx,
+				    extensions, NULL)) {
+					BIO_printf(bio_err,
+					    "Error Loading extension section %s\n",
+					    extensions);
+					ret = 1;
+					goto err;
+				}
+			}
+		}
+		if (startdate == NULL) {
+			startdate = NCONF_get_string(conf, section,
+			    ENV_DEFAULT_STARTDATE);
+			if (startdate == NULL)
+				ERR_clear_error();
+		}
+		if (startdate && !ASN1_TIME_set_string(NULL, startdate)) {
+			BIO_printf(bio_err, "start date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
+			goto err;
+		}
+		if (startdate == NULL)
+			startdate = "today";
+
+		if (enddate == NULL) {
+			enddate = NCONF_get_string(conf, section,
+			    ENV_DEFAULT_ENDDATE);
+			if (enddate == NULL)
+				ERR_clear_error();
+		}
+		if (enddate && !ASN1_TIME_set_string(NULL, enddate)) {
+			BIO_printf(bio_err, "end date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
+			goto err;
+		}
+		if (days == 0) {
+			if (!NCONF_get_number(conf, section,
+			    ENV_DEFAULT_DAYS, &days))
+				days = 0;
+		}
+		if (!enddate && (days == 0)) {
+			BIO_printf(bio_err,
+			    "cannot lookup how many days to certify for\n");
+			goto err;
+		}
+		if ((serial = load_serial(serialfile, create_ser, NULL)) ==
+		    NULL) {
+			BIO_printf(bio_err,
+			    "error while loading serial number\n");
+			goto err;
+		}
+		if (verbose) {
+			if (BN_is_zero(serial))
+				BIO_printf(bio_err,
+				    "next serial number is 00\n");
+			else {
+				if ((f = BN_bn2hex(serial)) == NULL)
+					goto err;
+				BIO_printf(bio_err,
+				    "next serial number is %s\n", f);
+				free(f);
+			}
+		}
+		if ((attribs = NCONF_get_section(conf, policy)) == NULL) {
+			BIO_printf(bio_err,
+			    "unable to find 'section' for %s\n", policy);
+			goto err;
+		}
+		if ((cert_sk = sk_X509_new_null()) == NULL) {
+			BIO_printf(bio_err, "Memory allocation failure\n");
+			goto err;
+		}
+		if (spkac_file != NULL) {
+			total++;
+			j = certify_spkac(&x, spkac_file, pkey, x509, dgst,
+			    sigopts, attribs, db, serial, subj, chtype,
+			    multirdn, email_dn, startdate, enddate, days,
+			    extensions, conf, verbose, certopt, nameopt,
+			    default_op, ext_copy);
+			if (j < 0)
+				goto err;
+			if (j > 0) {
+				total_done++;
+				BIO_printf(bio_err, "\n");
+				if (!BN_add_word(serial, 1))
+					goto err;
+				if (!sk_X509_push(cert_sk, x)) {
+					BIO_printf(bio_err,
+					    "Memory allocation failure\n");
+					goto err;
+				}
+				if (outfile) {
+					output_der = 1;
+					batch = 1;
+				}
+			}
+		}
+		if (ss_cert_file != NULL) {
+			total++;
+			j = certify_cert(&x, ss_cert_file, pkey, x509, dgst,
+			    sigopts, attribs, db, serial, subj, chtype,
+			    multirdn, email_dn, startdate, enddate, days, batch,
+			    extensions, conf, verbose, certopt, nameopt,
+			    default_op, ext_copy, e);
+			if (j < 0)
+				goto err;
+			if (j > 0) {
+				total_done++;
+				BIO_printf(bio_err, "\n");
+				if (!BN_add_word(serial, 1))
+					goto err;
+				if (!sk_X509_push(cert_sk, x)) {
+					BIO_printf(bio_err,
+					    "Memory allocation failure\n");
+					goto err;
+				}
+			}
+		}
+		if (infile != NULL) {
+			total++;
+			j = certify(&x, infile, pkey, x509p, dgst, sigopts,
+			    attribs, db, serial, subj, chtype, multirdn,
+			    email_dn, startdate, enddate, days, batch,
+			    extensions, conf, verbose, certopt, nameopt,
+			    default_op, ext_copy, selfsign);
+			if (j < 0)
+				goto err;
+			if (j > 0) {
+				total_done++;
+				BIO_printf(bio_err, "\n");
+				if (!BN_add_word(serial, 1))
+					goto err;
+				if (!sk_X509_push(cert_sk, x)) {
+					BIO_printf(bio_err,
+					    "Memory allocation failure\n");
+					goto err;
+				}
+			}
+		}
+		for (i = 0; i < argc; i++) {
+			total++;
+			j = certify(&x, argv[i], pkey, x509p, dgst, sigopts,
+			    attribs, db, serial, subj, chtype, multirdn,
+			    email_dn, startdate, enddate, days, batch,
+			    extensions, conf, verbose, certopt, nameopt,
+			    default_op, ext_copy, selfsign);
+			if (j < 0)
+				goto err;
+			if (j > 0) {
+				total_done++;
+				BIO_printf(bio_err, "\n");
+				if (!BN_add_word(serial, 1))
+					goto err;
+				if (!sk_X509_push(cert_sk, x)) {
+					BIO_printf(bio_err,
+					    "Memory allocation failure\n");
+					goto err;
+				}
+			}
+		}
+		/*
+		 * we have a stack of newly certified certificates and a data
+		 * base and serial number that need updating
+		 */
+
+		if (sk_X509_num(cert_sk) > 0) {
+			if (!batch) {
+				BIO_printf(bio_err, "\n%d out of %d certificate requests certified, commit? [y/n]", total_done, total);
+				(void) BIO_flush(bio_err);
+				buf[0][0] = '\0';
+				if (!fgets(buf[0], 10, stdin)) {
+					BIO_printf(bio_err, "CERTIFICATION CANCELED: I/O error\n");
+					ret = 0;
+					goto err;
+				}
+				if ((buf[0][0] != 'y') && (buf[0][0] != 'Y')) {
+					BIO_printf(bio_err, "CERTIFICATION CANCELED\n");
+					ret = 0;
+					goto err;
+				}
+			}
+			BIO_printf(bio_err, "Write out database with %d new entries\n", sk_X509_num(cert_sk));
+
+			if (!save_serial(serialfile, "new", serial, NULL))
+				goto err;
+
+			if (!save_index(dbfile, "new", db))
+				goto err;
+		}
+		if (verbose)
+			BIO_printf(bio_err, "writing new certificates\n");
+		for (i = 0; i < sk_X509_num(cert_sk); i++) {
+			int k;
+			char *serial;
+			unsigned char *data;
+
+			x = sk_X509_value(cert_sk, i);
+
+			j = x->cert_info->serialNumber->length;
+			data = (unsigned char *)x->cert_info->serialNumber->data;
+			if (j > 0)
+				serial = bin2hex(data, j);
+			else
+				serial = strdup("00");
+			if (serial) {
+				k = snprintf(buf[2], sizeof(buf[2]),
+				    "%s/%s.pem", outdir, serial);
+				free(serial);
+				if (k == -1 || k >= sizeof(buf[2])) {
+					BIO_printf(bio_err,
+					    "certificate file name too long\n");
+					goto err;
+				}
+			} else {
+				BIO_printf(bio_err,
+				    "memory allocation failed\n");
+				goto err;
+			}
+			if (verbose)
+				BIO_printf(bio_err, "writing %s\n", buf[2]);
+
+			if (BIO_write_filename(Cout, buf[2]) <= 0) {
+				perror(buf[2]);
+				goto err;
+			}
+			write_new_certificate(Cout, x, 0, notext);
+			write_new_certificate(Sout, x, output_der, notext);
+		}
+
+		if (sk_X509_num(cert_sk)) {
+			/* Rename the database and the serial file */
+			if (!rotate_serial(serialfile, "new", "old"))
+				goto err;
+
+			if (!rotate_index(dbfile, "new", "old"))
+				goto err;
+
+			BIO_printf(bio_err, "Data Base Updated\n");
+		}
+	}
+	/*****************************************************************/
+	if (gencrl) {
+		int crl_v2 = 0;
+		if (!crl_ext) {
+			crl_ext = NCONF_get_string(conf, section, ENV_CRLEXT);
+			if (!crl_ext)
+				ERR_clear_error();
+		}
+		if (crl_ext) {
+			/* Check syntax of file */
+			X509V3_CTX ctx;
+			X509V3_set_ctx_test(&ctx);
+			X509V3_set_nconf(&ctx, conf);
+			if (!X509V3_EXT_add_nconf(conf, &ctx, crl_ext, NULL)) {
+				BIO_printf(bio_err,
+				    "Error Loading CRL extension section %s\n",
+				    crl_ext);
+				ret = 1;
+				goto err;
+			}
+		}
+		if ((crlnumberfile = NCONF_get_string(conf, section,
+		    ENV_CRLNUMBER)) != NULL)
+			if ((crlnumber = load_serial(crlnumberfile, 0,
+			    NULL)) == NULL) {
+				BIO_printf(bio_err,
+				    "error while loading CRL number\n");
+				goto err;
+			}
+		if (!crldays && !crlhours && !crlsec) {
+			if (!NCONF_get_number(conf, section,
+			    ENV_DEFAULT_CRL_DAYS, &crldays))
+				crldays = 0;
+			if (!NCONF_get_number(conf, section,
+			    ENV_DEFAULT_CRL_HOURS, &crlhours))
+				crlhours = 0;
+			ERR_clear_error();
+		}
+		if ((crldays == 0) && (crlhours == 0) && (crlsec == 0)) {
+			BIO_printf(bio_err, "cannot lookup how long until the next CRL is issued\n");
+			goto err;
+		}
+		if (verbose)
+			BIO_printf(bio_err, "making CRL\n");
+		if ((crl = X509_CRL_new()) == NULL)
+			goto err;
+		if (!X509_CRL_set_issuer_name(crl, X509_get_subject_name(x509)))
+			goto err;
+
+		tmptm = ASN1_TIME_new();
+		if (!tmptm)
+			goto err;
+		X509_gmtime_adj(tmptm, 0);
+		X509_CRL_set_lastUpdate(crl, tmptm);
+		if (!X509_time_adj_ex(tmptm, crldays,
+		    crlhours * 60 * 60 + crlsec, NULL)) {
+			BIO_puts(bio_err, "error setting CRL nextUpdate\n");
+			goto err;
+		}
+		X509_CRL_set_nextUpdate(crl, tmptm);
+
+		ASN1_TIME_free(tmptm);
+
+		for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
+			pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
+			if (pp[DB_type][0] == DB_TYPE_REV) {
+				if ((r = X509_REVOKED_new()) == NULL)
+					goto err;
+				j = make_revoked(r, pp[DB_rev_date]);
+				if (!j)
+					goto err;
+				if (j == 2)
+					crl_v2 = 1;
+				if (!BN_hex2bn(&serial, pp[DB_serial]))
+					goto err;
+				tmpser = BN_to_ASN1_INTEGER(serial, NULL);
+				BN_free(serial);
+				serial = NULL;
+				if (!tmpser)
+					goto err;
+				X509_REVOKED_set_serialNumber(r, tmpser);
+				ASN1_INTEGER_free(tmpser);
+				X509_CRL_add0_revoked(crl, r);
+			}
+		}
+
+		/*
+		 * sort the data so it will be written in serial number order
+		 */
+		X509_CRL_sort(crl);
+
+		/* we now have a CRL */
+		if (verbose)
+			BIO_printf(bio_err, "signing CRL\n");
+
+		/* Add any extensions asked for */
+
+		if (crl_ext || crlnumberfile != NULL) {
+			X509V3_CTX crlctx;
+			X509V3_set_ctx(&crlctx, x509, NULL, NULL, crl, 0);
+			X509V3_set_nconf(&crlctx, conf);
+
+			if (crl_ext)
+				if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx,
+				    crl_ext, crl))
+					goto err;
+			if (crlnumberfile != NULL) {
+				tmpser = BN_to_ASN1_INTEGER(crlnumber, NULL);
+				if (!tmpser)
+					goto err;
+				X509_CRL_add1_ext_i2d(crl, NID_crl_number,
+				    tmpser, 0, 0);
+				ASN1_INTEGER_free(tmpser);
+				crl_v2 = 1;
+				if (!BN_add_word(crlnumber, 1))
+					goto err;
+			}
+		}
+		if (crl_ext || crl_v2) {
+			if (!X509_CRL_set_version(crl, 1))
+				goto err;	/* version 2 CRL */
+		}
+		if (crlnumberfile != NULL)	/* we have a CRL number that
+						 * need updating */
+			if (!save_serial(crlnumberfile, "new", crlnumber, NULL))
+				goto err;
+
+		if (crlnumber) {
+			BN_free(crlnumber);
+			crlnumber = NULL;
+		}
+		if (!do_X509_CRL_sign(bio_err, crl, pkey, dgst, sigopts))
+			goto err;
+
+		PEM_write_bio_X509_CRL(Sout, crl);
+
+		if (crlnumberfile != NULL)	/* Rename the crlnumber file */
+			if (!rotate_serial(crlnumberfile, "new", "old"))
+				goto err;
+
+	}
+	/*****************************************************************/
+	if (dorevoke) {
+		if (infile == NULL) {
+			BIO_printf(bio_err, "no input files\n");
+			goto err;
+		} else {
+			X509 *revcert;
+			revcert = load_cert(bio_err, infile, FORMAT_PEM,
+			    NULL, e, infile);
+			if (revcert == NULL)
+				goto err;
+			j = do_revoke(revcert, db, rev_type, rev_arg);
+			if (j <= 0)
+				goto err;
+			X509_free(revcert);
+
+			if (!save_index(dbfile, "new", db))
+				goto err;
+
+			if (!rotate_index(dbfile, "new", "old"))
+				goto err;
+
+			BIO_printf(bio_err, "Data Base Updated\n");
+		}
+	}
+	/*****************************************************************/
+	ret = 0;
+
+err:
+	free(tofree);
+
+	BIO_free_all(Cout);
+	BIO_free_all(Sout);
+	BIO_free_all(out);
+	BIO_free_all(in);
+
+	if (cert_sk)
+		sk_X509_pop_free(cert_sk, X509_free);
+
+	if (ret)
+		ERR_print_errors(bio_err);
+	if (free_key && key)
+		free(key);
+	BN_free(serial);
+	BN_free(crlnumber);
+	free_index(db);
+	if (sigopts)
+		sk_OPENSSL_STRING_free(sigopts);
+	EVP_PKEY_free(pkey);
+	if (x509)
+		X509_free(x509);
+	X509_CRL_free(crl);
+	NCONF_free(conf);
+	NCONF_free(extconf);
+	OBJ_cleanup();
+
+	return (ret);
+}
+
+static void
+lookup_fail(const char *name, const char *tag)
+{
+	BIO_printf(bio_err, "variable lookup failed for %s::%s\n", name, tag);
+}
+
+static int
+certify(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509,
+    const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
+    STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj,
+    unsigned long chtype, int multirdn, int email_dn, char *startdate,
+    char *enddate, long days, int batch, char *ext_sect, CONF * lconf,
+    int verbose, unsigned long certopt, unsigned long nameopt, int default_op,
+    int ext_copy, int selfsign)
+{
+	X509_REQ *req = NULL;
+	BIO *in = NULL;
+	EVP_PKEY *pktmp = NULL;
+	int ok = -1, i;
+
+	in = BIO_new(BIO_s_file());
+
+	if (BIO_read_filename(in, infile) <= 0) {
+		perror(infile);
+		goto err;
+	}
+	if ((req = PEM_read_bio_X509_REQ(in, NULL, NULL, NULL)) == NULL) {
+		BIO_printf(bio_err, "Error reading certificate request in %s\n",
+		    infile);
+		goto err;
+	}
+	if (verbose)
+		X509_REQ_print(bio_err, req);
+
+	BIO_printf(bio_err, "Check that the request matches the signature\n");
+
+	if (selfsign && !X509_REQ_check_private_key(req, pkey)) {
+		BIO_printf(bio_err,
+		    "Certificate request and CA private key do not match\n");
+		ok = 0;
+		goto err;
+	}
+	if ((pktmp = X509_REQ_get_pubkey(req)) == NULL) {
+		BIO_printf(bio_err, "error unpacking public key\n");
+		goto err;
+	}
+	i = X509_REQ_verify(req, pktmp);
+	EVP_PKEY_free(pktmp);
+	if (i < 0) {
+		ok = 0;
+		BIO_printf(bio_err, "Signature verification problems....\n");
+		goto err;
+	}
+	if (i == 0) {
+		ok = 0;
+		BIO_printf(bio_err,
+		    "Signature did not match the certificate request\n");
+		goto err;
+	} else
+		BIO_printf(bio_err, "Signature ok\n");
+
+	ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial,
+	    subj, chtype, multirdn, email_dn, startdate, enddate, days, batch,
+	    verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
+	    ext_copy, selfsign);
+
+err:
+	if (req != NULL)
+		X509_REQ_free(req);
+	if (in != NULL)
+		BIO_free(in);
+	return (ok);
+}
+
+static int
+certify_cert(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509,
+    const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
+    STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj,
+    unsigned long chtype, int multirdn, int email_dn, char *startdate,
+    char *enddate, long days, int batch, char *ext_sect, CONF * lconf,
+    int verbose, unsigned long certopt, unsigned long nameopt, int default_op,
+    int ext_copy, ENGINE * e)
+{
+	X509 *req = NULL;
+	X509_REQ *rreq = NULL;
+	EVP_PKEY *pktmp = NULL;
+	int ok = -1, i;
+
+	if ((req = load_cert(bio_err, infile, FORMAT_PEM, NULL, e,
+	    infile)) == NULL)
+		goto err;
+	if (verbose)
+		X509_print(bio_err, req);
+
+	BIO_printf(bio_err, "Check that the request matches the signature\n");
+
+	if ((pktmp = X509_get_pubkey(req)) == NULL) {
+		BIO_printf(bio_err, "error unpacking public key\n");
+		goto err;
+	}
+	i = X509_verify(req, pktmp);
+	EVP_PKEY_free(pktmp);
+	if (i < 0) {
+		ok = 0;
+		BIO_printf(bio_err, "Signature verification problems....\n");
+		goto err;
+	}
+	if (i == 0) {
+		ok = 0;
+		BIO_printf(bio_err,
+		    "Signature did not match the certificate\n");
+		goto err;
+	} else
+		BIO_printf(bio_err, "Signature ok\n");
+
+	if ((rreq = X509_to_X509_REQ(req, NULL, EVP_md5())) == NULL)
+		goto err;
+
+	ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial,
+	    subj, chtype, multirdn, email_dn, startdate, enddate, days, batch,
+	    verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
+	    ext_copy, 0);
+
+err:
+	if (rreq != NULL)
+		X509_REQ_free(rreq);
+	if (req != NULL)
+		X509_free(req);
+	return (ok);
+}
+
+static int
+do_body(X509 ** xret, EVP_PKEY * pkey, X509 * x509, const EVP_MD * dgst,
+    STACK_OF(OPENSSL_STRING) * sigopts, STACK_OF(CONF_VALUE) * policy,
+    CA_DB * db, BIGNUM * serial, char *subj, unsigned long chtype, int multirdn,
+    int email_dn, char *startdate, char *enddate, long days, int batch,
+    int verbose, X509_REQ * req, char *ext_sect, CONF * lconf,
+    unsigned long certopt, unsigned long nameopt, int default_op,
+    int ext_copy, int selfsign)
+{
+	X509_NAME *name = NULL, *CAname = NULL, *subject = NULL, *dn_subject = NULL;
+	ASN1_UTCTIME *tm, *tmptm;
+	ASN1_STRING *str, *str2;
+	ASN1_OBJECT *obj;
+	X509 *ret = NULL;
+	X509_CINF *ci;
+	X509_NAME_ENTRY *ne;
+	X509_NAME_ENTRY *tne, *push;
+	EVP_PKEY *pktmp;
+	int ok = -1, i, j, last, nid;
+	const char *p;
+	CONF_VALUE *cv;
+	OPENSSL_STRING row[DB_NUMBER];
+	OPENSSL_STRING *irow = NULL;
+	OPENSSL_STRING *rrow = NULL;
+	char buf[25];
+
+	tmptm = ASN1_UTCTIME_new();
+	if (tmptm == NULL) {
+		BIO_printf(bio_err, "malloc error\n");
+		return (0);
+	}
+	for (i = 0; i < DB_NUMBER; i++)
+		row[i] = NULL;
+
+	if (subj) {
+		X509_NAME *n = parse_name(subj, chtype, multirdn);
+
+		if (!n) {
+			ERR_print_errors(bio_err);
+			goto err;
+		}
+		X509_REQ_set_subject_name(req, n);
+		req->req_info->enc.modified = 1;
+		X509_NAME_free(n);
+	}
+	if (default_op)
+		BIO_printf(bio_err,
+		    "The Subject's Distinguished Name is as follows\n");
+
+	name = X509_REQ_get_subject_name(req);
+	for (i = 0; i < X509_NAME_entry_count(name); i++) {
+		ne = X509_NAME_get_entry(name, i);
+		str = X509_NAME_ENTRY_get_data(ne);
+		obj = X509_NAME_ENTRY_get_object(ne);
+
+		if (msie_hack) {
+			/* assume all type should be strings */
+			nid = OBJ_obj2nid(ne->object);
+
+			if (str->type == V_ASN1_UNIVERSALSTRING)
+				ASN1_UNIVERSALSTRING_to_string(str);
+
+			if ((str->type == V_ASN1_IA5STRING) &&
+			    (nid != NID_pkcs9_emailAddress))
+				str->type = V_ASN1_T61STRING;
+
+			if ((nid == NID_pkcs9_emailAddress) &&
+			    (str->type == V_ASN1_PRINTABLESTRING))
+				str->type = V_ASN1_IA5STRING;
+		}
+		/* If no EMAIL is wanted in the subject */
+		if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) && (!email_dn))
+			continue;
+
+		/* check some things */
+		if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) &&
+		    (str->type != V_ASN1_IA5STRING)) {
+			BIO_printf(bio_err, "\nemailAddress type needs to be of type IA5STRING\n");
+			goto err;
+		}
+		if ((str->type != V_ASN1_BMPSTRING) &&
+		    (str->type != V_ASN1_UTF8STRING)) {
+			j = ASN1_PRINTABLE_type(str->data, str->length);
+			if (((j == V_ASN1_T61STRING) &&
+			    (str->type != V_ASN1_T61STRING)) ||
+			    ((j == V_ASN1_IA5STRING) &&
+			    (str->type == V_ASN1_PRINTABLESTRING))) {
+				BIO_printf(bio_err, "\nThe string contains characters that are illegal for the ASN.1 type\n");
+				goto err;
+			}
+		}
+		if (default_op)
+			old_entry_print(bio_err, obj, str);
+	}
+
+	/* Ok, now we check the 'policy' stuff. */
+	if ((subject = X509_NAME_new()) == NULL) {
+		BIO_printf(bio_err, "Memory allocation failure\n");
+		goto err;
+	}
+	/* take a copy of the issuer name before we mess with it. */
+	if (selfsign)
+		CAname = X509_NAME_dup(name);
+	else
+		CAname = X509_NAME_dup(x509->cert_info->subject);
+	if (CAname == NULL)
+		goto err;
+	str = str2 = NULL;
+
+	for (i = 0; i < sk_CONF_VALUE_num(policy); i++) {
+		cv = sk_CONF_VALUE_value(policy, i);	/* get the object id */
+		if ((j = OBJ_txt2nid(cv->name)) == NID_undef) {
+			BIO_printf(bio_err, "%s:unknown object type in 'policy' configuration\n", cv->name);
+			goto err;
+		}
+		obj = OBJ_nid2obj(j);
+
+		last = -1;
+		for (;;) {
+			/* lookup the object in the supplied name list */
+			j = X509_NAME_get_index_by_OBJ(name, obj, last);
+			if (j < 0) {
+				if (last != -1)
+					break;
+				tne = NULL;
+			} else {
+				tne = X509_NAME_get_entry(name, j);
+			}
+			last = j;
+
+			/* depending on the 'policy', decide what to do. */
+			push = NULL;
+			if (strcmp(cv->value, "optional") == 0) {
+				if (tne != NULL)
+					push = tne;
+			} else if (strcmp(cv->value, "supplied") == 0) {
+				if (tne == NULL) {
+					BIO_printf(bio_err, "The %s field needed to be supplied and was missing\n", cv->name);
+					goto err;
+				} else
+					push = tne;
+			} else if (strcmp(cv->value, "match") == 0) {
+				int last2;
+
+				if (tne == NULL) {
+					BIO_printf(bio_err, "The mandatory %s field was missing\n", cv->name);
+					goto err;
+				}
+				last2 = -1;
+
+again2:
+				j = X509_NAME_get_index_by_OBJ(CAname, obj, last2);
+				if ((j < 0) && (last2 == -1)) {
+					BIO_printf(bio_err, "The %s field does not exist in the CA certificate,\nthe 'policy' is misconfigured\n", cv->name);
+					goto err;
+				}
+				if (j >= 0) {
+					push = X509_NAME_get_entry(CAname, j);
+					str = X509_NAME_ENTRY_get_data(tne);
+					str2 = X509_NAME_ENTRY_get_data(push);
+					last2 = j;
+					if (ASN1_STRING_cmp(str, str2) != 0)
+						goto again2;
+				}
+				if (j < 0) {
+					BIO_printf(bio_err, "The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n", cv->name, ((str2 == NULL) ? "NULL" : (char *) str2->data), ((str == NULL) ? "NULL" : (char *) str->data));
+					goto err;
+				}
+			} else {
+				BIO_printf(bio_err, "%s:invalid type in 'policy' configuration\n", cv->value);
+				goto err;
+			}
+
+			if (push != NULL) {
+				if (!X509_NAME_add_entry(subject, push,
+				    -1, 0)) {
+					if (push != NULL)
+						X509_NAME_ENTRY_free(push);
+					BIO_printf(bio_err,
+					    "Memory allocation failure\n");
+					goto err;
+				}
+			}
+			if (j < 0)
+				break;
+		}
+	}
+
+	if (preserve) {
+		X509_NAME_free(subject);
+		/* subject=X509_NAME_dup(X509_REQ_get_subject_name(req)); */
+		subject = X509_NAME_dup(name);
+		if (subject == NULL)
+			goto err;
+	}
+	if (verbose)
+		BIO_printf(bio_err, "The subject name appears to be ok, checking data base for clashes\n");
+
+	/* Build the correct Subject if no e-mail is wanted in the subject */
+	/*
+	 * and add it later on because of the method extensions are added
+	 * (altName)
+	 */
+
+	if (email_dn)
+		dn_subject = subject;
+	else {
+		X509_NAME_ENTRY *tmpne;
+		/*
+		 * Its best to dup the subject DN and then delete any email
+		 * addresses because this retains its structure.
+		 */
+		if (!(dn_subject = X509_NAME_dup(subject))) {
+			BIO_printf(bio_err, "Memory allocation failure\n");
+			goto err;
+		}
+		while ((i = X509_NAME_get_index_by_NID(dn_subject,
+		    NID_pkcs9_emailAddress, -1)) >= 0) {
+			tmpne = X509_NAME_get_entry(dn_subject, i);
+			X509_NAME_delete_entry(dn_subject, i);
+			X509_NAME_ENTRY_free(tmpne);
+		}
+	}
+
+	if (BN_is_zero(serial))
+		row[DB_serial] = strdup("00");
+	else
+		row[DB_serial] = BN_bn2hex(serial);
+	if (row[DB_serial] == NULL) {
+		BIO_printf(bio_err, "Memory allocation failure\n");
+		goto err;
+	}
+	if (db->attributes.unique_subject) {
+		OPENSSL_STRING *crow = row;
+
+		rrow = TXT_DB_get_by_index(db->db, DB_name, crow);
+		if (rrow != NULL) {
+			BIO_printf(bio_err,
+			    "ERROR:There is already a certificate for %s\n",
+			    row[DB_name]);
+		}
+	}
+	if (rrow == NULL) {
+		rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
+		if (rrow != NULL) {
+			BIO_printf(bio_err,
+			    "ERROR:Serial number %s has already been issued,\n",
+			    row[DB_serial]);
+			BIO_printf(bio_err, "      check the database/serial_file for corruption\n");
+		}
+	}
+	if (rrow != NULL) {
+		BIO_printf(bio_err,
+		    "The matching entry has the following details\n");
+		if (rrow[DB_type][0] == 'E')
+			p = "Expired";
+		else if (rrow[DB_type][0] == 'R')
+			p = "Revoked";
+		else if (rrow[DB_type][0] == 'V')
+			p = "Valid";
+		else
+			p = "\ninvalid type, Data base error\n";
+		BIO_printf(bio_err, "Type	  :%s\n", p);
+		if (rrow[DB_type][0] == 'R') {
+			p = rrow[DB_exp_date];
+			if (p == NULL)
+				p = "undef";
+			BIO_printf(bio_err, "Was revoked on:%s\n", p);
+		}
+		p = rrow[DB_exp_date];
+		if (p == NULL)
+			p = "undef";
+		BIO_printf(bio_err, "Expires on    :%s\n", p);
+		p = rrow[DB_serial];
+		if (p == NULL)
+			p = "undef";
+		BIO_printf(bio_err, "Serial Number :%s\n", p);
+		p = rrow[DB_file];
+		if (p == NULL)
+			p = "undef";
+		BIO_printf(bio_err, "File name     :%s\n", p);
+		p = rrow[DB_name];
+		if (p == NULL)
+			p = "undef";
+		BIO_printf(bio_err, "Subject Name  :%s\n", p);
+		ok = -1;	/* This is now a 'bad' error. */
+		goto err;
+	}
+	/* We are now totally happy, lets make and sign the certificate */
+	if (verbose)
+		BIO_printf(bio_err, "Everything appears to be ok, creating and signing the certificate\n");
+
+	if ((ret = X509_new()) == NULL)
+		goto err;
+	ci = ret->cert_info;
+
+#ifdef X509_V3
+	/* Make it an X509 v3 certificate. */
+	if (!X509_set_version(ret, 2))
+		goto err;
+#endif
+
+	if (BN_to_ASN1_INTEGER(serial, ci->serialNumber) == NULL)
+		goto err;
+	if (selfsign) {
+		if (!X509_set_issuer_name(ret, subject))
+			goto err;
+	} else {
+		if (!X509_set_issuer_name(ret, X509_get_subject_name(x509)))
+			goto err;
+	}
+
+	if (strcmp(startdate, "today") == 0)
+		X509_gmtime_adj(X509_get_notBefore(ret), 0);
+	else
+		ASN1_TIME_set_string(X509_get_notBefore(ret), startdate);
+
+	if (enddate == NULL)
+		X509_time_adj_ex(X509_get_notAfter(ret), days, 0, NULL);
+	else
+		ASN1_TIME_set_string(X509_get_notAfter(ret), enddate);
+
+	if (!X509_set_subject_name(ret, subject))
+		goto err;
+
+	pktmp = X509_REQ_get_pubkey(req);
+	i = X509_set_pubkey(ret, pktmp);
+	EVP_PKEY_free(pktmp);
+	if (!i)
+		goto err;
+
+	/* Lets add the extensions, if there are any */
+	if (ext_sect) {
+		X509V3_CTX ctx;
+		if (ci->version == NULL)
+			if ((ci->version = ASN1_INTEGER_new()) == NULL)
+				goto err;
+		ASN1_INTEGER_set(ci->version, 2);	/* version 3 certificate */
+
+		/*
+		 * Free the current entries if any, there should not be any I
+		 * believe
+		 */
+		if (ci->extensions != NULL)
+			sk_X509_EXTENSION_pop_free(ci->extensions,
+			    X509_EXTENSION_free);
+
+		ci->extensions = NULL;
+
+		/* Initialize the context structure */
+		if (selfsign)
+			X509V3_set_ctx(&ctx, ret, ret, req, NULL, 0);
+		else
+			X509V3_set_ctx(&ctx, x509, ret, req, NULL, 0);
+
+		if (extconf) {
+			if (verbose)
+				BIO_printf(bio_err,
+				    "Extra configuration file found\n");
+
+			/* Use the extconf configuration db LHASH */
+			X509V3_set_nconf(&ctx, extconf);
+
+			/* Test the structure (needed?) */
+			/* X509V3_set_ctx_test(&ctx); */
+
+			/* Adds exts contained in the configuration file */
+			if (!X509V3_EXT_add_nconf(extconf, &ctx,
+			    ext_sect, ret)) {
+				BIO_printf(bio_err,
+				    "ERROR: adding extensions in section %s\n",
+				    ext_sect);
+				ERR_print_errors(bio_err);
+				goto err;
+			}
+			if (verbose)
+				BIO_printf(bio_err, "Successfully added extensions from file.\n");
+		} else if (ext_sect) {
+			/* We found extensions to be set from config file */
+			X509V3_set_nconf(&ctx, lconf);
+
+			if (!X509V3_EXT_add_nconf(lconf, &ctx, ext_sect, ret)) {
+				BIO_printf(bio_err,
+				    "ERROR: adding extensions in section %s\n",
+				    ext_sect);
+				ERR_print_errors(bio_err);
+				goto err;
+			}
+			if (verbose)
+				BIO_printf(bio_err, "Successfully added extensions from config\n");
+		}
+	}
+	/* Copy extensions from request (if any) */
+
+	if (!copy_extensions(ret, req, ext_copy)) {
+		BIO_printf(bio_err, "ERROR: adding extensions from request\n");
+		ERR_print_errors(bio_err);
+		goto err;
+	}
+	/* Set the right value for the noemailDN option */
+	if (email_dn == 0) {
+		if (!X509_set_subject_name(ret, dn_subject))
+			goto err;
+	}
+	if (!default_op) {
+		BIO_printf(bio_err, "Certificate Details:\n");
+		/*
+		 * Never print signature details because signature not
+		 * present
+		 */
+		certopt |= X509_FLAG_NO_SIGDUMP | X509_FLAG_NO_SIGNAME;
+		X509_print_ex(bio_err, ret, nameopt, certopt);
+	}
+	BIO_printf(bio_err, "Certificate is to be certified until ");
+	ASN1_TIME_print(bio_err, X509_get_notAfter(ret));
+	if (days)
+		BIO_printf(bio_err, " (%ld days)", days);
+	BIO_printf(bio_err, "\n");
+
+	if (!batch) {
+
+		BIO_printf(bio_err, "Sign the certificate? [y/n]:");
+		(void) BIO_flush(bio_err);
+		buf[0] = '\0';
+		if (!fgets(buf, sizeof(buf) - 1, stdin)) {
+			BIO_printf(bio_err,
+			    "CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
+			ok = 0;
+			goto err;
+		}
+		if (!((buf[0] == 'y') || (buf[0] == 'Y'))) {
+			BIO_printf(bio_err,
+			    "CERTIFICATE WILL NOT BE CERTIFIED\n");
+			ok = 0;
+			goto err;
+		}
+	}
+	pktmp = X509_get_pubkey(ret);
+	if (EVP_PKEY_missing_parameters(pktmp) &&
+	    !EVP_PKEY_missing_parameters(pkey))
+		EVP_PKEY_copy_parameters(pktmp, pkey);
+	EVP_PKEY_free(pktmp);
+
+	if (!do_X509_sign(bio_err, ret, pkey, dgst, sigopts))
+		goto err;
+
+	/* We now just add it to the database */
+	row[DB_type] = malloc(2);
+
+	tm = X509_get_notAfter(ret);
+	row[DB_exp_date] = malloc(tm->length + 1);
+	memcpy(row[DB_exp_date], tm->data, tm->length);
+	row[DB_exp_date][tm->length] = '\0';
+
+	row[DB_rev_date] = NULL;
+
+	/* row[DB_serial] done already */
+	row[DB_file] = malloc(8);
+	row[DB_name] = X509_NAME_oneline(X509_get_subject_name(ret), NULL, 0);
+
+	if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
+	    (row[DB_file] == NULL) || (row[DB_name] == NULL)) {
+		BIO_printf(bio_err, "Memory allocation failure\n");
+		goto err;
+	}
+	(void) strlcpy(row[DB_file], "unknown", 8);
+	row[DB_type][0] = 'V';
+	row[DB_type][1] = '\0';
+
+	if ((irow = reallocarray(NULL, DB_NUMBER + 1, sizeof(char *))) ==
+	    NULL) {
+		BIO_printf(bio_err, "Memory allocation failure\n");
+		goto err;
+	}
+	for (i = 0; i < DB_NUMBER; i++) {
+		irow[i] = row[i];
+		row[i] = NULL;
+	}
+	irow[DB_NUMBER] = NULL;
+
+	if (!TXT_DB_insert(db->db, irow)) {
+		BIO_printf(bio_err, "failed to update database\n");
+		BIO_printf(bio_err, "TXT_DB error number %ld\n", db->db->error);
+		goto err;
+	}
+	ok = 1;
+err:
+	for (i = 0; i < DB_NUMBER; i++)
+		free(row[i]);
+
+	if (CAname != NULL)
+		X509_NAME_free(CAname);
+	if (subject != NULL)
+		X509_NAME_free(subject);
+	if ((dn_subject != NULL) && !email_dn)
+		X509_NAME_free(dn_subject);
+	if (tmptm != NULL)
+		ASN1_UTCTIME_free(tmptm);
+	if (ok <= 0) {
+		if (ret != NULL)
+			X509_free(ret);
+		ret = NULL;
+	} else
+		*xret = ret;
+	return (ok);
+}
+
+static void
+write_new_certificate(BIO * bp, X509 * x, int output_der, int notext)
+{
+	if (output_der) {
+		(void) i2d_X509_bio(bp, x);
+		return;
+	}
+#if 0
+	/* ??? Not needed since X509_print prints all this stuff anyway */
+	f = X509_NAME_oneline(X509_get_issuer_name(x), buf, 256);
+	BIO_printf(bp, "issuer :%s\n", f);
+
+	f = X509_NAME_oneline(X509_get_subject_name(x), buf, 256);
+	BIO_printf(bp, "subject:%s\n", f);
+
+	BIO_puts(bp, "serial :");
+	i2a_ASN1_INTEGER(bp, x->cert_info->serialNumber);
+	BIO_puts(bp, "\n\n");
+#endif
+	if (!notext)
+		X509_print(bp, x);
+	PEM_write_bio_X509(bp, x);
+}
+
+static int
+certify_spkac(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509,
+    const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
+    STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj,
+    unsigned long chtype, int multirdn, int email_dn, char *startdate,
+    char *enddate, long days, char *ext_sect, CONF * lconf, int verbose,
+    unsigned long certopt, unsigned long nameopt, int default_op, int ext_copy)
+{
+	STACK_OF(CONF_VALUE) * sk = NULL;
+	LHASH_OF(CONF_VALUE) * parms = NULL;
+	X509_REQ *req = NULL;
+	CONF_VALUE *cv = NULL;
+	NETSCAPE_SPKI *spki = NULL;
+	X509_REQ_INFO *ri;
+	char *type, *buf;
+	EVP_PKEY *pktmp = NULL;
+	X509_NAME *n = NULL;
+	X509_NAME_ENTRY *ne = NULL;
+	int ok = -1, i, j;
+	long errline;
+	int nid;
+
+	/*
+	 * Load input file into a hash table.  (This is just an easy
+	 * way to read and parse the file, then put it into a convenient
+	 * STACK format).
+	 */
+	parms = CONF_load(NULL, infile, &errline);
+	if (parms == NULL) {
+		BIO_printf(bio_err, "error on line %ld of %s\n",
+		    errline, infile);
+		ERR_print_errors(bio_err);
+		goto err;
+	}
+	sk = CONF_get_section(parms, "default");
+	if (sk_CONF_VALUE_num(sk) == 0) {
+		BIO_printf(bio_err, "no name/value pairs found in %s\n",
+		    infile);
+		CONF_free(parms);
+		goto err;
+	}
+	/*
+	 * Now create a dummy X509 request structure.  We don't actually
+	 * have an X509 request, but we have many of the components
+	 * (a public key, various DN components).  The idea is that we
+	 * put these components into the right X509 request structure
+	 * and we can use the same code as if you had a real X509 request.
+	 */
+	req = X509_REQ_new();
+	if (req == NULL) {
+		ERR_print_errors(bio_err);
+		goto err;
+	}
+	/*
+	 * Build up the subject name set.
+	 */
+	ri = req->req_info;
+	n = ri->subject;
+
+	for (i = 0;; i++) {
+		if (sk_CONF_VALUE_num(sk) <= i)
+			break;
+
+		cv = sk_CONF_VALUE_value(sk, i);
+		type = cv->name;
+		/*
+		 * Skip past any leading X. X: X, etc to allow for multiple
+		 * instances
+		 */
+		for (buf = cv->name; *buf; buf++) {
+			if ((*buf == ':') || (*buf == ',') || (*buf == '.')) {
+				buf++;
+				if (*buf)
+					type = buf;
+				break;
+			}
+		}
+
+		buf = cv->value;
+		if ((nid = OBJ_txt2nid(type)) == NID_undef) {
+			if (strcmp(type, "SPKAC") == 0) {
+				spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
+				if (spki == NULL) {
+					BIO_printf(bio_err, "unable to load Netscape SPKAC structure\n");
+					ERR_print_errors(bio_err);
+					goto err;
+				}
+			}
+			continue;
+		}
+		if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
+		    (unsigned char *)buf, -1, -1, 0))
+			goto err;
+	}
+	if (spki == NULL) {
+		BIO_printf(bio_err,
+		    "Netscape SPKAC structure not found in %s\n", infile);
+		goto err;
+	}
+	/*
+	 * Now extract the key from the SPKI structure.
+	 */
+
+	BIO_printf(bio_err,
+	    "Check that the SPKAC request matches the signature\n");
+
+	if ((pktmp = NETSCAPE_SPKI_get_pubkey(spki)) == NULL) {
+		BIO_printf(bio_err, "error unpacking SPKAC public key\n");
+		goto err;
+	}
+	j = NETSCAPE_SPKI_verify(spki, pktmp);
+	if (j <= 0) {
+		BIO_printf(bio_err,
+		    "signature verification failed on SPKAC public key\n");
+		goto err;
+	}
+	BIO_printf(bio_err, "Signature ok\n");
+
+	X509_REQ_set_pubkey(req, pktmp);
+	EVP_PKEY_free(pktmp);
+	ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial,
+	    subj, chtype, multirdn, email_dn, startdate, enddate, days, 1,
+	    verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
+	    ext_copy, 0);
+
+err:
+	if (req != NULL)
+		X509_REQ_free(req);
+	if (parms != NULL)
+		CONF_free(parms);
+	if (spki != NULL)
+		NETSCAPE_SPKI_free(spki);
+	if (ne != NULL)
+		X509_NAME_ENTRY_free(ne);
+
+	return (ok);
+}
+
+static int
+check_time_format(const char *str)
+{
+	return ASN1_TIME_set_string(NULL, str);
+}
+
+static int
+do_revoke(X509 * x509, CA_DB * db, int type, char *value)
+{
+	ASN1_UTCTIME *tm = NULL;
+	char *row[DB_NUMBER], **rrow, **irow;
+	char *rev_str = NULL;
+	BIGNUM *bn = NULL;
+	int ok = -1, i;
+
+	for (i = 0; i < DB_NUMBER; i++)
+		row[i] = NULL;
+	row[DB_name] = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0);
+	bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(x509), NULL);
+	if (!bn)
+		goto err;
+	if (BN_is_zero(bn))
+		row[DB_serial] = strdup("00");
+	else
+		row[DB_serial] = BN_bn2hex(bn);
+	BN_free(bn);
+	if ((row[DB_name] == NULL) || (row[DB_serial] == NULL)) {
+		BIO_printf(bio_err, "Memory allocation failure\n");
+		goto err;
+	}
+	/*
+	 * We have to lookup by serial number because name lookup skips
+	 * revoked certs
+	 */
+	rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
+	if (rrow == NULL) {
+		BIO_printf(bio_err,
+		    "Adding Entry with serial number %s to DB for %s\n",
+		    row[DB_serial], row[DB_name]);
+
+		/* We now just add it to the database */
+		row[DB_type] = malloc(2);
+
+		tm = X509_get_notAfter(x509);
+		row[DB_exp_date] = malloc(tm->length + 1);
+		memcpy(row[DB_exp_date], tm->data, tm->length);
+		row[DB_exp_date][tm->length] = '\0';
+
+		row[DB_rev_date] = NULL;
+
+		/* row[DB_serial] done already */
+		row[DB_file] = malloc(8);
+
+		/* row[DB_name] done already */
+
+		if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
+		    (row[DB_file] == NULL)) {
+			BIO_printf(bio_err, "Memory allocation failure\n");
+			goto err;
+		}
+		(void) strlcpy(row[DB_file], "unknown", 8);
+		row[DB_type][0] = 'V';
+		row[DB_type][1] = '\0';
+
+		if ((irow = reallocarray(NULL, sizeof(char *),
+		    (DB_NUMBER + 1))) == NULL) {
+			BIO_printf(bio_err, "Memory allocation failure\n");
+			goto err;
+		}
+		for (i = 0; i < DB_NUMBER; i++) {
+			irow[i] = row[i];
+			row[i] = NULL;
+		}
+		irow[DB_NUMBER] = NULL;
+
+		if (!TXT_DB_insert(db->db, irow)) {
+			BIO_printf(bio_err, "failed to update database\n");
+			BIO_printf(bio_err, "TXT_DB error number %ld\n",
+			    db->db->error);
+			goto err;
+		}
+		/* Revoke Certificate */
+		ok = do_revoke(x509, db, type, value);
+
+		goto err;
+
+	} else if (index_name_cmp_noconst(row, rrow)) {
+		BIO_printf(bio_err, "ERROR:name does not match %s\n",
+		    row[DB_name]);
+		goto err;
+	} else if (rrow[DB_type][0] == 'R') {
+		BIO_printf(bio_err, "ERROR:Already revoked, serial number %s\n",
+		    row[DB_serial]);
+		goto err;
+	} else {
+		BIO_printf(bio_err, "Revoking Certificate %s.\n",
+		    rrow[DB_serial]);
+		rev_str = make_revocation_str(type, value);
+		if (!rev_str) {
+			BIO_printf(bio_err, "Error in revocation arguments\n");
+			goto err;
+		}
+		rrow[DB_type][0] = 'R';
+		rrow[DB_type][1] = '\0';
+		rrow[DB_rev_date] = rev_str;
+	}
+	ok = 1;
+
+err:
+	for (i = 0; i < DB_NUMBER; i++)
+		free(row[i]);
+
+	return (ok);
+}
+
+static int
+get_certificate_status(const char *serial, CA_DB * db)
+{
+	char *row[DB_NUMBER], **rrow;
+	int ok = -1, i;
+
+	/* Free Resources */
+	for (i = 0; i < DB_NUMBER; i++)
+		row[i] = NULL;
+
+	/* Malloc needed char spaces */
+	row[DB_serial] = malloc(strlen(serial) + 2);
+	if (row[DB_serial] == NULL) {
+		BIO_printf(bio_err, "Malloc failure\n");
+		goto err;
+	}
+	if (strlen(serial) % 2) {
+		/* Set the first char to 0 */ ;
+		row[DB_serial][0] = '0';
+
+		/* Copy String from serial to row[DB_serial] */
+		memcpy(row[DB_serial] + 1, serial, strlen(serial));
+		row[DB_serial][strlen(serial) + 1] = '\0';
+	} else {
+		/* Copy String from serial to row[DB_serial] */
+		memcpy(row[DB_serial], serial, strlen(serial));
+		row[DB_serial][strlen(serial)] = '\0';
+	}
+
+	/* Make it Upper Case */
+	for (i = 0; row[DB_serial][i] != '\0'; i++)
+		row[DB_serial][i] = toupper((unsigned char) row[DB_serial][i]);
+
+
+	ok = 1;
+
+	/* Search for the certificate */
+	rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
+	if (rrow == NULL) {
+		BIO_printf(bio_err, "Serial %s not present in db.\n",
+		    row[DB_serial]);
+		ok = -1;
+		goto err;
+	} else if (rrow[DB_type][0] == 'V') {
+		BIO_printf(bio_err, "%s=Valid (%c)\n",
+		    row[DB_serial], rrow[DB_type][0]);
+		goto err;
+	} else if (rrow[DB_type][0] == 'R') {
+		BIO_printf(bio_err, "%s=Revoked (%c)\n",
+		    row[DB_serial], rrow[DB_type][0]);
+		goto err;
+	} else if (rrow[DB_type][0] == 'E') {
+		BIO_printf(bio_err, "%s=Expired (%c)\n",
+		    row[DB_serial], rrow[DB_type][0]);
+		goto err;
+	} else if (rrow[DB_type][0] == 'S') {
+		BIO_printf(bio_err, "%s=Suspended (%c)\n",
+		    row[DB_serial], rrow[DB_type][0]);
+		goto err;
+	} else {
+		BIO_printf(bio_err, "%s=Unknown (%c).\n",
+		    row[DB_serial], rrow[DB_type][0]);
+		ok = -1;
+	}
+
+err:
+	for (i = 0; i < DB_NUMBER; i++)
+		free(row[i]);
+
+	return (ok);
+}
+
+static int
+do_updatedb(CA_DB * db)
+{
+	ASN1_UTCTIME *a_tm = NULL;
+	int i, cnt = 0;
+	int db_y2k, a_y2k;	/* flags = 1 if y >= 2000 */
+	char **rrow, *a_tm_s;
+
+	a_tm = ASN1_UTCTIME_new();
+
+	/* get actual time and make a string */
+	a_tm = X509_gmtime_adj(a_tm, 0);
+	a_tm_s = malloc(a_tm->length + 1);
+	if (a_tm_s == NULL) {
+		cnt = -1;
+		goto err;
+	}
+	memcpy(a_tm_s, a_tm->data, a_tm->length);
+	a_tm_s[a_tm->length] = '\0';
+
+	if (strncmp(a_tm_s, "49", 2) <= 0)
+		a_y2k = 1;
+	else
+		a_y2k = 0;
+
+	for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
+		rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
+
+		if (rrow[DB_type][0] == 'V') {
+			/* ignore entries that are not valid */
+			if (strncmp(rrow[DB_exp_date], "49", 2) <= 0)
+				db_y2k = 1;
+			else
+				db_y2k = 0;
+
+			if (db_y2k == a_y2k) {
+				/* all on the same y2k side */
+				if (strcmp(rrow[DB_exp_date], a_tm_s) <= 0) {
+					rrow[DB_type][0] = 'E';
+					rrow[DB_type][1] = '\0';
+					cnt++;
+
+					BIO_printf(bio_err, "%s=Expired\n",
+					    rrow[DB_serial]);
+				}
+			} else if (db_y2k < a_y2k) {
+				rrow[DB_type][0] = 'E';
+				rrow[DB_type][1] = '\0';
+				cnt++;
+
+				BIO_printf(bio_err, "%s=Expired\n",
+				    rrow[DB_serial]);
+			}
+		}
+	}
+
+err:
+	ASN1_UTCTIME_free(a_tm);
+	free(a_tm_s);
+
+	return (cnt);
+}
+
+static const char *crl_reasons[] = {
+	/* CRL reason strings */
+	"unspecified",
+	"keyCompromise",
+	"CACompromise",
+	"affiliationChanged",
+	"superseded",
+	"cessationOfOperation",
+	"certificateHold",
+	"removeFromCRL",
+	/* Additional pseudo reasons */
+	"holdInstruction",
+	"keyTime",
+	"CAkeyTime"
+};
+
+#define NUM_REASONS (sizeof(crl_reasons) / sizeof(char *))
+
+/* Given revocation information convert to a DB string.
+ * The format of the string is:
+ * revtime[,reason,extra]. Where 'revtime' is the
+ * revocation time (the current time). 'reason' is the
+ * optional CRL reason and 'extra' is any additional
+ * argument
+ */
+
+char *
+make_revocation_str(int rev_type, char *rev_arg)
+{
+	char *other = NULL, *str;
+	const char *reason = NULL;
+	ASN1_OBJECT *otmp;
+	ASN1_UTCTIME *revtm = NULL;
+	int i;
+	switch (rev_type) {
+	case REV_NONE:
+		break;
+
+	case REV_CRL_REASON:
+		for (i = 0; i < 8; i++) {
+			if (!strcasecmp(rev_arg, crl_reasons[i])) {
+				reason = crl_reasons[i];
+				break;
+			}
+		}
+		if (reason == NULL) {
+			BIO_printf(bio_err, "Unknown CRL reason %s\n", rev_arg);
+			return NULL;
+		}
+		break;
+
+	case REV_HOLD:
+		/* Argument is an OID */
+
+		otmp = OBJ_txt2obj(rev_arg, 0);
+		ASN1_OBJECT_free(otmp);
+
+		if (otmp == NULL) {
+			BIO_printf(bio_err,
+			    "Invalid object identifier %s\n", rev_arg);
+			return NULL;
+		}
+		reason = "holdInstruction";
+		other = rev_arg;
+		break;
+
+	case REV_KEY_COMPROMISE:
+	case REV_CA_COMPROMISE:
+
+		/* Argument is the key compromise time  */
+		if (!ASN1_GENERALIZEDTIME_set_string(NULL, rev_arg)) {
+			BIO_printf(bio_err,
+			    "Invalid time format %s. Need YYYYMMDDHHMMSSZ\n",
+			    rev_arg);
+			return NULL;
+		}
+		other = rev_arg;
+		if (rev_type == REV_KEY_COMPROMISE)
+			reason = "keyTime";
+		else
+			reason = "CAkeyTime";
+
+		break;
+
+	}
+
+	revtm = X509_gmtime_adj(NULL, 0);
+	if (asprintf(&str, "%s%s%s%s%s", revtm->data,
+	    reason ? "," : "", reason ? reason : "",
+	    other ? "," : "", other ? other : "") == -1)
+		str = NULL;
+	ASN1_UTCTIME_free(revtm);
+	return str;
+}
+
+/* Convert revocation field to X509_REVOKED entry
+ * return code:
+ * 0 error
+ * 1 OK
+ * 2 OK and some extensions added (i.e. V2 CRL)
+ */
+
+int
+make_revoked(X509_REVOKED * rev, const char *str)
+{
+	char *tmp = NULL;
+	int reason_code = -1;
+	int i, ret = 0;
+	ASN1_OBJECT *hold = NULL;
+	ASN1_GENERALIZEDTIME *comp_time = NULL;
+	ASN1_ENUMERATED *rtmp = NULL;
+
+	ASN1_TIME *revDate = NULL;
+
+	i = unpack_revinfo(&revDate, &reason_code, &hold, &comp_time, str);
+
+	if (i == 0)
+		goto err;
+
+	if (rev && !X509_REVOKED_set_revocationDate(rev, revDate))
+		goto err;
+
+	if (rev && (reason_code != OCSP_REVOKED_STATUS_NOSTATUS)) {
+		rtmp = ASN1_ENUMERATED_new();
+		if (!rtmp || !ASN1_ENUMERATED_set(rtmp, reason_code))
+			goto err;
+		if (!X509_REVOKED_add1_ext_i2d(rev, NID_crl_reason, rtmp, 0, 0))
+			goto err;
+	}
+	if (rev && comp_time) {
+		if (!X509_REVOKED_add1_ext_i2d(rev, NID_invalidity_date,
+		    comp_time, 0, 0))
+			goto err;
+	}
+	if (rev && hold) {
+		if (!X509_REVOKED_add1_ext_i2d(rev, NID_hold_instruction_code,
+		    hold, 0, 0))
+			goto err;
+	}
+	if (reason_code != OCSP_REVOKED_STATUS_NOSTATUS)
+		ret = 2;
+	else
+		ret = 1;
+
+err:
+	free(tmp);
+
+	ASN1_OBJECT_free(hold);
+	ASN1_GENERALIZEDTIME_free(comp_time);
+	ASN1_ENUMERATED_free(rtmp);
+	ASN1_TIME_free(revDate);
+
+	return ret;
+}
+
+int
+old_entry_print(BIO * bp, ASN1_OBJECT * obj, ASN1_STRING * str)
+{
+	char buf[25], *pbuf, *p;
+	int j;
+
+	j = i2a_ASN1_OBJECT(bp, obj);
+	pbuf = buf;
+	for (j = 22 - j; j > 0; j--)
+		*(pbuf++) = ' ';
+	*(pbuf++) = ':';
+	*(pbuf++) = '\0';
+	BIO_puts(bp, buf);
+
+	if (str->type == V_ASN1_PRINTABLESTRING)
+		BIO_printf(bp, "PRINTABLE:'");
+	else if (str->type == V_ASN1_T61STRING)
+		BIO_printf(bp, "T61STRING:'");
+	else if (str->type == V_ASN1_IA5STRING)
+		BIO_printf(bp, "IA5STRING:'");
+	else if (str->type == V_ASN1_UNIVERSALSTRING)
+		BIO_printf(bp, "UNIVERSALSTRING:'");
+	else
+		BIO_printf(bp, "ASN.1 %2d:'", str->type);
+
+	p = (char *) str->data;
+	for (j = str->length; j > 0; j--) {
+		if ((*p >= ' ') && (*p <= '~'))
+			BIO_printf(bp, "%c", *p);
+		else if (*p & 0x80)
+			BIO_printf(bp, "\\0x%02X", *p);
+		else if ((unsigned char) *p == 0xf7)
+			BIO_printf(bp, "^?");
+		else
+			BIO_printf(bp, "^%c", *p + '@');
+		p++;
+	}
+	BIO_printf(bp, "'\n");
+	return 1;
+}
+
+int
+unpack_revinfo(ASN1_TIME ** prevtm, int *preason, ASN1_OBJECT ** phold,
+    ASN1_GENERALIZEDTIME ** pinvtm, const char *str)
+{
+	char *tmp = NULL;
+	char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
+	int reason_code = -1;
+	int ret = 0;
+	unsigned int i;
+	ASN1_OBJECT *hold = NULL;
+	ASN1_GENERALIZEDTIME *comp_time = NULL;
+
+	if ((tmp = strdup(str)) == NULL) {
+		BIO_printf(bio_err, "malloc failed\n");
+		goto err;
+	}
+	p = strchr(tmp, ',');
+	rtime_str = tmp;
+
+	if (p) {
+		*p = '\0';
+		p++;
+		reason_str = p;
+		p = strchr(p, ',');
+		if (p) {
+			*p = '\0';
+			arg_str = p + 1;
+		}
+	}
+	if (prevtm) {
+		*prevtm = ASN1_UTCTIME_new();
+		if (!ASN1_UTCTIME_set_string(*prevtm, rtime_str)) {
+			BIO_printf(bio_err, "invalid revocation date %s\n",
+			    rtime_str);
+			goto err;
+		}
+	}
+	if (reason_str) {
+		for (i = 0; i < NUM_REASONS; i++) {
+			if (!strcasecmp(reason_str, crl_reasons[i])) {
+				reason_code = i;
+				break;
+			}
+		}
+		if (reason_code == OCSP_REVOKED_STATUS_NOSTATUS) {
+			BIO_printf(bio_err, "invalid reason code %s\n",
+			    reason_str);
+			goto err;
+		}
+		if (reason_code == 7)
+			reason_code = OCSP_REVOKED_STATUS_REMOVEFROMCRL;
+		else if (reason_code == 8) {	/* Hold instruction */
+			if (!arg_str) {
+				BIO_printf(bio_err,
+				    "missing hold instruction\n");
+				goto err;
+			}
+			reason_code = OCSP_REVOKED_STATUS_CERTIFICATEHOLD;
+			hold = OBJ_txt2obj(arg_str, 0);
+
+			if (!hold) {
+				BIO_printf(bio_err,
+				    "invalid object identifier %s\n", arg_str);
+				goto err;
+			}
+			if (phold)
+				*phold = hold;
+		} else if ((reason_code == 9) || (reason_code == 10)) {
+			if (!arg_str) {
+				BIO_printf(bio_err,
+				    "missing compromised time\n");
+				goto err;
+			}
+			comp_time = ASN1_GENERALIZEDTIME_new();
+			if (!ASN1_GENERALIZEDTIME_set_string(comp_time,
+			    arg_str)) {
+				BIO_printf(bio_err,
+				    "invalid compromised time %s\n", arg_str);
+				goto err;
+			}
+			if (reason_code == 9)
+				reason_code = OCSP_REVOKED_STATUS_KEYCOMPROMISE;
+			else
+				reason_code = OCSP_REVOKED_STATUS_CACOMPROMISE;
+		}
+	}
+	if (preason)
+		*preason = reason_code;
+	if (pinvtm)
+		*pinvtm = comp_time;
+	else
+		ASN1_GENERALIZEDTIME_free(comp_time);
+
+	ret = 1;
+
+err:
+	free(tmp);
+
+	if (!phold)
+		ASN1_OBJECT_free(hold);
+	if (!pinvtm)
+		ASN1_GENERALIZEDTIME_free(comp_time);
+
+	return ret;
+}
+
+static char *
+bin2hex(unsigned char * data, size_t len)
+{
+	char *ret = NULL;
+	char hex[] = "0123456789ABCDEF";
+	int i;
+
+	if ((ret = malloc(len * 2 + 1))) {
+		for (i = 0; i < len; i++) {
+			ret[i * 2 + 0] = hex[data[i] >> 4];
+			ret[i * 2 + 1] = hex[data[i] & 0x0F];
+		}
+		ret[len * 2] = '\0';
+	}
+	return ret;
+}