diff options
| author | Ben Laurie <ben@openssl.org> | 1999-05-30 21:16:24 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-05-30 21:16:24 +0000 |
| commit | fc875472d0aad0bd7ed3235d727dbe4b66b53363 (patch) | |
| tree | dc23dce884c637ff3b3313be0762bcf493d380d5 /crypto/asn1/p8_pkey.c | |
| parent | e5e932d212aea2f9acceb4779b44f123050347a7 (diff) | |
Another stack.
Diffstat (limited to 'crypto/asn1/p8_pkey.c')
| -rw-r--r-- | crypto/asn1/p8_pkey.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c index 17c5bc3ccb..dee229451c 100644 --- a/crypto/asn1/p8_pkey.c +++ b/crypto/asn1/p8_pkey.c @@ -68,14 +68,16 @@ int i2d_PKCS8_PRIV_KEY_INFO (PKCS8_PRIV_KEY_INFO *a, unsigned char **pp) M_ASN1_I2D_len (a->version, i2d_ASN1_INTEGER); M_ASN1_I2D_len (a->pkeyalg, i2d_X509_ALGOR); M_ASN1_I2D_len (a->pkey, i2d_ASN1_TYPE); - M_ASN1_I2D_len_IMP_SET_opt (a->attributes, i2d_X509_ATTRIBUTE, 0); + M_ASN1_I2D_len_IMP_SET_opt_type (X509_ATTRIBUTE, a->attributes, + i2d_X509_ATTRIBUTE, 0); M_ASN1_I2D_seq_total (); M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER); M_ASN1_I2D_put (a->pkeyalg, i2d_X509_ALGOR); M_ASN1_I2D_put (a->pkey, i2d_ASN1_TYPE); - M_ASN1_I2D_put_IMP_SET_opt (a->attributes, i2d_X509_ATTRIBUTE, 0); + M_ASN1_I2D_put_IMP_SET_opt_type (X509_ATTRIBUTE, a->attributes, + i2d_X509_ATTRIBUTE, 0); M_ASN1_I2D_finish(); } @@ -103,8 +105,9 @@ PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO **a, M_ASN1_D2I_get (ret->version, d2i_ASN1_INTEGER); M_ASN1_D2I_get (ret->pkeyalg, d2i_X509_ALGOR); M_ASN1_D2I_get (ret->pkey, d2i_ASN1_TYPE); - M_ASN1_D2I_get_IMP_set_opt(ret->attributes, d2i_X509_ATTRIBUTE, - X509_ATTRIBUTE_free, 0); + M_ASN1_D2I_get_IMP_set_opt_type(X509_ATTRIBUTE, ret->attributes, + d2i_X509_ATTRIBUTE, + X509_ATTRIBUTE_free, 0); if (ASN1_TYPE_get(ret->pkey) == V_ASN1_SEQUENCE) ret->broken = PKCS8_NO_OCTET; M_ASN1_D2I_Finish(a, PKCS8_PRIV_KEY_INFO_free, ASN1_F_D2I_PKCS8_PRIV_KEY_INFO); @@ -120,6 +123,6 @@ void PKCS8_PRIV_KEY_INFO_free (PKCS8_PRIV_KEY_INFO *a) memset (a->pkey->value.octet_string->data, 0, a->pkey->value.octet_string->length); ASN1_TYPE_free (a->pkey); - sk_pop_free (a->attributes, X509_ATTRIBUTE_free); - Free ((char *)a); + sk_X509_ATTRIBUTE_pop_free (a->attributes, X509_ATTRIBUTE_free); + Free (a); } |