ca.c 73.6 KB
Newer Older
1
/* apps/ca.c */
2
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
 * 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
64
#include <ctype.h>
65
#include <sys/types.h>
66 67 68 69 70 71 72 73 74
#include <openssl/conf.h>
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/txt_db.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/objects.h>
75
#include <openssl/ocsp.h>
76
#include <openssl/pem.h>
77 78

#ifndef W_OK
79
#  ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
80 81 82 83 84
#    if defined(__DECC)
#      include <unistd.h>
#    else
#      include <unixlib.h>
#    endif
R
Richard Levitte 已提交
85
#  elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_NETWARE)
U
Ulf Möller 已提交
86 87 88 89
#    include <sys/file.h>
#  endif
#endif

90 91
#include "apps.h"

U
Ulf Möller 已提交
92 93 94 95 96
#ifndef W_OK
#  define F_OK 0
#  define X_OK 1
#  define W_OK 2
#  define R_OK 4
97 98 99 100 101 102
#endif

#undef PROG
#define PROG ca_main

#define BASE_SECTION	"ca"
U
Ulf Möller 已提交
103
#define CONFIG_FILE "openssl.cnf"
104 105 106

#define ENV_DEFAULT_CA		"default_ca"

D
Dr. Stephen Henson 已提交
107 108 109
#define STRING_MASK	"string_mask"
#define UTF8_IN			"utf8"

110 111 112 113 114 115 116
#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"
R
Richard Levitte 已提交
117
#define ENV_CRLNUMBER		"crlnumber"
118 119 120 121
#define ENV_CRL			"crl"
#define ENV_PRIVATE_KEY		"private_key"
#define ENV_RANDFILE		"RANDFILE"
#define ENV_DEFAULT_DAYS 	"default_days"
122
#define ENV_DEFAULT_STARTDATE 	"default_startdate"
123
#define ENV_DEFAULT_ENDDATE 	"default_enddate"
124 125 126
#define ENV_DEFAULT_CRL_DAYS 	"default_crl_days"
#define ENV_DEFAULT_CRL_HOURS 	"default_crl_hours"
#define ENV_DEFAULT_MD		"default_md"
127
#define ENV_DEFAULT_EMAIL_DN	"email_in_dn"
128 129 130
#define ENV_PRESERVE		"preserve"
#define ENV_POLICY      	"policy"
#define ENV_EXTENSIONS      	"x509_extensions"
131
#define ENV_CRLEXT      	"crl_extensions"
132
#define ENV_MSIE_HACK		"msie_hack"
D
 
Dr. Stephen Henson 已提交
133 134
#define ENV_NAMEOPT		"name_opt"
#define ENV_CERTOPT		"cert_opt"
135
#define ENV_EXTCOPY		"copy_extensions"
136
#define ENV_UNIQUE_SUBJECT	"unique_subject"
137 138 139

#define ENV_DATABASE		"database"

140 141 142 143 144 145 146 147
/* 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 */

N
Nils Larsch 已提交
148
static const char *ca_usage[]={
149 150
"usage: ca args\n",
"\n",
151
" -verbose        - Talk a lot while doing things\n",
152 153 154 155 156
" -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",
157 158
" -startdate YYMMDDHHMMSSZ  - certificate validity notBefore\n",
" -enddate YYMMDDHHMMSSZ    - certificate validity notAfter (overrides -days)\n",
159 160 161
" -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",
162 163
" -keyfile arg    - private key file\n",
" -keyform arg    - private key file format (PEM or ENGINE)\n",
164
" -key arg        - key to decode the private key if it is encrypted\n",
B
Ben Laurie 已提交
165
" -cert file      - The CA certificate\n",
166
" -selfsign       - sign a certificate with the key associated with it\n",
167 168 169 170 171
" -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",
172
" -ss_cert file   - File contains a self signed cert to sign\n",
173
" -preserveDN     - Don't re-order the DN\n",
174
" -noemailDN      - Don't add the EMAIL field into certificate' subject\n",
175 176
" -batch          - Don't ask questions\n",
" -msie_hack      - msie modifications to handle all those universal strings\n",
177
" -revoke file    - Revoke a certificate (given in file)\n",
178
" -subj arg       - Use arg instead of request's subject\n",
D
Dr. Stephen Henson 已提交
179
" -utf8           - input characters are UTF8 (default ASCII)\n",
180
" -multivalue-rdn - enable support for multivalued RDNs\n",
181
" -extensions ..  - Extension section (override value in config file)\n",
182
" -extfile file   - Configuration file with X509v3 extensions to add\n",
183
" -crlexts ..     - CRL extension section (override value in config file)\n",
184
#ifndef OPENSSL_NO_ENGINE
185
" -engine e       - use engine e, possibly a hardware device.\n",
186
#endif
187 188
" -status serial  - Shows certificate status given the serial number\n",
" -updatedb       - Updates db for expired certificates\n",
189 190 191 192 193 194 195 196 197
NULL
};

#ifdef EFENCE
extern int EF_PROTECT_FREE;
extern int EF_PROTECT_BELOW;
extern int EF_ALIGNMENT;
#endif

N
Nils Larsch 已提交
198
static void lookup_fail(const char *name, const char *tag);
199
static int certify(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
200 201
		   const EVP_MD *dgst,STACK_OF(OPENSSL_STRING) *sigopts,
		   STACK_OF(CONF_VALUE) *policy,CA_DB *db,
D
Dr. Stephen Henson 已提交
202
		   BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn, char *startdate,
203 204
		   char *enddate, long days, int batch, char *ext_sect, CONF *conf,
		   int verbose, unsigned long certopt, unsigned long nameopt,
205
		   int default_op, int ext_copy, int selfsign);
206
static int certify_cert(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
207 208
			const EVP_MD *dgst,STACK_OF(OPENSSL_STRING) *sigopts,
			STACK_OF(CONF_VALUE) *policy,
D
Dr. Stephen Henson 已提交
209
			CA_DB *db, BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn,
210 211
			char *startdate, char *enddate, long days, int batch,
			char *ext_sect, CONF *conf,int verbose, unsigned long certopt,
212 213
			unsigned long nameopt, int default_op, int ext_copy,
			ENGINE *e);
214
static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
215 216
			 const EVP_MD *dgst,STACK_OF(OPENSSL_STRING) *sigopts,
			 STACK_OF(CONF_VALUE) *policy,
D
Dr. Stephen Henson 已提交
217
			 CA_DB *db, BIGNUM *serial,char *subj,unsigned long chtype, int multirdn, int email_dn,
218 219 220
			 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);
D
 
Dr. Stephen Henson 已提交
221
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
B
Ben Laurie 已提交
222
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
223
	STACK_OF(OPENSSL_STRING) *sigopts,
D
Dr. Stephen Henson 已提交
224
	STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,char *subj,unsigned long chtype, int multirdn,
225 226
	int email_dn, char *startdate, char *enddate, long days, int batch,
       	int verbose, X509_REQ *req, char *ext_sect, CONF *conf,
D
 
Dr. Stephen Henson 已提交
227
	unsigned long certopt, unsigned long nameopt, int default_op,
228
	int ext_copy, int selfsign);
229 230 231
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);
D
Dr. Stephen Henson 已提交
232
static int check_time_format(const char *str);
233
char *make_revocation_str(int rev_type, char *rev_arg);
N
Nils Larsch 已提交
234
int make_revoked(X509_REVOKED *rev, const char *str);
D
 
Dr. Stephen Henson 已提交
235
int old_entry_print(BIO *bp, ASN1_OBJECT *obj, ASN1_STRING *str);
D
 
Dr. Stephen Henson 已提交
236 237
static CONF *conf=NULL;
static CONF *extconf=NULL;
238 239 240 241 242
static char *section=NULL;

static int preserve=0;
static int msie_hack=0;

243

244 245
int MAIN(int, char **);

