ca.c 74.2 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 66
#include <sys/types.h>
#include <sys/stat.h>
67 68 69 70 71 72 73 74 75
#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>
76
#include <openssl/ocsp.h>
77
#include <openssl/pem.h>
78

79 80 81
#ifdef OPENSSL_SYS_WINDOWS
#define strcasecmp _stricmp
#else
82 83 84 85 86
#  ifdef NO_STRINGS_H
    int	strcasecmp();
#  else
#    include <strings.h>
#  endif /* NO_STRINGS_H */
87 88
#endif

89
#ifndef W_OK
90
#  ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
91 92 93 94 95
#    if defined(__DECC)
#      include <unistd.h>
#    else
#      include <unixlib.h>
#    endif
R
Richard Levitte 已提交
96
#  elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS)
U
Ulf Möller 已提交
97 98 99 100
#    include <sys/file.h>
#  endif
#endif

101 102
#include "apps.h"

U
Ulf Möller 已提交
103 104 105 106 107
#ifndef W_OK
#  define F_OK 0
#  define X_OK 1
#  define W_OK 2
#  define R_OK 4
108 109 110 111 112 113
#endif

#undef PROG
#define PROG ca_main

#define BASE_SECTION	"ca"
U
Ulf Möller 已提交
114
#define CONFIG_FILE "openssl.cnf"
115 116 117 118 119 120 121 122 123 124 125 126 127 128

#define ENV_DEFAULT_CA		"default_ca"

#define ENV_DIR			"dir"
#define ENV_CERTS		"certs"
#define ENV_CRL_DIR		"crl_dir"
#define ENV_CA_DB		"CA_DB"
#define ENV_NEW_CERTS_DIR	"new_certs_dir"
#define ENV_CERTIFICATE 	"certificate"
#define ENV_SERIAL		"serial"
#define ENV_CRL			"crl"
#define ENV_PRIVATE_KEY		"private_key"
#define ENV_RANDFILE		"RANDFILE"
#define ENV_DEFAULT_DAYS 	"default_days"
129
#define ENV_DEFAULT_STARTDATE 	"default_startdate"
130
#define ENV_DEFAULT_ENDDATE 	"default_enddate"
131 132 133
#define ENV_DEFAULT_CRL_DAYS 	"default_crl_days"
#define ENV_DEFAULT_CRL_HOURS 	"default_crl_hours"
#define ENV_DEFAULT_MD		"default_md"
134
#define ENV_DEFAULT_EMAIL_DN	"email_in_dn"
135 136 137
#define ENV_PRESERVE		"preserve"
#define ENV_POLICY      	"policy"
#define ENV_EXTENSIONS      	"x509_extensions"
138
#define ENV_CRLEXT      	"crl_extensions"
139
#define ENV_MSIE_HACK		"msie_hack"
D
 
Dr. Stephen Henson 已提交
140 141
#define ENV_NAMEOPT		"name_opt"
#define ENV_CERTOPT		"cert_opt"
142
#define ENV_EXTCOPY		"copy_extensions"
143 144 145

#define ENV_DATABASE		"database"

146 147 148 149 150 151 152 153
/* 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 */

154 155 156 157 158 159 160 161 162
static char *ca_usage[]={
"usage: ca args\n",
"\n",
" -verbose        - Talk alot while doing things\n",
" -config file    - A config file\n",
" -name arg       - The particular CA definition to use\n",
" -gencrl         - Generate a new CRL\n",
" -crldays days   - Days is when the next CRL is due\n",
" -crlhours hours - Hours is when the next CRL is due\n",
163 164
" -startdate YYMMDDHHMMSSZ  - certificate validity notBefore\n",
" -enddate YYMMDDHHMMSSZ    - certificate validity notAfter (overrides -days)\n",
165 166 167
" -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",
168 169
" -keyfile arg    - private key file\n",
" -keyform arg    - private key file format (PEM or ENGINE)\n",
170
" -key arg        - key to decode the private key if it is encrypted\n",
B
Ben Laurie 已提交
171
" -cert file      - The CA certificate\n",
172
" -selfsign       - sign a certificate with the key associated with it\n",
173 174 175 176 177
" -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",
178
" -ss_cert file   - File contains a self signed cert to sign\n",
179
" -preserveDN     - Don't re-order the DN\n",
180
" -noemailDN      - Don't add the EMAIL field into certificate' subject\n",
181 182
" -batch          - Don't ask questions\n",
" -msie_hack      - msie modifications to handle all those universal strings\n",
183
" -revoke file    - Revoke a certificate (given in file)\n",
184
" -subj arg       - Use arg instead of request's subject\n",
185
" -extensions ..  - Extension section (override value in config file)\n",
186
" -extfile file   - Configuration file with X509v3 extentions to add\n",
187
" -crlexts ..     - CRL extension section (override value in config file)\n",
188
#ifndef OPENSSL_NO_ENGINE
189
" -engine e       - use engine e, possibly a hardware device.\n",
190
#endif
191 192
" -status serial  - Shows certificate status given the serial number\n",
" -updatedb       - Updates db for expired certificates\n",
193 194 195 196 197 198 199 200 201 202 203
NULL
};

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

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

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

244

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

U
Ulf Möller 已提交
247
int MAIN(int argc, char **argv)
248
	{
249
	ENGINE *e = NULL;
250
	char *key=NULL,*passargin=NULL;
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 264 265 266 267 268 269
	long crldays=0;
	long crlhours=0;
	long errorline= -1;
	char *configfile=NULL;
	char *md=NULL;
	char *policy=NULL;
	char *keyfile=NULL;
	char *certfile=NULL;
270
	int keyform=FORMAT_PEM;
271 272
	char *infile=NULL;
	char *spkac_file=NULL;
273
	char *ss_cert_file=NULL;
274
	char *ser_status=NULL;
275 276 277 278 279 280
	EVP_PKEY *pkey=NULL;
	int output_der = 0;
	char *outfile=NULL;
	char *outdir=NULL;
	char *serialfile=NULL;
	char *extensions=NULL;
281
	char *extfile=NULL;
282
	char *subj=NULL;
283
	char *tmp_email_dn=NULL;
284
	char *crl_ext=NULL;
285 286
	int rev_type = REV_NONE;
	char *rev_arg = NULL;
287
	BIGNUM *serial=NULL;
288
	char *startdate=NULL;
289
	char *enddate=NULL;
D
 
Dr. Stephen Henson 已提交
290
	long days=0;
291
	int batch=0;
D
 
Dr. Stephen Henson 已提交
292
	int notext=0;
D
 
Dr. Stephen Henson 已提交
293 294
	unsigned long nameopt = 0, certopt = 0;
	int default_op = 1;
295
	int ext_copy = EXT_COPY_NONE;
296 297
	int selfsign = 0;
	X509 *x509=NULL, *x509p = NULL;
298 299 300
	X509 *x=NULL;
	BIO *in=NULL,*out=NULL,*Sout=NULL,*Cout=NULL;
	char *dbfile=NULL;
301
	CA_DB *db=NULL;
302 303
	X509_CRL *crl=NULL;
	X509_REVOKED *r=NULL;
D
 
Dr. Stephen Henson 已提交
304 305
	ASN1_TIME *tmptm;
	ASN1_INTEGER *tmpser;
306 307
	char **pp,*p,*f;
	int i,j;
B
Ben Laurie 已提交
308
	const EVP_MD *dgst=NULL;
309
	STACK_OF(CONF_VALUE) *attribs=NULL;
B
Ben Laurie 已提交
310
	STACK_OF(X509) *cert_sk=NULL;
311 312 313
#undef BSIZE
#define BSIZE 256
	MS_STATIC char buf[3][BSIZE];
B
Ben Laurie 已提交
314
	char *randfile=NULL;
315
#ifndef OPENSSL_NO_ENGINE
316
	char *engine = NULL;
317
#endif
318
	char *tofree=NULL;
319
	DB_ATTR db_attr;
320 321 322 323 324 325 326 327 328

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

	apps_startup();

329
	conf = NULL;
330 331 332
	key = NULL;
	section = NULL;

333
	preserve=0;
334
	msie_hack=0;
335 336
	if (bio_err == NULL)
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
337
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354

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

	if (badops)
		{
		for (pp=ca_usage; (*pp != NULL); pp++)
U
Ulf Möller 已提交
545
			BIO_printf(bio_err,"%s",*pp);
546 547 548 549 550
		goto err;
		}

	ERR_load_crypto_strings();

551
#ifndef OPENSSL_NO_ENGINE
552
	e = setup_engine(bio_err, engine, 0);
553
#endif
554

555
	/*****************************************************************/
556
	tofree=NULL;
557 558
	if (configfile == NULL) configfile = getenv("OPENSSL_CONF");
	if (configfile == NULL) configfile = getenv("SSLEAY_CONF");
559 560
	if (configfile == NULL)
		{
561 562
		const char *s=X509_get_default_cert_area();

563
#ifdef OPENSSL_SYS_VMS
564 565
		tofree=OPENSSL_malloc(strlen(s)+sizeof(CONFIG_FILE));
		strcpy(tofree,s);
U
Ulf Möller 已提交
566
#else
567 568 569
		tofree=OPENSSL_malloc(strlen(s)+sizeof(CONFIG_FILE)+1);
		strcpy(tofree,s);
		strcat(tofree,"/");
U
Ulf Möller 已提交
570
#endif
571 572
		strcat(tofree,CONFIG_FILE);
		configfile=tofree;
573 574 575
		}

	BIO_printf(bio_err,"Using configuration from %s\n",configfile);
D
 
Dr. Stephen Henson 已提交
576 577
	conf = NCONF_new(NULL);
	if (NCONF_load(conf,configfile,&errorline) <= 0)
578 579 580 581 582 583 584 585 586
		{
		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;
		}
587
	if(tofree)
588
		{
589
		OPENSSL_free(tofree);
590 591
		tofree = NULL;
		}
592

D
Dr. Stephen Henson 已提交
593 594 595
	if (!load_config(bio_err, conf))
		goto err;

596 597 598
	/* Lets get the config section we are using */
	if (section == NULL)
		{
D
 
Dr. Stephen Henson 已提交
599
		section=NCONF_get_string(conf,BASE_SECTION,ENV_DEFAULT_CA);
600 601 602 603 604 605 606
		if (section == NULL)
			{
			lookup_fail(BASE_SECTION,ENV_DEFAULT_CA);
			goto err;
			}
		}

607 608
	if (conf != NULL)
		{
D
 
Dr. Stephen Henson 已提交
609
		p=NCONF_get_string(conf,NULL,"oid_file");
610 611
		if (p == NULL)
			ERR_clear_error();
612 613 614 615 616 617 618 619 620 621 622
		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 已提交
623
				ERR_clear_error();
624 625 626 627 628 629 630
				}
			else
				{
				OBJ_create_objects(oid_bio);
				BIO_free(oid_bio);
				}
			}
