req.c 32.7 KB
Newer Older
1
/* apps/req.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
 * 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.]
 */

#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <string.h>
63
#ifdef NO_STDIO
64 65 66
#define APPS_WIN16
#endif
#include "apps.h"
67 68 69 70 71 72 73 74 75
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/conf.h>
#include <openssl/err.h>
#include <openssl/asn1.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/objects.h>
#include <openssl/pem.h>
76
#include <openssl/engine.h>
77 78 79 80 81

#define SECTION		"req"

#define BITS		"default_bits"
#define KEYFILE		"default_keyfile"
82
#define PROMPT		"prompt"
83 84
#define DISTINGUISHED_NAME	"distinguished_name"
#define ATTRIBUTES	"attributes"
85
#define V3_EXTENSIONS	"x509_extensions"
86
#define REQ_EXTENSIONS	"req_extensions"
87
#define STRING_MASK	"string_mask"
88 89 90 91 92 93 94

#define DEFAULT_KEY_LENGTH	512
#define MIN_KEY_LENGTH		384

#undef PROG
#define PROG	req_main

95
/* -inform arg	- input format - default PEM (DER or PEM)
96 97 98 99 100 101 102 103 104
 * -outform arg - output format - default PEM
 * -in arg	- input file - default stdin
 * -out arg	- output file - default stdout
 * -verify	- check request signature
 * -noout	- don't print stuff out.
 * -text	- print out human readable text.
 * -nodes	- no des encryption
 * -config file	- Load configuration file.
 * -key file	- make a request using key in file (or use it for verification).
R
Richard Levitte 已提交
105
 * -keyform arg	- key file format.
106
 * -rand file(s) - load the file(s) into the PRNG.
107 108 109 110 111 112 113 114
 * -newkey	- make a key and a request.
 * -modulus	- print RSA modulus.
 * -x509	- output a self signed X509 structure instead.
 * -asn1-kludge	- output new certificate request in a format that some CA's
 *		  require.  This format is wrong
 */

static int make_REQ(X509_REQ *req,EVP_PKEY *pkey,int attribs);
115 116 117 118 119
static int prompt_info(X509_REQ *req,
		STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect,
		STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs);
static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk,
				STACK_OF(CONF_VALUE) *attr, int attribs);
120
static int add_attribute_object(X509_REQ *req, char *text,
B
Ben Laurie 已提交
121 122
				char *def, char *value, int nid, int min,
				int max);
123 124
static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
	int nid,int min,int max);
B
Ben Laurie 已提交
125
#ifndef NO_RSA
B
Ben Laurie 已提交
126
static void MS_CALLBACK req_cb(int p,int n,void *arg);
B
Ben Laurie 已提交
127
#endif
128
static int req_check_len(int len,int min,int max);
129
static int check_end(char *str, char *end);
130 131 132 133 134 135 136 137 138 139
#ifndef MONOLITH
static char *default_config_file=NULL;
static LHASH *config=NULL;
#endif
static LHASH *req_conf=NULL;

#define TYPE_RSA	1
#define TYPE_DSA	2
#define TYPE_DH		3

140 141
int MAIN(int, char **);

