X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fcrl2p7.c;h=ba4eba16bf9ca1932dd5524ae80de0e9a00a1c89;hb=426edadf98dfa465329dd1501e83b0cb0be2facb;hp=aa407b709892f3a8e9bb8d02b712177778ed4a6e;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=oweals%2Fopenssl.git

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index aa407b7098..ba4eba16bf 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -65,19 +65,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "err.h"
-#include "evp.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-#include "objects.h"
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
-#else
-static int add_certs_from_file();
-#endif
-
 #undef PROG
 #define PROG	crl2pkcs7_main
 
@@ -292,7 +287,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 	BIO *in=NULL;
 	int count=0;
 	int ret= -1;
-	STACK *sk=NULL;
+	STACK_OF(X509_INFO) *sk=NULL;
 	X509_INFO *xi;
 
 	if ((stat(certfile,&st) != 0))
@@ -316,9 +311,9 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 	}
 
 	/* scan over it and pull out the CRL's */
-	while (sk_num(sk))
+	while (sk_X509_INFO_num(sk))
 		{
-		xi=(X509_INFO *)sk_shift(sk);
+		xi=sk_X509_INFO_shift(sk);
 		if (xi->x509 != NULL)
 			{
 			sk_X509_push(stack,xi->x509);
@@ -332,7 +327,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 end:
  	/* never need to Free x */
 	if (in != NULL) BIO_free(in);
-	if (sk != NULL) sk_free(sk);
+	if (sk != NULL) sk_X509_INFO_free(sk);
 	return(ret);
 	}