631
		if (!add_oid_section(bio_err,conf)) 
632
			{
633 634
			ERR_print_errors(bio_err);
			goto err;
635
			}
636
		}
637

D
 
Dr. Stephen Henson 已提交
638
	randfile = NCONF_get_string(conf, BASE_SECTION, "RANDFILE");
639 640
	if (randfile == NULL)
		ERR_clear_error();
641
	app_RAND_load_file(randfile, bio_err, 0);
642 643 644 645 646

	db_attr.unique_subject = 1;
	p = NCONF_get_string(conf, section, "unique_subject");
	if (p)
		{
647
#ifdef RL_DEBUG
648
		BIO_printf(bio_err, "DEBUG: unique_subject = \"%s\"\n", p);
649
#endif
650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666
		switch(*p)
			{
		case 'f': /* false */
		case 'F': /* FALSE */
		case 'n': /* no */
		case 'N': /* NO */
			db_attr.unique_subject = 0;
			break;
		case 't': /* true */
		case 'T': /* TRUE */
		case 'y': /* yes */
		case 'Y': /* YES */
		default:
			db_attr.unique_subject = 1;
			break;
			}
		}
667
#ifdef RL_DEBUG
668 669
	else
		BIO_printf(bio_err, "DEBUG: unique_subject undefined\n", p);
670 671
#endif
#ifdef RL_DEBUG
672 673
	BIO_printf(bio_err, "DEBUG: configured unique_subject is %d\n",
		db_attr.unique_subject);
674
#endif
675
	
676 677 678 679 680 681 682 683 684 685 686
	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;
		}

	/*****************************************************************/
687 688 689
	/* report status of cert with serial number given on command line */
	if (ser_status)
	{
D
 
Dr. Stephen Henson 已提交
690
		if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
691 692 693 694
			{
			lookup_fail(section,ENV_DATABASE);
			goto err;
			}
695
		db = load_index(dbfile,&db_attr);
696 697
		if (db == NULL) goto err;

698
		if (!index_index(db)) goto err;
699 700 701 702 703 704 705 706

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

	/*****************************************************************/
707
	/* we definitely need a private key, so let's get it */
708

D
 
Dr. Stephen Henson 已提交
709
	if ((keyfile == NULL) && ((keyfile=NCONF_get_string(conf,
710 711 712 713 714
		section,ENV_PRIVATE_KEY)) == NULL))
		{
		lookup_fail(section,ENV_PRIVATE_KEY);
		goto err;
		}
D
 
Dr. Stephen Henson 已提交
715
	if (!key)
716
		{
D
 
Dr. Stephen Henson 已提交
717 718 719 720 721 722
		free_key = 1;
		if (!app_passwd(bio_err, passargin, NULL, &key, NULL))
			{
			BIO_printf(bio_err,"Error getting password\n");
			goto err;
			}
723
		}
724
	pkey = load_key(bio_err, keyfile, keyform, 0, key, e, 
725
		"CA private key");
726
	if (key) OPENSSL_cleanse(key,strlen(key));
727 728
	if (pkey == NULL)
		{
729
		/* load_key() has already printed an appropriate message */
730 731 732 733 734
		goto err;
		}

	/*****************************************************************/
	/* we need a certificate */
735
	if (!selfsign || spkac_file || ss_cert_file || gencrl)
736
		{
737 738 739 740 741 742 743 744 745 746 747
		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;
748

749 750 751 752 753
		if (!X509_check_private_key(x509,pkey))
			{
			BIO_printf(bio_err,"CA certificate and CA private key do not match\n");
			goto err;
			}
754
		}
755
	if (!selfsign) x509p = x509;
756

D
 
Dr. Stephen Henson 已提交
757
	f=NCONF_get_string(conf,BASE_SECTION,ENV_PRESERVE);
758 759
	if (f == NULL)
		ERR_clear_error();
760 761
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		preserve=1;
D
 
Dr. Stephen Henson 已提交
762
	f=NCONF_get_string(conf,BASE_SECTION,ENV_MSIE_HACK);
763 764
	if (f == NULL)
		ERR_clear_error();
765 766 767
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		msie_hack=1;

D
 
Dr. Stephen Henson 已提交
768
	f=NCONF_get_string(conf,section,ENV_NAMEOPT);
D
 
Dr. Stephen Henson 已提交
769 770 771 772 773 774 775 776 777 778 779 780 781

	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 已提交
782
	f=NCONF_get_string(conf,section,ENV_CERTOPT);
D
 
Dr. Stephen Henson 已提交
783 784 785 786 787 788 789 790 791 792 793 794 795

	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 已提交
796
	f=NCONF_get_string(conf,section,ENV_EXTCOPY);
797 798 799 800 801 802 803 804 805 806 807

	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 已提交
808

809 810 811 812 813 814
	/*****************************************************************/
	/* lookup where to write new certificates */
	if ((outdir == NULL) && (req))
		{
		struct stat sb;

D
 
Dr. Stephen Henson 已提交
815
		if ((outdir=NCONF_get_string(conf,section,ENV_NEW_CERTS_DIR))
816 817 818 819 820
			== NULL)
			{
			BIO_printf(bio_err,"there needs to be defined a directory for new certificate to be placed in\n");
			goto err;
			}
821 822
#ifndef OPENSSL_SYS_VMS
	    /* outdir is a directory spec, but access() for VMS demands a
823 824 825 826 827 828 829 830
	       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.
831
	    */
832 833
		if (access(outdir,R_OK|W_OK|X_OK) != 0)
			{
U
Ulf Möller 已提交
834
			BIO_printf(bio_err,"I am unable to access the %s directory\n",outdir);
835 836 837 838 839 840 841 842 843 844
			perror(outdir);
			goto err;
			}

		if (stat(outdir,&sb) != 0)
			{
			BIO_printf(bio_err,"unable to stat(%s)\n",outdir);
			perror(outdir);
			goto err;
			}
845
#ifdef S_IFDIR
846 847 848 849 850 851
		if (!(sb.st_mode & S_IFDIR))
			{
			BIO_printf(bio_err,"%s need to be a directory\n",outdir);
			perror(outdir);
			goto err;
			}
852
#endif
853
#endif
854 855 856 857
		}

	/*****************************************************************/
	/* we need to load the database file */
D
 
Dr. Stephen Henson 已提交
858
	if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
859 860 861 862
		{
		lookup_fail(section,ENV_DATABASE);
		goto err;
		}
863
	db = load_index(dbfile, &db_attr);
864 865 866
	if (db == NULL) goto err;

	/* Lets check some fields */
867
	for (i=0; i<sk_num(db->db->data); i++)
868
		{
869
		pp=(char **)sk_value(db->db->data,i);
870 871 872
		if ((pp[DB_type][0] != DB_TYPE_REV) &&
			(pp[DB_rev_date][0] != '\0'))
			{
873
			BIO_printf(bio_err,"entry %d: not revoked yet, but has a revocation date\n",i+1);
874 875 876
			goto err;
			}
		if ((pp[DB_type][0] == DB_TYPE_REV) &&
877
			!make_revoked(NULL, pp[DB_rev_date]))
878
			{
879
			BIO_printf(bio_err," in entry %d\n", i+1);
880 881 882 883 884 885 886 887 888
			goto err;
			}
		if (!check_time_format(pp[DB_exp_date]))
			{
			BIO_printf(bio_err,"entry %d: invalid expiry date\n",i+1);
			goto err;
			}
		p=pp[DB_serial];
		j=strlen(p);
889 890 891 892 893
		if (*p == '-')
			{
			p++;
			j--;
			}
894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912
		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)
		{
913
		BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT); /* cannot fail */
914
#ifdef OPENSSL_SYS_VMS
915 916 917 918 919
		{
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
		out = BIO_push(tmpbio, out);
		}
#endif
920
		TXT_DB_write(out,db->db);
921
		BIO_printf(bio_err,"%d entries loaded from the database\n",
922
			db->db->data->num);
U
Ulf Möller 已提交
923
		BIO_printf(bio_err,"generating index\n");
924 925
		}
	
