ca.c 73.7 KB
Newer Older
1
/* apps/ca.c */
2
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */

/* The PPKI stuff has been donated by Jeff Barber <jeffb@issl.atl.hp.com> */

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
64
#include <ctype.h>
65 66 67
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
68 69 70 71 72 73 74 75 76
#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>
77
#include <openssl/ocsp.h>
78
#include <openssl/pem.h>
79
#include <openssl/engine.h>
80

81 82 83 84 85 86
#ifdef OPENSSL_SYS_WINDOWS
#define strcasecmp _stricmp
#else
#include <strings.h>
#endif

87
#ifndef W_OK
88
#  ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
#    if defined(__DECC)
#      include <unistd.h>
#    else
#      include <unixlib.h>
#    endif
#  else
#    include <sys/file.h>
#  endif
#endif

#ifndef W_OK
#  define F_OK 0
#  define X_OK 1
#  define W_OK 2
#  define R_OK 4
104 105 106 107 108 109
#endif

#undef PROG
#define PROG ca_main

#define BASE_SECTION	"ca"
U
Ulf Möller 已提交
110
#define CONFIG_FILE "openssl.cnf"
111 112 113 114 115 116 117 118 119 120 121 122 123 124

#define ENV_DEFAULT_CA		"default_ca"

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

#define ENV_DATABASE		"database"

#define DB_type         0
#define DB_exp_date     1
#define DB_rev_date     2
#define DB_serial       3       /* index - unique */
#define DB_file         4       
#define DB_name         5       /* index - unique for active */
#define DB_NUMBER       6

#define DB_TYPE_REV	'R'
#define DB_TYPE_EXP	'E'
#define DB_TYPE_VAL	'V'

153 154 155 156 157 158 159 160
/* 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 */

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

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

static void lookup_fail(char *name,char *tag);
206 207 208
static unsigned long index_serial_hash(const char **a);
static int index_serial_cmp(const char **a, const char **b);
static unsigned long index_name_hash(const char **a);
209
static int index_name_qual(char **a);
210
static int index_name_cmp(const char **a,const char **b);
211 212 213
static BIGNUM *load_serial(char *serialfile);
static int save_serial(char *serialfile, BIGNUM *serial);
static int certify(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
214
		   const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,TXT_DB *db,
215
		   BIGNUM *serial, char *subj, char *startdate,char *enddate,
D
 
Dr. Stephen Henson 已提交
216
		   long days, int batch, char *ext_sect, CONF *conf,int verbose,
D
 
Dr. Stephen Henson 已提交
217 218
		   unsigned long certopt, unsigned long nameopt, int default_op,
		   int ext_copy);
219
static int certify_cert(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
220
			const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,
221
			TXT_DB *db, BIGNUM *serial, char *subj, char *startdate,
D
 
Dr. Stephen Henson 已提交
222 223
			char *enddate, long days, int batch, char *ext_sect,
			CONF *conf,int verbose, unsigned long certopt,
224 225
			unsigned long nameopt, int default_op, int ext_copy,
			ENGINE *e);
226
static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
227
			 const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,
228
			 TXT_DB *db, BIGNUM *serial,char *subj, char *startdate,
D
 
Dr. Stephen Henson 已提交
229
			 char *enddate, long days, char *ext_sect,CONF *conf,
D
 
Dr. Stephen Henson 已提交
230 231
			 int verbose, unsigned long certopt, unsigned long nameopt,
			 int default_op, int ext_copy);
232
static int fix_data(int nid, int *type);
D
 
Dr. Stephen Henson 已提交
233
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
B
Ben Laurie 已提交
234
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
235
	STACK_OF(CONF_VALUE) *policy, TXT_DB *db, BIGNUM *serial,char *subj,
D
 
Dr. Stephen Henson 已提交
236 237
	char *startdate, char *enddate, long days, int batch, int verbose,
	X509_REQ *req, char *ext_sect, CONF *conf,
D
 
Dr. Stephen Henson 已提交
238 239
	unsigned long certopt, unsigned long nameopt, int default_op,
	int ext_copy);
240
static X509_NAME *do_subject(char *subject);
241
static int do_revoke(X509 *x509, TXT_DB *db, int ext, char *extval);
242 243
static int get_certificate_status(const char *ser_status, TXT_DB *db);
static int do_updatedb(TXT_DB *db);
244
static int check_time_format(char *str);
245 246
char *make_revocation_str(int rev_type, char *rev_arg);
int make_revoked(X509_REVOKED *rev, char *str);
D
 
Dr. Stephen Henson 已提交
247
int old_entry_print(BIO *bp, ASN1_OBJECT *obj, ASN1_STRING *str);
D
 
Dr. Stephen Henson 已提交
248 249
static CONF *conf=NULL;
static CONF *extconf=NULL;
250 251 252 253 254
static char *section=NULL;

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

B
Ben Laurie 已提交
255 256 257 258
static IMPLEMENT_LHASH_HASH_FN(index_serial_hash,const char **)
static IMPLEMENT_LHASH_COMP_FN(index_serial_cmp,const char **)
static IMPLEMENT_LHASH_HASH_FN(index_name_hash,const char **)
static IMPLEMENT_LHASH_COMP_FN(index_name_cmp,const char **)
259 260


261 262
int MAIN(int, char **);

U
Ulf Möller 已提交
263
int MAIN(int argc, char **argv)
264
	{
265
	ENGINE *e = NULL;
266
	char *key=NULL,*passargin=NULL;
267 268 269 270 271 272 273
	int total=0;
	int total_done=0;
	int badops=0;
	int ret=1;
	int req=0;
	int verbose=0;
	int gencrl=0;
274
	int dorevoke=0;
275
	int doupdatedb=0;
276 277 278 279 280 281 282 283
	long crldays=0;
	long crlhours=0;
	long errorline= -1;
	char *configfile=NULL;
	char *md=NULL;
	char *policy=NULL;
	char *keyfile=NULL;
	char *certfile=NULL;
284
	int keyform=FORMAT_PEM;
285 286
	char *infile=NULL;
	char *spkac_file=NULL;
287
	char *ss_cert_file=NULL;
288
	char *ser_status=NULL;
289 290 291 292 293 294
	EVP_PKEY *pkey=NULL;
	int output_der = 0;
	char *outfile=NULL;
	char *outdir=NULL;
	char *serialfile=NULL;
	char *extensions=NULL;
295
	char *extfile=NULL;
296
	char *subj=NULL;
297
	char *crl_ext=NULL;
298 299
	int rev_type = REV_NONE;
	char *rev_arg = NULL;
300
	BIGNUM *serial=NULL;
301
	char *startdate=NULL;
302
	char *enddate=NULL;
D
 
Dr. Stephen Henson 已提交
303
	long days=0;
304
	int batch=0;
D
 
Dr. Stephen Henson 已提交
305
	int notext=0;
D
 
Dr. Stephen Henson 已提交
306 307
	unsigned long nameopt = 0, certopt = 0;
	int default_op = 1;
308
	int ext_copy = EXT_COPY_NONE;
309 310 311 312 313 314 315 316 317 318 319
	X509 *x509=NULL;
	X509 *x=NULL;
	BIO *in=NULL,*out=NULL,*Sout=NULL,*Cout=NULL;
	char *dbfile=NULL;
	TXT_DB *db=NULL;
	X509_CRL *crl=NULL;
	X509_CRL_INFO *ci=NULL;
	X509_REVOKED *r=NULL;
	char **pp,*p,*f;
	int i,j;
	long l;
B
Ben Laurie 已提交
320
	const EVP_MD *dgst=NULL;
321
	STACK_OF(CONF_VALUE) *attribs=NULL;
B
Ben Laurie 已提交
322
	STACK_OF(X509) *cert_sk=NULL;
323 324 325
#undef BSIZE
#define BSIZE 256
	MS_STATIC char buf[3][BSIZE];
B
Ben Laurie 已提交
326
	char *randfile=NULL;
327
	char *engine = NULL;
328 329 330 331 332 333 334 335 336

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

	apps_startup();

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

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

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

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

	ERR_load_crypto_strings();

553
        e = setup_engine(bio_err, engine, 0);
554

555
	/*****************************************************************/
556 557
	if (configfile == NULL) configfile = getenv("OPENSSL_CONF");
	if (configfile == NULL) configfile = getenv("SSLEAY_CONF");
558 559 560
	if (configfile == NULL)
		{
		/* We will just use 'buf[0]' as a temporary buffer.  */
561
#ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
562 563 564
		strncpy(buf[0],X509_get_default_cert_area(),
			sizeof(buf[0])-1-sizeof(CONFIG_FILE));
#else
565 566 567
		strncpy(buf[0],X509_get_default_cert_area(),
			sizeof(buf[0])-2-sizeof(CONFIG_FILE));
		strcat(buf[0],"/");
U
Ulf Möller 已提交
568
#endif
569 570 571 572 573
		strcat(buf[0],CONFIG_FILE);
		configfile=buf[0];
		}

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

	/* Lets get the config section we are using */
	if (section == NULL)
		{
D
 
Dr. Stephen Henson 已提交
589
		section=NCONF_get_string(conf,BASE_SECTION,ENV_DEFAULT_CA);
590 591 592 593 594 595 596
		if (section == NULL)
			{
			lookup_fail(BASE_SECTION,ENV_DEFAULT_CA);
			goto err;
			}
		}

597 598
	if (conf != NULL)
		{
D
 
Dr. Stephen Henson 已提交
599
		p=NCONF_get_string(conf,NULL,"oid_file");
600 601
		if (p == NULL)
			ERR_clear_error();
602 603 604 605 606 607 608 609 610 611 612
		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 已提交
613
				ERR_clear_error();
614 615 616 617 618 619 620
				}
			else
				{
				OBJ_create_objects(oid_bio);
				BIO_free(oid_bio);
				}
			}