U
Ulf Möller 已提交
142
int MAIN(int argc, char **argv)
143
	{
144
	ENGINE *e = NULL;
145
#ifndef NO_DSA
146
	DSA *dsa_params=NULL;
147
#endif
148
	unsigned long nmflag = 0;
149 150 151 152
	int ex=1,x509=0,days=30;
	X509 *x509ss=NULL;
	X509_REQ *req=NULL;
	EVP_PKEY *pkey=NULL;
153
	int i,badops=0,newreq=0,newkey= -1,pkey_type=TYPE_RSA;
154 155
	BIO *in=NULL,*out=NULL;
	int informat,outformat,verify=0,noout=0,text=0,keyform=FORMAT_PEM;
156
	int nodes=0,kludge=0,newhdr=0,subject=0;
157
	char *infile,*outfile,*prog,*keyfile=NULL,*template=NULL,*keyout=NULL;
158
	char *engine=NULL;
159
	char *extensions = NULL;
160
	char *req_exts = NULL;
161 162
	EVP_CIPHER *cipher=NULL;
	int modulus=0;
163
	char *inrand=NULL;
D
Dr. Stephen Henson 已提交
164
	char *passargin = NULL, *passargout = NULL;
165
	char *passin = NULL, *passout = NULL;
166
	char *p;
B
Ben Laurie 已提交
167
	const EVP_MD *md_alg=NULL,*digest=EVP_md5();
168 169 170 171
#ifndef MONOLITH
	MS_STATIC char config_name[256];
#endif

172
	req_conf = NULL;
173 174 175 176 177 178 179
#ifndef NO_DES
	cipher=EVP_des_ede3_cbc();
#endif
	apps_startup();

	if (bio_err == NULL)
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
180
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201

	infile=NULL;
	outfile=NULL;
	informat=FORMAT_PEM;
	outformat=FORMAT_PEM;

	prog=argv[0];
	argc--;
	argv++;
	while (argc >= 1)
		{
		if 	(strcmp(*argv,"-inform") == 0)
			{
			if (--argc < 1) goto bad;
			informat=str2fmt(*(++argv));
			}
		else if (strcmp(*argv,"-outform") == 0)
			{
			if (--argc < 1) goto bad;
			outformat=str2fmt(*(++argv));
			}
202 203 204 205 206
		else if (strcmp(*argv,"-engine") == 0)
			{
			if (--argc < 1) goto bad;
			engine= *(++argv);
			}
207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240
		else if (strcmp(*argv,"-key") == 0)
			{
			if (--argc < 1) goto bad;
			keyfile= *(++argv);
			}
		else if (strcmp(*argv,"-new") == 0)
			{
			newreq=1;
			}
		else if (strcmp(*argv,"-config") == 0)
			{	
			if (--argc < 1) goto bad;
			template= *(++argv);
			}
		else if (strcmp(*argv,"-keyform") == 0)
			{
			if (--argc < 1) goto bad;
			keyform=str2fmt(*(++argv));
			}
		else if (strcmp(*argv,"-in") == 0)
			{
			if (--argc < 1) goto bad;
			infile= *(++argv);
			}
		else if (strcmp(*argv,"-out") == 0)
			{
			if (--argc < 1) goto bad;
			outfile= *(++argv);
			}
		else if (strcmp(*argv,"-keyout") == 0)
			{
			if (--argc < 1) goto bad;
			keyout= *(++argv);
			}
241 242 243
		else if (strcmp(*argv,"-passin") == 0)
			{
			if (--argc < 1) goto bad;
D
Dr. Stephen Henson 已提交
244
			passargin= *(++argv);
245 246 247 248
			}
		else if (strcmp(*argv,"-passout") == 0)
			{
			if (--argc < 1) goto bad;
D
Dr. Stephen Henson 已提交
249
			passargout= *(++argv);
250
			}
251 252 253 254 255
		else if (strcmp(*argv,"-rand") == 0)
			{
			if (--argc < 1) goto bad;
			inrand= *(++argv);
			}
256 257
		else if (strcmp(*argv,"-newkey") == 0)
			{
B
Ben Laurie 已提交
258 259
			int is_numeric;

260 261
			if (--argc < 1) goto bad;
			p= *(++argv);
B
Ben Laurie 已提交
262 263
			is_numeric = p[0] >= '0' && p[0] <= '9';
			if (strncmp("rsa:",p,4) == 0 || is_numeric)
264 265
				{
				pkey_type=TYPE_RSA;
B
Ben Laurie 已提交
266 267
				if(!is_numeric)
				    p+=4;
268 269
				newkey= atoi(p);
				}
270 271 272
			else
#ifndef NO_DSA
				if (strncmp("dsa:",p,4) == 0)
273 274 275 276 277 278 279 280 281 282 283
				{
				X509 *xtmp=NULL;
				EVP_PKEY *dtmp;

				pkey_type=TYPE_DSA;
				p+=4;
				if ((in=BIO_new_file(p,"r")) == NULL)
					{
					perror(p);
					goto end;
					}
284
				if ((dsa_params=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
285 286
					{
					ERR_clear_error();
B
Bodo Möller 已提交
287
					(void)BIO_reset(in);
288
					if ((xtmp=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL)
289 290 291 292
						{
						BIO_printf(bio_err,"unable to load DSA parameters from file\n");
						goto end;
						}
293

294 295 296
					dtmp=X509_get_pubkey(xtmp);
					if (dtmp->type == EVP_PKEY_DSA)
						dsa_params=DSAparams_dup(dtmp->pkey.dsa);
297
					EVP_PKEY_free(dtmp);
298 299 300 301 302 303 304 305 306 307 308
					X509_free(xtmp);
					if (dsa_params == NULL)
						{
						BIO_printf(bio_err,"Certificate does not contain DSA parameters\n");
						goto end;
						}
					}
				BIO_free(in);
				newkey=BN_num_bits(dsa_params->p);
				in=NULL;
				}
309 310 311 312
			else 
#endif
#ifndef NO_DH
				if (strncmp("dh:",p,4) == 0)
313 314 315 316 317
				{
				pkey_type=TYPE_DH;
				p+=3;
				}
			else
318
#endif
319 320 321 322
				pkey_type=TYPE_RSA;

			newreq=1;
			}
323 324
		else if (strcmp(*argv,"-newhdr") == 0)
			newhdr=1;
325 326 327 328 329 330 331 332
		else if (strcmp(*argv,"-modulus") == 0)
			modulus=1;
		else if (strcmp(*argv,"-verify") == 0)
			verify=1;
		else if (strcmp(*argv,"-nodes") == 0)
			nodes=1;
		else if (strcmp(*argv,"-noout") == 0)
			noout=1;
333 334 335 336 337 338 339
		else if (strcmp(*argv,"-nameopt") == 0)
			{
			if (--argc < 1) goto bad;
			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
			}
		else if (strcmp(*argv,"-subject") == 0)
			subject=1;
340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358
		else if (strcmp(*argv,"-text") == 0)
			text=1;
		else if (strcmp(*argv,"-x509") == 0)
			x509=1;
		else if (strcmp(*argv,"-asn1-kludge") == 0)
			kludge=1;
		else if (strcmp(*argv,"-no-asn1-kludge") == 0)
			kludge=0;
		else if (strcmp(*argv,"-days") == 0)
			{
			if (--argc < 1) goto bad;
			days= atoi(*(++argv));
			if (days == 0) days=30;
			}
		else if ((md_alg=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
			{
			/* ok */
			digest=md_alg;
			}
359 360 361 362 363 364 365 366 367 368
		else if (strcmp(*argv,"-extensions") == 0)
			{
			if (--argc < 1) goto bad;
			extensions = *(++argv);
			}
		else if (strcmp(*argv,"-reqexts") == 0)
			{
			if (--argc < 1) goto bad;
			req_exts = *(++argv);
			}
369 370 371 372 373 374 375 376 377 378 379 380 381 382 383
		else
			{
			BIO_printf(bio_err,"unknown option %s\n",*argv);
			badops=1;
			break;
			}
		argc--;
		argv++;
		}

	if (badops)
		{
bad:
		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
		BIO_printf(bio_err,"where options  are\n");
384 385
		BIO_printf(bio_err," -inform arg    input format - DER or PEM\n");
		BIO_printf(bio_err," -outform arg   output format - DER or PEM\n");
386
		BIO_printf(bio_err," -in arg        input file\n");
387 388 389 390 391 392
		BIO_printf(bio_err," -out arg       output file\n");
		BIO_printf(bio_err," -text          text form of request\n");
		BIO_printf(bio_err," -noout         do not output REQ\n");
		BIO_printf(bio_err," -verify        verify signature on REQ\n");
		BIO_printf(bio_err," -modulus       RSA modulus\n");
		BIO_printf(bio_err," -nodes         don't encrypt the output key\n");
393
		BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
394 395 396
		BIO_printf(bio_err," -key file	use the private key contained in file\n");
		BIO_printf(bio_err," -keyform arg   key file format\n");
		BIO_printf(bio_err," -keyout arg    file to send the key to\n");
397 398 399
		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
		BIO_printf(bio_err,"                load the file (or the files in the directory) into\n");
		BIO_printf(bio_err,"                the random number generator\n");
400 401 402 403
		BIO_printf(bio_err," -newkey rsa:bits generate a new RSA key of 'bits' in size\n");
		BIO_printf(bio_err," -newkey dsa:file generate a new DSA key, parameters taken from CA in 'file'\n");

		BIO_printf(bio_err," -[digest]      Digest to sign with (md5, sha1, md2, mdc2)\n");
M
Mark J. Cox 已提交
404
		BIO_printf(bio_err," -config file   request template file.\n");
405 406 407
		BIO_printf(bio_err," -new           new request.\n");
		BIO_printf(bio_err," -x509          output a x509 structure instead of a cert. req.\n");
		BIO_printf(bio_err," -days          number of days a x509 generated by -x509 is valid for.\n");
408
		BIO_printf(bio_err," -newhdr        output \"NEW\" in the header lines\n");
409 410
		BIO_printf(bio_err," -asn1-kludge   Output the 'request' in a format that is wrong but some CA's\n");
		BIO_printf(bio_err,"                have been reported as requiring\n");
411 412
		BIO_printf(bio_err," -extensions .. specify certificate extension section (override value in config file)\n");
		BIO_printf(bio_err," -reqexts ..    specify request extension section (override value in config file)\n");
413 414 415 416
		goto end;
		}

	ERR_load_crypto_strings();
D
Dr. Stephen Henson 已提交
417 418 419 420
	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
		BIO_printf(bio_err, "Error getting passwords\n");
		goto end;
	}
421

B
Bodo Möller 已提交
422
#ifndef MONOLITH /* else this has happened in openssl.c (global `config') */
423
	/* Lets load up our environment a little */
424 425 426
	p=getenv("OPENSSL_CONF");
	if (p == NULL)
		p=getenv("SSLEAY_CONF");
427 428 429
	if (p == NULL)
		{
		strcpy(config_name,X509_get_default_cert_area());
U
Ulf Möller 已提交
430
#ifndef VMS
U
Ulf Möller 已提交
431
		strcat(config_name,"/");
U
Ulf Möller 已提交
432
#endif
433
		strcat(config_name,OPENSSL_CONF);
434 435
		p=config_name;
		}
B
Bodo Möller 已提交
436
	default_config_file=p;
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 462
	config=CONF_load(config,p,NULL);
#endif

	if (template != NULL)
		{
		long errline;

		BIO_printf(bio_err,"Using configuration from %s\n",template);
		req_conf=CONF_load(NULL,template,&errline);
		if (req_conf == NULL)
			{
			BIO_printf(bio_err,"error on line %ld of %s\n",errline,template);
			goto end;
			}
		}
	else
		{
		req_conf=config;
		BIO_printf(bio_err,"Using configuration from %s\n",
			default_config_file);
		if (req_conf == NULL)
			{
			BIO_printf(bio_err,"Unable to load config info\n");
			}
		}

463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484
	if (req_conf != NULL)
		{
		p=CONF_get_string(req_conf,NULL,"oid_file");
		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);
				*/
				}
			else
				{
				OBJ_create_objects(oid_bio);
				BIO_free(oid_bio);
				}
			}
		}
485
		if(!add_oid_section(bio_err, req_conf)) goto end;
486

487 488 489 490 491 492 493
	if ((md_alg == NULL) &&
		((p=CONF_get_string(req_conf,SECTION,"default_md")) != NULL))
		{
		if ((md_alg=EVP_get_digestbyname(p)) != NULL)
			digest=md_alg;
		}

494 495
	if(!extensions)
		extensions = CONF_get_string(req_conf, SECTION, V3_EXTENSIONS);
496 497
	if(extensions) {
		/* Check syntax of file */
498 499 500 501
		X509V3_CTX ctx;
		X509V3_set_ctx_test(&ctx);
		X509V3_set_conf_lhash(&ctx, req_conf);
		if(!X509V3_EXT_add_conf(req_conf, &ctx, extensions, NULL)) {
502 503 504 505 506
			BIO_printf(bio_err,
			 "Error Loading extension section %s\n", extensions);
			goto end;
		}
	}
507

508 509 510 511 512 513
	if(!passin)
		passin = CONF_get_string(req_conf, SECTION, "input_password");

	if(!passout)
		passout = CONF_get_string(req_conf, SECTION, "output_password");

514
	p = CONF_get_string(req_conf, SECTION, STRING_MASK);
515 516

	if(p && !ASN1_STRING_set_default_mask_asc(p)) {
517
		BIO_printf(bio_err, "Invalid global string mask setting %s\n", p);
518 519 520
		goto end;
	}

521 522
	if(!req_exts)
		req_exts = CONF_get_string(req_conf, SECTION, REQ_EXTENSIONS);
523 524 525 526 527 528 529 530 531 532 533 534 535
	if(req_exts) {
		/* Check syntax of file */
		X509V3_CTX ctx;
		X509V3_set_ctx_test(&ctx);
		X509V3_set_conf_lhash(&ctx, req_conf);
		if(!X509V3_EXT_add_conf(req_conf, &ctx, req_exts, NULL)) {
			BIO_printf(bio_err,
			 "Error Loading request extension section %s\n",
								req_exts);
			goto end;
		}
	}

536 537 538 539 540
	in=BIO_new(BIO_s_file());
	out=BIO_new(BIO_s_file());
	if ((in == NULL) || (out == NULL))
		goto end;

541
	if (engine != NULL)
542
		{
543
		if((e = ENGINE_by_id(engine)) == NULL)
544
			{
545 546
			BIO_printf(bio_err,"invalid engine \"%s\"\n",
				engine);
547 548
			goto end;
			}
549 550 551 552 553 554 555 556 557
		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
			{
			BIO_printf(bio_err,"can't use that engine\n");
			goto end;
			}
		BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
		/* Free our "structural" reference. */
		ENGINE_free(e);
		}
558

559 560 561
	if (keyfile != NULL)
		{
		if (keyform == FORMAT_ENGINE)
562
			{
563 564 565 566 567 568
			if (!e)
				{
				BIO_printf(bio_err,"no engine specified\n");
				goto end;
				}
			pkey = ENGINE_load_private_key(e, keyfile, NULL);
569
			}
570 571
		else
			{
572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589
			if (BIO_read_filename(in,keyfile) <= 0)
				{
				perror(keyfile);
				goto end;
				}

			if (keyform == FORMAT_ASN1)
				pkey=d2i_PrivateKey_bio(in,NULL);
			else if (keyform == FORMAT_PEM)
				{
				pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,
					passin);
				}
			else
				{
				BIO_printf(bio_err,"bad input format specified for X509 request\n");
				goto end;
				}
590 591 592 593 594 595 596
			}

		if (pkey == NULL)
			{
			BIO_printf(bio_err,"unable to load Private key\n");
			goto end;
			}
D
 
Dr. Stephen Henson 已提交
597 598 599 600 601
                if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA)
			{
			char *randfile = CONF_get_string(req_conf,SECTION,"RANDFILE");
			app_RAND_load_file(randfile, bio_err, 0);
                	}
602 603 604 605
		}

	if (newreq && (pkey == NULL))
		{
606
		char *randfile = CONF_get_string(req_conf,SECTION,"RANDFILE");
607
		app_RAND_load_file(randfile, bio_err, 0);
608 609
		if (inrand)
			app_RAND_load_files(inrand);
610
	
611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632
		if (newkey <= 0)
			{
			newkey=(int)CONF_get_number(req_conf,SECTION,BITS);
			if (newkey <= 0)
				newkey=DEFAULT_KEY_LENGTH;
			}

		if (newkey < MIN_KEY_LENGTH)
			{
			BIO_printf(bio_err,"private key length is too short,\n");
			BIO_printf(bio_err,"it needs to be at least %d bits, not %d\n",MIN_KEY_LENGTH,newkey);
			goto end;
			}
		BIO_printf(bio_err,"Generating a %d bit %s private key\n",
			newkey,(pkey_type == TYPE_RSA)?"RSA":"DSA");

		if ((pkey=EVP_PKEY_new()) == NULL) goto end;

#ifndef NO_RSA
		if (pkey_type == TYPE_RSA)
			{
			if (!EVP_PKEY_assign_RSA(pkey,
633
				RSA_generate_key(newkey,0x10001,
B
Ben Laurie 已提交
634
					req_cb,bio_err)))
635 636 637 638 639 640 641 642 643 644 645 646 647
				goto end;
			}
		else
#endif
#ifndef NO_DSA
			if (pkey_type == TYPE_DSA)
			{
			if (!DSA_generate_key(dsa_params)) goto end;
			if (!EVP_PKEY_assign_DSA(pkey,dsa_params)) goto end;
			dsa_params=NULL;
			}
#endif

648
		app_RAND_write_file(randfile, bio_err);
649 650 651 652 653 654 655 656 657 658

		if (pkey == NULL) goto end;

		if (keyout == NULL)
			keyout=CONF_get_string(req_conf,SECTION,KEYFILE);

		if (keyout == NULL)
			{
			BIO_printf(bio_err,"writing new private key to stdout\n");
			BIO_set_fp(out,stdout,BIO_NOCLOSE);
659 660 661 662 663 664
#ifdef VMS
			{
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
			out = BIO_push(tmpbio, out);
			}
#endif
665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685
			}
		else
			{
			BIO_printf(bio_err,"writing new private key to '%s'\n",keyout);
			if (BIO_write_filename(out,keyout) <= 0)
				{
				perror(keyout);
				goto end;
				}
			}

		p=CONF_get_string(req_conf,SECTION,"encrypt_rsa_key");
		if (p == NULL)
			p=CONF_get_string(req_conf,SECTION,"encrypt_key");
		if ((p != NULL) && (strcmp(p,"no") == 0))
			cipher=NULL;
		if (nodes) cipher=NULL;
		
		i=0;
loop:
		if (!PEM_write_bio_PrivateKey(out,pkey,cipher,
D
Dr. Stephen Henson 已提交
686
			NULL,0,NULL,passout))
687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719
			{
			if ((ERR_GET_REASON(ERR_peek_error()) ==
				PEM_R_PROBLEMS_GETTING_PASSWORD) && (i < 3))
				{
				ERR_clear_error();
				i++;
				goto loop;
				}
			goto end;
			}
		BIO_printf(bio_err,"-----\n");
		}

	if (!newreq)
		{
		/* Since we are using a pre-existing certificate
		 * request, the kludge 'format' info should not be
		 * changed. */
		kludge= -1;
		if (infile == NULL)
			BIO_set_fp(in,stdin,BIO_NOCLOSE);
		else
			{
			if (BIO_read_filename(in,infile) <= 0)
				{
				perror(infile);
				goto end;
				}
			}

		if	(informat == FORMAT_ASN1)
			req=d2i_X509_REQ_bio(in,NULL);
		else if (informat == FORMAT_PEM)
720
			req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL);