926
	if (!index_index(db)) goto err;
927

928 929 930 931 932 933 934 935 936 937 938 939 940
	/*****************************************************************/
	/* 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;
941
			}
942
		else if (i == 0)
943
			{
944 945 946 947 948
			if (verbose) BIO_printf(bio_err,
					"No entries found to mark expired\n"); 
			}
	    	else
			{
949 950 951
			if (!save_index(dbfile,"new",db)) goto err;
				
			if (!rotate_index(dbfile,"new","old")) goto err;
952 953 954 955 956 957 958
				
			if (verbose) BIO_printf(bio_err,
				"Done. %d entries marked as expired\n",i); 
	      		}
			goto err;
	  	}

959 960 961 962
 	/*****************************************************************/
	/* Read extentions config file                                   */
	if (extfile)
		{
D
 
Dr. Stephen Henson 已提交
963 964
		extconf = NCONF_new(NULL);
		if (NCONF_load(extconf,extfile,&errorline) <= 0)
965 966 967 968 969 970 971 972 973 974 975 976
			{
			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 已提交
977
			BIO_printf(bio_err, "Successfully loaded extensions file %s\n", extfile);
978 979

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

984 985 986 987 988 989 990 991 992 993 994 995
	/*****************************************************************/
	if (req || gencrl)
		{
		if (outfile != NULL)
			{
			if (BIO_write_filename(Sout,outfile) <= 0)
				{
				perror(outfile);
				goto err;
				}
			}
		else
996
			{
997
			BIO_set_fp(Sout,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
998
#ifdef OPENSSL_SYS_VMS
999 1000 1001 1002 1003 1004
			{
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
			Sout = BIO_push(tmpbio, Sout);
			}
#endif
			}
1005 1006 1007 1008
		}

	if (req)
		{
D
 
Dr. Stephen Henson 已提交
1009
		if ((md == NULL) && ((md=NCONF_get_string(conf,
1010 1011 1012 1013 1014
			section,ENV_DEFAULT_MD)) == NULL))
			{
			lookup_fail(section,ENV_DEFAULT_MD);
			goto err;
			}
1015 1016 1017 1018 1019 1020
		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;
			}
1021 1022 1023 1024 1025 1026 1027 1028
		if ((dgst=EVP_get_digestbyname(md)) == NULL)
			{
			BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
			goto err;
			}
		if (verbose)
			BIO_printf(bio_err,"message digest is %s\n",
				OBJ_nid2ln(dgst->type));
D
 
Dr. Stephen Henson 已提交
1029
		if ((policy == NULL) && ((policy=NCONF_get_string(conf,
1030 1031 1032 1033 1034 1035 1036 1037
			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 已提交
1038
		if ((serialfile=NCONF_get_string(conf,section,ENV_SERIAL))
1039 1040 1041 1042 1043
			== NULL)
			{
			lookup_fail(section,ENV_SERIAL);
			goto err;
			}
1044 1045

		if (!extconf)
1046
			{
1047 1048
			/* no '-extfile' option, so we look for extensions
			 * in the main configuration file */
1049 1050
			if (!extensions)
				{
D
 
Dr. Stephen Henson 已提交
1051
				extensions=NCONF_get_string(conf,section,
1052 1053 1054 1055 1056 1057 1058 1059 1060
								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 已提交
1061 1062
				X509V3_set_nconf(&ctx, conf);
				if (!X509V3_EXT_add_nconf(conf, &ctx, extensions,
1063 1064 1065 1066
								NULL))
					{
					BIO_printf(bio_err,
				 	"Error Loading extension section %s\n",
1067
								 extensions);
1068 1069 1070
					ret = 1;
					goto err;
					}
1071
				}
1072 1073
			}

1074 1075
		if (startdate == NULL)
			{
D
 
Dr. Stephen Henson 已提交
1076
			startdate=NCONF_get_string(conf,section,
1077
				ENV_DEFAULT_STARTDATE);
1078 1079
			if (startdate == NULL)
				ERR_clear_error();
1080 1081 1082 1083 1084 1085 1086 1087 1088 1089
			}
		if (startdate && !ASN1_UTCTIME_set_string(NULL,startdate))
			{
			BIO_printf(bio_err,"start date is invalid, it should be YYMMDDHHMMSSZ\n");
			goto err;
			}
		if (startdate == NULL) startdate="today";

		if (enddate == NULL)
			{
D
 
Dr. Stephen Henson 已提交
1090
			enddate=NCONF_get_string(conf,section,
1091
				ENV_DEFAULT_ENDDATE);
1092 1093
			if (enddate == NULL)
				ERR_clear_error();
1094 1095 1096 1097 1098
			}
		if (enddate && !ASN1_UTCTIME_set_string(NULL,enddate))
			{
			BIO_printf(bio_err,"end date is invalid, it should be YYMMDDHHMMSSZ\n");
			goto err;
1099 1100
			}

1101 1102
		if (days == 0)
			{
D
 
Dr. Stephen Henson 已提交
1103 1104
			if(!NCONF_get_number(conf,section, ENV_DEFAULT_DAYS, &days))
				days = 0;
1105
			}
1106
		if (!enddate && (days == 0))
1107 1108 1109 1110 1111
			{
			BIO_printf(bio_err,"cannot lookup how many days to certify for\n");
			goto err;
			}

1112
		if ((serial=load_serial(serialfile, 0, NULL)) == NULL)
1113 1114 1115 1116 1117 1118
			{
			BIO_printf(bio_err,"error while loading serial number\n");
			goto err;
			}
		if (verbose)
			{
1119 1120 1121 1122 1123 1124 1125 1126
			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);
				}
1127 1128
			}

D
 
Dr. Stephen Henson 已提交
1129
		if ((attribs=NCONF_get_section(conf,policy)) == NULL)
1130 1131 1132 1133 1134
			{
			BIO_printf(bio_err,"unable to find 'section' for %s\n",policy);
			goto err;
			}

B
Ben Laurie 已提交
1135
		if ((cert_sk=sk_X509_new_null()) == NULL)
1136
			{
1137
			BIO_printf(bio_err,"Memory allocation failure\n");
1138 1139 1140 1141 1142 1143
			goto err;
			}
		if (spkac_file != NULL)
			{
			total++;
			j=certify_spkac(&x,spkac_file,pkey,x509,dgst,attribs,db,
1144 1145
				serial,subj,email_dn,startdate,enddate,days,extensions,
				conf,verbose,certopt,nameopt,default_op,ext_copy);
1146 1147 1148 1149 1150 1151
			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 已提交
1152
				if (!sk_X509_push(cert_sk,x))
1153
					{
1154
					BIO_printf(bio_err,"Memory allocation failure\n");
1155 1156 1157 1158 1159 1160 1161 1162 1163
					goto err;
					}
				if (outfile)
					{
					output_der = 1;
					batch = 1;
					}
				}
			}
1164 1165 1166 1167
		if (ss_cert_file != NULL)
			{
			total++;
			j=certify_cert(&x,ss_cert_file,pkey,x509,dgst,attribs,
1168
				db,serial,subj,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1169
				extensions,conf,verbose, certopt, nameopt,
1170
				default_op, ext_copy, e);
1171 1172 1173 1174 1175 1176
			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 已提交
1177
				if (!sk_X509_push(cert_sk,x))
1178
					{
1179
					BIO_printf(bio_err,"Memory allocation failure\n");
1180 1181 1182 1183
					goto err;
					}
				}
			}
1184 1185 1186
		if (infile != NULL)
			{
			total++;
1187
			j=certify(&x,infile,pkey,x509p,dgst,attribs,db,
1188
				serial,subj,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1189
				extensions,conf,verbose, certopt, nameopt,
1190
				default_op, ext_copy, selfsign);
1191 1192 1193 1194 1195 1196
			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 已提交
1197
				if (!sk_X509_push(cert_sk,x))
1198
					{
1199
					BIO_printf(bio_err,"Memory allocation failure\n");
1200 1201 1202 1203 1204 1205 1206
					goto err;
					}
				}
			}
		for (i=0; i<argc; i++)
			{
			total++;
1207
			j=certify(&x,argv[i],pkey,x509p,dgst,attribs,db,
1208
				serial,subj,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1209
				extensions,conf,verbose, certopt, nameopt,
1210
				default_op, ext_copy, selfsign);
1211 1212 1213 1214 1215 1216
			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 已提交
1217
				if (!sk_X509_push(cert_sk,x))
1218
					{
1219
					BIO_printf(bio_err,"Memory allocation failure\n");
1220 1221 1222 1223 1224 1225 1226 1227
					goto err;
					}
				}
			}	
		/* we have a stack of newly certified certificates
		 * and a data base and serial number that need
		 * updating */

B
Ben Laurie 已提交
1228
		if (sk_X509_num(cert_sk) > 0)
1229 1230 1231 1232
			{
			if (!batch)
				{
				BIO_printf(bio_err,"\n%d out of %d certificate requests certified, commit? [y/n]",total_done,total);
B
Bodo Möller 已提交
1233
				(void)BIO_flush(bio_err);
1234 1235 1236 1237 1238 1239 1240 1241 1242 1243
				buf[0][0]='\0';
				fgets(buf[0],10,stdin);
				if ((buf[0][0] != 'y') && (buf[0][0] != 'Y'))
					{
					BIO_printf(bio_err,"CERTIFICATION CANCELED\n"); 
					ret=0;
					goto err;
					}
				}

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

1246 1247 1248 1249 1250 1251 1252
			if(strlen(serialfile) > BSIZE-5 || strlen(dbfile) > BSIZE-5)
				{
				BIO_printf(bio_err,"file name too long\n");
				goto err;
				}

			strcpy(buf[0],serialfile);
U
Ulf Möller 已提交
1253

1254
#ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
1255 1256
			strcat(buf[0],"-new");
#else
1257
			strcat(buf[0],".new");
U
Ulf Möller 已提交
1258
#endif
1259

1260
			if (!save_serial(buf[0],serial,NULL)) goto err;
U
Ulf Möller 已提交
1261

1262
			if (!save_index(dbfile, "new", db)) goto err;
1263 1264 1265 1266
			}
	
		if (verbose)
			BIO_printf(bio_err,"writing new certificates\n");
B
Ben Laurie 已提交
1267
		for (i=0; i<sk_X509_num(cert_sk); i++)
1268 1269 1270 1271
			{
			int k;
			unsigned char *n;

B
Ben Laurie 已提交
1272
			x=sk_X509_value(cert_sk,i);
1273 1274 1275 1276

			j=x->cert_info->serialNumber->length;
			p=(char *)x->cert_info->serialNumber->data;
			
R
Richard Levitte 已提交
1277
			if(strlen(outdir) >= (size_t)(j ? BSIZE-j*2-6 : BSIZE-8))
1278 1279 1280 1281 1282 1283
				{
				BIO_printf(bio_err,"certificate file name too long\n");
				goto err;
				}

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

1285
#ifndef OPENSSL_SYS_VMS
1286
			strcat(buf[2],"/");
U
Ulf Möller 已提交
1287 1288
#endif

1289 1290 1291 1292 1293
			n=(unsigned char *)&(buf[2][strlen(buf[2])]);
			if (j > 0)
				{
				for (k=0; k<j; k++)
					{
1294
					sprintf((char *)n,"%02X",(unsigned char)*(p++));
1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312
					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 已提交
1313 1314
			write_new_certificate(Cout,x, 0, notext);
			write_new_certificate(Sout,x, output_der, notext);
1315 1316
			}

B
Ben Laurie 已提交
1317
		if (sk_X509_num(cert_sk))
1318 1319 1320
			{
			/* Rename the database and the serial file */
			strncpy(buf[2],serialfile,BSIZE-4);
1321
			buf[2][BSIZE-4]='\0';
U
Ulf Möller 已提交
1322

1323
#ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
1324 1325
			strcat(buf[2],"-old");
#else
1326
			strcat(buf[2],".old");
U
Ulf Möller 已提交
1327 1328
#endif

1329
			BIO_free(in);
1330
			BIO_free_all(out);
1331 1332 1333 1334
			in=NULL;
			out=NULL;
			if (rename(serialfile,buf[2]) < 0)
				{
U
Ulf Möller 已提交
1335
				BIO_printf(bio_err,"unable to rename %s to %s\n",
1336 1337 1338 1339 1340 1341
					serialfile,buf[2]);
				perror("reason");
				goto err;
				}
			if (rename(buf[0],serialfile) < 0)
				{
U
Ulf Möller 已提交
1342
				BIO_printf(bio_err,"unable to rename %s to %s\n",
1343 1344 1345 1346 1347 1348
					buf[0],serialfile);
				perror("reason");
				rename(buf[2],serialfile);
				goto err;
				}

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

1351 1352 1353 1354 1355 1356 1357
			BIO_printf(bio_err,"Data Base Updated\n");
			}
		}
	
	/*****************************************************************/
	if (gencrl)
		{
1358
		int crl_v2 = 0;
1359 1360
		if (!crl_ext)
			{
D
 
Dr. Stephen Henson 已提交
1361
			crl_ext=NCONF_get_string(conf,section,ENV_CRLEXT);
1362 1363 1364 1365 1366
			if (!crl_ext)
				ERR_clear_error();
			}
		if (crl_ext)
			{
1367
			/* Check syntax of file */
1368 1369
			X509V3_CTX ctx;
			X509V3_set_ctx_test(&ctx);
D
 
Dr. Stephen Henson 已提交
1370 1371
			X509V3_set_nconf(&ctx, conf);
			if (!X509V3_EXT_add_nconf(conf, &ctx, crl_ext, NULL))
1372
				{
1373 1374 1375 1376 1377
				BIO_printf(bio_err,
				 "Error Loading CRL extension section %s\n",
								 crl_ext);
				ret = 1;
				goto err;
1378
				}
1379
			}
1380 1381 1382

		if (!crldays && !crlhours)
			{
D
 
Dr. Stephen Henson 已提交
1383 1384 1385 1386 1387 1388
			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;
1389 1390 1391
			}
		if ((crldays == 0) && (crlhours == 0))
			{
1392
			BIO_printf(bio_err,"cannot lookup how long until the next CRL is issued\n");
1393 1394 1395 1396 1397
			goto err;
			}

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

D
 
Dr. Stephen Henson 已提交
1400 1401 1402 1403 1404 1405 1406 1407
		tmptm = ASN1_TIME_new();
		if (!tmptm) goto err;
		X509_gmtime_adj(tmptm,0);
		X509_CRL_set_lastUpdate(crl, tmptm);	
		X509_gmtime_adj(tmptm,(crldays*24+crlhours)*60*60);
		X509_CRL_set_nextUpdate(crl, tmptm);	

		ASN1_TIME_free(tmptm);
1408

1409
		for (i=0; i<sk_num(db->db->data); i++)
1410
			{
1411
			pp=(char **)sk_value(db->db->data,i);
1412 1413 1414
			if (pp[DB_type][0] == DB_TYPE_REV)
				{
				if ((r=X509_REVOKED_new()) == NULL) goto err;
1415 1416 1417
				j = make_revoked(r, pp[DB_rev_date]);
				if (!j) goto err;
				if (j == 2) crl_v2 = 1;
1418 1419
				if (!BN_hex2bn(&serial, pp[DB_serial]))
					goto err;
D
 
Dr. Stephen Henson 已提交
1420
				tmpser = BN_to_ASN1_INTEGER(serial, NULL);
1421 1422
				BN_free(serial);
				serial = NULL;
D
 
Dr. Stephen Henson 已提交
1423
				if (!tmpser)
1424
					goto err;
D
 
Dr. Stephen Henson 已提交
1425 1426
				X509_REVOKED_set_serialNumber(r, tmpser);
				ASN1_INTEGER_free(tmpser);
D
 
Dr. Stephen Henson 已提交
1427
				X509_CRL_add0_revoked(crl,r);
1428 1429
				}
			}
D
 
Dr. Stephen Henson 已提交
1430

1431 1432
		/* sort the data so it will be written in serial
		 * number order */
D
 
Dr. Stephen Henson 已提交
1433
		X509_CRL_sort(crl);
1434

1435
		/* we now have a CRL */
1436 1437 1438 1439 1440 1441 1442 1443 1444 1445
		if (verbose) BIO_printf(bio_err,"signing CRL\n");
		if (md != NULL)
			{
			if ((dgst=EVP_get_digestbyname(md)) == NULL)
				{
				BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
				goto err;
				}
			}
		else
1446
			{
1447
#ifndef OPENSSL_NO_DSA
1448 1449 1450
			if (pkey->type == EVP_PKEY_DSA) 
				dgst=EVP_dss1();
			else
B
Bodo Möller 已提交
1451 1452
#endif
#ifndef OPENSSL_NO_ECDSA
1453
			if (pkey->type == EVP_PKEY_EC)
B
Bodo Möller 已提交
1454 1455
				dgst=EVP_ecdsa();
			else
1456
#endif
1457 1458
				dgst=EVP_md5();
			}
B
Ben Laurie 已提交
1459

1460 1461
		/* Add any extensions asked for */

1462 1463 1464 1465
		if (crl_ext)
			{
			X509V3_CTX crlctx;
			X509V3_set_ctx(&crlctx, x509, NULL, NULL, crl, 0);
D
 
Dr. Stephen Henson 已提交
1466
			X509V3_set_nconf(&crlctx, conf);
1467

D
 
Dr. Stephen Henson 已提交
1468
			if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx,
1469 1470
				crl_ext, crl)) goto err;
			}
1471 1472
		if (crl_ext || crl_v2)
			{
D
 
Dr. Stephen Henson 已提交
1473 1474
			if (!X509_CRL_set_version(crl, 1))
				goto err; /* version 2 CRL */
1475
			}
1476

1477 1478 1479 1480 1481
		if (!X509_CRL_sign(crl,pkey,dgst)) goto err;

		PEM_write_bio_X509_CRL(Sout,crl);
		}
	/*****************************************************************/
1482
	if (dorevoke)
1483
		{
1484 1485 1486 1487 1488
		if (infile == NULL) 
			{
			BIO_printf(bio_err,"no input files\n");
			goto err;
			}
1489 1490
		else
			{
1491
			X509 *revcert;
1492 1493
			revcert=load_cert(bio_err, infile, FORMAT_PEM,
				NULL, e, infile);
1494
			if (revcert == NULL)
1495
				goto err;
1496
			j=do_revoke(revcert,db, rev_type, rev_arg);
1497 1498
			if (j <= 0) goto err;
			X509_free(revcert);
1499

1500 1501 1502
			if (!save_index(dbfile, "new", db)) goto err;

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

1504 1505
			BIO_printf(bio_err,"Data Base Updated\n"); 
			}
1506 1507
		}
	/*****************************************************************/
1508 1509
	ret=0;
err:
1510 1511
	if(tofree)
		OPENSSL_free(tofree);
1512 1513 1514
	BIO_free_all(Cout);
	BIO_free_all(Sout);
	BIO_free_all(out);
1515
	BIO_free_all(in);
1516

1517 1518
	if (cert_sk)
		sk_X509_pop_free(cert_sk,X509_free);
1519 1520

	if (ret) ERR_print_errors(bio_err);
1521
	app_RAND_write_file(randfile, bio_err);
D
Typo.  
Dr. Stephen Henson 已提交
1522
	if (free_key && key)
D
 
Dr. Stephen Henson 已提交
1523
		OPENSSL_free(key);
1524
	BN_free(serial);
1525
	free_index(db);
1526
	EVP_PKEY_free(pkey);
1527
	if (x509) X509_free(x509);
1528
	X509_CRL_free(crl);
D
 
Dr. Stephen Henson 已提交
1529
	NCONF_free(conf);
1530
	OBJ_cleanup();
1531
	apps_shutdown();
1532
	OPENSSL_EXIT(ret);
1533 1534
	}

