ca.c 73.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
#include <sys/types.h>
66 67 68 69 70 71 72 73 74
#include <openssl/conf.h>
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/txt_db.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/objects.h>
75
#include <openssl/ocsp.h>
76
#include <openssl/pem.h>
77 78

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

90 91
#include "apps.h"

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

#undef PROG
#define PROG ca_main

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

#define ENV_DEFAULT_CA		"default_ca"

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

110 111 112 113 114 115 116
#define ENV_DIR			"dir"
#define ENV_CERTS		"certs"
#define ENV_CRL_DIR		"crl_dir"
#define ENV_CA_DB		"CA_DB"
#define ENV_NEW_CERTS_DIR	"new_certs_dir"
#define ENV_CERTIFICATE 	"certificate"
#define ENV_SERIAL		"serial"
R
Richard Levitte 已提交
117
#define ENV_CRLNUMBER		"crlnumber"
118 119 120 121
#define ENV_CRL			"crl"
#define ENV_PRIVATE_KEY		"private_key"
#define ENV_RANDFILE		"RANDFILE"
#define ENV_DEFAULT_DAYS 	"default_days"
122
#define ENV_DEFAULT_STARTDATE 	"default_startdate"
123
#define ENV_DEFAULT_ENDDATE 	"default_enddate"
124 125 126
#define ENV_DEFAULT_CRL_DAYS 	"default_crl_days"
#define ENV_DEFAULT_CRL_HOURS 	"default_crl_hours"
#define ENV_DEFAULT_MD		"default_md"
127
#define ENV_DEFAULT_EMAIL_DN	"email_in_dn"
128 129 130
#define ENV_PRESERVE		"preserve"
#define ENV_POLICY      	"policy"
#define ENV_EXTENSIONS      	"x509_extensions"
131
#define ENV_CRLEXT      	"crl_extensions"
132
#define ENV_MSIE_HACK		"msie_hack"
D
 
Dr. Stephen Henson 已提交
133 134
#define ENV_NAMEOPT		"name_opt"
#define ENV_CERTOPT		"cert_opt"
135
#define ENV_EXTCOPY		"copy_extensions"
136
#define ENV_UNIQUE_SUBJECT	"unique_subject"
137 138 139

#define ENV_DATABASE		"database"

140 141 142 143 144 145 146 147
/* Additional revocation information types */

#define REV_NONE		0	/* No addditional information */
#define REV_CRL_REASON		1	/* Value is CRL reason code */
#define REV_HOLD		2	/* Value is hold instruction */
#define REV_KEY_COMPROMISE	3	/* Value is cert key compromise time */
#define REV_CA_COMPROMISE	4	/* Value is CA key compromise time */

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

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

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

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

240

241 242
int MAIN(int, char **);

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

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

	apps_startup();

333
	conf = NULL;
334 335 336
	key = NULL;
	section = NULL;

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

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

	if (badops)
		{
B
Ben Laurie 已提交
559 560 561 562
		const char **pp2;

		for (pp2=ca_usage; (*pp2 != NULL); pp2++)
			BIO_printf(bio_err,"%s",*pp2);
563 564 565 566 567 568
		goto err;
		}

	ERR_load_crypto_strings();

	/*****************************************************************/
569
	tofree=NULL;
570 571
	if (configfile == NULL) configfile = getenv("OPENSSL_CONF");
	if (configfile == NULL) configfile = getenv("SSLEAY_CONF");
572 573
	if (configfile == NULL)
		{
574
		const char *s=X509_get_default_cert_area();
575
		size_t len;
576

577
#ifdef OPENSSL_SYS_VMS
578 579
		len = strlen(s)+sizeof(CONFIG_FILE);
		tofree=OPENSSL_malloc(len);
580
		strcpy(tofree,s);
U
Ulf Möller 已提交
581
#else
582 583 584 585
		len = strlen(s)+sizeof(CONFIG_FILE)+1;
		tofree=OPENSSL_malloc(len);
		BUF_strlcpy(tofree,s,len);
		BUF_strlcat(tofree,"/",len);
U
Ulf Möller 已提交
586
#endif
587
		BUF_strlcat(tofree,CONFIG_FILE,len);
588
		configfile=tofree;
589 590 591
		}

	BIO_printf(bio_err,"Using configuration from %s\n",configfile);
D
 
Dr. Stephen Henson 已提交
592 593
	conf = NCONF_new(NULL);
	if (NCONF_load(conf,configfile,&errorline) <= 0)
594 595 596 597 598 599 600 601 602
		{
		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;
		}
603
	if(tofree)
604
		{
605
		OPENSSL_free(tofree);
606 607
		tofree = NULL;
		}
608

D
Dr. Stephen Henson 已提交
609 610 611
	if (!load_config(bio_err, conf))
		goto err;

612 613 614 615
#ifndef OPENSSL_NO_ENGINE
	e = setup_engine(bio_err, engine, 0);
#endif

616 617 618
	/* Lets get the config section we are using */
	if (section == NULL)
		{
D
 
Dr. Stephen Henson 已提交
619
		section=NCONF_get_string(conf,BASE_SECTION,ENV_DEFAULT_CA);
620 621 622 623 624 625 626
		if (section == NULL)
			{
			lookup_fail(BASE_SECTION,ENV_DEFAULT_CA);
			goto err;
			}
		}

627 628
	if (conf != NULL)
		{
D
 
Dr. Stephen Henson 已提交
629
		p=NCONF_get_string(conf,NULL,"oid_file");
630 631
		if (p == NULL)
			ERR_clear_error();
632 633 634 635 636 637 638 639 640 641 642
		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 已提交
643
				ERR_clear_error();
644 645 646 647 648 649 650
				}
			else
				{
				OBJ_create_objects(oid_bio);
				BIO_free(oid_bio);
				}
			}
651
		if (!add_oid_section(bio_err,conf)) 
652
			{
653 654
			ERR_print_errors(bio_err);
			goto err;
655
			}
656
		}
657

D
 
Dr. Stephen Henson 已提交
658
	randfile = NCONF_get_string(conf, BASE_SECTION, "RANDFILE");
659 660
	if (randfile == NULL)
		ERR_clear_error();
661
	app_RAND_load_file(randfile, bio_err, 0);
662

D
Dr. Stephen Henson 已提交
663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679
	f = NCONF_get_string(conf, section, STRING_MASK);
	if (!f)
		ERR_clear_error();

	if(f && !ASN1_STRING_set_default_mask_asc(f)) {
		BIO_printf(bio_err, "Invalid global string mask setting %s\n", f);
		goto err;
	}

	if (chtype != MBSTRING_UTF8){
		f = NCONF_get_string(conf, section, UTF8_IN);
		if (!f)
			ERR_clear_error();
		else if (!strcmp(f, "yes"))
			chtype = MBSTRING_UTF8;
	}

680
	db_attr.unique_subject = 1;
