#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
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))
}
/* 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);
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);
}