Convert casted X509_INFO stacks to type-safe STACK_OF(X509_INFO).

[openssl.git] / apps / crl2p7.c

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 611046ecf51e4cff3f140f74329f96db2bbe7cb9..ba4eba16bf9ca1932dd5524ae80de0e9a00a1c89 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -287,7 +287,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
        BIO *in=NULL;
        int count=0;
        int ret= -1;
        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))
        X509_INFO *xi;
 
        if ((stat(certfile,&st) != 0))


@@ -311,9 +311,9 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
        }
 
        /* scan over it and pull out the CRL's */
        }
 
        /* 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);
                if (xi->x509 != NULL)
                        {
                        sk_X509_push(stack,xi->x509);


@@ -327,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);
 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);
        }
 
        return(ret);
        }