U
Ulf Möller 已提交
1535
static void lookup_fail(char *name, char *tag)
1536 1537 1538 1539
	{
	BIO_printf(bio_err,"variable lookup failed for %s::%s\n",name,tag);
	}

U
Ulf Möller 已提交
1540
static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1541
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1542 1543
	     BIGNUM *serial, char *subj, int email_dn, char *startdate, char *enddate,
	     long days, int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1544
	     unsigned long certopt, unsigned long nameopt, int default_op,
1545
	     int ext_copy, int selfsign)
1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558
	{
	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;
		}
1559
	if ((req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL)) == NULL)
1560 1561 1562 1563 1564 1565 1566 1567 1568 1569
		{
		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");

1570 1571 1572 1573 1574 1575
	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;
		}
1576 1577 1578 1579 1580 1581
	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);
1582
	EVP_PKEY_free(pktmp);
1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597
	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");

1598 1599
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj, email_dn,
		startdate,enddate,days,batch,verbose,req,ext_sect,lconf,
1600
		certopt, nameopt, default_op, ext_copy, selfsign);
1601 1602 1603 1604 1605 1606 1607

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

U
Ulf Möller 已提交
1608
static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1609
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1610 1611
	     BIGNUM *serial, char *subj, int email_dn, char *startdate, char *enddate,
	     long days, int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1612
	     unsigned long certopt, unsigned long nameopt, int default_op,