721 722 723 724 725 726 727 728 729 730 731 732 733 734
		else
			{
			BIO_printf(bio_err,"bad input format specified for X509 request\n");
			goto end;
			}
		if (req == NULL)
			{
			BIO_printf(bio_err,"unable to load X509 request\n");
			goto end;
			}
		}

	if (newreq || x509)
		{
735
#ifndef NO_DSA
736 737
		if (pkey->type == EVP_PKEY_DSA)
			digest=EVP_dss1();
738
#endif
739 740 741 742 743 744 745 746 747 748 749 750 751 752 753

		if (pkey == NULL)
			{
			BIO_printf(bio_err,"you need to specify a private key\n");
			goto end;
			}
		if (req == NULL)
			{
			req=X509_REQ_new();
			if (req == NULL)
				{
				goto end;
				}

			i=make_REQ(req,pkey,!x509);
D
 
Dr. Stephen Henson 已提交
754 755 756 757 758
			if ((kludge > 0) && !sk_X509_ATTRIBUTE_num(req->req_info->attributes))
				{
				sk_X509_ATTRIBUTE_free(req->req_info->attributes);
				req->req_info->attributes = NULL;
				}
759 760 761 762 763 764 765 766
			if (!i)
				{
				BIO_printf(bio_err,"problems making Certificate Request\n");
				goto end;
				}
			}
		if (x509)
			{
767
			EVP_PKEY *tmppkey;
768
			X509V3_CTX ext_ctx;
769 770
			if ((x509ss=X509_new()) == NULL) goto end;

771 772
			/* Set version to V3 */
			if(!X509_set_version(x509ss, 2)) goto end;
773 774 775 776 777 778 779 780 781
			ASN1_INTEGER_set(X509_get_serialNumber(x509ss),0L);

			X509_set_issuer_name(x509ss,
				X509_REQ_get_subject_name(req));
			X509_gmtime_adj(X509_get_notBefore(x509ss),0);
			X509_gmtime_adj(X509_get_notAfter(x509ss),
				(long)60*60*24*days);
			X509_set_subject_name(x509ss,
				X509_REQ_get_subject_name(req));
782 783 784
			tmppkey = X509_REQ_get_pubkey(req);
			X509_set_pubkey(x509ss,tmppkey);
			EVP_PKEY_free(tmppkey);
785

786 787
			/* Set up V3 context struct */

788 789
			X509V3_set_ctx(&ext_ctx, x509ss, x509ss, NULL, NULL, 0);
			X509V3_set_conf_lhash(&ext_ctx, req_conf);
790 791 792

			/* Add extensions */
			if(extensions && !X509V3_EXT_add_conf(req_conf, 
B
Ben Laurie 已提交
793 794 795 796 797 798 799
				 	&ext_ctx, extensions, x509ss))
			    {
			    BIO_printf(bio_err,
				       "Error Loading extension section %s\n",
				       extensions);
			    goto end;
			    }
800

801 802 803 804 805
			if (!(i=X509_sign(x509ss,pkey,digest)))
				goto end;
			}
		else
			{
806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821
			X509V3_CTX ext_ctx;

			/* Set up V3 context struct */

			X509V3_set_ctx(&ext_ctx, NULL, NULL, req, NULL, 0);
			X509V3_set_conf_lhash(&ext_ctx, req_conf);

			/* Add extensions */
			if(req_exts && !X509V3_EXT_REQ_add_conf(req_conf, 
				 	&ext_ctx, req_exts, req))
			    {
			    BIO_printf(bio_err,
				       "Error Loading extension section %s\n",
				       req_exts);
			    goto end;
			    }
822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838
			if (!(i=X509_REQ_sign(req,pkey,digest)))
				goto end;
			}
		}

	if (verify && !x509)
		{
		int tmp=0;

		if (pkey == NULL)
			{
			pkey=X509_REQ_get_pubkey(req);
			tmp=1;
			if (pkey == NULL) goto end;
			}

		i=X509_REQ_verify(req,pkey);
839 840 841 842
		if (tmp) {
			EVP_PKEY_free(pkey);
			pkey=NULL;
		}
843 844 845 846 847 848 849 850 851 852 853 854 855

		if (i < 0)
			{
			goto end;
			}
		else if (i == 0)
			{
			BIO_printf(bio_err,"verify failure\n");
			}
		else /* if (i > 0) */
			BIO_printf(bio_err,"verify OK\n");
		}

