diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-31 01:13:04 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-31 01:13:04 +0000 |
| commit | ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda (patch) | |
| tree | 71a101c30b45069272befb805c9b285059a4cd4b /crypto/asn1/asn_pack.c | |
| parent | 71db02813c8d1ac2901be397ee4aa5f4dceabb17 (diff) | |
Rewrite PKCS#12 code and remove some of the old
horrible macros.
Fix two evil ASN1 bugs. Attempt to use 'ctx' when
NULL if input is indefinite length constructed
in asn1_check_tlen() and invalid pointer to ASN1_TYPE
when reusing existing structure (this took *ages* to
find because the new PKCS#12 code triggered it).
Diffstat (limited to 'crypto/asn1/asn_pack.c')
| -rw-r--r-- | crypto/asn1/asn_pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c index e62eed2afa..e6051db2dc 100644 --- a/crypto/asn1/asn_pack.c +++ b/crypto/asn1/asn_pack.c @@ -149,7 +149,7 @@ ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(), ASN1_STRING **oct) /* ASN1_ITEM versions of the above */ -ASN1_STRING *ASN1_pack_item(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct) +ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct) { ASN1_STRING *octmp; @@ -179,7 +179,7 @@ ASN1_STRING *ASN1_pack_item(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct) /* Extract an ASN1 object from an ASN1_STRING */ -void *ASN1_unpack_item(ASN1_STRING *oct, const ASN1_ITEM *it) +void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it) { unsigned char *p; void *ret; |