diff options
| author | Ben Laurie <ben@openssl.org> | 1999-05-01 18:29:59 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-05-01 18:29:59 +0000 |
| commit | d35ea5b00b32eb30eaaffd3c5e504d6c003c17dc (patch) | |
| tree | b88a7b2510ac63d5c5fd733e5595a3347271402e /crypto/asn1/x_attrib.c | |
| parent | d500de16725216503786dba48db519d3031614e7 (diff) | |
Another stack.
Diffstat (limited to 'crypto/asn1/x_attrib.c')
| -rw-r--r-- | crypto/asn1/x_attrib.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c index 78a7990c2f..274c9a920d 100644 --- a/crypto/asn1/x_attrib.c +++ b/crypto/asn1/x_attrib.c @@ -84,7 +84,7 @@ int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp) ret+=i2d_ASN1_OBJECT(a->object,p); if (a->set) - ret+=i2d_ASN1_SET(a->value.set,p,i2d_ASN1_TYPE, + ret+=i2d_ASN1_SET_OF_ASN1_TYPE(a->value.set,p,i2d_ASN1_TYPE, V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET); else ret+=i2d_ASN1_TYPE(a->value.single,p); @@ -105,7 +105,8 @@ X509_ATTRIBUTE *d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a, unsigned char **pp, (M_ASN1_next == (V_ASN1_CONSTRUCTED|V_ASN1_UNIVERSAL|V_ASN1_SET))) { ret->set=1; - M_ASN1_D2I_get_set(ret->value.set,d2i_ASN1_TYPE,ASN1_TYPE_free); + M_ASN1_D2I_get_set_type(ASN1_TYPE,ret->value.set,d2i_ASN1_TYPE, + ASN1_TYPE_free); } else { @@ -125,9 +126,9 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, char *value) return(NULL); ret->object=OBJ_nid2obj(nid); ret->set=1; - if ((ret->value.set=sk_new_null()) == NULL) goto err; + if ((ret->value.set=sk_ASN1_TYPE_new_null()) == NULL) goto err; if ((val=ASN1_TYPE_new()) == NULL) goto err; - if (!sk_push(ret->value.set,(char *)val)) goto err; + if (!sk_ASN1_TYPE_push(ret->value.set,val)) goto err; ASN1_TYPE_set(val,atrtype,value); return(ret); @@ -155,7 +156,7 @@ void X509_ATTRIBUTE_free(X509_ATTRIBUTE *a) if (a == NULL) return; ASN1_OBJECT_free(a->object); if (a->set) - sk_pop_free(a->value.set,ASN1_TYPE_free); + sk_ASN1_TYPE_pop_free(a->value.set,ASN1_TYPE_free); else ASN1_TYPE_free(a->value.single); Free((char *)a); |