856
	if (noout && !text && !modulus && !subject)
857 858 859 860 861 862
		{
		ex=0;
		goto end;
		}

	if (outfile == NULL)
863
		{
864
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
865 866 867 868 869 870 871
#ifdef VMS
		{
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
		out = BIO_push(tmpbio, out);
		}
#endif
		}
872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892
	else
		{
		if ((keyout != NULL) && (strcmp(outfile,keyout) == 0))
			i=(int)BIO_append_filename(out,outfile);
		else
			i=(int)BIO_write_filename(out,outfile);
		if (!i)
			{
			perror(outfile);
			goto end;
			}
		}

	if (text)
		{
		if (x509)
			X509_print(out,x509ss);
		else	
			X509_REQ_print(out,req);
		}

893 894 895 896 897 898 899 900
	if(subject) 
		{
		if(x509)
			print_name(out, "subject=", X509_get_subject_name(x509ss), nmflag);
		else
			print_name(out, "subject=", X509_REQ_get_subject_name(req), nmflag);
		}

901 902 903 904 905 906 907 908 909 910 911 912 913 914
	if (modulus)
		{
		EVP_PKEY *pubkey;

		if (x509)
			pubkey=X509_get_pubkey(x509ss);
		else
			pubkey=X509_REQ_get_pubkey(req);
		if (pubkey == NULL)
			{
			fprintf(stdout,"Modulus=unavailable\n");
			goto end; 
			}
		fprintf(stdout,"Modulus=");
915
#ifndef NO_RSA
916 917 918
		if (pubkey->type == EVP_PKEY_RSA)
			BN_print(out,pubkey->pkey.rsa->n);
		else
919
#endif
920 921 922 923 924 925 926 927
			fprintf(stdout,"Wrong Algorithm type");
		fprintf(stdout,"\n");
		}

	if (!noout && !x509)
		{
		if 	(outformat == FORMAT_ASN1)
			i=i2d_X509_REQ_bio(out,req);
928 929 930 931
		else if (outformat == FORMAT_PEM) {
			if(newhdr) i=PEM_write_bio_X509_REQ_NEW(out,req);
			else i=PEM_write_bio_X509_REQ(out,req);
		} else {
932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963
			BIO_printf(bio_err,"bad output format specified for outfile\n");
			goto end;
			}
		if (!i)
			{
			BIO_printf(bio_err,"unable to write X509 request\n");
			goto end;
			}
		}
	if (!noout && x509 && (x509ss != NULL))
		{
		if 	(outformat == FORMAT_ASN1)
			i=i2d_X509_bio(out,x509ss);
		else if (outformat == FORMAT_PEM)
			i=PEM_write_bio_X509(out,x509ss);
		else	{
			BIO_printf(bio_err,"bad output format specified for outfile\n");
			goto end;
			}
		if (!i)
			{
			BIO_printf(bio_err,"unable to write X509 certificate\n");
			goto end;
			}
		}
	ex=0;