1613
	     int ext_copy, ENGINE *e)
1614 1615 1616 1617 1618 1619
	{
	X509 *req=NULL;
	X509_REQ *rreq=NULL;
	EVP_PKEY *pktmp=NULL;
	int ok= -1,i;

1620
	if ((req=load_cert(bio_err, infile, FORMAT_PEM, NULL, e, infile)) == NULL)
1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632
		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);
1633
	EVP_PKEY_free(pktmp);
1634 1635 1636 1637 1638 1639 1640 1641 1642
	if (i < 0)
		{
		ok=0;
		BIO_printf(bio_err,"Signature verification problems....\n");
		goto err;
		}
	if (i == 0)
		{
		ok=0;
1643
		BIO_printf(bio_err,"Signature did not match the certificate\n");
1644 1645 1646 1647 1648 1649 1650 1651
		goto err;
		}
	else
		BIO_printf(bio_err,"Signature ok\n");

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

1652 1653
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,email_dn,startdate,enddate,
		days,batch,verbose,rreq,ext_sect,lconf, certopt, nameopt, default_op,
1654
		ext_copy, 0);
1655 1656 1657 1658 1659 1660 1661

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

U
Ulf Möller 已提交
1662
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
1663
	     STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial, char *subj,
1664 1665
	     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 已提交
1666
	     unsigned long certopt, unsigned long nameopt, int default_op,
1667
	     int ext_copy, int selfsign)
1668
	{
1669
	X509_NAME *name=NULL,*CAname=NULL,*subject=NULL, *dn_subject=NULL;
1670
	ASN1_UTCTIME *tm,*tmptm;
1671 1672 1673 1674 1675 1676 1677 1678 1679 1680
	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;
	char *p;
	CONF_VALUE *cv;
1681
	char *row[DB_NUMBER],**rrow=NULL,**irow=NULL;
D
 
Dr. Stephen Henson 已提交
1682
	char buf[25];
1683

1684 1685 1686 1687 1688 1689 1690
	tmptm=ASN1_UTCTIME_new();
	if (tmptm == NULL)
		{
		BIO_printf(bio_err,"malloc error\n");
		return(0);
		}

1691 1692 1693
	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;

1694 1695
	if (subj)
		{
D
 
Dr. Stephen Henson 已提交
1696
		X509_NAME *n = do_subject(subj, MBSTRING_ASC);
1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707

		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 已提交
1708 1709
	if (default_op)
		BIO_printf(bio_err,"The Subject's Distinguished Name is as follows\n");
1710

1711 1712 1713
	name=X509_REQ_get_subject_name(req);
	for (i=0; i<X509_NAME_entry_count(name); i++)
		{
D
 
Dr. Stephen Henson 已提交
1714
		ne= X509_NAME_get_entry(name,i);
1715
		str=X509_NAME_ENTRY_get_data(ne);
D
 
Dr. Stephen Henson 已提交
1716
		obj=X509_NAME_ENTRY_get_object(ne);
1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734

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

1735 1736 1737 1738
		/* If no EMAIL is wanted in the subject */
		if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) && (!email_dn))
			continue;

1739 1740 1741 1742 1743 1744 1745
		/* 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;
			}
1746
		if ((str->type != V_ASN1_BMPSTRING) && (str->type != V_ASN1_UTF8STRING))
1747
			{
1748 1749 1750 1751 1752 1753 1754 1755 1756
			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;
				}
1757
			}
D
 
Dr. Stephen Henson 已提交
1758 1759 1760

		if (default_op)
			old_entry_print(bio_err, obj, str);
1761 1762 1763 1764 1765
		}

	/* Ok, now we check the 'policy' stuff. */
	if ((subject=X509_NAME_new()) == NULL)
		{
1766
		BIO_printf(bio_err,"Memory allocation failure\n");
1767 1768 1769 1770
		goto err;
		}

	/* take a copy of the issuer name before we mess with it. */
1771 1772 1773 1774
	if (selfsign)
		CAname=X509_NAME_dup(name);
	else
		CAname=X509_NAME_dup(x509->cert_info->subject);
1775 1776 1777
	if (CAname == NULL) goto err;
	str=str2=NULL;

1778
	for (i=0; i<sk_CONF_VALUE_num(policy); i++)
1779
		{
1780
		cv=sk_CONF_VALUE_value(policy,i); /* get the object id */
1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850
		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)
					{
1851
					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));