U
Ulf Möller 已提交
246
int MAIN(int argc, char **argv)
247
	{
248
	ENGINE *e = NULL;
249
	char *key=NULL,*passargin=NULL;
250
	int create_ser = 0;
D
 
Dr. Stephen Henson 已提交
251
	int free_key = 0;
252 253 254 255
	int total=0;
	int total_done=0;
	int badops=0;
	int ret=1;
256
	int email_dn=1;
257 258 259
	int req=0;
	int verbose=0;
	int gencrl=0;
260
	int dorevoke=0;
261
	int doupdatedb=0;
262 263
	long crldays=0;
	long crlhours=0;
264
	long crlsec=0;
265 266 267 268 269 270
	long errorline= -1;
	char *configfile=NULL;
	char *md=NULL;
	char *policy=NULL;
	char *keyfile=NULL;
	char *certfile=NULL;
271
	int keyform=FORMAT_PEM;
272 273
	char *infile=NULL;
	char *spkac_file=NULL;
274
	char *ss_cert_file=NULL;
275
	char *ser_status=NULL;
276 277 278 279 280
	EVP_PKEY *pkey=NULL;
	int output_der = 0;
	char *outfile=NULL;
	char *outdir=NULL;
	char *serialfile=NULL;
R
Richard Levitte 已提交
281
	char *crlnumberfile=NULL;
282
	char *extensions=NULL;
283
	char *extfile=NULL;
284
	char *subj=NULL;
D
Dr. Stephen Henson 已提交
285
	unsigned long chtype = MBSTRING_ASC;
286
	int multirdn = 0;
287
	char *tmp_email_dn=NULL;
288
	char *crl_ext=NULL;
289 290
	int rev_type = REV_NONE;
	char *rev_arg = NULL;
291
	BIGNUM *serial=NULL;
R
Richard Levitte 已提交
292
	BIGNUM *crlnumber=NULL;
293
	char *startdate=NULL;
294
	char *enddate=NULL;
D
 
Dr. Stephen Henson 已提交
295
	long days=0;
296
	int batch=0;
D
 
Dr. Stephen Henson 已提交
297
	int notext=0;
D
 
Dr. Stephen Henson 已提交
298 299
	unsigned long nameopt = 0, certopt = 0;
	int default_op = 1;
300
	int ext_copy = EXT_COPY_NONE;
301 302
	int selfsign = 0;
	X509 *x509=NULL, *x509p = NULL;
303 304 305
	X509 *x=NULL;
	BIO *in=NULL,*out=NULL,*Sout=NULL,*Cout=NULL;
	char *dbfile=NULL;
306
	CA_DB *db=NULL;
307 308
	X509_CRL *crl=NULL;
	X509_REVOKED *r=NULL;
D
 
Dr. Stephen Henson 已提交
309 310
	ASN1_TIME *tmptm;
	ASN1_INTEGER *tmpser;
N
Nils Larsch 已提交
311
	char *f;
B
Ben Laurie 已提交
312 313
	const char *p;
	char * const *pp;
314
	int i,j;
B
Ben Laurie 已提交
315
	const EVP_MD *dgst=NULL;
316
	STACK_OF(CONF_VALUE) *attribs=NULL;
B
Ben Laurie 已提交
317
	STACK_OF(X509) *cert_sk=NULL;
318
	STACK_OF(OPENSSL_STRING) *sigopts = NULL;
319 320 321
#undef BSIZE
#define BSIZE 256
	MS_STATIC char buf[3][BSIZE];
B
Ben Laurie 已提交
322
	char *randfile=NULL;
323
#ifndef OPENSSL_NO_ENGINE
324
	char *engine = NULL;
325
#endif
326
	char *tofree=NULL;
327
	DB_ATTR db_attr;
328 329 330 331 332 333 334 335 336

#ifdef EFENCE
EF_PROTECT_FREE=1;
EF_PROTECT_BELOW=1;
EF_ALIGNMENT=0;
#endif

	apps_startup();

337
	conf = NULL;
338 339 340
	key = NULL;
	section = NULL;

341
	preserve=0;
342
	msie_hack=0;
343 344
	if (bio_err == NULL)
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
345
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362

	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);
			}
363 364 365 366 367 368
		else if (strcmp(*argv,"-subj") == 0)
			{
			if (--argc < 1) goto bad;
			subj= *(++argv);
			/* preserve=1; */
			}
D
Dr. Stephen Henson 已提交
369 370
		else if (strcmp(*argv,"-utf8") == 0)
			chtype = MBSTRING_UTF8;
371 372
		else if (strcmp(*argv,"-create_serial") == 0)
			create_ser = 1;
373 374
		else if (strcmp(*argv,"-multivalue-rdn") == 0)
			multirdn=1;
375 376 377 378 379
		else if (strcmp(*argv,"-startdate") == 0)
			{
			if (--argc < 1) goto bad;
			startdate= *(++argv);
			}
380 381 382 383 384
		else if (strcmp(*argv,"-enddate") == 0)
			{
			if (--argc < 1) goto bad;
			enddate= *(++argv);
			}
385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404
		else if (strcmp(*argv,"-days") == 0)
			{
			if (--argc < 1) goto bad;
			days=atoi(*(++argv));
			}
		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);
			}
405 406 407 408 409
		else if (strcmp(*argv,"-keyform") == 0)
			{
			if (--argc < 1) goto bad;
			keyform=str2fmt(*(++argv));
			}
410 411 412 413 414
		else if (strcmp(*argv,"-passin") == 0)
			{
			if (--argc < 1) goto bad;
			passargin= *(++argv);
			}
415 416 417 418 419 420 421 422 423 424
		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);
			}
425 426
		else if (strcmp(*argv,"-selfsign") == 0)
			selfsign=1;
427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442
		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);
			}
443 444 445 446 447 448 449 450 451
		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;
			}
D
 
Dr. Stephen Henson 已提交
452 453
		else if (strcmp(*argv,"-notext") == 0)
			notext=1;
454 455 456 457
		else if (strcmp(*argv,"-batch") == 0)
			batch=1;
		else if (strcmp(*argv,"-preserveDN") == 0)
			preserve=1;
458 459
		else if (strcmp(*argv,"-noemailDN") == 0)
			email_dn=0;
460 461 462 463 464 465 466 467 468 469 470 471 472 473
		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= atol(*(++argv));
			}
		else if (strcmp(*argv,"-crlhours") == 0)
			{
			if (--argc < 1) goto bad;
			crlhours= atol(*(++argv));
			}
474 475 476 477 478
		else if (strcmp(*argv,"-crlsec") == 0)
			{
			if (--argc < 1) goto bad;
			crlsec = atol(*(++argv));
			}
479 480 481 482 483 484 485
		else if (strcmp(*argv,"-infiles") == 0)
			{
			argc--;
			argv++;
			req=1;
			break;
			}
486 487 488 489 490 491
		else if (strcmp(*argv, "-ss_cert") == 0)
			{
			if (--argc < 1) goto bad;
			ss_cert_file = *(++argv);
			req=1;
			}
492 493 494 495 496 497
		else if (strcmp(*argv, "-spkac") == 0)
			{
			if (--argc < 1) goto bad;
			spkac_file = *(++argv);
			req=1;
			}
498 499 500 501
		else if (strcmp(*argv,"-revoke") == 0)
			{
			if (--argc < 1) goto bad;
			infile= *(++argv);
502
			dorevoke=1;
503
			}
504 505 506 507 508 509
		else if (strcmp(*argv,"-valid") == 0)
			{
			if (--argc < 1) goto bad;
			infile= *(++argv);
			dorevoke=2;
			}
510 511 512 513 514
		else if (strcmp(*argv,"-extensions") == 0)
			{
			if (--argc < 1) goto bad;
			extensions= *(++argv);
			}
515 516 517 518 519
		else if (strcmp(*argv,"-extfile") == 0)
			{
			if (--argc < 1) goto bad;
			extfile= *(++argv);
			}
520 521 522 523 524 525 526 527 528
		else if (strcmp(*argv,"-status") == 0)
			{
			if (--argc < 1) goto bad;
			ser_status= *(++argv);
			}
		else if (strcmp(*argv,"-updatedb") == 0)
			{
			doupdatedb=1;
			}
529 530 531 532 533
		else if (strcmp(*argv,"-crlexts") == 0)
			{
			if (--argc < 1) goto bad;
			crl_ext= *(++argv);
			}
534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557
		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;
			}
558
#ifndef OPENSSL_NO_ENGINE
559 560 561 562 563
		else if (strcmp(*argv,"-engine") == 0)
			{
			if (--argc < 1) goto bad;
			engine= *(++argv);
			}
564
#endif
565 566 567 568 569 570 571 572 573 574 575 576 577
		else
			{
bad:
			BIO_printf(bio_err,"unknown option %s\n",*argv);
			badops=1;
			break;
			}
		argc--;
		argv++;
		}

	if (badops)
		{
B
Ben Laurie 已提交
578 579 580 581
		const char **pp2;

		for (pp2=ca_usage; (*pp2 != NULL); pp2++)
			BIO_printf(bio_err,"%s",*pp2);
582 583 584 585 586 587
		goto err;
		}

	ERR_load_crypto_strings();

	/*****************************************************************/
588
	tofree=NULL;
589 590
	if (configfile == NULL) configfile = getenv("OPENSSL_CONF");
	if (configfile == NULL) configfile = getenv("SSLEAY_CONF");
591 592
	if (configfile == NULL)
		{
593
		const char *s=X509_get_default_cert_area();
594
		size_t len;
595

596
#ifdef OPENSSL_SYS_VMS
597 598
		len = strlen(s)+sizeof(CONFIG_FILE);
		tofree=OPENSSL_malloc(len);
599
		strcpy(tofree,s);
U
Ulf Möller 已提交
600
#else
601 602 603 604
		len = strlen(s)+sizeof(CONFIG_FILE)+1;
		tofree=OPENSSL_malloc(len);
		BUF_strlcpy(tofree,s,len);
		BUF_strlcat(tofree,"/",len);
U
Ulf Möller 已提交
605
#endif
606
		BUF_strlcat(tofree,CONFIG_FILE,len);
607
		configfile=tofree;
608 609 610
		}

	BIO_printf(bio_err,"Using configuration from %s\n",configfile);
D
 
Dr. Stephen Henson 已提交
611 612
	conf = NCONF_new(NULL);
	if (NCONF_load(conf,configfile,&errorline) <= 0)
613 614 615 616 617 618 619 620 621
		{
		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;
		}
622
	if(tofree)
623
		{
624
		OPENSSL_free(tofree);
625 626
		tofree = NULL;
		}
627

D
Dr. Stephen Henson 已提交
628 629 630
	if (!load_config(bio_err, conf))
		goto err;

631 632 633 634
#ifndef OPENSSL_NO_ENGINE
	e = setup_engine(bio_err, engine, 0);
#endif

635 636 637
	/* Lets get the config section we are using */
	if (section == NULL)
		{
D
 
Dr. Stephen Henson 已提交
638
		section=NCONF_get_string(conf,BASE_SECTION,ENV_DEFAULT_CA);
639 640 641 642 643 644 645
		if (section == NULL)
			{
			lookup_fail(BASE_SECTION,ENV_DEFAULT_CA);
			goto err;
			}
		}

646 647
	if (conf != NULL)
		{
D
 
Dr. Stephen Henson 已提交
648
		p=NCONF_get_string(conf,NULL,"oid_file");
649 650
		if (p == NULL)
			ERR_clear_error();
651 652 653 654 655 656 657 658 659 660 661
		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);
				*/
B
Ben Laurie 已提交
662
				ERR_clear_error();
663 664 665 666 667 668 669
				}
			else
				{
				OBJ_create_objects(oid_bio);
				BIO_free(oid_bio);
				}
			}