681
	p = NCONF_get_string(conf, section, ENV_UNIQUE_SUBJECT);
682 683
	if (p)
		{
684
#ifdef RL_DEBUG
685
		BIO_printf(bio_err, "DEBUG: unique_subject = \"%s\"\n", p);
686
#endif
687
		db_attr.unique_subject = parse_yesno(p,1);
688 689
		}
	else
690 691 692
		ERR_clear_error();
#ifdef RL_DEBUG
	if (!p)
693
		BIO_printf(bio_err, "DEBUG: unique_subject undefined\n", p);
694 695
#endif
#ifdef RL_DEBUG
696 697
	BIO_printf(bio_err, "DEBUG: configured unique_subject is %d\n",
		db_attr.unique_subject);
698
#endif
699
	
700 701 702 703 704 705 706 707 708 709 710
	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;
		}

	/*****************************************************************/
711 712 713
	/* report status of cert with serial number given on command line */
	if (ser_status)
	{
D
 
Dr. Stephen Henson 已提交
714
		if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
715 716 717 718
			{
			lookup_fail(section,ENV_DATABASE);
			goto err;
			}
719
		db = load_index(dbfile,&db_attr);
720 721
		if (db == NULL) goto err;

722
		if (!index_index(db)) goto err;
723 724 725 726 727 728 729 730

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

	/*****************************************************************/
731
	/* we definitely need a private key, so let's get it */
732

D
 
Dr. Stephen Henson 已提交
733
	if ((keyfile == NULL) && ((keyfile=NCONF_get_string(conf,
734 735 736 737 738
		section,ENV_PRIVATE_KEY)) == NULL))
		{
		lookup_fail(section,ENV_PRIVATE_KEY);
		goto err;
		}
D
 
Dr. Stephen Henson 已提交
739
	if (!key)
740
		{
D
 
Dr. Stephen Henson 已提交
741 742 743 744 745 746
		free_key = 1;
		if (!app_passwd(bio_err, passargin, NULL, &key, NULL))
			{
			BIO_printf(bio_err,"Error getting password\n");
			goto err;
			}
747
		}
748
	pkey = load_key(bio_err, keyfile, keyform, 0, key, e, 
749
		"CA private key");
750
	if (key) OPENSSL_cleanse(key,strlen(key));
751 752
	if (pkey == NULL)
		{
753
		/* load_key() has already printed an appropriate message */
754 755 756 757 758
		goto err;
		}

	/*****************************************************************/
	/* we need a certificate */
759
	if (!selfsign || spkac_file || ss_cert_file || gencrl)
760
		{
761 762 763 764 765 766 767 768 769 770 771
		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;
772

773 774 775 776 777
		if (!X509_check_private_key(x509,pkey))
			{
			BIO_printf(bio_err,"CA certificate and CA private key do not match\n");
			goto err;
			}
778
		}
779
	if (!selfsign) x509p = x509;
780

D
 
Dr. Stephen Henson 已提交
781
	f=NCONF_get_string(conf,BASE_SECTION,ENV_PRESERVE);
782 783
	if (f == NULL)
		ERR_clear_error();
784 785
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		preserve=1;
D
 
Dr. Stephen Henson 已提交
786
	f=NCONF_get_string(conf,BASE_SECTION,ENV_MSIE_HACK);
787 788
	if (f == NULL)
		ERR_clear_error();
789 790 791
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		msie_hack=1;

D
 
Dr. Stephen Henson 已提交
792
	f=NCONF_get_string(conf,section,ENV_NAMEOPT);
D
 
Dr. Stephen Henson 已提交
793 794 795 796 797 798 799 800 801 802 803 804 805

	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 已提交
806
	f=NCONF_get_string(conf,section,ENV_CERTOPT);
D
 
Dr. Stephen Henson 已提交
807 808 809 810 811 812 813 814 815 816 817 818 819

	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 已提交
820
	f=NCONF_get_string(conf,section,ENV_EXTCOPY);
821 822 823 824 825 826 827 828 829 830 831

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

833 834 835 836 837
	/*****************************************************************/
	/* lookup where to write new certificates */
	if ((outdir == NULL) && (req))
		{

D
 
Dr. Stephen Henson 已提交
838
		if ((outdir=NCONF_get_string(conf,section,ENV_NEW_CERTS_DIR))
839 840 841 842 843
			== NULL)
			{
			BIO_printf(bio_err,"there needs to be defined a directory for new certificate to be placed in\n");
			goto err;
			}
844 845
#ifndef OPENSSL_SYS_VMS
	    /* outdir is a directory spec, but access() for VMS demands a
846 847 848 849 850 851 852 853
	       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.
854
	    */
855
#ifndef _WIN32
856
		if (access(outdir,R_OK|W_OK|X_OK) != 0)
857 858 859
#else
		if (_access(outdir,R_OK|W_OK|X_OK) != 0)
#endif
860
			{
U
Ulf Möller 已提交
861
			BIO_printf(bio_err,"I am unable to access the %s directory\n",outdir);
862 863 864 865
			perror(outdir);
			goto err;
			}

866
		if (app_isdir(outdir)<=0)
867 868 869 870 871
			{
			BIO_printf(bio_err,"%s need to be a directory\n",outdir);
			perror(outdir);
			goto err;
			}
872
#endif
873 874 875 876
		}

	/*****************************************************************/
	/* we need to load the database file */
D
 
Dr. Stephen Henson 已提交
877
	if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
878 879 880 881
		{
		lookup_fail(section,ENV_DATABASE);
		goto err;
		}
882
	db = load_index(dbfile, &db_attr);
883 884 885
	if (db == NULL) goto err;

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

947 948 949 950 951 952 953 954 955 956 957 958 959
	/*****************************************************************/
	/* 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;
960
			}
961
		else if (i == 0)
962
			{
963 964 965 966 967
			if (verbose) BIO_printf(bio_err,
					"No entries found to mark expired\n"); 
			}
	    	else
			{
968 969 970
			if (!save_index(dbfile,"new",db)) goto err;
				
			if (!rotate_index(dbfile,"new","old")) goto err;
971 972 973 974 975 976
				
			if (verbose) BIO_printf(bio_err,
				"Done. %d entries marked as expired\n",i); 
	      		}
	  	}

977 978 979 980
 	/*****************************************************************/
	/* Read extentions config file                                   */
	if (extfile)
		{
D
 
Dr. Stephen Henson 已提交
981 982
		extconf = NCONF_new(NULL);
		if (NCONF_load(extconf,extfile,&errorline) <= 0)
983 984 985 986 987 988 989 990 991 992 993 994
			{
			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 已提交
995
			BIO_printf(bio_err, "Successfully loaded extensions file %s\n", extfile);
996 997

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

1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013
	/*****************************************************************/
	if (req || gencrl)
		{
		if (outfile != NULL)
			{
			if (BIO_write_filename(Sout,outfile) <= 0)
				{
				perror(outfile);
				goto err;
				}
			}
		else
1014
			{
1015
			BIO_set_fp(Sout,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
1016
#ifdef OPENSSL_SYS_VMS
1017 1018 1019 1020 1021 1022
			{
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
			Sout = BIO_push(tmpbio, Sout);
			}
#endif
			}
1023 1024
		}

1025 1026 1027 1028 1029 1030 1031
	if ((md == NULL) && ((md=NCONF_get_string(conf,
		section,ENV_DEFAULT_MD)) == NULL))
		{
		lookup_fail(section,ENV_DEFAULT_MD);
		goto err;
		}

1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042
	if (!strcmp(md, "default"))
		{
		int def_nid;
		if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) <= 0)
			{
			BIO_puts(bio_err,"no default digest\n");
			goto err;
			}
		md = (char *)OBJ_nid2sn(def_nid);
		}

1043 1044 1045 1046 1047 1048
	if ((dgst=EVP_get_digestbyname(md)) == NULL)
		{
		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
		goto err;
		}

1049 1050
	if (req)
		{
1051 1052 1053 1054 1055 1056
		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;
			}
1057 1058 1059
		if (verbose)
			BIO_printf(bio_err,"message digest is %s\n",
				OBJ_nid2ln(dgst->type));
D
 
Dr. Stephen Henson 已提交
1060
		if ((policy == NULL) && ((policy=NCONF_get_string(conf,
1061 1062 1063 1064 1065 1066 1067 1068
			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 已提交
1069
		if ((serialfile=NCONF_get_string(conf,section,ENV_SERIAL))
1070 1071 1072 1073 1074
			== NULL)
			{
			lookup_fail(section,ENV_SERIAL);
			goto err;
			}
1075 1076

		if (!extconf)
1077
			{
1078 1079
			/* no '-extfile' option, so we look for extensions
			 * in the main configuration file */
1080 1081
			if (!extensions)
				{
D
 
Dr. Stephen Henson 已提交
1082
				extensions=NCONF_get_string(conf,section,
1083 1084 1085 1086 1087 1088 1089 1090 1091
								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 已提交
1092 1093
				X509V3_set_nconf(&ctx, conf);
				if (!X509V3_EXT_add_nconf(conf, &ctx, extensions,
1094 1095 1096 1097
								NULL))
					{
					BIO_printf(bio_err,
				 	"Error Loading extension section %s\n",
1098
								 extensions);
1099 1100 1101
					ret = 1;
					goto err;
					}
1102
				}
1103 1104
			}

1105 1106
		if (startdate == NULL)
			{
D
 
Dr. Stephen Henson 已提交
1107
			startdate=NCONF_get_string(conf,section,
1108
				ENV_DEFAULT_STARTDATE);
1109 1110
			if (startdate == NULL)
				ERR_clear_error();
1111
			}
D
Dr. Stephen Henson 已提交
1112
		if (startdate && !ASN1_TIME_set_string(NULL, startdate))
1113
			{
D
Dr. Stephen Henson 已提交
1114
			BIO_printf(bio_err,"start date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
1115 1116 1117 1118 1119 1120
			goto err;
			}
		if (startdate == NULL) startdate="today";

		if (enddate == NULL)
			{
D
 
Dr. Stephen Henson 已提交
1121
			enddate=NCONF_get_string(conf,section,
1122
				ENV_DEFAULT_ENDDATE);
1123 1124
			if (enddate == NULL)
				ERR_clear_error();
1125
			}
D
Dr. Stephen Henson 已提交
1126
		if (enddate && !ASN1_TIME_set_string(NULL, enddate))
1127
			{
D
Dr. Stephen Henson 已提交
1128
			BIO_printf(bio_err,"end date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
1129
			goto err;
1130 1131
			}

1132 1133
		if (days == 0)
			{
D
 
Dr. Stephen Henson 已提交
1134 1135
			if(!NCONF_get_number(conf,section, ENV_DEFAULT_DAYS, &days))
				days = 0;
1136
			}
1137
		if (!enddate && (days == 0))
1138 1139 1140 1141 1142
			{
			BIO_printf(bio_err,"cannot lookup how many days to certify for\n");
			goto err;
			}

1143
		if ((serial=load_serial(serialfile, create_ser, NULL)) == NULL)
1144 1145 1146 1147 1148 1149
			{
			BIO_printf(bio_err,"error while loading serial number\n");
			goto err;
			}
		if (verbose)
			{
1150 1151 1152 1153 1154 1155 1156 1157
			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);
				}
1158 1159
			}

D
 
Dr. Stephen Henson 已提交
1160
		if ((attribs=NCONF_get_section(conf,policy)) == NULL)
1161 1162 1163 1164 1165
			{
			BIO_printf(bio_err,"unable to find 'section' for %s\n",policy);
			goto err;
			}

B
Ben Laurie 已提交
1166
		if ((cert_sk=sk_X509_new_null()) == NULL)
1167
			{
1168
			BIO_printf(bio_err,"Memory allocation failure\n");
1169 1170 1171 1172 1173 1174
			goto err;
			}
		if (spkac_file != NULL)
			{
			total++;
			j=certify_spkac(&x,spkac_file,pkey,x509,dgst,attribs,db,
D
Dr. Stephen Henson 已提交
1175
				serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,extensions,
1176
				conf,verbose,certopt,nameopt,default_op,ext_copy);
1177 1178 1179 1180 1181 1182
			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 已提交
1183
				if (!sk_X509_push(cert_sk,x))
1184
					{
1185
					BIO_printf(bio_err,"Memory allocation failure\n");
1186 1187 1188 1189 1190 1191 1192 1193 1194
					goto err;
					}
				if (outfile)
					{
					output_der = 1;
					batch = 1;
					}
				}
			}
1195 1196 1197 1198
		if (ss_cert_file != NULL)
			{
			total++;
			j=certify_cert(&x,ss_cert_file,pkey,x509,dgst,attribs,
D
Dr. Stephen Henson 已提交
1199
				db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1200
				extensions,conf,verbose, certopt, nameopt,
1201
				default_op, ext_copy, e);
1202 1203 1204 1205 1206 1207
			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 已提交
1208
				if (!sk_X509_push(cert_sk,x))
1209
					{
1210
					BIO_printf(bio_err,"Memory allocation failure\n");
1211 1212 1213 1214
					goto err;
					}
				}
			}
1215 1216 1217
		if (infile != NULL)
			{
			total++;
1218
			j=certify(&x,infile,pkey,x509p,dgst,attribs,db,
D
Dr. Stephen Henson 已提交
1219
				serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1220
				extensions,conf,verbose, certopt, nameopt,
1221
				default_op, ext_copy, selfsign);
1222 1223 1224 1225 1226 1227
			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 已提交
1228
				if (!sk_X509_push(cert_sk,x))
1229
					{
1230
					BIO_printf(bio_err,"Memory allocation failure\n");
1231 1232 1233 1234 1235 1236 1237
					goto err;
					}
				}
			}
		for (i=0; i<argc; i++)
			{
			total++;
1238
			j=certify(&x,argv[i],pkey,x509p,dgst,attribs,db,
D
Dr. Stephen Henson 已提交
1239
				serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
D
 
Dr. Stephen Henson 已提交
1240
				extensions,conf,verbose, certopt, nameopt,
1241
				default_op, ext_copy, selfsign);
1242 1243 1244 1245 1246 1247
			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 已提交
1248
				if (!sk_X509_push(cert_sk,x))
1249
					{
1250
					BIO_printf(bio_err,"Memory allocation failure\n");
1251 1252 1253 1254 1255 1256 1257 1258
					goto err;
					}
				}
			}	
		/* we have a stack of newly certified certificates
		 * and a data base and serial number that need
		 * updating */

B
Ben Laurie 已提交
1259
		if (sk_X509_num(cert_sk) > 0)
1260 1261 1262 1263
			{
			if (!batch)
				{
				BIO_printf(bio_err,"\n%d out of %d certificate requests certified, commit? [y/n]",total_done,total);
B
Bodo Möller 已提交
1264
				(void)BIO_flush(bio_err);
1265
				buf[0][0]='\0';
1266 1267 1268 1269 1270 1271
				if (!fgets(buf[0],10,stdin))
					{
					BIO_printf(bio_err,"CERTIFICATION CANCELED: I/O error\n"); 
					ret=0;
					goto err;
					}
1272 1273 1274 1275 1276 1277 1278 1279
				if ((buf[0][0] != 'y') && (buf[0][0] != 'Y'))
					{
					BIO_printf(bio_err,"CERTIFICATION CANCELED\n"); 
					ret=0;
					goto err;
					}
				}

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

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

1284
			if (!save_index(dbfile, "new", db)) goto err;
1285 1286 1287 1288
			}
	
		if (verbose)
			BIO_printf(bio_err,"writing new certificates\n");
B
Ben Laurie 已提交
1289
		for (i=0; i<sk_X509_num(cert_sk); i++)
1290 1291
			{
			int k;
1292
			char *n;
1293

B
Ben Laurie 已提交
1294
			x=sk_X509_value(cert_sk,i);
1295 1296

			j=x->cert_info->serialNumber->length;
N
Nils Larsch 已提交
1297
			p=(const char *)x->cert_info->serialNumber->data;
1298
			
R
Richard Levitte 已提交
1299
			if(strlen(outdir) >= (size_t)(j ? BSIZE-j*2-6 : BSIZE-8))
1300 1301 1302 1303 1304 1305
				{
				BIO_printf(bio_err,"certificate file name too long\n");
				goto err;
				}

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

1307
#ifndef OPENSSL_SYS_VMS
1308
			BUF_strlcat(buf[2],"/",sizeof(buf[2]));
U
Ulf Möller 已提交
1309 1310
#endif

1311
			n=(char *)&(buf[2][strlen(buf[2])]);
1312 1313 1314 1315
			if (j > 0)
				{
				for (k=0; k<j; k++)
					{
1316 1317 1318 1319 1320
					if (n >= &(buf[2][sizeof(buf[2])]))
						break;
					BIO_snprintf(n,
						     &buf[2][0] + sizeof(buf[2]) - n,
						     "%02X",(unsigned char)*(p++));
1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338
					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 已提交
1339 1340
			write_new_certificate(Cout,x, 0, notext);
			write_new_certificate(Sout,x, output_der, notext);
1341 1342
			}

B
Ben Laurie 已提交
1343
		if (sk_X509_num(cert_sk))
1344 1345
			{
			/* Rename the database and the serial file */
1346
			if (!rotate_serial(serialfile,"new","old")) goto err;
1347

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

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

R
Richard Levitte 已提交
1380 1381 1382 1383 1384 1385 1386 1387
		if ((crlnumberfile=NCONF_get_string(conf,section,ENV_CRLNUMBER))
			!= NULL)
			if ((crlnumber=load_serial(crlnumberfile,0,NULL)) == NULL)
				{
				BIO_printf(bio_err,"error while loading CRL number\n");
				goto err;
				}

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

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

D
 
Dr. Stephen Henson 已提交
1407 1408 1409 1410
		tmptm = ASN1_TIME_new();
		if (!tmptm) goto err;
		X509_gmtime_adj(tmptm,0);
		X509_CRL_set_lastUpdate(crl, tmptm);	
D
Dr. Stephen Henson 已提交
1411 1412 1413 1414 1415 1416
		if (!X509_time_adj_ex(tmptm, crldays, crlhours*60*60 + crlsec,
			NULL))
			{
			BIO_puts(bio_err, "error setting CRL nextUpdate\n");
			goto err;
			}
D
 
Dr. Stephen Henson 已提交
1417 1418 1419
		X509_CRL_set_nextUpdate(crl, tmptm);	

		ASN1_TIME_free(tmptm);
1420

D
Dr. Stephen Henson 已提交
1421
		for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
1422
			{
D
Dr. Stephen Henson 已提交
1423
			pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
1424 1425 1426
			if (pp[DB_type][0] == DB_TYPE_REV)
				{
				if ((r=X509_REVOKED_new()) == NULL) goto err;
1427 1428 1429
				j = make_revoked(r, pp[DB_rev_date]);
				if (!j) goto err;
				if (j == 2) crl_v2 = 1;
1430 1431
				if (!BN_hex2bn(&serial, pp[DB_serial]))
					goto err;
D
 
Dr. Stephen Henson 已提交
1432
				tmpser = BN_to_ASN1_INTEGER(serial, NULL);
1433 1434
				BN_free(serial);
				serial = NULL;
D
 
Dr. Stephen Henson 已提交
1435
				if (!tmpser)
1436
					goto err;
D
 
Dr. Stephen Henson 已提交
1437 1438
				X509_REVOKED_set_serialNumber(r, tmpser);
				ASN1_INTEGER_free(tmpser);
D
 
Dr. Stephen Henson 已提交
1439
				X509_CRL_add0_revoked(crl,r);
1440 1441
				}
			}
D
 
Dr. Stephen Henson 已提交
1442

1443 1444
		/* sort the data so it will be written in serial
		 * number order */
D
 
Dr. Stephen Henson 已提交
1445
		X509_CRL_sort(crl);
1446

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

1450 1451
		/* Add any extensions asked for */

R
Richard Levitte 已提交
1452
		if (crl_ext || crlnumberfile != NULL)
1453 1454 1455
			{
			X509V3_CTX crlctx;
			X509V3_set_ctx(&crlctx, x509, NULL, NULL, crl, 0);
D
 
Dr. Stephen Henson 已提交
1456
			X509V3_set_nconf(&crlctx, conf);
1457

R
Richard Levitte 已提交
1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469
			if (crl_ext)
				if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx,
					crl_ext, crl)) goto err;
			if (crlnumberfile != NULL)
				{
				tmpser = BN_to_ASN1_INTEGER(crlnumber, NULL);
				if (!tmpser) goto err;
				X509_CRL_add1_ext_i2d(crl,NID_crl_number,tmpser,0,0);
				ASN1_INTEGER_free(tmpser);
				crl_v2 = 1;
				if (!BN_add_word(crlnumber,1)) goto err;
				}
1470
			}
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

R
Richard Levitte 已提交
1477 1478 1479 1480
		
		if (crlnumberfile != NULL)	/* we have a CRL number that need updating */
			if (!save_serial(crlnumberfile,"new",crlnumber,NULL)) goto err;

1481 1482 1483 1484 1485 1486
		if (crlnumber)
			{
			BN_free(crlnumber);
			crlnumber = NULL;
			}

1487 1488 1489
		if (!X509_CRL_sign(crl,pkey,dgst)) goto err;

		PEM_write_bio_X509_CRL(Sout,crl);
R
Richard Levitte 已提交
1490 1491 1492 1493

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

1494 1495
		}
	/*****************************************************************/
1496
	if (dorevoke)
1497
		{
1498 1499 1500 1501 1502
		if (infile == NULL) 
			{
			BIO_printf(bio_err,"no input files\n");
			goto err;
			}
1503 1504
		else
			{
1505
			X509 *revcert;
1506 1507
			revcert=load_cert(bio_err, infile, FORMAT_PEM,
				NULL, e, infile);
1508
			if (revcert == NULL)
1509
				goto err;
1510
			j=do_revoke(revcert,db, rev_type, rev_arg);
1511 1512
			if (j <= 0) goto err;
			X509_free(revcert);
1513

1514 1515 1516
			if (!save_index(dbfile, "new", db)) goto err;

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

1518 1519
			BIO_printf(bio_err,"Data Base Updated\n"); 
			}
1520 1521
		}
	/*****************************************************************/
1522 1523
	ret=0;
err:
1524 1525
	if(tofree)
		OPENSSL_free(tofree);
1526 1527 1528
	BIO_free_all(Cout);
	BIO_free_all(Sout);
	BIO_free_all(out);
1529
	BIO_free_all(in);
1530

1531 1532
	if (cert_sk)
		sk_X509_pop_free(cert_sk,X509_free);
1533 1534

	if (ret) ERR_print_errors(bio_err);
1535
	app_RAND_write_file(randfile, bio_err);
D
Typo.  
Dr. Stephen Henson 已提交
1536
	if (free_key && key)
D
 
Dr. Stephen Henson 已提交
1537
		OPENSSL_free(key);
1538
	BN_free(serial);
1539
	BN_free(crlnumber);
1540
	free_index(db);
1541
	EVP_PKEY_free(pkey);
1542
	if (x509) X509_free(x509);
1543
	X509_CRL_free(crl);
D
 
Dr. Stephen Henson 已提交
1544
	NCONF_free(conf);
B
Ben Laurie 已提交
1545
	NCONF_free(extconf);
1546
	OBJ_cleanup();
1547
	apps_shutdown();
1548
	OPENSSL_EXIT(ret);
1549 1550
	}

N
Nils Larsch 已提交
1551
static void lookup_fail(const char *name, const char *tag)
1552 1553 1554 1555
	{
	BIO_printf(bio_err,"variable lookup failed for %s::%s\n",name,tag);
	}

U
Ulf Möller 已提交
1556
static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1557
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
D
Dr. Stephen Henson 已提交
1558
	     BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
1559
	     long days, int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1560
	     unsigned long certopt, unsigned long nameopt, int default_op,
1561
	     int ext_copy, int selfsign)
1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574
	{
	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;
		}
1575
	if ((req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL)) == NULL)