621
		if (!add_oid_section(bio_err,conf)) 
622
			{
623 624
			ERR_print_errors(bio_err);
			goto err;
625
			}
626
		}
627

D
 
Dr. Stephen Henson 已提交
628
	randfile = NCONF_get_string(conf, BASE_SECTION, "RANDFILE");
629 630
	if (randfile == NULL)
		ERR_clear_error();
631 632
	app_RAND_load_file(randfile, bio_err, 0);
	
633 634 635 636 637 638 639 640 641 642 643
	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;
		}

	/*****************************************************************/
644 645 646
	/* report status of cert with serial number given on command line */
	if (ser_status)
	{
D
 
Dr. Stephen Henson 已提交
647
		if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678
			{
			lookup_fail(section,ENV_DATABASE);
			goto err;
			}
		if (BIO_read_filename(in,dbfile) <= 0)
			{
			perror(dbfile);
			BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
			goto err;
			}
		db=TXT_DB_read(in,DB_NUMBER);
		if (db == NULL) goto err;

		if (!TXT_DB_create_index(db, DB_serial, NULL,
					LHASH_HASH_FN(index_serial_hash),
					LHASH_COMP_FN(index_serial_cmp)))
			{
			BIO_printf(bio_err,
			  "error creating serial number index:(%ld,%ld,%ld)\n",
			  			db->error,db->arg1,db->arg2);
			goto err;
			}

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

	/*****************************************************************/
	/* we definitely need a public key, so let's get it */
679

D
 
Dr. Stephen Henson 已提交
680
	if ((keyfile == NULL) && ((keyfile=NCONF_get_string(conf,
681 682 683 684 685
		section,ENV_PRIVATE_KEY)) == NULL))
		{
		lookup_fail(section,ENV_PRIVATE_KEY);
		goto err;
		}
686
	if (!key && !app_passwd(bio_err, passargin, NULL, &key, NULL))
687 688 689 690
		{
		BIO_printf(bio_err,"Error getting password\n");
		goto err;
		}
691 692
	pkey = load_key(bio_err, keyfile, keyform, key, e, 
		"CA private key");
693
	if (key) memset(key,0,strlen(key));
694 695
	if (pkey == NULL)
		{
696
		/* load_key() has already printed an appropriate message */
697 698 699 700 701
		goto err;
		}

	/*****************************************************************/
	/* we need a certificate */
D
 
Dr. Stephen Henson 已提交
702
	if ((certfile == NULL) && ((certfile=NCONF_get_string(conf,
703 704 705 706 707
		section,ENV_CERTIFICATE)) == NULL))
		{
		lookup_fail(section,ENV_CERTIFICATE);
		goto err;
		}
708 709
	x509=load_cert(bio_err, certfile, FORMAT_PEM, NULL, e,
		"CA certificate");
710 711 712
	if (x509 == NULL)
		goto err;

713 714 715 716 717 718
	if (!X509_check_private_key(x509,pkey))
		{
		BIO_printf(bio_err,"CA certificate and CA private key do not match\n");
		goto err;
		}

D
 
Dr. Stephen Henson 已提交
719
	f=NCONF_get_string(conf,BASE_SECTION,ENV_PRESERVE);
720 721
	if (f == NULL)
		ERR_clear_error();
722 723
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		preserve=1;
D
 
Dr. Stephen Henson 已提交
724
	f=NCONF_get_string(conf,BASE_SECTION,ENV_MSIE_HACK);
725 726
	if (f == NULL)
		ERR_clear_error();
727 728 729
	if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
		msie_hack=1;

D
 
Dr. Stephen Henson 已提交
730
	f=NCONF_get_string(conf,section,ENV_NAMEOPT);
D
 
Dr. Stephen Henson 已提交
731 732 733 734 735 736 737 738 739 740 741 742 743

	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 已提交
744
	f=NCONF_get_string(conf,section,ENV_CERTOPT);
D
 
Dr. Stephen Henson 已提交
745 746 747 748 749 750 751 752 753 754 755 756 757

	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 已提交
758
	f=NCONF_get_string(conf,section,ENV_EXTCOPY);
759 760 761 762 763 764 765 766 767 768 769

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

771 772 773 774 775 776
	/*****************************************************************/
	/* lookup where to write new certificates */
	if ((outdir == NULL) && (req))
		{
		struct stat sb;

D
 
Dr. Stephen Henson 已提交
777
		if ((outdir=NCONF_get_string(conf,section,ENV_NEW_CERTS_DIR))
778 779 780 781 782
			== NULL)
			{
			BIO_printf(bio_err,"there needs to be defined a directory for new certificate to be placed in\n");
			goto err;
			}
783 784
#ifndef OPENSSL_SYS_VMS
	    /* outdir is a directory spec, but access() for VMS demands a
785 786 787 788 789 790 791 792
	       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.
793
	    */
794 795
		if (access(outdir,R_OK|W_OK|X_OK) != 0)
			{
U
Ulf Möller 已提交
796
			BIO_printf(bio_err,"I am unable to access the %s directory\n",outdir);
797 798 799 800 801 802 803 804 805 806
			perror(outdir);
			goto err;
			}

		if (stat(outdir,&sb) != 0)
			{
			BIO_printf(bio_err,"unable to stat(%s)\n",outdir);
			perror(outdir);
			goto err;
			}
807
#ifdef S_IFDIR
808 809 810 811 812 813
		if (!(sb.st_mode & S_IFDIR))
			{
			BIO_printf(bio_err,"%s need to be a directory\n",outdir);
			perror(outdir);
			goto err;
			}
814
#endif
815
#endif
816 817 818 819
		}

	/*****************************************************************/
	/* we need to load the database file */
D
 
Dr. Stephen Henson 已提交
820
	if ((dbfile=NCONF_get_string(conf,section,ENV_DATABASE)) == NULL)
821 822 823 824
		{
		lookup_fail(section,ENV_DATABASE);
		goto err;
		}
825
	if (BIO_read_filename(in,dbfile) <= 0)
826 827 828 829 830 831 832 833 834 835 836 837 838 839 840
		{
		perror(dbfile);
		BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
		goto err;
		}
	db=TXT_DB_read(in,DB_NUMBER);
	if (db == NULL) goto err;

	/* Lets check some fields */
	for (i=0; i<sk_num(db->data); i++)
		{
		pp=(char **)sk_value(db->data,i);
		if ((pp[DB_type][0] != DB_TYPE_REV) &&
			(pp[DB_rev_date][0] != '\0'))
			{
841
			BIO_printf(bio_err,"entry %d: not revoked yet, but has a revocation date\n",i+1);
842 843 844
			goto err;
			}
		if ((pp[DB_type][0] == DB_TYPE_REV) &&
845
			!make_revoked(NULL, pp[DB_rev_date]))
846
			{
847
			BIO_printf(bio_err," in entry %d\n", i+1);
848 849 850 851 852 853 854 855 856
			goto err;
			}
		if (!check_time_format(pp[DB_exp_date]))
			{
			BIO_printf(bio_err,"entry %d: invalid expiry date\n",i+1);
			goto err;
			}
		p=pp[DB_serial];
		j=strlen(p);
857 858 859 860 861
		if (*p == '-')
			{
			p++;
			j--;
			}
862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880
		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)
		{
881
		BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT); /* cannot fail */
882
#ifdef OPENSSL_SYS_VMS
883 884 885 886 887
		{
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
		out = BIO_push(tmpbio, out);
		}
#endif
888 889 890
		TXT_DB_write(out,db);
		BIO_printf(bio_err,"%d entries loaded from the database\n",
			db->data->num);
U
Ulf Möller 已提交
891
		BIO_printf(bio_err,"generating index\n");
892 893
		}
	