670
		if (!add_oid_section(bio_err,conf)) 
671
			{
672 673
			ERR_print_errors(bio_err);
			goto err;
674
			}
675
		}
676

D
 
Dr. Stephen Henson 已提交
677
	randfile = NCONF_get_string(conf, BASE_SECTION, "RANDFILE");
678 679
	if (randfile == NULL)
		ERR_clear_error();
680
	app_RAND_load_file(randfile, bio_err, 0);
681

D
Dr. Stephen Henson 已提交
682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698
	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;
	}

699
	db_attr.unique_subject = 1;
700
	p = NCONF_get_string(conf, section, ENV_UNIQUE_SUBJECT);
701 702
	if (p)
		{
703
#ifdef RL_DEBUG
704
		BIO_printf(bio_err, "DEBUG: unique_subject = \"%s\"\n", p);
705
#endif
706
		db_attr.unique_subject = parse_yesno(p,1);
707 708
		}
	else
709 710 711
		ERR_clear_error();
#ifdef RL_DEBUG
	if (!p)
712
		BIO_printf(bio_err, "DEBUG: unique_subject undefined\n", p);
713 714
#endif
#ifdef RL_DEBUG
715 716
	BIO_printf(bio_err, "DEBUG: configured unique_subject is %d\n",
		db_attr.unique_subject);
717
#endif
718
	
719 720 721 722 723 724 725 726 727 728 729
	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;
		}

	/*****************************************************************/
730 731 732
	/* report status of cert with serial number given on command line */
	if (ser_status)
	{
D
 
Dr. Stephen Henson 已提交
733
		if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
734 735 736 737
			{
			lookup_fail(section,ENV_DATABASE);
			goto err;
			}
738
		db = load_index(dbfile,&db_attr);
739 740
		if (db == NULL) goto err;

741
		if (!index_index(db)) goto err;
742 743 744 745 746 747 748 749

		if (get_certificate_status(ser_status,db) != 1)
			BIO_printf(bio_err,"Error verifying serial %s!\n",
				 ser_status);
		goto err;
	}

	/*****************************************************************/
750
	/* we definitely need a private key, so let's get it */
751

D
 
Dr. Stephen Henson 已提交
752
	if ((keyfile == NULL) && ((keyfile=NCONF_get_string(conf,
753 754 755 756 757
		section,ENV_PRIVATE_KEY)) == NULL))
		{
		lookup_fail(section,ENV_PRIVATE_KEY);
		goto err;
		}
D
 
Dr. Stephen Henson 已提交
758
	if (!key)
759
		{
D
 
Dr. Stephen Henson 已提交
760 761 762 763 764 765
		free_key = 1;
		if (!app_passwd(bio_err, passargin, NULL, &key, NULL))
			{
			BIO_printf(bio_err,"Error getting password\n");
			goto err;
			}
766
		}
767
	pkey = load_key(bio_err, keyfile, keyform, 0, key, e, 
768
		"CA private key");
769
	if (key) OPENSSL_cleanse(key,strlen(key));
770 771
	if (pkey == NULL)
		{
772
		/* load_key() has already printed an appropriate message */
773 774 775 776 777
		goto err;
		}

	/*****************************************************************/
	/* we need a certificate */
778
	if (!selfsign || spkac_file || ss_cert_file || gencrl)
779
		{
780 781 782 783 784 785 786 787 788 789 790
		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;
791

792 793 794 795 796
		if (!X509_check_private_key(x509,pkey))
			{
			BIO_printf(bio_err,"CA certificate and CA private key do not match\n");
			goto err;
			}
797
		}
798
	if (!selfsign) x509p = x509;
799

D
 
Dr. Stephen Henson 已提交
800
	f=NCONF_get_string(conf,BASE_SECTION,ENV_PRESERVE);
801 802
	if (f == NULL)
		ERR_clear_error();
803 804
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		preserve=1;
D
 
Dr. Stephen Henson 已提交
805
	f=NCONF_get_string(conf,BASE_SECTION,ENV_MSIE_HACK);
806 807
	if (f == NULL)
		ERR_clear_error();
808 809 810
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		msie_hack=1;

D
 
Dr. Stephen Henson 已提交
811
	f=NCONF_get_string(conf,section,ENV_NAMEOPT);
D
 
Dr. Stephen Henson 已提交
812 813 814 815 816 817 818 819 820 821 822 823 824

	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();

D
 
Dr. Stephen Henson 已提交
825
	f=NCONF_get_string(conf,section,ENV_CERTOPT);
D
 
Dr. Stephen Henson 已提交
826 827 828 829 830 831 832 833 834 835 836 837 838

	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();

D
 
Dr. Stephen Henson 已提交
839
	f=NCONF_get_string(conf,section,ENV_EXTCOPY);
840 841 842 843 844 845 846 847 848 849 850

	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();
D
 
Dr. Stephen Henson 已提交
851

852 853 854 855 856
	/*****************************************************************/
	/* lookup where to write new certificates */
	if ((outdir == NULL) && (req))
		{

D
 
Dr. Stephen Henson 已提交
857
		if ((outdir=NCONF_get_string(conf,section,ENV_NEW_CERTS_DIR))
858 859 860 861 862
			== NULL)
			{
			BIO_printf(bio_err,"there needs to be defined a directory for new certificate to be placed in\n");
			goto err;
			}
863 864
#ifndef OPENSSL_SYS_VMS
	    /* outdir is a directory spec, but access() for VMS demands a
865 866 867 868 869 870 871 872
	       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.
873
	    */
874
#ifndef _WIN32
875
		if (access(outdir,R_OK|W_OK|X_OK) != 0)
876 877 878
#else
		if (_access(outdir,R_OK|W_OK|X_OK) != 0)
#endif
879
			{
U
Ulf Möller 已提交
880
			BIO_printf(bio_err,"I am unable to access the %s directory\n",outdir);
881 882 883 884
			perror(outdir);
			goto err;
			}

885
		if (app_isdir(outdir)<=0)
886 887 888 889 890
			{
			BIO_printf(bio_err,"%s need to be a directory\n",outdir);
			perror(outdir);
			goto err;
			}
891
#endif
892 893 894 895
		}

	/*****************************************************************/
	/* we need to load the database file */
D
 
Dr. Stephen Henson 已提交
896
	if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
897 898 899 900
		{
		lookup_fail(section,ENV_DATABASE);
		goto err;
		}
901
	db = load_index(dbfile, &db_attr);
902 903 904
	if (db == NULL) goto err;

	/* Lets check some fields */
D
Dr. Stephen Henson 已提交
905
	for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
906
		{
D
Dr. Stephen Henson 已提交
907
		pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
908 909 910
		if ((pp[DB_type][0] != DB_TYPE_REV) &&
			(pp[DB_rev_date][0] != '\0'))
			{
911
			BIO_printf(bio_err,"entry %d: not revoked yet, but has a revocation date\n",i+1);
912 913 914
			goto err;
			}
		if ((pp[DB_type][0] == DB_TYPE_REV) &&
915
			!make_revoked(NULL, pp[DB_rev_date]))
916
			{
917
			BIO_printf(bio_err," in entry %d\n", i+1);
918 919
			goto err;
			}
N
Nils Larsch 已提交
920
		if (!check_time_format((char *)pp[DB_exp_date]))
921 922 923 924 925 926
			{
			BIO_printf(bio_err,"entry %d: invalid expiry date\n",i+1);
			goto err;
			}
		p=pp[DB_serial];
		j=strlen(p);
927 928 929 930 931
		if (*p == '-')
			{
			p++;
			j--;
			}
932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950
		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)
		{
951
		BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT); /* cannot fail */
952
#ifdef OPENSSL_SYS_VMS
953 954 955 956 957
		{
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
		out = BIO_push(tmpbio, out);
		}
#endif
958
		TXT_DB_write(out,db->db);
959
		BIO_printf(bio_err,"%d entries loaded from the database\n",
D
Dr. Stephen Henson 已提交
960
			   sk_OPENSSL_PSTRING_num(db->db->data));
U
Ulf Möller 已提交
961
		BIO_printf(bio_err,"generating index\n");
962 963
		}
	
964
	if (!index_index(db)) goto err;
965

966 967 968 969 970 971 972 973 974 975 976 977 978
	/*****************************************************************/
	/* 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;
979
			}
980
		else if (i == 0)
981
			{
982 983 984 985 986
			if (verbose) BIO_printf(bio_err,
					"No entries found to mark expired\n"); 
			}
	    	else
			{
987 988 989
			if (!save_index(dbfile,"new",db)) goto err;
				
			if (!rotate_index(dbfile,"new","old")) goto err;
990 991 992 993 994 995
				
			if (verbose) BIO_printf(bio_err,
				"Done. %d entries marked as expired\n",i); 
	      		}
	  	}

996
 	/*****************************************************************/
997
	/* Read extensions config file                                   */
998 999
	if (extfile)
		{
D
 
Dr. Stephen Henson 已提交
1000 1001
		extconf = NCONF_new(NULL);
		if (NCONF_load(extconf,extfile,&errorline) <= 0)
1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013
			{
			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)
R
Richard Levitte 已提交
1014
			BIO_printf(bio_err, "Successfully loaded extensions file %s\n", extfile);
1015 1016

		/* We can have sections in the ext file */
D
 
Dr. Stephen Henson 已提交
1017
		if (!extensions && !(extensions = NCONF_get_string(extconf, "default", "extensions")))
1018
			extensions = "default";
1019
		}
1020