1576 1577 1578 1579 1580 1581 1582 1583 1584 1585
		{
		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");

1586 1587 1588 1589 1590 1591
	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;
		}
1592 1593 1594 1595 1596 1597
	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);
1598
	EVP_PKEY_free(pktmp);
1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613
	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");

D
Dr. Stephen Henson 已提交
1614
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,chtype,multirdn, email_dn,
1615
		startdate,enddate,days,batch,verbose,req,ext_sect,lconf,
1616
		certopt, nameopt, default_op, ext_copy, selfsign);
1617 1618 1619 1620 1621 1622 1623

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

U
Ulf Möller 已提交
1624
static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1625
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
D
Dr. Stephen Henson 已提交
1626
	     BIGNUM *serial, char *subj, unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
1627
	     long days, int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1628
	     unsigned long certopt, unsigned long nameopt, int default_op,
1629
	     int ext_copy, ENGINE *e)
1630 1631 1632 1633 1634 1635
	{
	X509 *req=NULL;
	X509_REQ *rreq=NULL;
	EVP_PKEY *pktmp=NULL;
	int ok= -1,i;

1636
	if ((req=load_cert(bio_err, infile, FORMAT_PEM, NULL, e, infile)) == NULL)
1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648
		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);
1649
	EVP_PKEY_free(pktmp);
