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);
}
int PEM_ASN1_write_bio(int (*i2d)(),const char *name,BIO *bp,char *x,
const EVP_CIPHER *enc,unsigned char *kstr,int klen,
int (*callback)());
-STACK * PEM_X509_INFO_read_bio(BIO *bp, STACK *sk, int (*cb)());
+STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, int (*cb)());
int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
unsigned char *kstr, int klen, int (*cb)());
#endif
int PEM_ASN1_write(int (*i2d)(),const char *name,FILE *fp,char *x,
const EVP_CIPHER *enc,unsigned char *kstr,int klen,
int (*callback)());
-STACK * PEM_X509_INFO_read(FILE *fp, STACK *sk, int (*cb)());
+STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, int (*cb)());
#endif
int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
#include <openssl/pem.h>
#ifndef NO_FP_API
-STACK *PEM_X509_INFO_read(FILE *fp, STACK *sk, int (*cb)())
+STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, int (*cb)())
{
BIO *b;
- STACK *ret;
+ STACK_OF(X509_INFO) *ret;
if ((b=BIO_new(BIO_s_file())) == NULL)
{
}
#endif
-STACK *PEM_X509_INFO_read_bio(BIO *bp, STACK *sk, int (*cb)())
+STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, int (*cb)())
{
X509_INFO *xi=NULL;
char *name=NULL,*header=NULL,**pp;
unsigned char *data=NULL,*p;
long len,error=0;
int ok=0;
- STACK *ret=NULL;
+ STACK_OF(X509_INFO) *ret=NULL;
unsigned int i,raw;
char *(*d2i)();
if (sk == NULL)
{
- if ((ret=sk_new_null()) == NULL)
+ if ((ret=sk_X509_INFO_new_null()) == NULL)
{
PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_MALLOC_FAILURE);
goto err;
d2i=(char *(*)())d2i_X509;
if (xi->x509 != NULL)
{
- if (!sk_push(ret,(char *)xi)) goto err;
+ if (!sk_X509_INFO_push(ret,xi)) goto err;
if ((xi=X509_INFO_new()) == NULL) goto err;
goto start;
}
d2i=(char *(*)())d2i_X509_CRL;
if (xi->crl != NULL)
{
- if (!sk_push(ret,(char *)xi)) goto err;
+ if (!sk_X509_INFO_push(ret,xi)) goto err;
if ((xi=X509_INFO_new()) == NULL) goto err;
goto start;
}
d2i=(char *(*)())d2i_RSAPrivateKey;
if (xi->x_pkey != NULL)
{
- if (!sk_push(ret,(char *)xi)) goto err;
+ if (!sk_X509_INFO_push(ret,xi)) goto err;
if ((xi=X509_INFO_new()) == NULL) goto err;
goto start;
}
d2i=(char *(*)())d2i_DSAPrivateKey;
if (xi->x_pkey != NULL)
{
- if (!sk_push(ret,(char *)xi)) goto err;
+ if (!sk_X509_INFO_push(ret,xi)) goto err;
if ((xi=X509_INFO_new()) == NULL) goto err;
goto start;
}
if ((xi->x509 != NULL) || (xi->crl != NULL) ||
(xi->x_pkey != NULL) || (xi->enc_data != NULL))
{
- if (!sk_push(ret,(char *)xi)) goto err;
+ if (!sk_X509_INFO_push(ret,xi)) goto err;
xi=NULL;
}
ok=1;
if (xi != NULL) X509_INFO_free(xi);
if (!ok)
{
- for (i=0; ((int)i)<sk_num(ret); i++)
+ for (i=0; ((int)i)<sk_X509_INFO_num(ret); i++)
{
- xi=(X509_INFO *)sk_value(ret,i);
+ xi=sk_X509_INFO_value(ret,i);
X509_INFO_free(xi);
}
- if (ret != sk) sk_free(ret);
+ if (ret != sk) sk_X509_INFO_free(ret);
ret=NULL;
}