1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032
	/*****************************************************************/
	if (req || gencrl)
		{
		if (outfile != NULL)
			{
			if (BIO_write_filename(Sout,outfile) <= 0)
				{
				perror(outfile);
				goto err;
				}
			}
		else
1033
			{
1034
			BIO_set_fp(Sout,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
1035
#ifdef OPENSSL_SYS_VMS
1036 1037 1038 1039 1040 1041
			{
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
			Sout = BIO_push(tmpbio, Sout);
			}
#endif
			}
1042 1043
		}

1044 1045 1046 1047 1048 1049 1050
	if ((md == NULL) && ((md=NCONF_get_string(conf,
		section,ENV_DEFAULT_MD)) == NULL))
		{
		lookup_fail(section,ENV_DEFAULT_MD);
		goto err;
		}

1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061
	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);
		}

1062 1063 1064 1065 1066 1067
	if ((dgst=EVP_get_digestbyname(md)) == NULL)
		{
		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
		goto err;
		}

1068 1069
	if (req)
		{
1070 1071 1072 1073 1074 1075
		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;
			}
1076 1077 1078
		if (verbose)
			BIO_printf(bio_err,"message digest is %s\n",
				OBJ_nid2ln(dgst->type));
D
 
Dr. Stephen Henson 已提交
1079
		if ((policy == NULL) && ((policy=NCONF_get_string(conf,
1080 1081 1082 1083 1084 1085 1086 1087
			section,ENV_POLICY)) == NULL))
			{
			lookup_fail(section,ENV_POLICY);
			goto err;
			}
		if (verbose)
			BIO_printf(bio_err,"policy is %s\n",policy);

D
 
Dr. Stephen Henson 已提交
1088
		if ((serialfile=NCONF_get_string(conf,section,ENV_SERIAL))
1089 1090 1091 1092 1093
			== NULL)
			{
			lookup_fail(section,ENV_SERIAL);
			goto err;
			}
1094 1095

		if (!extconf)
1096
			{
1097 1098
			/* no '-extfile' option, so we look for extensions
			 * in the main configuration file */
1099 1100
			if (!extensions)
				{
D
 
Dr. Stephen Henson 已提交
1101
				extensions=NCONF_get_string(conf,section,
1102 1103 1104 1105 1106 1107 1108 1109 1110
								ENV_EXTENSIONS);
				if (!extensions)
					ERR_clear_error();
				}
			if (extensions)
				{
				/* Check syntax of file */
				X509V3_CTX ctx;
				X509V3_set_ctx_test(&ctx);
D
 
Dr. Stephen Henson 已提交
1111 1112
				X509V3_set_nconf(&ctx, conf);
				if (!X509V3_EXT_add_nconf(conf, &ctx, extensions,
1113 1114 1115 1116
								NULL))
					{
					BIO_printf(bio_err,
				 	"Error Loading extension section %s\n",
1117
								 extensions);
1118 1119 1120
					ret = 1;
					goto err;
					}
1121
				}
1122 1123
			}

1124 1125
		if (startdate == NULL)
			{
D
 
Dr. Stephen Henson 已提交
1126
			startdate=NCONF_get_string(conf,section,
1127
				ENV_DEFAULT_STARTDATE);
1128 1129
			if (startdate == NULL)
				ERR_clear_error();
1130
			}
D
Dr. Stephen Henson 已提交
1131
		if (startdate && !ASN1_TIME_set_string(NULL, startdate))
1132
			{
D
Dr. Stephen Henson 已提交
1133
			BIO_printf(bio_err,"start date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
1134 1135 1136 1137 1138 1139
			goto err;
			}
		if (startdate == NULL) startdate="today";

		if (enddate == NULL)
			{
D
 
Dr. Stephen Henson 已提交
1140
			enddate=NCONF_get_string(conf,section,
1141
				ENV_DEFAULT_ENDDATE);
1142 1143
			if (enddate == NULL)
				ERR_clear_error();
1144
			}
D
Dr. Stephen Henson 已提交
1145
		if (enddate && !ASN1_TIME_set_string(NULL, enddate))
1146
			{
D
Dr. Stephen Henson 已提交
1147
			BIO_printf(bio_err,"end date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
1148
			goto err;
1149 1150
			}

1151 1152
		if (days == 0)
			{
D
 
Dr. Stephen Henson 已提交
1153 1154
			if(!NCONF_get_number(conf,section, ENV_DEFAULT_DAYS, &days))
				days = 0;
1155
			}
1156
		if (!enddate && (days == 0))
1157 1158 1159 1160 1161
			{
			BIO_printf(bio_err,"cannot lookup how many days to certify for\n");
			goto err;
			}

1162
		if ((serial=load_serial(serialfile, create_ser, NULL)) == NULL)
1163 1164 1165 1166 1167 1168
			{
			BIO_printf(bio_err,"error while loading serial number\n");
			goto err;
			}
		if (verbose)
			{
1169 1170 1171 1172 1173 1174 1175 1176
			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);
				OPENSSL_free(f);
				}
1177 1178
			}

D
 
Dr. Stephen Henson 已提交
1179
		if ((attribs=NCONF_get_section(conf,policy)) == NULL)
1180 1181 1182 1183 1184
			{
			BIO_printf(bio_err,"unable to find 'section' for %s\n",policy);
			goto err;
			}

B
Ben Laurie 已提交
1185
		if ((cert_sk=sk_X509_new_null()) == NULL)
1186
			{
1187
			BIO_printf(bio_err,"Memory allocation failure\n");
1188 1189 1190 1191 1192
			goto err;
			}
		if (spkac_file != NULL)
			{
			total++;
1193 1194 1195
			j=certify_spkac(&x,spkac_file,pkey,x509,dgst,sigopts,
				attribs,db, serial,subj,chtype,multirdn,
				email_dn,startdate,enddate,days,extensions,
1196
				conf,verbose,certopt,nameopt,default_op,ext_copy);
1197 1198 1199 1200 1201 1202
			if (j < 0) goto err;
			if (j > 0)
				{
				total_done++;
				BIO_printf(bio_err,"\n");
				if (!BN_add_word(serial,1)) goto err;
B
Ben Laurie 已提交
1203
				if (!sk_X509_push(cert_sk,x))
1204
					{
1205
					BIO_printf(bio_err,"Memory allocation failure\n");
1206 1207 1208 1209 1210 1211 1212 1213 1214
					goto err;
					}
				if (outfile)
					{
					output_der = 1;
					batch = 1;
					}
				}
			}
1215 1216 1217
		if (ss_cert_file != NULL)
			{
			total++;
1218 1219
			j=certify_cert(&x,ss_cert_file,pkey,x509,dgst,sigopts,
				attribs,
D
Dr. Stephen Henson 已提交
1220
				db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1221
				extensions,conf,verbose, certopt, nameopt,
1222
				default_op, ext_copy, e);
1223 1224 1225 1226 1227 1228
			if (j < 0) goto err;
			if (j > 0)
				{
				total_done++;
				BIO_printf(bio_err,"\n");
				if (!BN_add_word(serial,1)) goto err;
B
Ben Laurie 已提交
1229
				if (!sk_X509_push(cert_sk,x))
1230
					{
1231
					BIO_printf(bio_err,"Memory allocation failure\n");
1232 1233 1234 1235
					goto err;
					}
				}
			}
1236 1237 1238
		if (infile != NULL)
			{
			total++;
1239
			j=certify(&x,infile,pkey,x509p,dgst,sigopts, attribs,db,
D
Dr. Stephen Henson 已提交
1240
				serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1241
				extensions,conf,verbose, certopt, nameopt,
1242
				default_op, ext_copy, selfsign);
1243 1244 1245 1246 1247 1248
			if (j < 0) goto err;
			if (j > 0)
				{
				total_done++;
				BIO_printf(bio_err,"\n");
				if (!BN_add_word(serial,1)) goto err;
B
Ben Laurie 已提交
1249
				if (!sk_X509_push(cert_sk,x))
1250
					{
1251
					BIO_printf(bio_err,"Memory allocation failure\n");
1252 1253 1254 1255 1256 1257 1258
					goto err;
					}
				}
			}
		for (i=0; i<argc; i++)
			{
			total++;
1259
			j=certify(&x,argv[i],pkey,x509p,dgst,sigopts,attribs,db,
D
Dr. Stephen Henson 已提交
1260
				serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1261
				extensions,conf,verbose, certopt, nameopt,
1262
				default_op, ext_copy, selfsign);
1263 1264 1265 1266 1267 1268
			if (j < 0) goto err;
			if (j > 0)
				{
				total_done++;
				BIO_printf(bio_err,"\n");
				if (!BN_add_word(serial,1)) goto err;
B
Ben Laurie 已提交
1269
				if (!sk_X509_push(cert_sk,x))
1270
					{
1271
					BIO_printf(bio_err,"Memory allocation failure\n");
1272 1273 1274 1275 1276 1277 1278 1279
					goto err;
					}
				}
			}	
		/* we have a stack of newly certified certificates
		 * and a data base and serial number that need
		 * updating */

B
Ben Laurie 已提交
1280
		if (sk_X509_num(cert_sk) > 0)
1281 1282 1283 1284
			{
			if (!batch)
				{
				BIO_printf(bio_err,"\n%d out of %d certificate requests certified, commit? [y/n]",total_done,total);
B
Bodo Möller 已提交
1285
				(void)BIO_flush(bio_err);
1286
				buf[0][0]='\0';
1287 1288 1289 1290 1291 1292
				if (!fgets(buf[0],10,stdin))
					{
					BIO_printf(bio_err,"CERTIFICATION CANCELED: I/O error\n"); 
					ret=0;
					goto err;
					}
1293 1294 1295 1296 1297 1298 1299 1300
				if ((buf[0][0] != 'y') && (buf[0][0] != 'Y'))
					{
					BIO_printf(bio_err,"CERTIFICATION CANCELED\n"); 
					ret=0;
					goto err;
					}
				}

B
Ben Laurie 已提交
1301
			BIO_printf(bio_err,"Write out database with %d new entries\n",sk_X509_num(cert_sk));
1302

1303
			if (!save_serial(serialfile,"new",serial,NULL)) goto err;
U
Ulf Möller 已提交
1304

1305
			if (!save_index(dbfile, "new", db)) goto err;
1306 1307 1308 1309
			}
	
		if (verbose)
			BIO_printf(bio_err,"writing new certificates\n");