end:
	if (ex)
		{
		ERR_print_errors(bio_err);
		}
	if ((req_conf != NULL) && (req_conf != config)) CONF_free(req_conf);
964
	BIO_free(in);
965
	BIO_free_all(out);
966 967 968
	EVP_PKEY_free(pkey);
	X509_REQ_free(req);
	X509_free(x509ss);
969 970
	if(passargin && passin) OPENSSL_free(passin);
	if(passargout && passout) OPENSSL_free(passout);
971
	OBJ_cleanup();
972
#ifndef NO_DSA
973
	if (dsa_params != NULL) DSA_free(dsa_params);
974
#endif
975 976 977
	EXIT(ex);
	}

U
Ulf Möller 已提交
978
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, int attribs)
979
	{
980
	int ret=0,i;
981 982 983 984 985 986 987 988 989
	char no_prompt = 0;
	STACK_OF(CONF_VALUE) *dn_sk, *attr_sk = NULL;
	char *tmp, *dn_sect,*attr_sect;

	tmp=CONF_get_string(req_conf,SECTION,PROMPT);
	if((tmp != NULL) && !strcmp(tmp, "no")) no_prompt = 1;

	dn_sect=CONF_get_string(req_conf,SECTION,DISTINGUISHED_NAME);
	if (dn_sect == NULL)
990 991 992 993 994
		{
		BIO_printf(bio_err,"unable to find '%s' in config\n",
			DISTINGUISHED_NAME);
		goto err;
		}
995 996
	dn_sk=CONF_get_section(req_conf,dn_sect);
	if (dn_sk == NULL)
997
		{
998
		BIO_printf(bio_err,"unable to get '%s' section\n",dn_sect);
999 1000 1001
		goto err;
		}

1002 1003 1004
	attr_sect=CONF_get_string(req_conf,SECTION,ATTRIBUTES);
	if (attr_sect == NULL)
		attr_sk=NULL;
1005 1006
	else
		{
1007 1008
		attr_sk=CONF_get_section(req_conf,attr_sect);
		if (attr_sk == NULL)
1009
			{
1010
			BIO_printf(bio_err,"unable to get '%s' section\n",attr_sect);
1011 1012 1013 1014
			goto err;
			}
		}

1015
	/* setup version number */
1016
	if (!X509_REQ_set_version(req,0L)) goto err; /* version 1 */
1017

1018 1019 1020
	if(no_prompt) i = auto_info(req, dn_sk, attr_sk, attribs);
	else i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs);
	if(!i) goto err;