894
	if (!TXT_DB_create_index(db, DB_serial, NULL,
895 896
			LHASH_HASH_FN(index_serial_hash),
			LHASH_COMP_FN(index_serial_cmp)))
897 898 899 900 901
		{
		BIO_printf(bio_err,"error creating serial number index:(%ld,%ld,%ld)\n",db->error,db->arg1,db->arg2);
		goto err;
		}

902
	if (!TXT_DB_create_index(db, DB_name, index_name_qual,
903 904
			LHASH_HASH_FN(index_name_hash),
			LHASH_COMP_FN(index_name_cmp)))
905 906 907 908 909 910
		{
		BIO_printf(bio_err,"error creating name index:(%ld,%ld,%ld)\n",
			db->error,db->arg1,db->arg2);
		goto err;
		}

911 912 913 914 915 916 917 918 919 920 921 922 923
	/*****************************************************************/
	/* 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;
924
			}
925
		else if (i == 0)
926
			{
927 928 929 930 931 932 933 934 935 936 937 938
			if (verbose) BIO_printf(bio_err,
					"No entries found to mark expired\n"); 
			}
	    	else
			{
			out = BIO_new(BIO_s_file());
			if (out == NULL)
				{
				ERR_print_errors(bio_err);
				goto err;
				}

939
#ifndef OPENSSL_SYS_VMS
940
			j = BIO_snprintf(buf[0], sizeof buf[0], "%s.new", dbfile);
941 942 943
#else
			j = BIO_snprintf(buf[0], sizeof buf[0], "%s-new", dbfile);
#endif
944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960
			if (j < 0 || j >= sizeof buf[0])
				{
				BIO_printf(bio_err, "file name too long\n");
				goto err;
				}
			if (BIO_write_filename(out,buf[0]) <= 0)
		  		{
		    		perror(dbfile);
		    		BIO_printf(bio_err,"unable to open '%s'\n",
									dbfile);
		    		goto err;
		  		}
			j=TXT_DB_write(out,db);
			if (j <= 0) goto err;
			
			BIO_free(out);
			out = NULL;
961
#ifndef OPENSSL_SYS_VMS
962
			j = BIO_snprintf(buf[1], sizeof buf[1], "%s.old", dbfile);
963 964 965
#else
			j = BIO_snprintf(buf[1], sizeof buf[1], "%s-old", dbfile);
#endif
966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994
			if (j < 0 || j >= sizeof buf[1])
				{
				BIO_printf(bio_err, "file name too long\n");
				goto err;
				}
			if (rename(dbfile,buf[1]) < 0)
		  		{
		    		BIO_printf(bio_err,
						"unable to rename %s to %s\n",
						dbfile, buf[1]);
		    		perror("reason");
		    		goto err;
		  		}
			if (rename(buf[0],dbfile) < 0)
				{
		    		BIO_printf(bio_err,
						"unable to rename %s to %s\n",
						buf[0],dbfile);
		    		perror("reason");
		    		rename(buf[1],dbfile);
		    		goto err;
		  		}
				
			if (verbose) BIO_printf(bio_err,
				"Done. %d entries marked as expired\n",i); 
	      		}
			goto err;
	  	}

995 996 997 998
 	/*****************************************************************/
	/* Read extentions config file                                   */
	if (extfile)
		{
D
 
Dr. Stephen Henson 已提交
999 1000
		extconf = NCONF_new(NULL);
		if (NCONF_load(extconf,extfile,&errorline) <= 0)
1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015
			{
			if (errorline <= 0)
				BIO_printf(bio_err, "ERROR: loading the config file '%s'\n",
					extfile);
			else
				BIO_printf(bio_err, "ERROR: on line %ld of config file '%s'\n",
					errorline,extfile);
			ret = 1;
			goto err;
			}

		if (verbose)
			BIO_printf(bio_err, "Succesfully loaded extensions file %s\n", extfile);

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

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

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

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

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

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

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

		if ((serial=load_serial(serialfile)) == NULL)
			{
			BIO_printf(bio_err,"error while loading serial number\n");
			goto err;
			}
		if (verbose)
			{
1149
			if ((f=BN_bn2hex(serial)) == NULL) goto err;
1150
			BIO_printf(bio_err,"next serial number is %s\n",f);
1151
			OPENSSL_free(f);
1152 1153
			}

D
 
Dr. Stephen Henson 已提交
1154
		if ((attribs=NCONF_get_section(conf,policy)) == NULL)
1155 1156 1157 1158 1159
			{
			BIO_printf(bio_err,"unable to find 'section' for %s\n",policy);
			goto err;
			}

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

B
Ben Laurie 已提交
1253
		if (sk_X509_num(cert_sk) > 0)
1254 1255 1256 1257
			{
			if (!batch)
				{
				BIO_printf(bio_err,"\n%d out of %d certificate requests certified, commit? [y/n]",total_done,total);
B
Bodo Möller 已提交
1258
				(void)BIO_flush(bio_err);
1259 1260 1261 1262 1263 1264 1265 1266 1267 1268
				buf[0][0]='\0';
				fgets(buf[0],10,stdin);
				if ((buf[0][0] != 'y') && (buf[0][0] != 'Y'))
					{
					BIO_printf(bio_err,"CERTIFICATION CANCELED\n"); 
					ret=0;
					goto err;
					}
				}

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

			strncpy(buf[0],serialfile,BSIZE-4);
U
Ulf Möller 已提交
1272

1273
#ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
1274 1275
			strcat(buf[0],"-new");
#else
1276
			strcat(buf[0],".new");
U
Ulf Möller 已提交
1277
#endif
1278 1279 1280 1281

			if (!save_serial(buf[0],serial)) goto err;

			strncpy(buf[1],dbfile,BSIZE-4);
U
Ulf Möller 已提交
1282

1283
#ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
1284 1285
			strcat(buf[1],"-new");
#else
1286
			strcat(buf[1],".new");
U
Ulf Möller 已提交
1287 1288
#endif

1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300
			if (BIO_write_filename(out,buf[1]) <= 0)
				{
				perror(dbfile);
				BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
				goto err;
				}
			l=TXT_DB_write(out,db);
			if (l <= 0) goto err;
			}
	
		if (verbose)
			BIO_printf(bio_err,"writing new certificates\n");
B
Ben Laurie 已提交
1301
		for (i=0; i<sk_X509_num(cert_sk); i++)
1302 1303 1304 1305
			{
			int k;
			unsigned char *n;

B
Ben Laurie 已提交
1306
			x=sk_X509_value(cert_sk,i);
1307 1308 1309 1310 1311

			j=x->cert_info->serialNumber->length;
			p=(char *)x->cert_info->serialNumber->data;
			
			strncpy(buf[2],outdir,BSIZE-(j*2)-6);
U
Ulf Möller 已提交
1312

1313
#ifndef OPENSSL_SYS_VMS
1314
			strcat(buf[2],"/");
U
Ulf Möller 已提交
1315 1316
#endif

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

B
Ben Laurie 已提交
1345
		if (sk_X509_num(cert_sk))
1346 1347 1348
			{
			/* Rename the database and the serial file */
			strncpy(buf[2],serialfile,BSIZE-4);
U
Ulf Möller 已提交
1349

1350
#ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
1351 1352
			strcat(buf[2],"-old");
#else
1353
			strcat(buf[2],".old");
U
Ulf Möller 已提交
1354 1355
#endif

1356
			BIO_free(in);
1357
			BIO_free_all(out);
1358 1359 1360 1361
			in=NULL;
			out=NULL;
			if (rename(serialfile,buf[2]) < 0)
				{
U
Ulf Möller 已提交
1362
				BIO_printf(bio_err,"unable to rename %s to %s\n",
1363 1364 1365 1366 1367 1368
					serialfile,buf[2]);
				perror("reason");
				goto err;
				}
			if (rename(buf[0],serialfile) < 0)
				{
U
Ulf Möller 已提交
1369
				BIO_printf(bio_err,"unable to rename %s to %s\n",
1370 1371 1372 1373 1374 1375 1376
					buf[0],serialfile);
				perror("reason");
				rename(buf[2],serialfile);
				goto err;
				}

			strncpy(buf[2],dbfile,BSIZE-4);
U
Ulf Möller 已提交
1377

1378
#ifdef OPENSSL_SYS_VMS
U
Ulf Möller 已提交
1379 1380
			strcat(buf[2],"-old");
#else
1381
			strcat(buf[2],".old");
U
Ulf Möller 已提交
1382 1383
#endif

1384 1385
			if (rename(dbfile,buf[2]) < 0)
				{
U
Ulf Möller 已提交
1386
				BIO_printf(bio_err,"unable to rename %s to %s\n",
1387 1388 1389 1390 1391 1392
					dbfile,buf[2]);
				perror("reason");
				goto err;
				}
			if (rename(buf[1],dbfile) < 0)
				{
U
Ulf Möller 已提交
1393
				BIO_printf(bio_err,"unable to rename %s to %s\n",
1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405
					buf[1],dbfile);
				perror("reason");
				rename(buf[2],dbfile);
				goto err;
				}
			BIO_printf(bio_err,"Data Base Updated\n");
			}
		}
	
	/*****************************************************************/
	if (gencrl)
		{
1406
		int crl_v2 = 0;
1407 1408
		if (!crl_ext)
			{
D
 
Dr. Stephen Henson 已提交
1409
			crl_ext=NCONF_get_string(conf,section,ENV_CRLEXT);
1410 1411 1412 1413 1414
			if (!crl_ext)
				ERR_clear_error();
			}
		if (crl_ext)
			{
1415
			/* Check syntax of file */
1416 1417
			X509V3_CTX ctx;
			X509V3_set_ctx_test(&ctx);
D
 
Dr. Stephen Henson 已提交
1418 1419
			X509V3_set_nconf(&ctx, conf);
			if (!X509V3_EXT_add_nconf(conf, &ctx, crl_ext, NULL))
1420
				{
1421 1422 1423 1424 1425
				BIO_printf(bio_err,
				 "Error Loading CRL extension section %s\n",
								 crl_ext);
				ret = 1;
				goto err;
1426
				}
1427
			}
1428 1429 1430

		if (!crldays && !crlhours)
			{
D
 
Dr. Stephen Henson 已提交
1431 1432 1433 1434 1435 1436
			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;
1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451
			}
		if ((crldays == 0) && (crlhours == 0))
			{
			BIO_printf(bio_err,"cannot lookup how long until the next CRL is issuer\n");
			goto err;
			}

		if (verbose) BIO_printf(bio_err,"making CRL\n");
		if ((crl=X509_CRL_new()) == NULL) goto err;
		ci=crl->crl;
		X509_NAME_free(ci->issuer);
		ci->issuer=X509_NAME_dup(x509->cert_info->subject);
		if (ci->issuer == NULL) goto err;

		X509_gmtime_adj(ci->lastUpdate,0);
1452 1453
		if (ci->nextUpdate == NULL)
			ci->nextUpdate=ASN1_UTCTIME_new();
1454 1455 1456 1457 1458 1459 1460 1461
		X509_gmtime_adj(ci->nextUpdate,(crldays*24+crlhours)*60*60);

		for (i=0; i<sk_num(db->data); i++)
			{
			pp=(char **)sk_value(db->data,i);
			if (pp[DB_type][0] == DB_TYPE_REV)
				{
				if ((r=X509_REVOKED_new()) == NULL) goto err;
1462 1463 1464
				j = make_revoked(r, pp[DB_rev_date]);
				if (!j) goto err;
				if (j == 2) crl_v2 = 1;
1465 1466 1467 1468 1469 1470
				if (!BN_hex2bn(&serial, pp[DB_serial]))
					goto err;
				r->serialNumber = BN_to_ASN1_INTEGER(serial, r->serialNumber);
				BN_free(serial);
				serial = NULL;
				if (!r->serialNumber)
1471
					goto err;
D
 
Dr. Stephen Henson 已提交
1472
				X509_CRL_add0_revoked(crl,r);
1473 1474 1475 1476
				}
			}
		/* sort the data so it will be written in serial
		 * number order */
B
Ben Laurie 已提交
1477 1478
		sk_X509_REVOKED_sort(ci->revoked);
		for (i=0; i<sk_X509_REVOKED_num(ci->revoked); i++)
1479
			{
B
Ben Laurie 已提交
1480
			r=sk_X509_REVOKED_value(ci->revoked,i);
1481 1482 1483
			r->sequence=i;
			}

1484
		/* we now have a CRL */
1485 1486 1487 1488 1489 1490 1491 1492 1493 1494
		if (verbose) BIO_printf(bio_err,"signing CRL\n");
		if (md != NULL)
			{
			if ((dgst=EVP_get_digestbyname(md)) == NULL)
				{
				BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
				goto err;
				}
			}
		else
1495
			{
1496
#ifndef OPENSSL_NO_DSA
1497 1498 1499
			if (pkey->type == EVP_PKEY_DSA) 
				dgst=EVP_dss1();
			else
1500
#endif
1501 1502
				dgst=EVP_md5();
			}
B
Ben Laurie 已提交
1503

1504 1505
		/* Add any extensions asked for */

1506 1507 1508 1509 1510 1511
		if (crl_ext)
			{
			X509V3_CTX crlctx;
			if (ci->version == NULL)
				if ((ci->version=ASN1_INTEGER_new()) == NULL) goto err;
			X509V3_set_ctx(&crlctx, x509, NULL, NULL, crl, 0);
D
 
Dr. Stephen Henson 已提交
1512
			X509V3_set_nconf(&crlctx, conf);
1513

D
 
Dr. Stephen Henson 已提交
1514
			if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx,
1515 1516
				crl_ext, crl)) goto err;
			}