1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862
					goto err;
					}
				}
			else
				{
				BIO_printf(bio_err,"%s:invalid type in 'policy' configuration\n",cv->value);
				goto err;
				}

			if (push != NULL)
				{
1863
				if (!X509_NAME_add_entry(subject,push, -1, 0))
1864 1865 1866
					{
					if (push != NULL)
						X509_NAME_ENTRY_free(push);
1867
					BIO_printf(bio_err,"Memory allocation failure\n");
1868 1869 1870 1871 1872 1873 1874 1875 1876 1877
					goto err;
					}
				}
			if (j < 0) break;
			}
		}

	if (preserve)
		{
		X509_NAME_free(subject);
1878 1879
		/* subject=X509_NAME_dup(X509_REQ_get_subject_name(req)); */
		subject=X509_NAME_dup(name);
1880 1881 1882 1883
		if (subject == NULL) goto err;
		}

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

1886 1887 1888
	/* 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) */
	 
1889 1890 1891
	if (email_dn)
		dn_subject = subject;
	else
1892
		{
1893 1894 1895 1896 1897
		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)))
1898 1899 1900 1901
			{
			BIO_printf(bio_err,"Memory allocation failure\n");
			goto err;
			}
1902
		while((i = X509_NAME_get_index_by_NID(dn_subject,
1903
					NID_pkcs9_emailAddress, -1)) >= 0)
1904
			{
1905 1906 1907
			tmpne = X509_NAME_get_entry(dn_subject, i);
			X509_NAME_delete_entry(dn_subject, i);
			X509_NAME_ENTRY_free(tmpne);
1908 1909 1910
			}
		}

1911 1912 1913 1914
	if (BN_is_zero(serial))
		row[DB_serial]=BUF_strdup("00");
	else
		row[DB_serial]=BN_bn2hex(serial);
1915
	if (row[DB_serial] == NULL)
1916
		{
1917
		BIO_printf(bio_err,"Memory allocation failure\n");
1918 1919 1920
		goto err;
		}

1921
	if (db->attributes.unique_subject)
1922
		{
1923 1924 1925 1926 1927 1928 1929
		rrow=TXT_DB_get_by_index(db->db,DB_name,row);
		if (rrow != NULL)
			{
			BIO_printf(bio_err,
				"ERROR:There is already a certificate for %s\n",
				row[DB_name]);
			}
1930
		}
1931
	if (rrow == NULL)
1932
		{
1933
		rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953
		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";
1954
		BIO_printf(bio_err,"Type	  :%s\n",p);;
1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971
		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 已提交
1972
	/* We are now totally happy, lets make and sign the certificate */
1973 1974 1975 1976 1977 1978 1979 1980
	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. */
1981
	if (!X509_set_version(ret,2)) goto err;
1982 1983 1984 1985
#endif

	if (BN_to_ASN1_INTEGER(serial,ci->serialNumber) == NULL)
		goto err;
1986 1987 1988 1989 1990 1991 1992 1993 1994 1995
	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;
		}
1996

1997 1998
	if (strcmp(startdate,"today") == 0)
		X509_gmtime_adj(X509_get_notBefore(ret),0);
1999 2000 2001
	else ASN1_UTCTIME_set_string(X509_get_notBefore(ret),startdate);

	if (enddate == NULL)
2002
		X509_gmtime_adj(X509_get_notAfter(ret),(long)60*60*24*days);
2003 2004
	else ASN1_UTCTIME_set_string(X509_get_notAfter(ret),enddate);

2005 2006 2007
	if (!X509_set_subject_name(ret,subject)) goto err;

	pktmp=X509_REQ_get_pubkey(req);
2008 2009 2010
	i = X509_set_pubkey(ret,pktmp);
	EVP_PKEY_free(pktmp);
	if (!i) goto err;
2011 2012

	/* Lets add the extensions, if there are any */
2013
	if (ext_sect)
2014
		{
2015
		X509V3_CTX ctx;
2016 2017 2018 2019 2020 2021
		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 已提交
2022
		 * be any I believe */
2023
		if (ci->extensions != NULL)
B
Ben Laurie 已提交
2024 2025
			sk_X509_EXTENSION_pop_free(ci->extensions,
						   X509_EXTENSION_free);
2026

2027 2028
		ci->extensions = NULL;

2029
		/* Initialize the context structure */
2030 2031 2032 2033
		if (selfsign)
			X509V3_set_ctx(&ctx, ret, ret, req, NULL, 0);
		else
			X509V3_set_ctx(&ctx, x509, ret, req, NULL, 0);
2034

2035 2036 2037 2038 2039 2040
		if (extconf)
			{
			if (verbose)
				BIO_printf(bio_err, "Extra configuration file found\n");
 
			/* Use the extconf configuration db LHASH */
D
 
Dr. Stephen Henson 已提交
2041
			X509V3_set_nconf(&ctx, extconf);
2042 2043 2044 2045 2046
 
			/* Test the structure (needed?) */
			/* X509V3_set_ctx_test(&ctx); */

			/* Adds exts contained in the configuration file */
D
 
Dr. Stephen Henson 已提交
2047
			if (!X509V3_EXT_add_nconf(extconf, &ctx, ext_sect,ret))
2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060
				{
				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 已提交
2061
			X509V3_set_nconf(&ctx, lconf);
2062

D
 
Dr. Stephen Henson 已提交
2063
			if(!X509V3_EXT_add_nconf(lconf, &ctx, ext_sect, ret))
2064 2065 2066 2067 2068 2069 2070 2071 2072
				{
				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");
			}
2073 2074
		}

2075 2076 2077 2078 2079 2080 2081 2082 2083
	/* 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;
		}

2084 2085 2086 2087 2088
	/* Set the right value for the noemailDN option */
	if( email_dn == 0 )
		{
		if (!X509_set_subject_name(ret,dn_subject)) goto err;
		}
2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099

	if (!default_op)
		{
		BIO_printf(bio_err, "Certificate Details:\n");
		/* Never print signature details because signature not present */
		certopt |= X509_FLAG_NO_SIGDUMP | X509_FLAG_NO_SIGNAME;
		X509_print_ex(bio_err, ret, nameopt, certopt); 
		}

	BIO_printf(bio_err,"Certificate is to be certified until ");
	ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ret));
2100
	if (days) BIO_printf(bio_err," (%ld days)",days);
2101
	BIO_printf(bio_err, "\n");
2102 2103 2104

	if (!batch)
		{
2105

2106
		BIO_printf(bio_err,"Sign the certificate? [y/n]:");
B
Bodo Möller 已提交
2107
		(void)BIO_flush(bio_err);
2108 2109 2110 2111 2112 2113 2114 2115 2116 2117
		buf[0]='\0';
		fgets(buf,sizeof(buf)-1,stdin);
		if (!((buf[0] == 'y') || (buf[0] == 'Y')))
			{
			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED\n");
			ok=0;
			goto err;
			}
		}

2118

2119
#ifndef OPENSSL_NO_DSA
2120
	if (pkey->type == EVP_PKEY_DSA) dgst=EVP_dss1();
2121 2122
	pktmp=X509_get_pubkey(ret);
	if (EVP_PKEY_missing_parameters(pktmp) &&
2123 2124
		!EVP_PKEY_missing_parameters(pkey))
		EVP_PKEY_copy_parameters(pktmp,pkey);
2125
	EVP_PKEY_free(pktmp);
2126
#endif
B
Bodo Möller 已提交
2127
#ifndef OPENSSL_NO_ECDSA
2128
	if (pkey->type == EVP_PKEY_EC)
B
Bodo Möller 已提交
2129 2130 2131 2132 2133 2134 2135 2136
		dgst = EVP_ecdsa();
	pktmp = X509_get_pubkey(ret);
	if (EVP_PKEY_missing_parameters(pktmp) &&
		!EVP_PKEY_missing_parameters(pkey))
		EVP_PKEY_copy_parameters(pktmp, pkey);
	EVP_PKEY_free(pktmp);
#endif

2137 2138 2139 2140 2141

	if (!X509_sign(ret,pkey,dgst))
		goto err;

	/* We now just add it to the database */
2142
	row[DB_type]=(char *)OPENSSL_malloc(2);
2143 2144

	tm=X509_get_notAfter(ret);
2145
	row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2146 2147 2148 2149 2150 2151
	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 */
2152
	row[DB_file]=(char *)OPENSSL_malloc(8);
2153
	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(ret),NULL,0);
2154 2155

	if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
2156
		(row[DB_file] == NULL) || (row[DB_name] == NULL))
2157
		{
2158
		BIO_printf(bio_err,"Memory allocation failure\n");
2159 2160 2161 2162 2163 2164
		goto err;
		}
	strcpy(row[DB_file],"unknown");
	row[DB_type][0]='V';
	row[DB_type][1]='\0';

2165
	if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2166
		{
2167
		BIO_printf(bio_err,"Memory allocation failure\n");
2168 2169 2170 2171 2172 2173 2174 2175 2176 2177
		goto err;
		}

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

2178
	if (!TXT_DB_insert(db->db,irow))