1021 1022 1023 1024 1025 1026 1027 1028

	X509_REQ_set_pubkey(req,pkey);

	ret=1;
err:
	return(ret);
	}

1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137

static int prompt_info(X509_REQ *req,
		STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect,
		STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs)
	{
	int i;
	char *p,*q;
	char buf[100];
	int nid,min,max;
	char *type,*def,*value;
	CONF_VALUE *v;
	X509_NAME *subj;
	subj = X509_REQ_get_subject_name(req);
	BIO_printf(bio_err,"You are about to be asked to enter information that will be incorporated\n");
	BIO_printf(bio_err,"into your certificate request.\n");
	BIO_printf(bio_err,"What you are about to enter is what is called a Distinguished Name or a DN.\n");
	BIO_printf(bio_err,"There are quite a few fields but you can leave some blank\n");
	BIO_printf(bio_err,"For some fields there will be a default value,\n");
	BIO_printf(bio_err,"If you enter '.', the field will be left blank.\n");
	BIO_printf(bio_err,"-----\n");


	if (sk_CONF_VALUE_num(dn_sk))
		{
		i= -1;
start:		for (;;)
			{
			i++;
			if (sk_CONF_VALUE_num(dn_sk) <= i) break;

			v=sk_CONF_VALUE_value(dn_sk,i);
			p=q=NULL;
			type=v->name;
			if(!check_end(type,"_min") || !check_end(type,"_max") ||
				!check_end(type,"_default") ||
					 !check_end(type,"_value")) continue;
			/* Skip past any leading X. X: X, etc to allow for
			 * multiple instances 
			 */
			for(p = v->name; *p ; p++) 
				if ((*p == ':') || (*p == ',') ||
							 (*p == '.')) {
					p++;
					if(*p) type = p;
					break;
				}
			/* If OBJ not recognised ignore it */
			if ((nid=OBJ_txt2nid(type)) == NID_undef) goto start;
			sprintf(buf,"%s_default",v->name);
			if ((def=CONF_get_string(req_conf,dn_sect,buf)) == NULL)
				def="";
				
			sprintf(buf,"%s_value",v->name);
			if ((value=CONF_get_string(req_conf,dn_sect,buf)) == NULL)
				value=NULL;

			sprintf(buf,"%s_min",v->name);
			min=(int)CONF_get_number(req_conf,dn_sect,buf);

			sprintf(buf,"%s_max",v->name);
			max=(int)CONF_get_number(req_conf,dn_sect,buf);

			if (!add_DN_object(subj,v->value,def,value,nid,
				min,max))
				return 0;
			}
		if (X509_NAME_entry_count(subj) == 0)
			{
			BIO_printf(bio_err,"error, no objects specified in config file\n");
			return 0;
			}

		if (attribs)
			{
			if ((attr_sk != NULL) && (sk_CONF_VALUE_num(attr_sk) > 0))
				{
				BIO_printf(bio_err,"\nPlease enter the following 'extra' attributes\n");
				BIO_printf(bio_err,"to be sent with your certificate request\n");
				}

			i= -1;
start2:			for (;;)
				{
				i++;
				if ((attr_sk == NULL) ||
					    (sk_CONF_VALUE_num(attr_sk) <= i))
					break;

				v=sk_CONF_VALUE_value(attr_sk,i);
				type=v->name;
				if ((nid=OBJ_txt2nid(type)) == NID_undef)
					goto start2;

				sprintf(buf,"%s_default",type);
				if ((def=CONF_get_string(req_conf,attr_sect,buf))
					== NULL)
					def="";
				
				sprintf(buf,"%s_value",type);
				if ((value=CONF_get_string(req_conf,attr_sect,buf))
					== NULL)
					value=NULL;

				sprintf(buf,"%s_min",type);
				min=(int)CONF_get_number(req_conf,attr_sect,buf);

				sprintf(buf,"%s_max",type);
				max=(int)CONF_get_number(req_conf,attr_sect,buf);

1138
				if (!add_attribute_object(req,
1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173
					v->value,def,value,nid,min,max))
					return 0;
				}
			}
		}
	else
		{
		BIO_printf(bio_err,"No template, please set one up.\n");
		return 0;
		}

	return 1;

	}