B
Ben Laurie 已提交
1310
		for (i=0; i<sk_X509_num(cert_sk); i++)
1311 1312
			{
			int k;
1313
			char *n;
1314

B
Ben Laurie 已提交
1315
			x=sk_X509_value(cert_sk,i);
1316 1317

			j=x->cert_info->serialNumber->length;
N
Nils Larsch 已提交
1318
			p=(const char *)x->cert_info->serialNumber->data;
1319
			
R
Richard Levitte 已提交
1320
			if(strlen(outdir) >= (size_t)(j ? BSIZE-j*2-6 : BSIZE-8))
1321 1322 1323 1324 1325 1326
				{
				BIO_printf(bio_err,"certificate file name too long\n");
				goto err;
				}

			strcpy(buf[2],outdir);
U
Ulf Möller 已提交
1327

1328
#ifndef OPENSSL_SYS_VMS
1329
			BUF_strlcat(buf[2],"/",sizeof(buf[2]));
U
Ulf Möller 已提交
1330 1331
#endif

1332
			n=(char *)&(buf[2][strlen(buf[2])]);
1333 1334 1335 1336
			if (j > 0)
				{
				for (k=0; k<j; k++)
					{
1337 1338 1339 1340 1341
					if (n >= &(buf[2][sizeof(buf[2])]))
						break;
					BIO_snprintf(n,
						     &buf[2][0] + sizeof(buf[2]) - n,
						     "%02X",(unsigned char)*(p++));
1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359
					n+=2;
					}
				}
			else
				{
				*(n++)='0';
				*(n++)='0';
				}
			*(n++)='.'; *(n++)='p'; *(n++)='e'; *(n++)='m';
			*n='\0';
			if (verbose)
				BIO_printf(bio_err,"writing %s\n",buf[2]);

			if (BIO_write_filename(Cout,buf[2]) <= 0)
				{
				perror(buf[2]);
				goto err;
				}
D
 
Dr. Stephen Henson 已提交
1360 1361
			write_new_certificate(Cout,x, 0, notext);
			write_new_certificate(Sout,x, output_der, notext);
1362 1363
			}

B
Ben Laurie 已提交
1364
		if (sk_X509_num(cert_sk))
1365 1366
			{
			/* Rename the database and the serial file */
1367
			if (!rotate_serial(serialfile,"new","old")) goto err;
1368

1369
			if (!rotate_index(dbfile,"new","old")) goto err;
U
Ulf Möller 已提交
1370

1371 1372 1373 1374 1375 1376 1377
			BIO_printf(bio_err,"Data Base Updated\n");
			}
		}
	
	/*****************************************************************/
	if (gencrl)
		{
1378
		int crl_v2 = 0;
1379 1380
		if (!crl_ext)
			{
D
 
Dr. Stephen Henson 已提交
1381
			crl_ext=NCONF_get_string(conf,section,ENV_CRLEXT);
1382 1383 1384 1385 1386
			if (!crl_ext)
				ERR_clear_error();
			}
		if (crl_ext)
			{
1387
			/* Check syntax of file */
1388 1389
			X509V3_CTX ctx;
			X509V3_set_ctx_test(&ctx);
D
 
Dr. Stephen Henson 已提交
1390 1391
			X509V3_set_nconf(&ctx, conf);
			if (!X509V3_EXT_add_nconf(conf, &ctx, crl_ext, NULL))
1392
				{
1393 1394 1395 1396 1397
				BIO_printf(bio_err,
				 "Error Loading CRL extension section %s\n",
								 crl_ext);
				ret = 1;
				goto err;
1398
				}
1399
			}
1400

R
Richard Levitte 已提交
1401 1402 1403 1404 1405 1406 1407 1408
		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;
				}

1409
		if (!crldays && !crlhours && !crlsec)
1410
			{
D
 
Dr. Stephen Henson 已提交
1411 1412 1413 1414 1415 1416
			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;
1417
			ERR_clear_error();
1418
			}
1419
		if ((crldays == 0) && (crlhours == 0) && (crlsec == 0))
1420
			{
1421
			BIO_printf(bio_err,"cannot lookup how long until the next CRL is issued\n");
1422 1423 1424 1425 1426
			goto err;
			}

		if (verbose) BIO_printf(bio_err,"making CRL\n");
		if ((crl=X509_CRL_new()) == NULL) goto err;
1427
		if (!X509_CRL_set_issuer_name(crl, X509_get_subject_name(x509))) goto err;
1428

D
 
Dr. Stephen Henson 已提交
1429 1430 1431 1432
		tmptm = ASN1_TIME_new();
		if (!tmptm) goto err;
		X509_gmtime_adj(tmptm,0);
		X509_CRL_set_lastUpdate(crl, tmptm);	
D
Dr. Stephen Henson 已提交
1433 1434 1435 1436 1437 1438
		if (!X509_time_adj_ex(tmptm, crldays, crlhours*60*60 + crlsec,
			NULL))
			{
			BIO_puts(bio_err, "error setting CRL nextUpdate\n");
			goto err;
			}
D
 
Dr. Stephen Henson 已提交
1439 1440 1441
		X509_CRL_set_nextUpdate(crl, tmptm);	

		ASN1_TIME_free(tmptm);
1442

D
Dr. Stephen Henson 已提交
1443
		for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
1444
			{
D
Dr. Stephen Henson 已提交
1445
			pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
1446 1447 1448
			if (pp[DB_type][0] == DB_TYPE_REV)
				{
				if ((r=X509_REVOKED_new()) == NULL) goto err;
1449 1450 1451
				j = make_revoked(r, pp[DB_rev_date]);
				if (!j) goto err;
				if (j == 2) crl_v2 = 1;
1452 1453
				if (!BN_hex2bn(&serial, pp[DB_serial]))
					goto err;
D
 
Dr. Stephen Henson 已提交
1454
				tmpser = BN_to_ASN1_INTEGER(serial, NULL);
1455 1456
				BN_free(serial);
				serial = NULL;
D
 
Dr. Stephen Henson 已提交
1457
				if (!tmpser)
1458
					goto err;
D
 
Dr. Stephen Henson 已提交
1459 1460
				X509_REVOKED_set_serialNumber(r, tmpser);
				ASN1_INTEGER_free(tmpser);
D
 
Dr. Stephen Henson 已提交
1461
				X509_CRL_add0_revoked(crl,r);
1462 1463
				}
			}
D
 
Dr. Stephen Henson 已提交
1464

1465 1466
		/* sort the data so it will be written in serial
		 * number order */
D
 
Dr. Stephen Henson 已提交
1467
		X509_CRL_sort(crl);
1468

1469
		/* we now have a CRL */
1470
		if (verbose) BIO_printf(bio_err,"signing CRL\n");
B
Ben Laurie 已提交
1471

1472 1473
		/* Add any extensions asked for */

R
Richard Levitte 已提交
1474
		if (crl_ext || crlnumberfile != NULL)
1475 1476 1477
			{
			X509V3_CTX crlctx;
			X509V3_set_ctx(&crlctx, x509, NULL, NULL, crl, 0);
D
 
Dr. Stephen Henson 已提交
1478
			X509V3_set_nconf(&crlctx, conf);
1479

R
Richard Levitte 已提交
1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491
			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;
				}
1492
			}
1493 1494
		if (crl_ext || crl_v2)
			{
D
 
Dr. Stephen Henson 已提交
1495 1496
			if (!X509_CRL_set_version(crl, 1))
				goto err; /* version 2 CRL */
1497
			}
1498

R
Richard Levitte 已提交
1499 1500 1501 1502
		
		if (crlnumberfile != NULL)	/* we have a CRL number that need updating */
			if (!save_serial(crlnumberfile,"new",crlnumber,NULL)) goto err;

1503 1504 1505 1506 1507 1508
		if (crlnumber)
			{
			BN_free(crlnumber);
			crlnumber = NULL;
			}

1509
		if (!do_X509_CRL_sign(bio_err,crl,pkey,dgst,sigopts)) goto err;
1510 1511

		PEM_write_bio_X509_CRL(Sout,crl);
R
Richard Levitte 已提交
1512 1513 1514 1515

		if (crlnumberfile != NULL)	/* Rename the crlnumber file */
			if (!rotate_serial(crlnumberfile,"new","old")) goto err;

1516 1517
		}
	/*****************************************************************/
1518
	if (dorevoke)
1519
		{
1520 1521 1522 1523 1524
		if (infile == NULL) 
			{
			BIO_printf(bio_err,"no input files\n");
			goto err;
			}
1525 1526
		else
			{
1527
			X509 *revcert;
1528 1529
			revcert=load_cert(bio_err, infile, FORMAT_PEM,
				NULL, e, infile);
1530
			if (revcert == NULL)
1531
				goto err;
1532 1533
			if (dorevoke == 2)
				rev_type = -1;
1534
			j=do_revoke(revcert,db, rev_type, rev_arg);
1535 1536
			if (j <= 0) goto err;
			X509_free(revcert);
1537

1538 1539 1540
			if (!save_index(dbfile, "new", db)) goto err;

			if (!rotate_index(dbfile, "new", "old")) goto err;
1541

1542 1543
			BIO_printf(bio_err,"Data Base Updated\n"); 
			}
1544 1545
		}
	/*****************************************************************/
1546 1547
	ret=0;
err:
1548 1549
	if(tofree)
		OPENSSL_free(tofree);
1550 1551 1552
	BIO_free_all(Cout);
	BIO_free_all(Sout);
	BIO_free_all(out);
1553
	BIO_free_all(in);
1554