2179 2180
		{
		BIO_printf(bio_err,"failed to update database\n");
2181
		BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
2182 2183 2184 2185 2186
		goto err;
		}
	ok=1;
err:
	for (i=0; i<DB_NUMBER; i++)
2187
		if (row[i] != NULL) OPENSSL_free(row[i]);
2188 2189 2190 2191 2192

	if (CAname != NULL)
		X509_NAME_free(CAname);
	if (subject != NULL)
		X509_NAME_free(subject);
2193 2194
	if ((dn_subject != NULL) && !email_dn)
		X509_NAME_free(dn_subject);
2195 2196
	if (tmptm != NULL)
		ASN1_UTCTIME_free(tmptm);
2197 2198 2199 2200 2201 2202 2203 2204 2205 2206
	if (ok <= 0)
		{
		if (ret != NULL) X509_free(ret);
		ret=NULL;
		}
	else
		*xret=ret;
	return(ok);
	}

D
 
Dr. Stephen Henson 已提交
2207
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
2208 2209 2210 2211 2212 2213 2214
	{

	if (output_der)
		{
		(void)i2d_X509_bio(bp,x);
		return;
		}
D
 
Dr. Stephen Henson 已提交
2215 2216
#if 0
	/* ??? Not needed since X509_print prints all this stuff anyway */
2217 2218 2219 2220 2221 2222 2223 2224 2225
	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 已提交
2226
#endif
2227
	if (!notext)X509_print(bp,x);
2228 2229 2230
	PEM_write_bio_X509(bp,x);
	}

U
Ulf Möller 已提交
2231
static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
2232
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
2233 2234
	     BIGNUM *serial, char *subj, int email_dn, char *startdate, char *enddate,
	     long days, char *ext_sect, CONF *lconf, int verbose, unsigned long certopt,
D
 
Dr. Stephen Henson 已提交
2235
	     unsigned long nameopt, int default_op, int ext_copy)
2236
	{
2237
	STACK_OF(CONF_VALUE) *sk=NULL;
2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264
	LHASH *parms=NULL;
	X509_REQ *req=NULL;
	CONF_VALUE *cv=NULL;
	NETSCAPE_SPKI *spki = NULL;
	X509_REQ_INFO *ri;
	char *type,*buf;
	EVP_PKEY *pktmp=NULL;
	X509_NAME *n=NULL;
	X509_NAME_ENTRY *ne=NULL;
	int ok= -1,i,j;
	long errline;
	int nid;

	/*
	 * Load input file into a hash table.  (This is just an easy
	 * way to read and parse the file, then put it into a convenient
	 * STACK format).
	 */
	parms=CONF_load(NULL,infile,&errline);
	if (parms == NULL)
		{
		BIO_printf(bio_err,"error on line %ld of %s\n",errline,infile);
		ERR_print_errors(bio_err);
		goto err;
		}

	sk=CONF_get_section(parms, "default");
2265
	if (sk_CONF_VALUE_num(sk) == 0)
2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293
		{
		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++)
		{
2294
		if (sk_CONF_VALUE_num(sk) <= i) break;
2295

2296
		cv=sk_CONF_VALUE_value(sk,i);
2297
		type=cv->name;
2298 2299 2300
		/* Skip past any leading X. X: X, etc to allow for
		 * multiple instances
		 */
2301 2302 2303 2304 2305 2306 2307
		for (buf = cv->name; *buf ; buf++)
			if ((*buf == ':') || (*buf == ',') || (*buf == '.'))
				{
				buf++;
				if (*buf) type = buf;
				break;
				}
2308

2309
		buf=cv->value;
2310 2311 2312 2313
		if ((nid=OBJ_txt2nid(type)) == NID_undef)
			{
			if (strcmp(type, "SPKAC") == 0)
				{
2314
				spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
2315 2316 2317 2318 2319 2320 2321 2322 2323 2324
				if (spki == NULL)
					{
					BIO_printf(bio_err,"unable to load Netscape SPKAC structure\n");
					ERR_print_errors(bio_err);
					goto err;
					}
				}
			continue;
			}

2325 2326 2327 2328 2329
		/*
		if ((nid == NID_pkcs9_emailAddress) && (email_dn == 0))
			continue;
		*/
		
2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342
		j=ASN1_PRINTABLE_type((unsigned char *)buf,-1);
		if (fix_data(nid, &j) == 0)
			{
			BIO_printf(bio_err,
				"invalid characters in string %s\n",buf);
			goto err;
			}

		if ((ne=X509_NAME_ENTRY_create_by_NID(&ne,nid,j,
			(unsigned char *)buf,
			strlen(buf))) == NULL)
			goto err;

2343
		if (!X509_NAME_add_entry(n,ne,-1, 0)) goto err;
2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357
		}
	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");

2358
	if ((pktmp=NETSCAPE_SPKI_get_pubkey(spki)) == NULL)
2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372
		{
		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);
2373
	EVP_PKEY_free(pktmp);
2374
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,email_dn,startdate,enddate,
D
 
Dr. Stephen Henson 已提交
2375
		   days,1,verbose,req,ext_sect,lconf, certopt, nameopt, default_op,
2376
			ext_copy, 0);
2377 2378 2379 2380 2381 2382 2383 2384 2385
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);
	}

U
Ulf Möller 已提交
2386
static int fix_data(int nid, int *type)
2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400
	{
	if (nid == NID_pkcs9_emailAddress)
		*type=V_ASN1_IA5STRING;
	if ((nid == NID_commonName) && (*type == V_ASN1_IA5STRING))
		*type=V_ASN1_T61STRING;
	if ((nid == NID_pkcs9_challengePassword) && (*type == V_ASN1_IA5STRING))
		*type=V_ASN1_T61STRING;
	if ((nid == NID_pkcs9_unstructuredName) && (*type == V_ASN1_T61STRING))
		return(0);
	if (nid == NID_pkcs9_unstructuredName)
		*type=V_ASN1_IA5STRING;
	return(1);
	}

U
Ulf Möller 已提交
2401
static int check_time_format(char *str)
2402 2403 2404 2405 2406 2407 2408 2409 2410
	{
	ASN1_UTCTIME tm;

	tm.data=(unsigned char *)str;
	tm.length=strlen(str);
	tm.type=V_ASN1_UTCTIME;
	return(ASN1_UTCTIME_check(&tm));
	}

2411
static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
2412
	{
2413
	ASN1_UTCTIME *tm=NULL;
2414
	char *row[DB_NUMBER],**rrow,**irow;
2415
	char *rev_str = NULL;
2416
	BIGNUM *bn = NULL;
2417 2418 2419 2420
	int ok=-1,i;

	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;
2421 2422
	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(x509),NULL,0);
	bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(x509),NULL);
2423 2424 2425 2426
	if (BN_is_zero(bn))
		row[DB_serial]=BUF_strdup("00");
	else
		row[DB_serial]=BN_bn2hex(bn);
2427
	BN_free(bn);
2428 2429
	if ((row[DB_name] == NULL) || (row[DB_serial] == NULL))
		{
2430
		BIO_printf(bio_err,"Memory allocation failure\n");
2431 2432
		goto err;
		}
2433 2434 2435
	/* We have to lookup by serial number because name lookup
	 * skips revoked certs
 	 */
2436
	rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
2437 2438
	if (rrow == NULL)
		{
2439
		BIO_printf(bio_err,"Adding Entry with serial number %s to DB for %s\n", row[DB_serial], row[DB_name]);
2440 2441

		/* We now just add it to the database */
2442
		row[DB_type]=(char *)OPENSSL_malloc(2);
2443 2444

		tm=X509_get_notAfter(x509);
2445
		row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2446 2447 2448 2449 2450 2451
		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 */
2452
		row[DB_file]=(char *)OPENSSL_malloc(8);
2453 2454 2455 2456 2457 2458

		/* row[DB_name] done already */

		if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
			(row[DB_file] == NULL))
			{
2459
			BIO_printf(bio_err,"Memory allocation failure\n");
2460 2461 2462 2463 2464 2465
			goto err;
			}
		strcpy(row[DB_file],"unknown");
		row[DB_type][0]='V';
		row[DB_type][1]='\0';

2466
		if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2467
			{
2468
			BIO_printf(bio_err,"Memory allocation failure\n");
2469 2470 2471 2472 2473 2474 2475 2476 2477 2478
			goto err;
			}

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

2479
		if (!TXT_DB_insert(db->db,irow))
2480 2481
			{
			BIO_printf(bio_err,"failed to update database\n");
2482
			BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
2483 2484 2485 2486
			goto err;
			}

		/* Revoke Certificate */
2487
		ok = do_revoke(x509,db, type, value);
2488 2489 2490 2491

		goto err;

		}
2492
	else if (index_name_cmp((const char **)row,(const char **)rrow))
