From 2f13ee21eae7ba289a80af2d7e4a04e21cc0f0d9 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 3 Nov 2000 00:59:49 +0000 Subject: [PATCH] Instead of just STACK, use STACK_OF(ASN1_OBJECT). --- crypto/ocsp/ocsp_ext.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c index b55f572e1a..60ddc2cff7 100644 --- a/crypto/ocsp/ocsp_ext.c +++ b/crypto/ocsp/ocsp_ext.c @@ -168,7 +168,7 @@ err: X509_EXTENSION *OCSP_accept_responses_new(char **oids) { int nid; - STACK *sk = NULL; + STACK_OF(ASN1_OBJECT) *sk = NULL; ASN1_OBJECT *o = NULL; X509_EXTENSION *x = NULL; if (!(sk = sk_new(NULL))) goto err; @@ -183,11 +183,11 @@ X509_EXTENSION *OCSP_accept_responses_new(char **oids) goto err; if (!(ASN1_STRING_encode(x->value,i2d_ASN1_OBJECT,NULL,sk))) goto err; - sk_pop_free(sk, ASN1_OBJECT_free); + sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free); return x; err: if (x) X509_EXTENSION_free(x); - if (sk) sk_pop_free(sk, ASN1_OBJECT_free); + if (sk) sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free); return NULL; } @@ -267,7 +267,7 @@ int OCSP_extension_print(BIO *bp, int ind) { int i, j; - STACK *sk = NULL; + STACK_OF(ASN1_OBJECT) *sk = NULL; unsigned char *p; OCSP_CRLID *crlid = NULL; OCSP_SERVICELOC *sloc = NULL; @@ -300,7 +300,8 @@ int OCSP_extension_print(BIO *bp, p = x->value->data; if (!(d2i_ASN1_SET(&sk, &p, x->value->length, (char *(*)())d2i_ASN1_OBJECT, - ASN1_OBJECT_free, V_ASN1_SEQUENCE, + (void (*)(void *))ASN1_OBJECT_free, + V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL))) goto err; for (i = 0; i < sk_num(sk); i++) @@ -312,7 +313,7 @@ int OCSP_extension_print(BIO *bp, goto err; } if (BIO_write(bp, "\n", 1) <= 0) goto err; - sk_pop_free(sk, ASN1_OBJECT_free); + sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free); break; case NID_id_pkix_OCSP_archiveCutoff: if (BIO_printf(bp, "%*sarchive cutoff: ", ind, "")<=0) -- 2.25.1