1517 1518 1519 1520 1521 1522
		if (crl_ext || crl_v2)
			{
			if (ci->version == NULL)
				if ((ci->version=ASN1_INTEGER_new()) == NULL) goto err;
			ASN1_INTEGER_set(ci->version,1); /* version 2 CRL */
			}
1523

1524 1525 1526 1527 1528
		if (!X509_CRL_sign(crl,pkey,dgst)) goto err;

		PEM_write_bio_X509_CRL(Sout,crl);
		}
	/*****************************************************************/
1529
	if (dorevoke)
1530
		{
1531 1532 1533 1534 1535
		if (infile == NULL) 
			{
			BIO_printf(bio_err,"no input files\n");
			goto err;
			}
1536 1537
		else
			{
1538
			X509 *revcert;
1539 1540
			revcert=load_cert(bio_err, infile, FORMAT_PEM,
				NULL, e, infile);
1541
			if (revcert == NULL)
1542
				goto err;
1543
			j=do_revoke(revcert,db, rev_type, rev_arg);
1544 1545
			if (j <= 0) goto err;
			X509_free(revcert);
1546 1547

			strncpy(buf[0],dbfile,BSIZE-4);
1548
#ifndef OPENSSL_SYS_VMS
1549
			strcat(buf[0],".new");
1550 1551 1552
#else
			strcat(buf[0],"-new");
#endif
1553 1554 1555 1556 1557 1558 1559 1560 1561
			if (BIO_write_filename(out,buf[0]) <= 0)
				{
				perror(dbfile);
				BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
				goto err;
				}
			j=TXT_DB_write(out,db);
			if (j <= 0) goto err;
			strncpy(buf[1],dbfile,BSIZE-4);
1562
#ifndef OPENSSL_SYS_VMS
1563
			strcat(buf[1],".old");
1564 1565 1566
#else
			strcat(buf[1],"-old");
#endif
1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581
			if (rename(dbfile,buf[1]) < 0)
				{
				BIO_printf(bio_err,"unable to rename %s to %s\n", dbfile, buf[1]);
				perror("reason");
				goto err;
				}
			if (rename(buf[0],dbfile) < 0)
				{
				BIO_printf(bio_err,"unable to rename %s to %s\n", buf[0],dbfile);
				perror("reason");
				rename(buf[1],dbfile);
				goto err;
				}
			BIO_printf(bio_err,"Data Base Updated\n"); 
			}
1582 1583
		}
	/*****************************************************************/