1650 1651 1652 1653 1654 1655 1656 1657 1658
	if (i < 0)
		{
		ok=0;
		BIO_printf(bio_err,"Signature verification problems....\n");
		goto err;
		}
	if (i == 0)
		{
		ok=0;
1659
		BIO_printf(bio_err,"Signature did not match the certificate\n");
1660 1661 1662 1663 1664 1665 1666 1667
		goto err;
		}
	else
		BIO_printf(bio_err,"Signature ok\n");

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

D
Dr. Stephen Henson 已提交
1668
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,
1669
		days,batch,verbose,rreq,ext_sect,lconf, certopt, nameopt, default_op,
1670
		ext_copy, 0);
1671 1672 1673 1674 1675 1676 1677

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

U
Ulf Möller 已提交
1678
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
1679
	     STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial, char *subj,
D
Dr. Stephen Henson 已提交
1680
	     unsigned long chtype, int multirdn,
1681 1682
	     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 已提交
1683
	     unsigned long certopt, unsigned long nameopt, int default_op,
1684
	     int ext_copy, int selfsign)
1685
	{
1686
	X509_NAME *name=NULL,*CAname=NULL,*subject=NULL, *dn_subject=NULL;
1687
	ASN1_UTCTIME *tm,*tmptm;
1688 1689 1690 1691 1692 1693 1694 1695
	ASN1_STRING *str,*str2;
	ASN1_OBJECT *obj;
	X509 *ret=NULL;
	X509_CINF *ci;
	X509_NAME_ENTRY *ne;
	X509_NAME_ENTRY *tne,*push;
	EVP_PKEY *pktmp;
	int ok= -1,i,j,last,nid;
N
Nils Larsch 已提交
1696
	const char *p;
1697
	CONF_VALUE *cv;
D
Dr. Stephen Henson 已提交
1698 1699 1700
	OPENSSL_STRING row[DB_NUMBER];
	OPENSSL_STRING *irow=NULL;
	OPENSSL_STRING *rrow=NULL;
D
 
Dr. Stephen Henson 已提交
1701
	char buf[25];
1702

1703 1704 1705 1706 1707 1708 1709
	tmptm=ASN1_UTCTIME_new();
	if (tmptm == NULL)
		{
		BIO_printf(bio_err,"malloc error\n");
		return(0);
		}

1710 1711 1712
	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;

1713 1714
	if (subj)
		{
D
Dr. Stephen Henson 已提交
1715
		X509_NAME *n = parse_name(subj, chtype, multirdn);
1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726

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

1730 1731 1732
	name=X509_REQ_get_subject_name(req);
	for (i=0; i<X509_NAME_entry_count(name); i++)
		{
D
 
Dr. Stephen Henson 已提交
1733
		ne= X509_NAME_get_entry(name,i);
1734
		str=X509_NAME_ENTRY_get_data(ne);
D
 
Dr. Stephen Henson 已提交
1735
		obj=X509_NAME_ENTRY_get_object(ne);
1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753

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

1754 1755 1756 1757
		/* If no EMAIL is wanted in the subject */
		if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) && (!email_dn))
			continue;

1758 1759 1760 1761 1762 1763 1764
		/* 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;
			}
1765
		if ((str->type != V_ASN1_BMPSTRING) && (str->type != V_ASN1_UTF8STRING))
1766
			{
1767 1768 1769 1770 1771 1772 1773 1774 1775
			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;
				}
1776
			}
D
 
Dr. Stephen Henson 已提交
1777 1778 1779

		if (default_op)
			old_entry_print(bio_err, obj, str);
1780 1781 1782 1783 1784
		}

	/* Ok, now we check the 'policy' stuff. */
	if ((subject=X509_NAME_new()) == NULL)
		{
1785
		BIO_printf(bio_err,"Memory allocation failure\n");
1786 1787 1788 1789
		goto err;
		}

	/* take a copy of the issuer name before we mess with it. */
1790 1791 1792 1793
	if (selfsign)
		CAname=X509_NAME_dup(name);
	else
		CAname=X509_NAME_dup(x509->cert_info->subject);
1794 1795 1796
	if (CAname == NULL) goto err;
	str=str2=NULL;

1797
	for (i=0; i<sk_CONF_VALUE_num(policy); i++)
1798
		{
1799
		cv=sk_CONF_VALUE_value(policy,i); /* get the object id */
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 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869
		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)
					{
1870
					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));