static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
			STACK_OF(CONF_VALUE) *attr_sk, int attribs)
	{
	int i;
	char *p,*q;
	char *type;
	CONF_VALUE *v;
	X509_NAME *subj;

	subj = X509_REQ_get_subject_name(req);

	for (i = 0; i < sk_CONF_VALUE_num(dn_sk); i++)
		{
		v=sk_CONF_VALUE_value(dn_sk,i);
		p=q=NULL;
		type=v->name;
		/* Skip past any leading X. X: X, etc to allow for
		 * multiple instances 
		 */
		for(p = v->name; *p ; p++) 
1174
#ifndef CHARSET_EBCDIC
1175
			if ((*p == ':') || (*p == ',') || (*p == '.')) {
1176 1177 1178
#else
			if ((*p == os_toascii[':']) || (*p == os_toascii[',']) || (*p == os_toascii['.'])) {
#endif
1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194
				p++;
				if(*p) type = p;
				break;
			}
		if (!X509_NAME_add_entry_by_txt(subj,type, MBSTRING_ASC,
				(unsigned char *) v->value,-1,-1,0)) return 0;

		}

		if (!X509_NAME_entry_count(subj))
			{
			BIO_printf(bio_err,"error, no objects specified in config file\n");
			return 0;
			}
		if (attribs)
			{
1195
			for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++)
1196 1197
				{
				v=sk_CONF_VALUE_value(attr_sk,i);
1198
				if(!X509_REQ_add1_attr_by_txt(req, v->name, MBSTRING_ASC,
1199
					(unsigned char *)v->value, -1)) return 0;
1200 1201 1202 1203 1204 1205
				}
			}
	return 1;
	}