1584 1585
	ret=0;
err:
1586 1587 1588
	BIO_free_all(Cout);
	BIO_free_all(Sout);
	BIO_free_all(out);
1589
	BIO_free_all(in);
1590

B
Ben Laurie 已提交
1591
	sk_X509_pop_free(cert_sk,X509_free);
1592 1593

	if (ret) ERR_print_errors(bio_err);
1594
	app_RAND_write_file(randfile, bio_err);
1595 1596 1597 1598 1599
	BN_free(serial);
	TXT_DB_free(db);
	EVP_PKEY_free(pkey);
	X509_free(x509);
	X509_CRL_free(crl);
D
 
Dr. Stephen Henson 已提交
1600
	NCONF_free(conf);
1601
	OBJ_cleanup();
1602
	apps_shutdown();
1603 1604 1605
	EXIT(ret);
	}

U
Ulf Möller 已提交
1606
static void lookup_fail(char *name, char *tag)
1607 1608 1609 1610
	{
	BIO_printf(bio_err,"variable lookup failed for %s::%s\n",name,tag);
	}

1611
static unsigned long index_serial_hash(const char **a)
1612
	{
1613
	const char *n;
1614 1615 1616 1617 1618 1619

	n=a[DB_serial];
	while (*n == '0') n++;
	return(lh_strhash(n));
	}

1620
static int index_serial_cmp(const char **a, const char **b)
1621
	{
1622
	const char *aa,*bb;
1623 1624 1625 1626 1627 1628

	for (aa=a[DB_serial]; *aa == '0'; aa++);
	for (bb=b[DB_serial]; *bb == '0'; bb++);
	return(strcmp(aa,bb));
	}

1629
static unsigned long index_name_hash(const char **a)
1630 1631
	{ return(lh_strhash(a[DB_name])); }

U
Ulf Möller 已提交
1632
static int index_name_qual(char **a)
1633 1634
	{ return(a[0][0] == 'V'); }

1635
static int index_name_cmp(const char **a, const char **b)
U
Ulf Möller 已提交
1636 1637
	{ return(strcmp(a[DB_name],
	     b[DB_name])); }
1638

U
Ulf Möller 已提交
1639
static BIGNUM *load_serial(char *serialfile)
1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676
	{
	BIO *in=NULL;
	BIGNUM *ret=NULL;
	MS_STATIC char buf[1024];
	ASN1_INTEGER *ai=NULL;

	if ((in=BIO_new(BIO_s_file())) == NULL)
		{
		ERR_print_errors(bio_err);
		goto err;
		}

	if (BIO_read_filename(in,serialfile) <= 0)
		{
		perror(serialfile);
		goto err;
		}
	ai=ASN1_INTEGER_new();
	if (ai == NULL) goto err;
	if (!a2i_ASN1_INTEGER(in,ai,buf,1024))
		{
		BIO_printf(bio_err,"unable to load number from %s\n",
			serialfile);
		goto err;
		}
	ret=ASN1_INTEGER_to_BN(ai,NULL);
	if (ret == NULL)
		{
		BIO_printf(bio_err,"error converting number from bin to BIGNUM");
		goto err;
		}
err:
	if (in != NULL) BIO_free(in);
	if (ai != NULL) ASN1_INTEGER_free(ai);
	return(ret);
	}

U
Ulf Möller 已提交
1677
static int save_serial(char *serialfile, BIGNUM *serial)
1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703
	{
	BIO *out;
	int ret=0;
	ASN1_INTEGER *ai=NULL;

	out=BIO_new(BIO_s_file());
	if (out == NULL)
		{
		ERR_print_errors(bio_err);
		goto err;
		}
	if (BIO_write_filename(out,serialfile) <= 0)
		{
		perror(serialfile);
		goto err;
		}

	if ((ai=BN_to_ASN1_INTEGER(serial,NULL)) == NULL)
		{
		BIO_printf(bio_err,"error converting serial to ASN.1 format\n");
		goto err;
		}
	i2a_ASN1_INTEGER(out,ai);
	BIO_puts(out,"\n");
	ret=1;
err:
1704
	if (out != NULL) BIO_free_all(out);
1705 1706 1707 1708
	if (ai != NULL) ASN1_INTEGER_free(ai);
	return(ret);
	}

U
Ulf Möller 已提交
1709
static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1710
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, TXT_DB *db,
D
 
Dr. Stephen Henson 已提交
1711 1712
	     BIGNUM *serial, char *subj, char *startdate, char *enddate, long days,
	     int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1713 1714
	     unsigned long certopt, unsigned long nameopt, int default_op,
	     int ext_copy)
1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727
	{
	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;
		}
1728
	if ((req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL)) == NULL)
1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744
		{
		BIO_printf(bio_err,"Error reading certificate request in %s\n",
			infile);
		goto err;
		}
	if (verbose)
		X509_REQ_print(bio_err,req);

	BIO_printf(bio_err,"Check that the request matches the signature\n");

	if ((pktmp=X509_REQ_get_pubkey(req)) == NULL)
		{
		BIO_printf(bio_err,"error unpacking public key\n");
		goto err;
		}
	i=X509_REQ_verify(req,pktmp);
1745
	EVP_PKEY_free(pktmp);
1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760
	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");

1761
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,startdate, enddate,
D
 
Dr. Stephen Henson 已提交
1762 1763
		days,batch,verbose,req,ext_sect,lconf,
		certopt, nameopt, default_op, ext_copy);
1764 1765 1766 1767 1768 1769 1770

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

U
Ulf Möller 已提交
1771
static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
1772
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, TXT_DB *db,
D
 
Dr. Stephen Henson 已提交
1773 1774
	     BIGNUM *serial, char *subj, char *startdate, char *enddate, long days,
	     int batch, char *ext_sect, CONF *lconf, int verbose,
D
 
Dr. Stephen Henson 已提交
1775
	     unsigned long certopt, unsigned long nameopt, int default_op,
1776
	     int ext_copy, ENGINE *e)
1777 1778 1779 1780 1781 1782
	{
	X509 *req=NULL;
	X509_REQ *rreq=NULL;
	EVP_PKEY *pktmp=NULL;
	int ok= -1,i;

1783
	if ((req=load_cert(bio_err, infile, FORMAT_PEM, NULL, e, infile)) == NULL)
1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795
		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);
1796
	EVP_PKEY_free(pktmp);
1797 1798 1799 1800 1801 1802 1803 1804 1805
	if (i < 0)
		{
		ok=0;
		BIO_printf(bio_err,"Signature verification problems....\n");
		goto err;
		}
	if (i == 0)
		{
		ok=0;
1806
		BIO_printf(bio_err,"Signature did not match the certificate\n");
1807 1808 1809 1810 1811 1812 1813 1814
		goto err;
		}
	else
		BIO_printf(bio_err,"Signature ok\n");

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

1815
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,startdate,enddate,days,
D
 
Dr. Stephen Henson 已提交
1816 1817
		batch,verbose,rreq,ext_sect,lconf, certopt, nameopt, default_op,
			ext_copy);
1818 1819 1820 1821 1822 1823 1824

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

U
Ulf Möller 已提交
1825
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
1826
	     STACK_OF(CONF_VALUE) *policy, TXT_DB *db, BIGNUM *serial, char *subj,
D
 
Dr. Stephen Henson 已提交
1827 1828
	     char *startdate, char *enddate, long days, int batch, int verbose,
	     X509_REQ *req, char *ext_sect, CONF *lconf,
D
 
Dr. Stephen Henson 已提交
1829 1830
	     unsigned long certopt, unsigned long nameopt, int default_op,
	     int ext_copy)