1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881
					goto err;
					}
				}
			else
				{
				BIO_printf(bio_err,"%s:invalid type in 'policy' configuration\n",cv->value);
				goto err;
				}

			if (push != NULL)
				{
1882
				if (!X509_NAME_add_entry(subject,push, -1, 0))
1883 1884 1885
					{
					if (push != NULL)
						X509_NAME_ENTRY_free(push);
1886
					BIO_printf(bio_err,"Memory allocation failure\n");
1887 1888 1889 1890 1891 1892 1893 1894 1895 1896
					goto err;
					}
				}
			if (j < 0) break;
			}
		}

	if (preserve)
		{
		X509_NAME_free(subject);
1897 1898
		/* subject=X509_NAME_dup(X509_REQ_get_subject_name(req)); */
		subject=X509_NAME_dup(name);
1899 1900 1901 1902
		if (subject == NULL) goto err;
		}

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

1905 1906 1907
	/* 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) */
	 
1908 1909 1910
	if (email_dn)
		dn_subject = subject;
	else
1911
		{
1912 1913 1914 1915 1916
		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)))
1917 1918 1919 1920
			{
			BIO_printf(bio_err,"Memory allocation failure\n");
			goto err;
			}
1921
		while((i = X509_NAME_get_index_by_NID(dn_subject,
1922
					NID_pkcs9_emailAddress, -1)) >= 0)
