Remove NOPROTO definitions and error code comments.

[openssl.git] / apps / pkcs7.c

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 47bd7564a97722aab5830cfae1f55bad7f789c6c..24b3e57882c516d28fe1debe157a01d6039e60af 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -1,5 +1,5 @@
 /* apps/pkcs7.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
@@ -61,12 +61,12 @@
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "err.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
+#include <openssl/err.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   pkcs7_main
@@ -81,13 +81,13 @@
  * -print_certs
  */
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        PKCS7 *p7=NULL;
        int i,badops=0;
+#if !defined(NO_DES) || !defined(NO_IDEA)
        EVP_CIPHER *enc=NULL;
+#endif
        BIO *in=NULL,*out=NULL;
        int informat,outformat;
        char *infile,*outfile,*prog,buf[256];
@@ -98,7 +98,7 @@ char **argv;
 
        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;
@@ -159,7 +159,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");
@@ -221,7 +221,7 @@ bad:
 
        if (print_certs)
                {
-               STACK *certs=NULL;
+               STACK_OF(X509) *certs=NULL;
                STACK *crls=NULL;
 
                i=OBJ_obj2nid(p7->type);
@@ -243,9 +243,9 @@ bad:
                        {
                        X509 *x;
 
-                       for (i=0; i<sk_num(certs); i++)
+                       for (i=0; i<sk_X509_num(certs); i++)
                                {
-                               x=(X509 *)sk_value(certs,i);
+                               x=sk_X509_value(certs,i);
 
                                X509_NAME_oneline(X509_get_subject_name(x),
                                        buf,256);
@@ -275,9 +275,9 @@ bad:
                                BIO_puts(out,buf);
 
                                BIO_puts(out,"\nlast update=");
-                               ASN1_UTCTIME_print(out,crl->crl->lastUpdate);
+                               ASN1_TIME_print(out,crl->crl->lastUpdate);
                                BIO_puts(out,"\nnext update=");
-                               ASN1_UTCTIME_print(out,crl->crl->nextUpdate);
+                               ASN1_TIME_print(out,crl->crl->nextUpdate);
                                BIO_puts(out,"\n");
 
                                PEM_write_bio_X509_CRL(out,crl);