X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=apps%2Fcrl2p7.c;h=ba4eba16bf9ca1932dd5524ae80de0e9a00a1c89;hb=e90c7729467108ffd6f813ade011c7ec5ced9680;hp=12e535a282bcb47dd5e1ac4d9a9bccf9a8d21065;hpb=ec577822f95a8bca0023c5c77cef1a4916822d4a;p=openssl.git

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 12e535a282..ba4eba16bf 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -72,12 +72,7 @@
 #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);
 	}