Enhanced support for Alpha Linux. See CHANGES for details.

[openssl.git] / apps / crl2p7.c

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 611046ecf51e4cff3f140f74329f96db2bbe7cb9..8634e3a1ec075f74fa07e0c80f58fc84367cffb1 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -92,7 +92,7 @@ int MAIN(int argc, char **argv)
        PKCS7_SIGNED *p7s = NULL;
        X509_CRL *crl=NULL;
        STACK *certflst=NULL;
-       STACK *crl_stack=NULL;
+       STACK_OF(X509_CRL) *crl_stack=NULL;
        STACK_OF(X509) *cert_stack=NULL;
        int ret=1,nocrl=0;
 
@@ -193,7 +193,7 @@ bad:
                if      (informat == FORMAT_ASN1)
                        crl=d2i_X509_CRL_bio(in,NULL);
                else if (informat == FORMAT_PEM)
-                       crl=PEM_read_bio_X509_CRL(in,NULL,NULL);
+                       crl=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
                else    {
                        BIO_printf(bio_err,"bad input format specified for input crl\n");
                        goto end;
@@ -213,11 +213,11 @@ bad:
        p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
 
        if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
-       if ((crl_stack=sk_new(NULL)) == NULL) goto end;
+       if ((crl_stack=sk_X509_CRL_new(NULL)) == NULL) goto end;
        p7s->crl=crl_stack;
        if (crl != NULL)
                {
-               sk_push(crl_stack,(char *)crl);
+               sk_X509_CRL_push(crl_stack,crl);
                crl=NULL; /* now part of p7 for Freeing */
                }
 
@@ -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;
-       STACK *sk=NULL;
+       STACK_OF(X509_INFO) *sk=NULL;
        X509_INFO *xi;
 
        if ((stat(certfile,&st) != 0))
@@ -304,16 +304,16 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
                }
 
        /* This loads from a file, a stack of x509/crl/pkey sets */
-       sk=PEM_X509_INFO_read_bio(in,NULL,NULL);
+       sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL);
        if (sk == NULL) {
                BIO_printf(bio_err,"error reading the file, %s\n",certfile);
                goto end;
        }
 
        /* 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);
@@ -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);
-       if (sk != NULL) sk_free(sk);
+       if (sk != NULL) sk_X509_INFO_free(sk);
        return(ret);
        }