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

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

diff --git a/CHANGES b/CHANGES
index 2f2b3b115e136b950da2300c897c2c057f724b48..55abf914d84c17cb7453627abc4e7d8d38d8d1ff 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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.

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 8c9837ef81ca8d01fe84e66c36c2186afb410eb5..cf9a3bf2bc13f8a9621457fe079a6640abde3dce 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -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");

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 82a7829558667c5d1f6cfdc87ed1b44c70acf3b3..befae045ce70349dbfd9bd7a6ea57acfb2c3bac7 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -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,15 +231,17 @@ 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");
+                       BIO_printf(bio_err, "error loading certificates\n");
                        ERR_print_errors(bio_err);
                        goto end;
                        }
-               }
+       }
+
+       sk_free(certflst);
 
        if (outfile == NULL)
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
@@ -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))

diff --git a/apps/dh.c b/apps/dh.c
index bbf445e84568330278402d4bebb900899141f2b9..f7769ccc6015c0537d4faccd1c637205046c729c 100644 (file)
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -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");

diff --git a/apps/dsa.c b/apps/dsa.c
index fbd85a467adbb6edc1ba377eeb9d36a3aa28eaba..f58ff35c7feb00a78567e87dea2359b56bdb832d 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -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");

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index de1d0cc953ad6490b1ecbcbf114736c94e6c6caa..e01f93974892fac327779d045850766771977c12 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -172,7 +172,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," -text         check the DSA parameters\n");
                BIO_printf(bio_err," -C            Output C code\n");

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 06640bf0f2a58e29c8b739eee900cd319e5c5238..9f96edc5655951aeeca559ee764085bee79b191e 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -161,7 +161,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," -print_certs  print any certs or crl in the input\n");
                BIO_printf(bio_err," -des          encrypt PEM output with cbc des\n");

diff --git a/apps/req.c b/apps/req.c
index 523139ecda528c456e3ead0b629249be5ebef9b2..6ff9bb2c02cfcd21045a975ccc043ba8716d6a76 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -335,7 +335,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," -text          text form of request\n");
                BIO_printf(bio_err," -noout         do not output REQ\n");

diff --git a/apps/rsa.c b/apps/rsa.c
index 267b12b15e1b26d1efe1f87a9f4294d6b9ea0af3..056936da73490ad8334bc425ddf4e2ab4d467e6e 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -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");