Remove NOPROTO definitions and error code comments.

[openssl.git] / apps / pkcs7.c

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 4105dbd9efbd390a1f40e76e146ab420cbf7aaba..24b3e57882c516d28fe1debe157a01d6039e60af 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -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,9 +81,7 @@
  * -print_certs
  */
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        PKCS7 *p7=NULL;
        int i,badops=0;
@@ -161,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");
@@ -223,7 +221,7 @@ bad:
 
        if (print_certs)
                {
-               STACK *certs=NULL;
+               STACK_OF(X509) *certs=NULL;
                STACK *crls=NULL;
 
                i=OBJ_obj2nid(p7->type);
@@ -245,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);
@@ -277,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);