1923
			{
1924 1925 1926
			tmpne = X509_NAME_get_entry(dn_subject, i);
			X509_NAME_delete_entry(dn_subject, i);
			X509_NAME_ENTRY_free(tmpne);
1927 1928 1929
			}
		}

1930 1931 1932 1933
	if (BN_is_zero(serial))
		row[DB_serial]=BUF_strdup("00");
	else
		row[DB_serial]=BN_bn2hex(serial);
1934
	if (row[DB_serial] == NULL)
1935
		{
1936
		BIO_printf(bio_err,"Memory allocation failure\n");
1937 1938 1939
		goto err;
		}

1940
	if (db->attributes.unique_subject)
1941
		{
D
Dr. Stephen Henson 已提交
1942
		OPENSSL_STRING *crow=row;
B
Ben Laurie 已提交
1943 1944

		rrow=TXT_DB_get_by_index(db->db,DB_name,crow);
1945 1946 1947 1948 1949 1950
		if (rrow != NULL)
			{
			BIO_printf(bio_err,
				"ERROR:There is already a certificate for %s\n",
				row[DB_name]);
			}
1951
		}
1952
	if (rrow == NULL)
1953
		{
1954
		rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974
		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";
1975
		BIO_printf(bio_err,"Type	  :%s\n",p);;
1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992
		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 已提交
1993
	/* We are now totally happy, lets make and sign the certificate */
1994 1995 1996 1997 1998 1999 2000 2001
	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. */
2002
	if (!X509_set_version(ret,2)) goto err;
2003 2004 2005 2006
#endif

	if (BN_to_ASN1_INTEGER(serial,ci->serialNumber) == NULL)
		goto err;
2007 2008 2009 2010 2011 2012 2013 2014 2015 2016
	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;
		}
2017

2018 2019
	if (strcmp(startdate,"today") == 0)
		X509_gmtime_adj(X509_get_notBefore(ret),0);
D
Dr. Stephen Henson 已提交
2020
	else ASN1_TIME_set_string(X509_get_notBefore(ret),startdate);
2021 2022

	if (enddate == NULL)
2023
		X509_time_adj_ex(X509_get_notAfter(ret),days, 0, NULL);
D
Dr. Stephen Henson 已提交
2024
	else ASN1_TIME_set_string(X509_get_notAfter(ret),enddate);
2025

2026 2027 2028
	if (!X509_set_subject_name(ret,subject)) goto err;

	pktmp=X509_REQ_get_pubkey(req);
2029 2030 2031
	i = X509_set_pubkey(ret,pktmp);
	EVP_PKEY_free(pktmp);
	if (!i) goto err;
2032 2033

	/* Lets add the extensions, if there are any */
2034
	if (ext_sect)
