Commit 9fe84296 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Allow the -certfile argument to be used multiple times in crl2pkcs7. 

Also fix typos in the usage messages: "inout" instead of "input".
parent 288cb84f

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 


 Changes between 0.9.1c and 0.9.2



  *) Modify crl2pkcs7 so it supports multiple -certfile arguments. Fix a

     few typos.

     [Steve Henson]



  *) Fixes to BN code.  Previously the default was to define BN_RECURSION

     but the BN code had some problems that would cause failures when

     doing certificate verification and some other functions.

apps/asn1pars.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ bad: 
		BIO_printf(bio_err,"%s [options] <infile\n",prog);

		BIO_printf(bio_err,"where options are\n");

		BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");

		BIO_printf(bio_err," -in arg       inout file\n");

		BIO_printf(bio_err," -in arg       input file\n");

		BIO_printf(bio_err," -offset arg   offset into file\n");

		BIO_printf(bio_err," -length arg   lenth of section in file\n");

		BIO_printf(bio_err," -i            indent entries\n");

apps/crl2p7.c

+17 −9
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ char **argv; 
	PKCS7 *p7 = NULL;

	PKCS7_SIGNED *p7s = NULL;

	X509_CRL *crl=NULL;

	STACK *certflst=NULL;

	STACK *crl_stack=NULL;

	STACK *cert_stack=NULL;

	int ret=1,nocrl=0;
@@ -112,7 +113,6 @@ char **argv; 
	outfile=NULL;

	informat=FORMAT_PEM;

	outformat=FORMAT_PEM;

	certfile=NULL;



	prog=argv[0];

	argc--;
@@ -146,7 +146,8 @@ char **argv; 
		else if (strcmp(*argv,"-certfile") == 0)

			{

			if (--argc < 1) goto bad;

			certfile= *(++argv);

			if(!certflst) certflst = sk_new(NULL);

			sk_push(certflst,*(++argv));

			}

		else

			{
@@ -165,9 +166,10 @@ bad: 
		BIO_printf(bio_err,"where options are\n");

		BIO_printf(bio_err," -inform arg    input format - one of DER TXT PEM\n");

		BIO_printf(bio_err," -outform arg   output format - one of DER TXT PEM\n");

		BIO_printf(bio_err," -in arg        inout file\n");

		BIO_printf(bio_err," -in arg        input file\n");

		BIO_printf(bio_err," -out arg       output file\n");

		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");

		BIO_printf(bio_err,"                (can be used more than once)\n");

		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");

		EXIT(1);

		}
@@ -229,8 +231,8 @@ bad: 
	if ((cert_stack=sk_new(NULL)) == NULL) goto end;

	p7s->cert=cert_stack;



	if (certfile != NULL) 

		{

	if(certflst) for(i = 0; i < sk_num(certflst); i++) {

		certfile = sk_value(certflst, i);

		if (add_certs_from_file(cert_stack,certfile) < 0)

			{

			BIO_printf(bio_err, "error loading certificates\n");
@@ -239,6 +241,8 @@ bad: 
			}

	}



	sk_free(certflst);



	if (outfile == NULL)

		BIO_set_fp(out,stdout,BIO_NOCLOSE);

	else
@@ -297,19 +301,23 @@ char *certfile; 


	if ((stat(certfile,&st) != 0))

		{

		BIO_printf(bio_err,"unable to file the file, %s\n",certfile);

		BIO_printf(bio_err,"unable to load the file, %s\n",certfile);

		goto end;

		}



	in=BIO_new(BIO_s_file());

	if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))

		{

		BIO_printf(bio_err,"error opening the file, %s\n",certfile);

		goto end;

		}



	/* This loads from a file, a stack of x509/crl/pkey sets */

	sk=PEM_X509_INFO_read_bio(in,NULL,NULL);

	if (sk == NULL) goto end;

	if (sk == NULL) {

		BIO_printf(bio_err,"error reading the file, %s\n",certfile);

		goto end;

	}



	/* scan over it and pull out the CRL's */

	while (sk_num(sk))

apps/dh.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ bad: 
		BIO_printf(bio_err,"where options are\n");

		BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");

		BIO_printf(bio_err," -outform arg  output format - one of DER TXT PEM\n");

		BIO_printf(bio_err," -in arg       inout file\n");

		BIO_printf(bio_err," -in arg       input file\n");

		BIO_printf(bio_err," -out arg      output file\n");

		BIO_printf(bio_err," -check        check the DH parameters\n");

		BIO_printf(bio_err," -text         check the DH parameters\n");

apps/dsa.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ bad: 
		BIO_printf(bio_err,"where options are\n");

		BIO_printf(bio_err," -inform arg   input format - one of DER NET PEM\n");

		BIO_printf(bio_err," -outform arg  output format - one of DER NET PEM\n");

		BIO_printf(bio_err," -in arg       inout file\n");

		BIO_printf(bio_err," -in arg       input file\n");

		BIO_printf(bio_err," -out arg      output file\n");

		BIO_printf(bio_err," -des          encrypt PEM output with cbc des\n");

		BIO_printf(bio_err," -des3         encrypt PEM output with ede cbc des using 168 bit key\n");