1555 1556
	if (cert_sk)
		sk_X509_pop_free(cert_sk,X509_free);
1557 1558

	if (ret) ERR_print_errors(bio_err);
1559
	app_RAND_write_file(randfile, bio_err);
D
Typo.  
Dr. Stephen Henson 已提交
1560
	if (free_key && key)
D
 
Dr. Stephen Henson 已提交
1561
		OPENSSL_free(key);
1562
	BN_free(serial);
1563
	BN_free(crlnumber);
1564
	free_index(db);
D
Dr. Stephen Henson 已提交
1565 1566
	if (sigopts)
		sk_OPENSSL_STRING_free(sigopts);
1567
	EVP_PKEY_free(pkey);
1568
	if (x509) X509_free(x509);
1569
	X509_CRL_free(crl);
D
 
Dr. Stephen Henson 已提交
1570
	NCONF_free(conf);
B
Ben Laurie 已提交
1571
	NCONF_free(extconf);
1572
	OBJ_cleanup();
1573
	apps_shutdown();
1574
	OPENSSL_EXIT(ret);
1575 1576
	}

N
Nils Larsch 已提交
1577
static void lookup_fail(const char *name, const char *tag)
1578 1579 1580 1581
	{
	BIO_printf(bio_err,"variable lookup failed for %s::%s\n",name,tag);
	}

U
Ulf Möller 已提交
1582
static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1583 1584 1585 1586
	     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,
1587
	     long days, int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1588
	     unsigned long certopt, unsigned long nameopt, int default_op,
1589
	     int ext_copy, int selfsign)
1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602
	{
	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;
		}
1603
	if ((req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL)) == NULL)
1604 1605 1606 1607 1608 1609 1610 1611 1612 1613
		{
		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");

1614 1615 1616 1617 1618 1619
	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;
		}
1620 1621 1622 1623 1624 1625
	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);
1626
	EVP_PKEY_free(pktmp);
1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641
	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");

1642 1643
	ok=do_body(xret,pkey,x509,dgst,sigopts, policy,db,serial,subj,chtype,
		multirdn, email_dn,
1644
		startdate,enddate,days,batch,verbose,req,ext_sect,lconf,
1645
		certopt, nameopt, default_op, ext_copy, selfsign);
1646 1647 1648 1649 1650 1651 1652

err:
	if (req != NULL) X509_REQ_free(req);
	if (in != NULL) BIO_free(in);
	return(ok);
	}

U
Ulf Möller 已提交
1653
static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1654 1655
	     const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
	     STACK_OF(CONF_VALUE) *policy, CA_DB *db,
D
Dr. Stephen Henson 已提交
1656
	     BIGNUM *serial, char *subj, unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
1657
	     long days, int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1658
	     unsigned long certopt, unsigned long nameopt, int default_op,
1659
	     int ext_copy, ENGINE *e)
1660 1661 1662 1663 1664 1665
	{
	X509 *req=NULL;
	X509_REQ *rreq=NULL;
	EVP_PKEY *pktmp=NULL;
	int ok= -1,i;

1666
	if ((req=load_cert(bio_err, infile, FORMAT_PEM, NULL, e, infile)) == NULL)
1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678
		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);
1679
	EVP_PKEY_free(pktmp);
1680 1681 1682 1683 1684 1685 1686 1687 1688
	if (i < 0)
		{
		ok=0;
		BIO_printf(bio_err,"Signature verification problems....\n");
		goto err;
		}
	if (i == 0)
		{
		ok=0;
1689
		BIO_printf(bio_err,"Signature did not match the certificate\n");
1690 1691 1692 1693 1694 1695 1696 1697
		goto err;
		}
	else
		BIO_printf(bio_err,"Signature ok\n");

	if ((rreq=X509_to_X509_REQ(req,NULL,EVP_md5())) == NULL)
		goto err;

1698
	ok=do_body(xret,pkey,x509,dgst,sigopts,policy,db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,
1699
		days,batch,verbose,rreq,ext_sect,lconf, certopt, nameopt, default_op,
1700
		ext_copy, 0);
1701 1702 1703 1704 1705 1706 1707

err:
	if (rreq != NULL) X509_REQ_free(rreq);
	if (req != NULL) X509_free(req);
	return(ok);
	}

U
Ulf Möller 已提交
1708
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
1709 1710
	     STACK_OF(OPENSSL_STRING) *sigopts, STACK_OF(CONF_VALUE) *policy,
             CA_DB *db, BIGNUM *serial, char *subj,
D
Dr. Stephen Henson 已提交
1711
	     unsigned long chtype, int multirdn,
1712 1713
	     int email_dn, char *startdate, char *enddate, long days, int batch,
	     int verbose, X509_REQ *req, char *ext_sect, CONF *lconf,
D
 
Dr. Stephen Henson 已提交
1714
	     unsigned long certopt, unsigned long nameopt, int default_op,
1715
	     int ext_copy, int selfsign)
1716
	{
1717
	X509_NAME *name=NULL,*CAname=NULL,*subject=NULL, *dn_subject=NULL;
1718
	ASN1_UTCTIME *tm,*tmptm;
1719 1720 1721 1722 1723 1724 1725 1726
	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;
N
Nils Larsch 已提交
1727
	const char *p;
1728
	CONF_VALUE *cv;
D
Dr. Stephen Henson 已提交
1729 1730 1731
	OPENSSL_STRING row[DB_NUMBER];
	OPENSSL_STRING *irow=NULL;
	OPENSSL_STRING *rrow=NULL;
D
 
Dr. Stephen Henson 已提交
1732
	char buf[25];
1733

1734 1735 1736 1737 1738 1739 1740
	tmptm=ASN1_UTCTIME_new();
	if (tmptm == NULL)
		{
		BIO_printf(bio_err,"malloc error\n");
		return(0);
		}

1741 1742 1743
	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;

1744 1745
	if (subj)
		{
D
Dr. Stephen Henson 已提交
1746
		X509_NAME *n = parse_name(subj, chtype, multirdn);
1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757

		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);
		}

D
 
Dr. Stephen Henson 已提交
1758 1759
	if (default_op)
		BIO_printf(bio_err,"The Subject's Distinguished Name is as follows\n");
1760

1761 1762 1763
	name=X509_REQ_get_subject_name(req);
	for (i=0; i<X509_NAME_entry_count(name); i++)
		{
D
 
Dr. Stephen Henson 已提交
1764
		ne= X509_NAME_get_entry(name,i);
1765
		str=X509_NAME_ENTRY_get_data(ne);
D
 
Dr. Stephen Henson 已提交
1766
		obj=X509_NAME_ENTRY_get_object(ne);
1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784

		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;
			}

1785 1786 1787 1788
		/* If no EMAIL is wanted in the subject */
		if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) && (!email_dn))
			continue;

1789 1790 1791 1792 1793 1794 1795
		/* 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;
			}
1796
		if ((str->type != V_ASN1_BMPSTRING) && (str->type != V_ASN1_UTF8STRING))
1797
			{
1798 1799 1800 1801 1802 1803 1804 1805 1806
			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;
				}
1807
			}
D
 
Dr. Stephen Henson 已提交
1808 1809 1810

		if (default_op)
			old_entry_print(bio_err, obj, str);
1811 1812 1813 1814 1815
		}

	/* Ok, now we check the 'policy' stuff. */
	if ((subject=X509_NAME_new()) == NULL)
		{
1816
		BIO_printf(bio_err,"Memory allocation failure\n");
1817 1818 1819 1820
		goto err;
		}

	/* take a copy of the issuer name before we mess with it. */
1821 1822 1823 1824
	if (selfsign)
		CAname=X509_NAME_dup(name);
	else
		CAname=X509_NAME_dup(x509->cert_info->subject);
1825 1826 1827
	if (CAname == NULL) goto err;
	str=str2=NULL;

1828
	for (i=0; i<sk_CONF_VALUE_num(policy); i++)
1829
		{
1830
		cv=sk_CONF_VALUE_value(policy,i); /* get the object id */
1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900
		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)
					{
1901
					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));
1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912
					goto err;
					}
				}
			else
				{
				BIO_printf(bio_err,"%s:invalid type in 'policy' configuration\n",cv->value);
				goto err;
				}

			if (push != NULL)
				{
1913
				if (!X509_NAME_add_entry(subject,push, -1, 0))
1914 1915 1916
					{
					if (push != NULL)
						X509_NAME_ENTRY_free(push);
1917
					BIO_printf(bio_err,"Memory allocation failure\n");
1918 1919 1920 1921 1922 1923 1924 1925 1926 1927
					goto err;
					}
				}
			if (j < 0) break;
			}
		}

	if (preserve)
		{
		X509_NAME_free(subject);
1928 1929
		/* subject=X509_NAME_dup(X509_REQ_get_subject_name(req)); */
		subject=X509_NAME_dup(name);
1930 1931 1932 1933
		if (subject == NULL) goto err;
		}

	if (verbose)
U
Ulf Möller 已提交
1934
		BIO_printf(bio_err,"The subject name appears to be ok, checking data base for clashes\n");
1935

1936 1937 1938
	/* 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) */
	 
1939 1940 1941
	if (email_dn)
		dn_subject = subject;
	else
1942
		{
1943 1944 1945 1946 1947
		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)))
1948 1949 1950 1951
			{
			BIO_printf(bio_err,"Memory allocation failure\n");
			goto err;
			}
1952
		while((i = X509_NAME_get_index_by_NID(dn_subject,
1953
					NID_pkcs9_emailAddress, -1)) >= 0)
1954
			{
1955 1956 1957
			tmpne = X509_NAME_get_entry(dn_subject, i);
			X509_NAME_delete_entry(dn_subject, i);
			X509_NAME_ENTRY_free(tmpne);
1958 1959 1960
			}
		}

