Change functions to ANSI C.

[openssl.git] / apps / crl2p7.c

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 04bb1a1c87df2c5fdfe076cf22cd47062bd2d021..aa407b709892f3a8e9bb8d02b712177778ed4a6e 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -1,5 +1,5 @@
 /* apps/crl2p7.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -73,7 +73,7 @@
 #include "objects.h"
 
 #ifndef NOPROTO
-static int add_certs_from_file(STACK *stack, char *certfile);
+static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #else
 static int add_certs_from_file();
 #endif
@@ -87,9 +87,7 @@ static int add_certs_from_file();
  * -out arg    - output file - default stdout
  */
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        int i,badops=0;
        BIO *in=NULL,*out=NULL;
@@ -98,21 +96,21 @@ char **argv;
        PKCS7 *p7 = NULL;
        PKCS7_SIGNED *p7s = NULL;
        X509_CRL *crl=NULL;
+       STACK *certflst=NULL;
        STACK *crl_stack=NULL;
-       STACK *cert_stack=NULL;
+       STACK_OF(X509) *cert_stack=NULL;
        int ret=1,nocrl=0;
 
        apps_startup();
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE);
+                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
        infile=NULL;
        outfile=NULL;
        informat=FORMAT_PEM;
        outformat=FORMAT_PEM;
-       certfile=NULL;
 
        prog=argv[0];
        argc--;
@@ -146,7 +144,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 +164,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);
                }
@@ -226,18 +226,20 @@ bad:
                crl=NULL; /* now part of p7 for Freeing */
                }
 
-       if ((cert_stack=sk_new(NULL)) == NULL) goto end;
+       if ((cert_stack=sk_X509_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);
@@ -284,9 +286,7 @@ end:
  *     number of certs added if successful, -1 if not.
  *----------------------------------------------------------------------
  */
-static int add_certs_from_file(stack,certfile)
-STACK *stack;
-char *certfile;
+static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
        {
        struct stat st;
        BIO *in=NULL;
@@ -297,19 +297,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))
@@ -317,7 +321,7 @@ char *certfile;
                xi=(X509_INFO *)sk_shift(sk);
                if (xi->x509 != NULL)
                        {
-                       sk_push(stack,(char *)xi->x509);
+                       sk_X509_push(stack,xi->x509);
                        xi->x509=NULL;
                        count++;
                        }