2493
		{
2494 2495
		BIO_printf(bio_err,"ERROR:name does not match %s\n",
			   row[DB_name]);
2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506
		goto err;
		}
	else if (rrow[DB_type][0]=='R')
		{
		BIO_printf(bio_err,"ERROR:Already revoked, serial number %s\n",
			   row[DB_serial]);
		goto err;
		}
	else
		{
		BIO_printf(bio_err,"Revoking Certificate %s.\n", rrow[DB_serial]);
2507 2508 2509 2510 2511 2512
		rev_str = make_revocation_str(type, value);
		if (!rev_str)
			{
			BIO_printf(bio_err, "Error in revocation arguments\n");
			goto err;
			}
2513 2514
		rrow[DB_type][0]='R';
		rrow[DB_type][1]='\0';
2515
		rrow[DB_rev_date] = rev_str;
2516 2517
		}
	ok=1;
2518
err:
2519 2520 2521
	for (i=0; i<DB_NUMBER; i++)
		{
		if (row[i] != NULL) 
2522
			OPENSSL_free(row[i]);
2523 2524
		}
	return(ok);
2525 2526
	}

2527
static int get_certificate_status(const char *serial, CA_DB *db)
2528
	{
D
Dr. Stephen Henson 已提交
2529
	char *row[DB_NUMBER],**rrow;
2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561
	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++)
2562 2563
		row[DB_serial][i] = toupper(row[DB_serial][i]);
	
2564 2565 2566 2567

	ok=1;

	/* Search for the certificate */
2568
	rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614
	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);
	}

2615
static int do_updatedb (CA_DB *db)
2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639
	{
	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;
2640

2641
	for (i = 0; i < sk_num(db->db->data); i++)
2642
		{
2643
		rrow = (char **) sk_value(db->db->data, i);
2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685

		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);
	}
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 2711 2712 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 2740 2741 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 2803 2804 2805 2806 2807

static char *crl_reasons[] = {
	/* CRL reason strings */
	"unspecified",
	"keyCompromise",
	"CACompromise",
	"affiliationChanged",
	"superseded", 
	"cessationOfOperation",
	"certificateHold",
	"removeFromCRL",
	/* Additional pseudo reasons */
	"holdInstruction",
	"keyTime",
	"CAkeyTime"
};

#define NUM_REASONS (sizeof(crl_reasons) / sizeof(char *))

/* Given revocation information convert to a DB string.
 * The format of the string is:
 * revtime[,reason,extra]. Where 'revtime' is the
 * revocation time (the current time). 'reason' is the
 * optional CRL reason and 'extra' is any additional
 * argument
 */

char *make_revocation_str(int rev_type, char *rev_arg)
	{
	char *reason = NULL, *other = NULL, *str;
	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);

	i = revtm->length + 1;

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

	str = OPENSSL_malloc(i);

	if (!str) return NULL;

	strcpy(str, (char *)revtm->data);
	if (reason)
		{
		strcat(str, ",");
		strcat(str, reason);
		}
	if (other)
		{
		strcat(str, ",");
		strcat(str, other);
		}
	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 已提交
2808

2809 2810 2811 2812 2813 2814 2815 2816 2817
int make_revoked(X509_REVOKED *rev, char *str)
	{
	char *tmp = NULL;
	int reason_code = -1;
	int i, ret = 0;
	ASN1_OBJECT *hold = NULL;
	ASN1_GENERALIZEDTIME *comp_time = NULL;
	ASN1_ENUMERATED *rtmp = NULL;

D
 
Dr. Stephen Henson 已提交
2818
	ASN1_TIME *revDate = NULL;
2819

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

D
 
Dr. Stephen Henson 已提交
2822
	if (i == 0)
2823 2824
		goto err;

D
 
Dr. Stephen Henson 已提交
2825 2826 2827
	if (rev && !X509_REVOKED_set_revocationDate(rev, revDate))
		goto err;

2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857
	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 已提交
2858
	ASN1_TIME_free(revDate);
2859 2860 2861

	return ret;
	}
2862

2863 2864 2865 2866
/*
 * subject is expected to be in the format /type0=value0/type1=value1/type2=...
 * where characters may be escaped by \
 */
D
 
Dr. Stephen Henson 已提交
2867
X509_NAME *do_subject(char *subject, long chtype)
2868
	{
D
 
Dr. Stephen Henson 已提交
2869 2870
	size_t buflen = strlen(subject)+1; /* to copy the types and values into. due to escaping, the copy can only become shorter */
	char *buf = OPENSSL_malloc(buflen);
2871
	size_t max_ne = buflen / 2 + 1; /* maximum number of name elements */
D
 
Dr. Stephen Henson 已提交
2872 2873
	char **ne_types = OPENSSL_malloc(max_ne * sizeof (char *));
	char **ne_values = OPENSSL_malloc(max_ne * sizeof (char *));
2874

2875 2876
	char *sp = subject, *bp = buf;
	int i, ne_num = 0;
2877

2878 2879
	X509_NAME *n = NULL;
	int nid;
2880

2881
	if (!buf || !ne_types || !ne_values)
2882
		{
2883
		BIO_printf(bio_err, "malloc error\n");
D
 
Dr. Stephen Henson 已提交
2884
		goto error;
2885
		}	
2886

2887
	if (*subject != '/')
2888
		{
2889
		BIO_printf(bio_err, "Subject does not start with '/'.\n");
D
 
Dr. Stephen Henson 已提交
2890
		goto error;
2891
		}
2892
	sp++; /* skip leading / */
2893

2894
	while (*sp)
2895
		{
2896 2897 2898
		/* collect type */
		ne_types[ne_num] = bp;
		while (*sp)
2899
			{
2900
			if (*sp == '\\') /* is there anything to escape in the type...? */
2901
				{
2902 2903
				if (*++sp)
					*bp++ = *sp++;
2904 2905
				else	
					{
2906
					BIO_printf(bio_err, "escape character at end of string\n");
D
 
Dr. Stephen Henson 已提交
2907
					goto error;
2908 2909
					}
				}	
2910
			else if (*sp == '=')
2911
				{
2912 2913 2914
				sp++;
				*bp++ = '\0';
				break;
2915
				}
2916 2917
			else
				*bp++ = *sp++;
2918
			}
2919
		if (!*sp)
2920
			{
2921
			BIO_printf(bio_err, "end of string encountered while processing type of subject name element #%d\n", ne_num);
D
 
Dr. Stephen Henson 已提交
2922
			goto error;
2923
			}
2924 2925
		ne_values[ne_num] = bp;
		while (*sp)
2926
			{
2927
			if (*sp == '\\')
2928
				{
2929 2930 2931
				if (*++sp)
					*bp++ = *sp++;
				else
2932
					{
2933
					BIO_printf(bio_err, "escape character at end of string\n");
D
 
Dr. Stephen Henson 已提交
2934
					goto error;
2935
					}
2936 2937
				}
			else if (*sp == '/')
2938
				{
2939 2940
				sp++;
				break;
2941
				}
2942 2943
			else
				*bp++ = *sp++;
2944
			}
2945 2946
		*bp++ = '\0';
		ne_num++;
2947
		}	
2948 2949

	if (!(n = X509_NAME_new()))
D
 
Dr. Stephen Henson 已提交
2950
		goto error;
2951 2952 2953

	for (i = 0; i < ne_num; i++)
		{
2954
		if ((nid=OBJ_txt2nid(ne_types[i])) == NID_undef)
2955
			{
2956
			BIO_printf(bio_err, "Subject Attribute %s has no known NID, skipped\n", ne_types[i]);
2957 2958 2959
			continue;
			}

2960
		if (!*ne_values[i])
2961
			{
2962
			BIO_printf(bio_err, "No value provided for Subject Attribute %s, skipped\n", ne_types[i]);
2963 2964 2965
			continue;
			}

D
 
Dr. Stephen Henson 已提交
2966 2967
		if (!X509_NAME_add_entry_by_NID(n, nid, chtype, (unsigned char*)ne_values[i], -1,-1,0))
			goto error;
2968 2969
		}

D
 
Dr. Stephen Henson 已提交
2970 2971 2972
	OPENSSL_free(ne_values);
	OPENSSL_free(ne_types);
	OPENSSL_free(buf);
2973
	return n;
2974

D
 
Dr. Stephen Henson 已提交
2975
error:
2976
	X509_NAME_free(n);
D
 
Dr. Stephen Henson 已提交
2977 2978 2979 2980 2981 2982
	if (ne_values)
		OPENSSL_free(ne_values);
	if (ne_types)
		OPENSSL_free(ne_types);
	if (buf)
		OPENSSL_free(buf);
2983 2984
	return NULL;
}
D
 
Dr. Stephen Henson 已提交
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

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 已提交
3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119

int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold, ASN1_GENERALIZEDTIME **pinvtm, char *str)
	{
	char *tmp = NULL;
	char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
	int reason_code = -1;
	int i, ret = 0;
	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 已提交
3120 3121
	ret = 1;

D
 
Dr. Stephen Henson 已提交
3122 3123 3124 3125 3126 3127 3128 3129 3130
	err:

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

	return ret;
	}