1961 1962 1963 1964
	if (BN_is_zero(serial))
		row[DB_serial]=BUF_strdup("00");
	else
		row[DB_serial]=BN_bn2hex(serial);
1965
	if (row[DB_serial] == NULL)
1966
		{
1967
		BIO_printf(bio_err,"Memory allocation failure\n");
1968 1969 1970
		goto err;
		}

1971
	if (db->attributes.unique_subject)
1972
		{
D
Dr. Stephen Henson 已提交
1973
		OPENSSL_STRING *crow=row;
B
Ben Laurie 已提交
1974 1975

		rrow=TXT_DB_get_by_index(db->db,DB_name,crow);
1976 1977 1978 1979 1980 1981
		if (rrow != NULL)
			{
			BIO_printf(bio_err,
				"ERROR:There is already a certificate for %s\n",
				row[DB_name]);
			}
1982
		}
1983
	if (rrow == NULL)
1984
		{
1985
		rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
		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";
2006
		BIO_printf(bio_err,"Type	  :%s\n",p);;
2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023
		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;
		}

U
Ulf Möller 已提交
2024
	/* We are now totally happy, lets make and sign the certificate */
2025 2026 2027 2028 2029 2030 2031 2032
	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. */
2033
	if (!X509_set_version(ret,2)) goto err;
2034 2035 2036 2037
#endif

	if (BN_to_ASN1_INTEGER(serial,ci->serialNumber) == NULL)
		goto err;
2038 2039 2040 2041 2042 2043 2044 2045 2046 2047
	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;
		}
2048

2049 2050
	if (strcmp(startdate,"today") == 0)
		X509_gmtime_adj(X509_get_notBefore(ret),0);
D
Dr. Stephen Henson 已提交
2051
	else ASN1_TIME_set_string(X509_get_notBefore(ret),startdate);
2052 2053

	if (enddate == NULL)
2054
		X509_time_adj_ex(X509_get_notAfter(ret),days, 0, NULL);
2055 2056 2057 2058 2059 2060 2061
	else
		{
		int tdays;
		ASN1_TIME_set_string(X509_get_notAfter(ret),enddate);
		ASN1_TIME_diff(&tdays, NULL, NULL, X509_get_notAfter(ret));
		days = tdays;
		}
2062

2063 2064 2065
	if (!X509_set_subject_name(ret,subject)) goto err;

	pktmp=X509_REQ_get_pubkey(req);
2066 2067 2068
	i = X509_set_pubkey(ret,pktmp);
	EVP_PKEY_free(pktmp);
	if (!i) goto err;
2069 2070

	/* Lets add the extensions, if there are any */
2071
	if (ext_sect)
2072
		{
2073
		X509V3_CTX ctx;
2074 2075 2076 2077 2078 2079
		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
U
Ulf Möller 已提交
2080
		 * be any I believe */
2081
		if (ci->extensions != NULL)
B
Ben Laurie 已提交
2082 2083
			sk_X509_EXTENSION_pop_free(ci->extensions,
						   X509_EXTENSION_free);
2084

2085 2086
		ci->extensions = NULL;

2087
		/* Initialize the context structure */
2088 2089 2090 2091
		if (selfsign)
			X509V3_set_ctx(&ctx, ret, ret, req, NULL, 0);
		else
			X509V3_set_ctx(&ctx, x509, ret, req, NULL, 0);
2092

2093 2094 2095 2096 2097 2098
		if (extconf)
			{
			if (verbose)
				BIO_printf(bio_err, "Extra configuration file found\n");
 
			/* Use the extconf configuration db LHASH */
D
 
Dr. Stephen Henson 已提交
2099
			X509V3_set_nconf(&ctx, extconf);
2100 2101 2102 2103 2104
 
			/* Test the structure (needed?) */
			/* X509V3_set_ctx_test(&ctx); */

			/* Adds exts contained in the configuration file */
D
 
Dr. Stephen Henson 已提交
2105
			if (!X509V3_EXT_add_nconf(extconf, &ctx, ext_sect,ret))
2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118
				{
				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 */
D
 
Dr. Stephen Henson 已提交
2119
			X509V3_set_nconf(&ctx, lconf);
2120

D
 
Dr. Stephen Henson 已提交
2121
			if(!X509V3_EXT_add_nconf(lconf, &ctx, ext_sect, ret))
2122 2123 2124 2125 2126 2127 2128 2129 2130
				{
				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");
			}
2131 2132
		}

2133 2134 2135 2136 2137 2138 2139 2140 2141
	/* 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;
		}

2142 2143 2144 2145 2146
	/* Set the right value for the noemailDN option */
	if( email_dn == 0 )
		{
		if (!X509_set_subject_name(ret,dn_subject)) goto err;
		}
2147 2148 2149 2150 2151 2152 2153 2154 2155 2156

	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 ");
D
Dr. Stephen Henson 已提交
2157
	ASN1_TIME_print(bio_err,X509_get_notAfter(ret));
2158
	if (days) BIO_printf(bio_err," (%ld days)",days);
2159
	BIO_printf(bio_err, "\n");
2160 2161 2162

	if (!batch)
		{
2163

2164
		BIO_printf(bio_err,"Sign the certificate? [y/n]:");
B
Bodo Möller 已提交
2165
		(void)BIO_flush(bio_err);
2166
		buf[0]='\0';
2167 2168 2169 2170 2171 2172
		if (!fgets(buf,sizeof(buf)-1,stdin))
			{
			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
			ok=0;
			goto err;
			}
2173 2174 2175 2176 2177 2178 2179 2180
		if (!((buf[0] == 'y') || (buf[0] == 'Y')))
			{
			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED\n");
			ok=0;
			goto err;
			}
		}

2181 2182
	pktmp=X509_get_pubkey(ret);
	if (EVP_PKEY_missing_parameters(pktmp) &&
2183 2184
		!EVP_PKEY_missing_parameters(pkey))
		EVP_PKEY_copy_parameters(pktmp,pkey);
2185
	EVP_PKEY_free(pktmp);
2186

2187
	if (!do_X509_sign(bio_err, ret,pkey,dgst, sigopts))
2188 2189 2190
		goto err;

	/* We now just add it to the database */
2191
	row[DB_type]=(char *)OPENSSL_malloc(2);
2192 2193

	tm=X509_get_notAfter(ret);
2194
	row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2195 2196 2197 2198 2199 2200
	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 */
2201
	row[DB_file]=(char *)OPENSSL_malloc(8);
2202
	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(ret),NULL,0);
2203 2204

	if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
2205
		(row[DB_file] == NULL) || (row[DB_name] == NULL))
2206
		{
2207
		BIO_printf(bio_err,"Memory allocation failure\n");
2208 2209
		goto err;
		}
2210
	BUF_strlcpy(row[DB_file],"unknown",8);
2211 2212 2213
	row[DB_type][0]='V';
	row[DB_type][1]='\0';

2214
	if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2215
		{
2216
		BIO_printf(bio_err,"Memory allocation failure\n");
2217 2218 2219 2220 2221 2222 2223 2224 2225 2226
		goto err;
		}

	for (i=0; i<DB_NUMBER; i++)
		{
		irow[i]=row[i];
		row[i]=NULL;
		}
	irow[DB_NUMBER]=NULL;

2227
	if (!TXT_DB_insert(db->db,irow))
2228 2229
		{
		BIO_printf(bio_err,"failed to update database\n");
2230
		BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
2231 2232 2233 2234 2235
		goto err;
		}
	ok=1;
err:
	for (i=0; i<DB_NUMBER; i++)
2236
		if (row[i] != NULL) OPENSSL_free(row[i]);
2237 2238 2239 2240 2241

	if (CAname != NULL)
		X509_NAME_free(CAname);
	if (subject != NULL)
		X509_NAME_free(subject);
2242 2243
	if ((dn_subject != NULL) && !email_dn)
		X509_NAME_free(dn_subject);
2244 2245
	if (tmptm != NULL)
		ASN1_UTCTIME_free(tmptm);
2246 2247 2248 2249 2250 2251 2252 2253 2254 2255
	if (ok <= 0)
		{
		if (ret != NULL) X509_free(ret);
		ret=NULL;
		}
	else
		*xret=ret;
	return(ok);
	}

D
 
Dr. Stephen Henson 已提交
2256
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
2257 2258 2259 2260 2261 2262 2263
	{

	if (output_der)
		{
		(void)i2d_X509_bio(bp,x);
		return;
		}
D
 
Dr. Stephen Henson 已提交
2264 2265
#if 0
	/* ??? Not needed since X509_print prints all this stuff anyway */
2266 2267 2268 2269 2270 2271 2272 2273 2274
	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");
D
 
Dr. Stephen Henson 已提交
2275
#endif
2276
	if (!notext)X509_print(bp,x);
2277 2278 2279
	PEM_write_bio_X509(bp,x);
	}

U
Ulf Möller 已提交
2280
static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
2281 2282
	     const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
	     STACK_OF(CONF_VALUE) *policy, CA_DB *db,
D
Dr. Stephen Henson 已提交
2283
	     BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
2284
	     long days, char *ext_sect, CONF *lconf, int verbose, unsigned long certopt,
D
 
Dr. Stephen Henson 已提交
2285
	     unsigned long nameopt, int default_op, int ext_copy)
