Typo, was "time" instead of "tim".

[openssl.git] / crypto / ocsp / ocsp_ext.c

diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index b55f572e1acff3af37ef3f53106ff76a91ce3235..aac4edb1e5fd2848dda6de5e155a53428ceb74ef 100644 (file)
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -83,7 +83,7 @@
 /* also CRL Entry Extensions */
 
 ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, int (*i2d)(), 
-                               char *data, STACK *sk)
+                               char *data, STACK_OF(ASN1_OBJECT) *sk)
         {
        int i;
        unsigned char *p, *b = NULL;
@@ -97,11 +97,11 @@ ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, int (*i2d)(),
                }
        else if (sk)
                {
-               if ((i=i2d_ASN1_SET(sk,NULL,i2d,V_ASN1_SEQUENCE,
+               if ((i=i2d_ASN1_SET_OF_ASN1_OBJECT(sk,NULL,i2d,V_ASN1_SEQUENCE,
                                   V_ASN1_UNIVERSAL,IS_SEQUENCE))<=0) goto err;
                if (!(b=p=(unsigned char*)OPENSSL_malloc((unsigned int)i)))
                        goto err;
-               if (i2d_ASN1_SET(sk,&p,i2d,V_ASN1_SEQUENCE,
+               if (i2d_ASN1_SET_OF_ASN1_OBJECT(sk,&p,i2d,V_ASN1_SEQUENCE,
                                 V_ASN1_UNIVERSAL,IS_SEQUENCE)<=0) goto err;
                }
        else
@@ -146,7 +146,7 @@ X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim)
                if (!(cid->crlNum = ASN1_INTEGER_new())) goto err;
                if (!(ASN1_INTEGER_set(cid->crlNum, *n))) goto err;
                }
-       if (time)
+       if (tim)
                {
                if (!(cid->crlTime = ASN1_GENERALIZEDTIME_new())) goto err;
                if (!(ASN1_GENERALIZEDTIME_set_string(cid->crlTime, tim))) 
@@ -168,14 +168,15 @@ 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;
+
+       if (!(sk = sk_ASN1_OBJECT_new(NULL))) goto err;
        while (oids && *oids)
                {
                if ((nid=OBJ_txt2nid(*oids))!=NID_undef&&(o=OBJ_nid2obj(nid))) 
-                       sk_push(sk, (char*) o);
+                       sk_ASN1_OBJECT_push(sk, o);
                oids++;
                }
        if (!(x = X509_EXTENSION_new())) goto err;
@@ -183,11 +184,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 +268,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;
@@ -298,21 +299,22 @@ int OCSP_extension_print(BIO *bp,
                                      ind, "") <= 0)
                                goto err;
                        p = x->value->data;
-                       if (!(d2i_ASN1_SET(&sk, &p, x->value->length, 
-                                          (char *(*)())d2i_ASN1_OBJECT, 
-                                          ASN1_OBJECT_free, V_ASN1_SEQUENCE, 
+                       if (!(d2i_ASN1_SET_OF_ASN1_OBJECT(&sk, &p, x->value->length, 
+                                          d2i_ASN1_OBJECT, 
+                                          ASN1_OBJECT_free,
+                                          V_ASN1_SEQUENCE, 
                                           V_ASN1_UNIVERSAL)))
                                goto err;
-                       for (i = 0; i < sk_num(sk); i++)
+                       for (i = 0; i < sk_ASN1_OBJECT_num(sk); i++)
                                {
-                               j=OBJ_obj2nid((ASN1_OBJECT*)sk->data[i]);
+                               j=OBJ_obj2nid(sk_ASN1_OBJECT_value(sk,i));
                                if (BIO_printf(bp," %s ",
                                               (j == NID_undef)?"UNKNOWN":
                                                           OBJ_nid2ln(j)) <= 0)
                                          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)