2035
		{
2036
		X509V3_CTX ctx;
2037 2038 2039 2040 2041 2042
		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 已提交
2043
		 * be any I believe */
2044
		if (ci->extensions != NULL)
B
Ben Laurie 已提交
2045 2046
			sk_X509_EXTENSION_pop_free(ci->extensions,
						   X509_EXTENSION_free);
2047

2048 2049
		ci->extensions = NULL;

2050
		/* Initialize the context structure */
2051 2052 2053 2054
		if (selfsign)
			X509V3_set_ctx(&ctx, ret, ret, req, NULL, 0);
		else
			X509V3_set_ctx(&ctx, x509, ret, req, NULL, 0);
2055

2056 2057 2058 2059 2060 2061
		if (extconf)
			{
			if (verbose)
				BIO_printf(bio_err, "Extra configuration file found\n");
 
			/* Use the extconf configuration db LHASH */
D
 
Dr. Stephen Henson 已提交
2062
			X509V3_set_nconf(&ctx, extconf);
2063 2064 2065 2066 2067
 
			/* Test the structure (needed?) */
			/* X509V3_set_ctx_test(&ctx); */

			/* Adds exts contained in the configuration file */
D
 
Dr. Stephen Henson 已提交
2068
			if (!X509V3_EXT_add_nconf(extconf, &ctx, ext_sect,ret))
2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081
				{
				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 已提交
2082
			X509V3_set_nconf(&ctx, lconf);
2083

D
 
Dr. Stephen Henson 已提交
2084
			if(!X509V3_EXT_add_nconf(lconf, &ctx, ext_sect, ret))
2085 2086 2087 2088 2089 2090 2091 2092 2093
				{
				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");
			}
2094 2095
		}

2096 2097 2098 2099 2100 2101 2102 2103 2104
	/* 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;
		}

2105 2106 2107 2108 2109
	/* Set the right value for the noemailDN option */
	if( email_dn == 0 )
		{
		if (!X509_set_subject_name(ret,dn_subject)) goto err;
		}
2110 2111 2112 2113 2114 2115 2116 2117 2118 2119

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

	BIO_printf(bio_err,"Certificate is to be certified until ");
D
Dr. Stephen Henson 已提交
2120
	ASN1_TIME_print(bio_err,X509_get_notAfter(ret));
2121
	if (days) BIO_printf(bio_err," (%ld days)",days);
2122
	BIO_printf(bio_err, "\n");
2123 2124 2125

	if (!batch)
		{
2126

2127
		BIO_printf(bio_err,"Sign the certificate? [y/n]:");
B
Bodo Möller 已提交
2128
		(void)BIO_flush(bio_err);
2129
		buf[0]='\0';
2130 2131 2132 2133 2134 2135
		if (!fgets(buf,sizeof(buf)-1,stdin))
			{
			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
			ok=0;
			goto err;
			}
2136 2137 2138 2139 2140 2141 2142 2143
		if (!((buf[0] == 'y') || (buf[0] == 'Y')))
			{
			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED\n");
			ok=0;
			goto err;
			}
		}

2144 2145
	pktmp=X509_get_pubkey(ret);
	if (EVP_PKEY_missing_parameters(pktmp) &&
2146 2147
		!EVP_PKEY_missing_parameters(pkey))
		EVP_PKEY_copy_parameters(pktmp,pkey);
2148
	EVP_PKEY_free(pktmp);
2149 2150 2151 2152 2153

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

	/* We now just add it to the database */
2154
	row[DB_type]=(char *)OPENSSL_malloc(2);
2155 2156

	tm=X509_get_notAfter(ret);
2157
	row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2158 2159 2160 2161 2162 2163
	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 */
2164
	row[DB_file]=(char *)OPENSSL_malloc(8);
2165
	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(ret),NULL,0);
2166 2167

	if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
2168
		(row[DB_file] == NULL) || (row[DB_name] == NULL))
2169
		{
2170
		BIO_printf(bio_err,"Memory allocation failure\n");
2171 2172
		goto err;
		}
2173
	BUF_strlcpy(row[DB_file],"unknown",8);
2174 2175 2176
	row[DB_type][0]='V';
	row[DB_type][1]='\0';

2177
	if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2178
		{
2179
		BIO_printf(bio_err,"Memory allocation failure\n");
2180 2181 2182 2183 2184 2185 2186 2187 2188 2189
		goto err;
		}

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

2190
	if (!TXT_DB_insert(db->db,irow))
2191 2192
		{
		BIO_printf(bio_err,"failed to update database\n");
2193
		BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
2194 2195 2196 2197 2198
		goto err;
		}
	ok=1;
err:
	for (i=0; i<DB_NUMBER; i++)
2199
		if (row[i] != NULL) OPENSSL_free(row[i]);
2200 2201 2202 2203 2204

	if (CAname != NULL)
		X509_NAME_free(CAname);
	if (subject != NULL)
		X509_NAME_free(subject);
2205 2206
	if ((dn_subject != NULL) && !email_dn)
		X509_NAME_free(dn_subject);
2207 2208
	if (tmptm != NULL)
		ASN1_UTCTIME_free(tmptm);
2209 2210 2211 2212 2213 2214 2215 2216 2217 2218
	if (ok <= 0)
		{
		if (ret != NULL) X509_free(ret);
		ret=NULL;
		}
	else
		*xret=ret;
	return(ok);
	}

D
 
Dr. Stephen Henson 已提交
2219
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
2220 2221 2222 2223 2224 2225 2226
	{

	if (output_der)
		{
		(void)i2d_X509_bio(bp,x);
		return;
		}
D
 
Dr. Stephen Henson 已提交
2227 2228
#if 0
	/* ??? Not needed since X509_print prints all this stuff anyway */
2229 2230 2231 2232 2233 2234 2235 2236 2237
	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 已提交
2238
#endif
2239
	if (!notext)X509_print(bp,x);
2240 2241 2242
	PEM_write_bio_X509(bp,x);
	}

U
Ulf Möller 已提交
2243
static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
2244
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
D
Dr. Stephen Henson 已提交
2245
	     BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
2246
	     long days, char *ext_sect, CONF *lconf, int verbose, unsigned long certopt,
D
 
Dr. Stephen Henson 已提交
2247
	     unsigned long nameopt, int default_op, int ext_copy)