2286
	{
2287
	STACK_OF(CONF_VALUE) *sk=NULL;
B
Ben Laurie 已提交
2288
	LHASH_OF(CONF_VALUE) *parms=NULL;
2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314
	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");
2315
	if (sk_CONF_VALUE_num(sk) == 0)
2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343
		{
		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++)
		{
2344
		if (sk_CONF_VALUE_num(sk) <= i) break;
2345

2346
		cv=sk_CONF_VALUE_value(sk,i);
2347
		type=cv->name;
2348 2349 2350
		/* Skip past any leading X. X: X, etc to allow for
		 * multiple instances
		 */
2351 2352 2353 2354 2355 2356 2357
		for (buf = cv->name; *buf ; buf++)
			if ((*buf == ':') || (*buf == ',') || (*buf == '.'))
				{
				buf++;
				if (*buf) type = buf;
				break;
				}
2358

2359
		buf=cv->value;
2360 2361 2362 2363
		if ((nid=OBJ_txt2nid(type)) == NID_undef)
			{
			if (strcmp(type, "SPKAC") == 0)
				{
2364
				spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
2365 2366 2367 2368 2369 2370 2371 2372 2373 2374
				if (spki == NULL)
					{
					BIO_printf(bio_err,"unable to load Netscape SPKAC structure\n");
					ERR_print_errors(bio_err);
					goto err;
					}
				}
			continue;
			}

2375 2376
		if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
				(unsigned char *)buf, -1, -1, 0))
2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391
			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");

2392
	if ((pktmp=NETSCAPE_SPKI_get_pubkey(spki)) == NULL)
2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406
		{
		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);
2407
	EVP_PKEY_free(pktmp);
2408 2409 2410
	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);
2411 2412 2413 2414 2415 2416 2417 2418 2419
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);
	}

D
Dr. Stephen Henson 已提交
2420
static int check_time_format(const char *str)
2421
	{
D
Dr. Stephen Henson 已提交
2422
	return ASN1_TIME_set_string(NULL, str);
2423 2424
	}

2425
static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
2426
	{
2427
	ASN1_UTCTIME *tm=NULL;
2428
	char *row[DB_NUMBER],**rrow,**irow;
2429
	char *rev_str = NULL;
2430
	BIGNUM *bn = NULL;
2431 2432 2433 2434
	int ok=-1,i;

	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;
2435 2436
	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(x509),NULL,0);
	bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(x509),NULL);
2437 2438
	if (!bn)
		goto err;
2439 2440 2441 2442
	if (BN_is_zero(bn))
		row[DB_serial]=BUF_strdup("00");
	else
		row[DB_serial]=BN_bn2hex(bn);
2443
	BN_free(bn);
2444 2445
	if ((row[DB_name] == NULL) || (row[DB_serial] == NULL))
		{
2446
		BIO_printf(bio_err,"Memory allocation failure\n");
2447 2448
		goto err;
		}
2449 2450 2451
	/* We have to lookup by serial number because name lookup
	 * skips revoked certs
 	 */
2452
	rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
2453 2454
	if (rrow == NULL)
		{
2455
		BIO_printf(bio_err,"Adding Entry with serial number %s to DB for %s\n", row[DB_serial], row[DB_name]);
2456 2457

		/* We now just add it to the database */
2458
		row[DB_type]=(char *)OPENSSL_malloc(2);
2459 2460

		tm=X509_get_notAfter(x509);
2461
		row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2462 2463 2464 2465 2466 2467
		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 */
2468
		row[DB_file]=(char *)OPENSSL_malloc(8);
2469 2470 2471 2472 2473 2474

		/* row[DB_name] done already */

		if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
			(row[DB_file] == NULL))
			{
2475
			BIO_printf(bio_err,"Memory allocation failure\n");
2476 2477
			goto err;
			}
2478
		BUF_strlcpy(row[DB_file],"unknown",8);
2479 2480 2481
		row[DB_type][0]='V';
		row[DB_type][1]='\0';

2482
		if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2483
			{
2484
			BIO_printf(bio_err,"Memory allocation failure\n");
2485 2486 2487 2488 2489 2490 2491 2492 2493 2494
			goto err;
			}

		for (i=0; i<DB_NUMBER; i++)
			{
			irow[i]=row[i];
			row[i]=NULL;
			}
		irow[DB_NUMBER]=NULL;

2495
		if (!TXT_DB_insert(db->db,irow))
2496 2497
			{
			BIO_printf(bio_err,"failed to update database\n");
2498
			BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
2499 2500 2501 2502
			goto err;
			}

		/* Revoke Certificate */
2503 2504 2505 2506
		if (type == -1)
			ok = 1;
		else
			ok = do_revoke(x509,db, type, value);
2507 2508 2509 2510

		goto err;

		}
D
Dr. Stephen Henson 已提交
2511
	else if (index_name_cmp_noconst(row, rrow))
2512
		{
2513 2514
		BIO_printf(bio_err,"ERROR:name does not match %s\n",
			   row[DB_name]);
2515 2516
		goto err;
		}
2517 2518 2519 2520 2521 2522
	else if (type == -1)
		{
		BIO_printf(bio_err,"ERROR:Already present, serial number %s\n",
			   row[DB_serial]);
		goto err;
		}
2523 2524 2525 2526 2527 2528 2529 2530 2531
	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]);
2532 2533 2534 2535 2536 2537
		rev_str = make_revocation_str(type, value);
		if (!rev_str)
			{
			BIO_printf(bio_err, "Error in revocation arguments\n");
			goto err;
			}
2538 2539
		rrow[DB_type][0]='R';
		rrow[DB_type][1]='\0';
2540
		rrow[DB_rev_date] = rev_str;
2541 2542
		}
	ok=1;
2543
err:
2544 2545 2546
	for (i=0; i<DB_NUMBER; i++)
		{
		if (row[i] != NULL) 
2547
			OPENSSL_free(row[i]);
2548 2549
		}
	return(ok);
2550 2551
	}

2552
static int get_certificate_status(const char *serial, CA_DB *db)
2553
	{
D
Dr. Stephen Henson 已提交
2554
	char *row[DB_NUMBER],**rrow;
2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586
	int ok=-1,i;

	/* Free Resources */
	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;

	/* Malloc needed char spaces */
	row[DB_serial] = OPENSSL_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++)
2587
		row[DB_serial][i] = toupper((unsigned char)row[DB_serial][i]);
2588
	
2589 2590 2591 2592

	ok=1;

	/* Search for the certificate */
2593
	rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639
	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++)
		{
		if (row[i] != NULL)
			OPENSSL_free(row[i]);
		}
	return(ok);
	}

2640
static int do_updatedb (CA_DB *db)
2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664
	{
	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 = (char *) OPENSSL_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;
2665

D
Dr. Stephen Henson 已提交
2666
	for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++)
2667
		{
D
Dr. Stephen Henson 已提交
2668
		rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710

		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);
	OPENSSL_free(a_tm_s);

	return (cnt);
	}
2711

N
Nils Larsch 已提交
2712
static const char *crl_reasons[] = {
2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739
	/* 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)
	{
N
Nils Larsch 已提交
2740 2741
	char *other = NULL, *str;
	const char *reason = NULL;
2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802
	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);

2803 2804 2805
	if (!revtm)
		return NULL;

2806 2807 2808 2809 2810 2811 2812 2813 2814
	i = revtm->length + 1;

	if (reason) i += strlen(reason) + 1;
	if (other) i += strlen(other) + 1;

	str = OPENSSL_malloc(i);

	if (!str) return NULL;

2815
	BUF_strlcpy(str, (char *)revtm->data, i);
2816 2817
	if (reason)
		{
2818 2819
		BUF_strlcat(str, ",", i);
		BUF_strlcat(str, reason, i);
2820 2821 2822
		}
	if (other)
		{
2823 2824
		BUF_strlcat(str, ",", i);
		BUF_strlcat(str, other, i);
2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836
		}
	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)
 */

D
 
Dr. Stephen Henson 已提交
2837

N
Nils Larsch 已提交
2838
int make_revoked(X509_REVOKED *rev, const char *str)
2839 2840 2841 2842 2843 2844 2845 2846
	{
	char *tmp = NULL;
	int reason_code = -1;
	int i, ret = 0;
	ASN1_OBJECT *hold = NULL;
	ASN1_GENERALIZEDTIME *comp_time = NULL;
	ASN1_ENUMERATED *rtmp = NULL;

D
 
Dr. Stephen Henson 已提交
2847
	ASN1_TIME *revDate = NULL;
2848

D
 
Dr. Stephen Henson 已提交
2849
	i = unpack_revinfo(&revDate, &reason_code, &hold, &comp_time, str);
2850

D
 
Dr. Stephen Henson 已提交
2851
	if (i == 0)
2852 2853
		goto err;

D
 
Dr. Stephen Henson 已提交
2854 2855 2856
	if (rev && !X509_REVOKED_set_revocationDate(rev, revDate))
		goto err;

2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886
	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:

	if (tmp) OPENSSL_free(tmp);
	ASN1_OBJECT_free(hold);
	ASN1_GENERALIZEDTIME_free(comp_time);
	ASN1_ENUMERATED_free(rtmp);
D
 
Dr. Stephen Henson 已提交
2887
	ASN1_TIME_free(revDate);
2888 2889 2890

	return ret;
	}
2891

D
 
Dr. Stephen Henson 已提交
2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929
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;
	}
D
 
Dr. Stephen Henson 已提交
2930

N
Nils Larsch 已提交
2931
int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold, ASN1_GENERALIZEDTIME **pinvtm, const char *str)
D
 
Dr. Stephen Henson 已提交
2932 2933 2934 2935
	{
	char *tmp = NULL;
	char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
	int reason_code = -1;
2936 2937
	int ret = 0;
	unsigned int i;
D
 
Dr. Stephen Henson 已提交
2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026
	ASN1_OBJECT *hold = NULL;
	ASN1_GENERALIZEDTIME *comp_time = NULL;
	tmp = BUF_strdup(str);

	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);

D
 
Dr. Stephen Henson 已提交
3027 3028
	ret = 1;

D
 
Dr. Stephen Henson 已提交
3029 3030 3031 3032 3033 3034 3035 3036
	err:

	if (tmp) OPENSSL_free(tmp);
	if (!phold) ASN1_OBJECT_free(hold);
	if (!pinvtm) ASN1_GENERALIZEDTIME_free(comp_time);

	return ret;
	}