1831 1832
	{
	X509_NAME *name=NULL,*CAname=NULL,*subject=NULL;
1833
	ASN1_UTCTIME *tm,*tmptm;
1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844
	ASN1_STRING *str,*str2;
	ASN1_OBJECT *obj;
	X509 *ret=NULL;
	X509_CINF *ci;
	X509_NAME_ENTRY *ne;
	X509_NAME_ENTRY *tne,*push;
	EVP_PKEY *pktmp;
	int ok= -1,i,j,last,nid;
	char *p;
	CONF_VALUE *cv;
	char *row[DB_NUMBER],**rrow,**irow=NULL;
D
 
Dr. Stephen Henson 已提交
1845
	char buf[25];
1846

1847 1848 1849 1850 1851 1852 1853
	tmptm=ASN1_UTCTIME_new();
	if (tmptm == NULL)
		{
		BIO_printf(bio_err,"malloc error\n");
		return(0);
		}

1854 1855 1856
	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;

1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870
	if (subj)
		{
		X509_NAME *n = do_subject(subj);

		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 已提交
1871 1872
	if (default_op)
		BIO_printf(bio_err,"The Subject's Distinguished Name is as follows\n");
1873 1874 1875
	name=X509_REQ_get_subject_name(req);
	for (i=0; i<X509_NAME_entry_count(name); i++)
		{
D
 
Dr. Stephen Henson 已提交
1876
		ne= X509_NAME_get_entry(name,i);
1877
		str=X509_NAME_ENTRY_get_data(ne);
D
 
Dr. Stephen Henson 已提交
1878
		obj=X509_NAME_ENTRY_get_object(ne);
1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912

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

		/* 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;
			}
		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;
			}
D
 
Dr. Stephen Henson 已提交
1913 1914 1915

		if (default_op)
			old_entry_print(bio_err, obj, str);
1916 1917 1918 1919 1920
		}

	/* Ok, now we check the 'policy' stuff. */
	if ((subject=X509_NAME_new()) == NULL)
		{
1921
		BIO_printf(bio_err,"Memory allocation failure\n");
1922 1923 1924 1925 1926 1927 1928 1929
		goto err;
		}

	/* take a copy of the issuer name before we mess with it. */
	CAname=X509_NAME_dup(x509->cert_info->subject);
	if (CAname == NULL) goto err;
	str=str2=NULL;

1930
	for (i=0; i<sk_CONF_VALUE_num(policy); i++)
1931
		{
1932
		cv=sk_CONF_VALUE_value(policy,i); /* get the object id */
1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002
		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)
					{
2003
					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));
2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014
					goto err;
					}
				}
			else
				{
				BIO_printf(bio_err,"%s:invalid type in 'policy' configuration\n",cv->value);
				goto err;
				}

			if (push != NULL)
				{
2015
				if (!X509_NAME_add_entry(subject,push, -1, 0))
2016 2017 2018
					{
					if (push != NULL)
						X509_NAME_ENTRY_free(push);
2019
					BIO_printf(bio_err,"Memory allocation failure\n");
2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034
					goto err;
					}
				}
			if (j < 0) break;
			}
		}

	if (preserve)
		{
		X509_NAME_free(subject);
		subject=X509_NAME_dup(X509_REQ_get_subject_name(req));
		if (subject == NULL) goto err;
		}

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

	row[DB_name]=X509_NAME_oneline(subject,NULL,0);
2038
	row[DB_serial]=BN_bn2hex(serial);
2039 2040
	if ((row[DB_name] == NULL) || (row[DB_serial] == NULL))
		{
2041
		BIO_printf(bio_err,"Memory allocation failure\n");
2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073
		goto err;
		}

	rrow=TXT_DB_get_by_index(db,DB_name,row);
	if (rrow != NULL)
		{
		BIO_printf(bio_err,"ERROR:There is already a certificate for %s\n",
			row[DB_name]);
		}
	else
		{
		rrow=TXT_DB_get_by_index(db,DB_serial,row);
		if (rrow != NULL)
			{
			BIO_printf(bio_err,"ERROR:Serial number %s has already been issued,\n",
				row[DB_serial]);
			BIO_printf(bio_err,"      check the database/serial_file for corruption\n");
			}
		}

	if (rrow != NULL)
		{
		BIO_printf(bio_err,
			"The matching entry has the following details\n");
		if (rrow[DB_type][0] == 'E')
			p="Expired";
		else if (rrow[DB_type][0] == 'R')
			p="Revoked";
		else if (rrow[DB_type][0] == 'V')
			p="Valid";
		else
			p="\ninvalid type, Data base error\n";
2074
		BIO_printf(bio_err,"Type	  :%s\n",p);;
2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091
		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 已提交
2092
	/* We are now totally happy, lets make and sign the certificate */
2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108
	if (verbose)
		BIO_printf(bio_err,"Everything appears to be ok, creating and signing the certificate\n");

	if ((ret=X509_new()) == NULL) goto err;
	ci=ret->cert_info;

#ifdef X509_V3
	/* Make it an X509 v3 certificate. */
	if (!X509_set_version(x509,2)) goto err;
#endif

	if (BN_to_ASN1_INTEGER(serial,ci->serialNumber) == NULL)
		goto err;
	if (!X509_set_issuer_name(ret,X509_get_subject_name(x509)))
		goto err;

2109 2110
	if (strcmp(startdate,"today") == 0)
		X509_gmtime_adj(X509_get_notBefore(ret),0);
2111 2112 2113
	else ASN1_UTCTIME_set_string(X509_get_notBefore(ret),startdate);

	if (enddate == NULL)
2114
		X509_gmtime_adj(X509_get_notAfter(ret),(long)60*60*24*days);
2115 2116
	else ASN1_UTCTIME_set_string(X509_get_notAfter(ret),enddate);

2117 2118 2119
	if (!X509_set_subject_name(ret,subject)) goto err;

	pktmp=X509_REQ_get_pubkey(req);
2120 2121 2122
	i = X509_set_pubkey(ret,pktmp);
	EVP_PKEY_free(pktmp);
	if (!i) goto err;
2123 2124

	/* Lets add the extensions, if there are any */
2125
	if (ext_sect)
2126
		{
2127
		X509V3_CTX ctx;
2128 2129 2130 2131 2132 2133
		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 已提交
2134
		 * be any I believe */
2135
		if (ci->extensions != NULL)
B
Ben Laurie 已提交
2136 2137
			sk_X509_EXTENSION_pop_free(ci->extensions,
						   X509_EXTENSION_free);
2138

2139 2140
		ci->extensions = NULL;

2141
		/* Initialize the context structure */
2142
		X509V3_set_ctx(&ctx, x509, ret, req, NULL, 0);
2143

2144 2145 2146 2147 2148 2149
		if (extconf)
			{
			if (verbose)
				BIO_printf(bio_err, "Extra configuration file found\n");
 
			/* Use the extconf configuration db LHASH */
D
 
Dr. Stephen Henson 已提交
2150
			X509V3_set_nconf(&ctx, extconf);
2151 2152 2153 2154 2155
 
			/* Test the structure (needed?) */
			/* X509V3_set_ctx_test(&ctx); */

			/* Adds exts contained in the configuration file */
D
 
Dr. Stephen Henson 已提交
2156
			if (!X509V3_EXT_add_nconf(extconf, &ctx, ext_sect,ret))
2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169
				{
				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 已提交
2170
			X509V3_set_nconf(&ctx, lconf);
2171

D
 
Dr. Stephen Henson 已提交
2172
			if(!X509V3_EXT_add_nconf(lconf, &ctx, ext_sect, ret))
2173 2174 2175 2176 2177 2178 2179 2180 2181
				{
				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");
			}
2182 2183
		}

2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205
	/* 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;
		}


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

	BIO_printf(bio_err,"Certificate is to be certified until ");
	ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ret));
	if (days) BIO_printf(bio_err," (%d days)",days);
	BIO_printf(bio_err, "\n");
2206 2207 2208

	if (!batch)
		{
2209

2210
		BIO_printf(bio_err,"Sign the certificate? [y/n]:");
B
Bodo Möller 已提交
2211
		(void)BIO_flush(bio_err);
2212 2213 2214 2215 2216 2217 2218 2219 2220 2221
		buf[0]='\0';
		fgets(buf,sizeof(buf)-1,stdin);
		if (!((buf[0] == 'y') || (buf[0] == 'Y')))
			{
			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED\n");
			ok=0;
			goto err;
			}
		}

2222

2223
#ifndef OPENSSL_NO_DSA
2224
	if (pkey->type == EVP_PKEY_DSA) dgst=EVP_dss1();
2225 2226
	pktmp=X509_get_pubkey(ret);
	if (EVP_PKEY_missing_parameters(pktmp) &&
2227 2228
		!EVP_PKEY_missing_parameters(pkey))
		EVP_PKEY_copy_parameters(pktmp,pkey);
2229
	EVP_PKEY_free(pktmp);
2230 2231 2232 2233 2234 2235
#endif

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

	/* We now just add it to the database */
2236
	row[DB_type]=(char *)OPENSSL_malloc(2);
2237 2238

	tm=X509_get_notAfter(ret);
2239
	row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2240 2241 2242 2243 2244 2245
	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 */
2246
	row[DB_file]=(char *)OPENSSL_malloc(8);
2247 2248 2249 2250 2251
	/* row[DB_name] done already */

	if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
		(row[DB_file] == NULL))
		{
2252
		BIO_printf(bio_err,"Memory allocation failure\n");
2253 2254 2255 2256 2257 2258
		goto err;
		}
	strcpy(row[DB_file],"unknown");
	row[DB_type][0]='V';
	row[DB_type][1]='\0';

2259
	if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2260
		{
2261
		BIO_printf(bio_err,"Memory allocation failure\n");
2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280
		goto err;
		}

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

	if (!TXT_DB_insert(db,irow))
		{
		BIO_printf(bio_err,"failed to update database\n");
		BIO_printf(bio_err,"TXT_DB error number %ld\n",db->error);
		goto err;
		}
	ok=1;
err:
	for (i=0; i<DB_NUMBER; i++)
2281
		if (row[i] != NULL) OPENSSL_free(row[i]);
2282 2283 2284 2285 2286

	if (CAname != NULL)
		X509_NAME_free(CAname);
	if (subject != NULL)
		X509_NAME_free(subject);
2287 2288
	if (tmptm != NULL)
		ASN1_UTCTIME_free(tmptm);
2289 2290 2291 2292 2293 2294 2295 2296 2297 2298
	if (ok <= 0)
		{
		if (ret != NULL) X509_free(ret);
		ret=NULL;
		}
	else
		*xret=ret;
	return(ok);
	}

D
 
Dr. Stephen Henson 已提交
2299
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
2300 2301 2302 2303 2304 2305 2306
	{

	if (output_der)
		{
		(void)i2d_X509_bio(bp,x);
		return;
		}
D
 
Dr. Stephen Henson 已提交
2307 2308
#if 0
	/* ??? Not needed since X509_print prints all this stuff anyway */
2309 2310 2311 2312 2313 2314 2315 2316 2317
	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 已提交
2318
#endif
2319
	if (!notext)X509_print(bp,x);
2320 2321 2322
	PEM_write_bio_X509(bp,x);
	}

U
Ulf Möller 已提交
2323
static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
2324
	     const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, TXT_DB *db,
D
 
Dr. Stephen Henson 已提交
2325 2326
	     BIGNUM *serial, char *subj, char *startdate, char *enddate, long days,
	     char *ext_sect, CONF *lconf, int verbose, unsigned long certopt,
D
 
Dr. Stephen Henson 已提交
2327
	     unsigned long nameopt, int default_op, int ext_copy)