2248
	{
2249
	STACK_OF(CONF_VALUE) *sk=NULL;
B
Ben Laurie 已提交
2250
	LHASH_OF(CONF_VALUE) *parms=NULL;
2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276
	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");
2277
	if (sk_CONF_VALUE_num(sk) == 0)
2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305
		{
		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++)
		{
2306
		if (sk_CONF_VALUE_num(sk) <= i) break;
2307

2308
		cv=sk_CONF_VALUE_value(sk,i);
2309
		type=cv->name;
2310 2311 2312
		/* Skip past any leading X. X: X, etc to allow for
		 * multiple instances
		 */
2313 2314 2315 2316 2317 2318 2319
		for (buf = cv->name; *buf ; buf++)
			if ((*buf == ':') || (*buf == ',') || (*buf == '.'))
				{
				buf++;
				if (*buf) type = buf;
				break;
				}
2320

2321
		buf=cv->value;
2322 2323 2324 2325
		if ((nid=OBJ_txt2nid(type)) == NID_undef)
			{
			if (strcmp(type, "SPKAC") == 0)
				{
2326
				spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
2327 2328 2329 2330 2331 2332 2333 2334 2335 2336
				if (spki == NULL)
					{
					BIO_printf(bio_err,"unable to load Netscape SPKAC structure\n");
					ERR_print_errors(bio_err);
					goto err;
					}
				}
			continue;
			}

2337 2338 2339 2340 2341
		/*
		if ((nid == NID_pkcs9_emailAddress) && (email_dn == 0))
			continue;
		*/
		
2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354
		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;

2355
		if (!X509_NAME_add_entry(n,ne,-1, 0)) goto err;
2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369
		}
	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");

2370
	if ((pktmp=NETSCAPE_SPKI_get_pubkey(spki)) == NULL)
2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384
		{
		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);
2385
	EVP_PKEY_free(pktmp);
D
Dr. Stephen Henson 已提交
2386
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,
D
 
Dr. Stephen Henson 已提交
2387
		   days,1,verbose,req,ext_sect,lconf, certopt, nameopt, default_op,
2388
			ext_copy, 0);
2389 2390 2391 2392 2393 2394 2395 2396 2397
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 已提交
2398
static int fix_data(int nid, int *type)
2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412
	{
	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);
	}

D
Dr. Stephen Henson 已提交
2413
static int check_time_format(const char *str)
2414
	{
D
Dr. Stephen Henson 已提交
2415
	return ASN1_TIME_set_string(NULL, str);
2416 2417
	}

2418
static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
2419
	{
2420
	ASN1_UTCTIME *tm=NULL;
2421
	char *row[DB_NUMBER],**rrow,**irow;
2422
	char *rev_str = NULL;
2423
	BIGNUM *bn = NULL;
2424 2425 2426 2427
	int ok=-1,i;

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

		/* We now just add it to the database */
2451
		row[DB_type]=(char *)OPENSSL_malloc(2);
2452 2453

		tm=X509_get_notAfter(x509);
2454
		row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2455 2456 2457 2458 2459 2460
		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 */
2461
		row[DB_file]=(char *)OPENSSL_malloc(8);
2462 2463 2464 2465 2466 2467

		/* row[DB_name] done already */

		if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
			(row[DB_file] == NULL))
			{
2468
			BIO_printf(bio_err,"Memory allocation failure\n");
2469 2470
			goto err;
			}
2471
		BUF_strlcpy(row[DB_file],"unknown",8);
2472 2473 2474
		row[DB_type][0]='V';
		row[DB_type][1]='\0';

2475
		if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2476
			{
2477
			BIO_printf(bio_err,"Memory allocation failure\n");
2478 2479 2480 2481 2482 2483 2484 2485 2486 2487
			goto err;
			}

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

2488
		if (!TXT_DB_insert(db->db,irow))
2489 2490
			{
			BIO_printf(bio_err,"failed to update database\n");
2491
			BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
2492 2493 2494 2495
			goto err;
			}

		/* Revoke Certificate */
2496
		ok = do_revoke(x509,db, type, value);
2497 2498 2499 2500

		goto err;

		}
D
Dr. Stephen Henson 已提交
2501
	else if (index_name_cmp_noconst(row, rrow))
2502
		{
2503 2504
		BIO_printf(bio_err,"ERROR:name does not match %s\n",
			   row[DB_name]);
2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515
		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]);
2516 2517 2518 2519 2520 2521
		rev_str = make_revocation_str(type, value);
		if (!rev_str)
			{
			BIO_printf(bio_err, "Error in revocation arguments\n");
			goto err;
			}
2522 2523
		rrow[DB_type][0]='R';
		rrow[DB_type][1]='\0';
2524
		rrow[DB_rev_date] = rev_str;
2525 2526
		}
	ok=1;
2527
err:
2528 2529 2530
	for (i=0; i<DB_NUMBER; i++)
		{
		if (row[i] != NULL) 
2531
			OPENSSL_free(row[i]);
2532 2533
		}
	return(ok);
2534 2535
	}

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

	ok=1;

	/* Search for the certificate */
2577
	rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
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 2615 2616 2617 2618 2619 2620 2621 2622 2623
	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);
	}

2624
static int do_updatedb (CA_DB *db)
2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648
	{
	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;
2649

D
Dr. Stephen Henson 已提交
2650
	for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++)
2651
		{
D
Dr. Stephen Henson 已提交
2652
		rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
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 2686 2687 2688 2689 2690 2691 2692 2693 2694

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

N
Nils Larsch 已提交
2696
static const char *crl_reasons[] = {
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
	/* CRL reason strings */
	"unspecified",
	"keyCompromise",
	"CACompromise",
	"affiliationChanged",
	"superseded", 
	"cessationOfOperation",
	"certificateHold",
	"removeFromCRL",
	/* Additional pseudo reasons */
	"holdInstruction",
	"keyTime",
	"CAkeyTime"
};

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

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

char *make_revocation_str(int rev_type, char *rev_arg)
	{
N
Nils Larsch 已提交
2724 2725
	char *other = NULL, *str;
	const char *reason = NULL;
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
	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;

2796
	BUF_strlcpy(str, (char *)revtm->data, i);
2797 2798
	if (reason)
		{
2799 2800
		BUF_strlcat(str, ",", i);
		BUF_strlcat(str, reason, i);
2801 2802 2803
		}
	if (other)
		{
2804 2805
		BUF_strlcat(str, ",", i);
		BUF_strlcat(str, other, i);
2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817
		}
	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 已提交
2818

N
Nils Larsch 已提交
2819
int make_revoked(X509_REVOKED *rev, const char *str)
2820 2821 2822 2823 2824 2825 2826 2827
	{
	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 已提交
2828
	ASN1_TIME *revDate = NULL;
2829

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

D
 
Dr. Stephen Henson 已提交
2832
	if (i == 0)
2833 2834
		goto err;

D
 
Dr. Stephen Henson 已提交
2835 2836 2837
	if (rev && !X509_REVOKED_set_revocationDate(rev, revDate))
		goto err;

2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867
	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 已提交
2868
	ASN1_TIME_free(revDate);
2869 2870 2871

	return ret;
	}
2872

D
 
Dr. Stephen Henson 已提交
2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910
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 已提交
2911

N
Nils Larsch 已提交
2912
int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold, ASN1_GENERALIZEDTIME **pinvtm, const char *str)
D
 
Dr. Stephen Henson 已提交
2913 2914 2915 2916
	{
	char *tmp = NULL;
	char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
	int reason_code = -1;
2917 2918
	int ret = 0;
	unsigned int i;
D
 
Dr. Stephen Henson 已提交
2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007
	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 已提交
3008 3009
	ret = 1;

D
 
Dr. Stephen Henson 已提交
3010 3011 3012 3013 3014 3015 3016 3017
	err:

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

	return ret;
	}