U
Ulf Möller 已提交
1206 1207
static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
	     int nid, int min, int max)
1208
	{
1209
	int i,ret=0;
1210
	MS_STATIC char buf[1024];
1211
start:
1212
	BIO_printf(bio_err,"%s [%s]:",text,def);
B
Bodo Möller 已提交
1213
	(void)BIO_flush(bio_err);
1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243
	if (value != NULL)
		{
		strcpy(buf,value);
		strcat(buf,"\n");
		BIO_printf(bio_err,"%s\n",value);
		}
	else
		{
		buf[0]='\0';
		fgets(buf,1024,stdin);
		}

	if (buf[0] == '\0') return(0);
	else if (buf[0] == '\n')
		{
		if ((def == NULL) || (def[0] == '\0'))
			return(1);
		strcpy(buf,def);
		strcat(buf,"\n");
		}
	else if ((buf[0] == '.') && (buf[1] == '\n')) return(1);

	i=strlen(buf);
	if (buf[i-1] != '\n')
		{
		BIO_printf(bio_err,"weird input :-(\n");
		return(0);
		}
	buf[--i]='\0';

1244 1245 1246
#ifdef CHARSET_EBCDIC
	ebcdic2ascii(buf, buf, i);
#endif
1247
	if(!req_check_len(i, min, max)) goto start;
1248 1249
	if (!X509_NAME_add_entry_by_NID(n,nid, MBSTRING_ASC,
				(unsigned char *) buf, -1,-1,0)) goto err;
1250 1251 1252 1253 1254
	ret=1;
err:
	return(ret);
	}

1255
static int add_attribute_object(X509_REQ *req, char *text,
B
Ben Laurie 已提交
1256 1257
				char *def, char *value, int nid, int min,
				int max)
1258
	{
1259
	int i;
1260 1261 1262 1263
	static char buf[1024];

start:
	BIO_printf(bio_err,"%s [%s]:",text,def);
B
Bodo Möller 已提交
1264
	(void)BIO_flush(bio_err);
1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293
	if (value != NULL)
		{
		strcpy(buf,value);
		strcat(buf,"\n");
		BIO_printf(bio_err,"%s\n",value);
		}
	else
		{
		buf[0]='\0';
		fgets(buf,1024,stdin);
		}

	if (buf[0] == '\0') return(0);
	else if (buf[0] == '\n')
		{
		if ((def == NULL) || (def[0] == '\0'))
			return(1);
		strcpy(buf,def);
		strcat(buf,"\n");
		}
	else if ((buf[0] == '.') && (buf[1] == '\n')) return(1);

	i=strlen(buf);
	if (buf[i-1] != '\n')
		{
		BIO_printf(bio_err,"weird input :-(\n");
		return(0);
		}
	buf[--i]='\0';
1294 1295 1296
#ifdef CHARSET_EBCDIC
	ebcdic2ascii(buf, buf, i);
#endif
1297
	if(!req_check_len(i, min, max)) goto start;
1298

1299
	if(!X509_REQ_add1_attr_by_NID(req, nid, MBSTRING_ASC,
1300 1301 1302
					(unsigned char *)buf, -1)) {
		BIO_printf(bio_err, "Error adding attribute\n");
		ERR_print_errors(bio_err);
1303
		goto err;
1304
	}
1305 1306 1307 1308 1309 1310

	return(1);
err:
	return(0);
	}

B
Ben Laurie 已提交
1311
#ifndef NO_RSA
B
Ben Laurie 已提交
1312
static void MS_CALLBACK req_cb(int p, int n, void *arg)
1313 1314 1315 1316 1317 1318 1319
	{
	char c='*';

	if (p == 0) c='.';
	if (p == 1) c='+';
	if (p == 2) c='*';
	if (p == 3) c='\n';
1320
	BIO_write((BIO *)arg,&c,1);
B
Bodo Möller 已提交
1321
	(void)BIO_flush((BIO *)arg);
1322 1323 1324 1325
#ifdef LINT
	p=n;
#endif
	}
B
Ben Laurie 已提交
1326
#endif
1327

1328
static int req_check_len(int len, int min, int max)
1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341
	{
	if (len < min)
		{
		BIO_printf(bio_err,"string is too short, it needs to be at least %d bytes long\n",min);
		return(0);
		}
	if ((max != 0) && (len > max))
		{
		BIO_printf(bio_err,"string is too long, it needs to be less than  %d bytes long\n",max);
		return(0);
		}
	return(1);
	}
1342 1343

/* Check if the end of a string matches 'end' */
U
Ulf Möller 已提交
1344
static int check_end(char *str, char *end)
1345 1346 1347 1348 1349 1350 1351 1352 1353
{
	int elen, slen;	
	char *tmp;
	elen = strlen(end);
	slen = strlen(str);
	if(elen > slen) return 1;
	tmp = str + slen - elen;
	return strcmp(tmp, end);
}