2328
	{
2329
	STACK_OF(CONF_VALUE) *sk=NULL;
2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356
	LHASH *parms=NULL;
	X509_REQ *req=NULL;
	CONF_VALUE *cv=NULL;
	NETSCAPE_SPKI *spki = NULL;
	X509_REQ_INFO *ri;
	char *type,*buf;
	EVP_PKEY *pktmp=NULL;
	X509_NAME *n=NULL;
	X509_NAME_ENTRY *ne=NULL;
	int ok= -1,i,j;
	long errline;
	int nid;

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

	sk=CONF_get_section(parms, "default");
2357
	if (sk_CONF_VALUE_num(sk) == 0)
2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385
		{
		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++)
		{
2386
		if (sk_CONF_VALUE_num(sk) <= i) break;
2387

2388
		cv=sk_CONF_VALUE_value(sk,i);
2389
		type=cv->name;
2390 2391 2392
		/* Skip past any leading X. X: X, etc to allow for
		 * multiple instances
		 */
2393 2394 2395 2396 2397 2398 2399
		for (buf = cv->name; *buf ; buf++)
			if ((*buf == ':') || (*buf == ',') || (*buf == '.'))
				{
				buf++;
				if (*buf) type = buf;
				break;
				}
2400

2401
		buf=cv->value;
2402 2403 2404 2405
		if ((nid=OBJ_txt2nid(type)) == NID_undef)
			{
			if (strcmp(type, "SPKAC") == 0)
				{
2406
				spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429
				if (spki == NULL)
					{
					BIO_printf(bio_err,"unable to load Netscape SPKAC structure\n");
					ERR_print_errors(bio_err);
					goto err;
					}
				}
			continue;
			}

		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;

2430
		if (!X509_NAME_add_entry(n,ne,-1, 0)) goto err;
2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444
		}
	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");

2445
	if ((pktmp=NETSCAPE_SPKI_get_pubkey(spki)) == NULL)
2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459
		{
		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);
2460
	EVP_PKEY_free(pktmp);
2461
	ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,startdate,enddate,
D
 
Dr. Stephen Henson 已提交
2462 2463
		   days,1,verbose,req,ext_sect,lconf, certopt, nameopt, default_op,
			ext_copy);
2464 2465 2466 2467 2468 2469 2470 2471 2472
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 已提交
2473
static int fix_data(int nid, int *type)
2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487
	{
	if (nid == NID_pkcs9_emailAddress)
		*type=V_ASN1_IA5STRING;
	if ((nid == NID_commonName) && (*type == V_ASN1_IA5STRING))
		*type=V_ASN1_T61STRING;
	if ((nid == NID_pkcs9_challengePassword) && (*type == V_ASN1_IA5STRING))
		*type=V_ASN1_T61STRING;
	if ((nid == NID_pkcs9_unstructuredName) && (*type == V_ASN1_T61STRING))
		return(0);
	if (nid == NID_pkcs9_unstructuredName)
		*type=V_ASN1_IA5STRING;
	return(1);
	}

U
Ulf Möller 已提交
2488
static int check_time_format(char *str)
2489 2490 2491 2492 2493 2494 2495 2496 2497
	{
	ASN1_UTCTIME tm;

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

2498
static int do_revoke(X509 *x509, TXT_DB *db, int type, char *value)
2499
	{
2500
	ASN1_UTCTIME *tm=NULL;
2501
	char *row[DB_NUMBER],**rrow,**irow;
2502
	char *rev_str = NULL;
2503
	BIGNUM *bn = NULL;
2504 2505 2506 2507
	int ok=-1,i;

	for (i=0; i<DB_NUMBER; i++)
		row[i]=NULL;
2508 2509 2510 2511
	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(x509),NULL,0);
	bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(x509),NULL);
	row[DB_serial]=BN_bn2hex(bn);
	BN_free(bn);
2512 2513
	if ((row[DB_name] == NULL) || (row[DB_serial] == NULL))
		{
2514
		BIO_printf(bio_err,"Memory allocation failure\n");
2515 2516
		goto err;
		}
2517 2518 2519 2520
	/* We have to lookup by serial number because name lookup
	 * skips revoked certs
 	 */
	rrow=TXT_DB_get_by_index(db,DB_serial,row);
2521 2522 2523 2524 2525
	if (rrow == NULL)
		{
		BIO_printf(bio_err,"Adding Entry to DB for %s\n", row[DB_name]);

		/* We now just add it to the database */
2526
		row[DB_type]=(char *)OPENSSL_malloc(2);
2527 2528

		tm=X509_get_notAfter(x509);
2529
		row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
2530 2531 2532 2533 2534 2535
		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 */
2536
		row[DB_file]=(char *)OPENSSL_malloc(8);
2537 2538 2539 2540 2541 2542

		/* row[DB_name] done already */

		if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
			(row[DB_file] == NULL))
			{
2543
			BIO_printf(bio_err,"Memory allocation failure\n");
2544 2545 2546 2547 2548 2549
			goto err;
			}
		strcpy(row[DB_file],"unknown");
		row[DB_type][0]='V';
		row[DB_type][1]='\0';

2550
		if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL)
2551
			{
2552
			BIO_printf(bio_err,"Memory allocation failure\n");
2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570
			goto err;
			}

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

		if (!TXT_DB_insert(db,irow))
			{
			BIO_printf(bio_err,"failed to update database\n");
			BIO_printf(bio_err,"TXT_DB error number %ld\n",db->error);
			goto err;
			}

		/* Revoke Certificate */
2571
		ok = do_revoke(x509,db, type, value);
2572 2573 2574 2575

		goto err;

		}
2576
	else if (index_name_cmp((const char **)row,(const char **)rrow))
2577
		{
2578 2579
		BIO_printf(bio_err,"ERROR:name does not match %s\n",
			   row[DB_name]);
2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590
		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]);
