Make "make test" fail if bntest fails an internal selfcheck.

[openssl.git] / apps / crl.c

diff --git a/apps/crl.c b/apps/crl.c
index 3bb7aae11eca25e1cebd91141f2fdbd966db9981..1b04f68ecfdb3d4315ecc760822d43a04bf9a639 100644 (file)
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -60,11 +60,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   crl_main
@@ -88,17 +88,10 @@ static char *crl_usage[]={
 NULL
 };
 
-#ifndef NOPROTO
 static X509_CRL *load_crl(char *file, int format);
-#else
-static X509_CRL *load_crl();
-#endif
-
 static BIO *bio_out=NULL;
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        X509_CRL *x=NULL;
        int ret=1,i,num,badops=0;
@@ -262,9 +255,7 @@ end:
        EXIT(ret);
        }
 
-static X509_CRL *load_crl(infile, format)
-char *infile;
-int format;
+static X509_CRL *load_crl(char *infile, int format)
        {
        X509_CRL *x=NULL;
        BIO *in=NULL;