2591 2592 2593 2594 2595 2596
		rev_str = make_revocation_str(type, value);
		if (!rev_str)
			{
			BIO_printf(bio_err, "Error in revocation arguments\n");
			goto err;
			}
2597 2598
		rrow[DB_type][0]='R';
		rrow[DB_type][1]='\0';
2599
		rrow[DB_rev_date] = rev_str;
2600 2601
		}
	ok=1;
2602
err:
2603 2604 2605
	for (i=0; i<DB_NUMBER; i++)
		{
		if (row[i] != NULL) 
2606
			OPENSSL_free(row[i]);
2607 2608
		}
	return(ok);
2609 2610 2611 2612
	}

static int get_certificate_status(const char *serial, TXT_DB *db)
	{
D
Dr. Stephen Henson 已提交
2613
	char *row[DB_NUMBER],**rrow;
2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645
	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++)
2646 2647
		row[DB_serial][i] = toupper(row[DB_serial][i]);
	
2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723

	ok=1;

	/* Search for the certificate */
	rrow=TXT_DB_get_by_index(db,DB_serial,row);
	if (rrow == NULL)
		{
		BIO_printf(bio_err,"Serial %s not present in db.\n",
				 row[DB_serial]);
		ok=-1;
		goto err;
		}
	else if (rrow[DB_type][0]=='V')
		{
		BIO_printf(bio_err,"%s=Valid (%c)\n",
			row[DB_serial], rrow[DB_type][0]);
		goto err;
		}
	else if (rrow[DB_type][0]=='R')
		{
		BIO_printf(bio_err,"%s=Revoked (%c)\n",
			row[DB_serial], rrow[DB_type][0]);
		goto err;
		}
	else if (rrow[DB_type][0]=='E')
		{
		BIO_printf(bio_err,"%s=Expired (%c)\n",
			row[DB_serial], rrow[DB_type][0]);
		goto err;
		}
	else if (rrow[DB_type][0]=='S')
		{
		BIO_printf(bio_err,"%s=Suspended (%c)\n",
			row[DB_serial], rrow[DB_type][0]);
		goto err;
		}
	else
		{
		BIO_printf(bio_err,"%s=Unknown (%c).\n",
			row[DB_serial], rrow[DB_type][0]);
		ok=-1;
		}
err:
	for (i=0; i<DB_NUMBER; i++)
		{
		if (row[i] != NULL)
			OPENSSL_free(row[i]);
		}
	return(ok);
	}

static int do_updatedb (TXT_DB *db)
	{
	ASN1_UTCTIME	*a_tm = NULL;
	int i, cnt = 0;
	int db_y2k, a_y2k;  /* flags = 1 if y >= 2000 */ 
	char **rrow, *a_tm_s;

	a_tm = ASN1_UTCTIME_new();

	/* get actual time and make a string */
	a_tm = X509_gmtime_adj(a_tm, 0);
	a_tm_s = (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;
2724

2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769
	for (i = 0; i < sk_num(db->data); i++)
		{
		rrow = (char **) sk_value(db->data, i);

		if (rrow[DB_type][0] == 'V')
		 	{
			/* ignore entries that are not valid */
			if (strncmp(rrow[DB_exp_date], "49", 2) <= 0)
				db_y2k = 1;
			else
				db_y2k = 0;

			if (db_y2k == a_y2k)
				{
				/* all on the same y2k side */
				if (strcmp(rrow[DB_exp_date], a_tm_s) <= 0)
				       	{
				       	rrow[DB_type][0]  = 'E';
				       	rrow[DB_type][1]  = '\0';
	  				cnt++;

					BIO_printf(bio_err, "%s=Expired\n",
							rrow[DB_serial]);
					}
				}
			else if (db_y2k < a_y2k)
				{
		  		rrow[DB_type][0]  = 'E';
		  		rrow[DB_type][1]  = '\0';
	  			cnt++;

				BIO_printf(bio_err, "%s=Expired\n",
							rrow[DB_serial]);
				}

			}
    		}

err:

	ASN1_UTCTIME_free(a_tm);
	OPENSSL_free(a_tm_s);

	return (cnt);
	}
2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 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 3008 3009 3010 3011

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

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

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

char *make_revocation_str(int rev_type, char *rev_arg)
	{
	char *reason = NULL, *other = NULL, *str;
	ASN1_OBJECT *otmp;
	ASN1_UTCTIME *revtm = NULL;
	int i;
	switch (rev_type)
		{
	case REV_NONE:
		break;

	case REV_CRL_REASON:
		for (i = 0; i < 8; i++)
			{
			if (!strcasecmp(rev_arg, crl_reasons[i]))
				{
				reason = crl_reasons[i];
				break;
				}
			}
		if (reason == NULL)
			{
			BIO_printf(bio_err, "Unknown CRL reason %s\n", rev_arg);
			return NULL;
			}
		break;

	case REV_HOLD:
		/* Argument is an OID */

		otmp = OBJ_txt2obj(rev_arg, 0);
		ASN1_OBJECT_free(otmp);

		if (otmp == NULL)
			{
			BIO_printf(bio_err, "Invalid object identifier %s\n", rev_arg);
			return NULL;
			}

		reason = "holdInstruction";
		other = rev_arg;
		break;
		
	case REV_KEY_COMPROMISE:
	case REV_CA_COMPROMISE:

		/* Argument is the key compromise time  */
		if (!ASN1_GENERALIZEDTIME_set_string(NULL, rev_arg))
			{	
			BIO_printf(bio_err, "Invalid time format %s. Need YYYYMMDDHHMMSSZ\n", rev_arg);
			return NULL;
			}
		other = rev_arg;
		if (rev_type == REV_KEY_COMPROMISE)
			reason = "keyTime";
		else 
			reason = "CAkeyTime";

		break;

		}

	revtm = X509_gmtime_adj(NULL, 0);

	i = revtm->length + 1;

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

	str = OPENSSL_malloc(i);

	if (!str) return NULL;

	strcpy(str, (char *)revtm->data);
	if (reason)
		{
		strcat(str, ",");
		strcat(str, reason);
		}
	if (other)
		{
		strcat(str, ",");
		strcat(str, other);
		}
	ASN1_UTCTIME_free(revtm);
	return str;
	}

/* Convert revocation field to X509_REVOKED entry 
 * return code:
 * 0 error
 * 1 OK
 * 2 OK and some extensions added (i.e. V2 CRL)
 */

int make_revoked(X509_REVOKED *rev, char *str)
	{
	char *tmp = NULL;
	char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
	int reason_code = -1;
	int i, ret = 0;
	ASN1_OBJECT *hold = NULL;
	ASN1_GENERALIZEDTIME *comp_time = NULL;
	ASN1_ENUMERATED *rtmp = 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 (rev && !ASN1_UTCTIME_set_string(rev->revocationDate, 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;
				}
			}
		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 (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);

	return ret;
	}
3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070

static X509_NAME *do_subject(char *subject)
	{
	X509_NAME *n = NULL;

	int i, nid, ne_num=0;

	char *ne_name = NULL;
	char *ne_value = NULL;

	char *tmp = NULL;
	char *p[2];

	char *str_list[256];
       
	p[0] = ",/";
	p[1] = "=";

	n = X509_NAME_new();

	tmp = strtok(subject, p[0]);
	while((tmp != NULL) && (ne_num < (sizeof str_list/sizeof *str_list)))
		{
		char *token = tmp;

		while (token[0] == ' ')
			token++;
		str_list[ne_num] = token;

		tmp = strtok(NULL, p[0]);
		ne_num++;
		}

	for (i = 0; i < ne_num; i++)
		{
		ne_name  = strtok(str_list[i], p[1]);
		ne_value = strtok(NULL, p[1]);

		if ((nid=OBJ_txt2nid(ne_name)) == NID_undef)
			{
			BIO_printf(bio_err, "Subject Attribute %s has no known NID, skipped\n", ne_name);
			continue;
			}

		if (ne_value == NULL)
			{
			BIO_printf(bio_err, "No value provided for Subject Attribute %s, skipped\n", ne_name);
			continue;
			}

		if (!X509_NAME_add_entry_by_NID(n, nid, MBSTRING_ASC, (unsigned char*)ne_value, -1,-1,0))
			{
			X509_NAME_free(n);
			return NULL;
			}
		}

	return n;
	}
D
 
Dr. Stephen Henson 已提交
3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110


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