generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another stack.

Browse Source
This commit is contained in:
Ben Laurie 1999-05-30 21:16:24 +00:00
parent e5e932d212
commit fc875472d0
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/asn1/p8_pkey.c
View File

@ -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->version, i2d_ASN1_INTEGER);
M_ASN1_I2D_len (a->pkeyalg, i2d_X509_ALGOR); M_ASN1_I2D_len (a->pkeyalg, i2d_X509_ALGOR);
M_ASN1_I2D_len (a->pkey, i2d_ASN1_TYPE); 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_seq_total ();
M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER); M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER);
M_ASN1_I2D_put (a->pkeyalg, i2d_X509_ALGOR); M_ASN1_I2D_put (a->pkeyalg, i2d_X509_ALGOR);
M_ASN1_I2D_put (a->pkey, i2d_ASN1_TYPE); 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(); M_ASN1_I2D_finish();
} }
@ -103,7 +105,8 @@ 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->version, d2i_ASN1_INTEGER);
M_ASN1_D2I_get (ret->pkeyalg, d2i_X509_ALGOR); M_ASN1_D2I_get (ret->pkeyalg, d2i_X509_ALGOR);
M_ASN1_D2I_get (ret->pkey, d2i_ASN1_TYPE); M_ASN1_D2I_get (ret->pkey, d2i_ASN1_TYPE);
M_ASN1_D2I_get_IMP_set_opt(ret->attributes, d2i_X509_ATTRIBUTE, M_ASN1_D2I_get_IMP_set_opt_type(X509_ATTRIBUTE, ret->attributes,
d2i_X509_ATTRIBUTE,
X509_ATTRIBUTE_free, 0); X509_ATTRIBUTE_free, 0);
if (ASN1_TYPE_get(ret->pkey) == V_ASN1_SEQUENCE) if (ASN1_TYPE_get(ret->pkey) == V_ASN1_SEQUENCE)
ret->broken = PKCS8_NO_OCTET; ret->broken = PKCS8_NO_OCTET;
@ -120,6 +123,6 @@ void PKCS8_PRIV_KEY_INFO_free (PKCS8_PRIV_KEY_INFO *a)
memset (a->pkey->value.octet_string->data, memset (a->pkey->value.octet_string->data,
0, a->pkey->value.octet_string->length); 0, a->pkey->value.octet_string->length);
ASN1_TYPE_free (a->pkey); ASN1_TYPE_free (a->pkey);
sk_pop_free (a->attributes, X509_ATTRIBUTE_free); sk_X509_ATTRIBUTE_pop_free (a->attributes, X509_ATTRIBUTE_free);
Free ((char *)a); Free (a);
} }

5
crypto/pkcs12/p12_attr.c
View File

@ -135,11 +135,12 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage)
} }
sk_ASN1_TYPE_push (attrib->value.set,keyid); sk_ASN1_TYPE_push (attrib->value.set,keyid);
attrib->set = 1; attrib->set = 1;
if (!p8->attributes && !(p8->attributes = sk_new (NULL))) { if (!p8->attributes
&& !(p8->attributes = sk_X509_ATTRIBUTE_new (NULL))) {
PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
return 0; return 0;
} }
sk_push (p8->attributes, (char *)attrib); sk_X509_ATTRIBUTE_push (p8->attributes, attrib);
return 1; return 1;
} }

2
crypto/x509/x509.h
View File

@ -375,7 +375,7 @@ typedef struct pkcs8_priv_key_info_st
ASN1_INTEGER *version; ASN1_INTEGER *version;
X509_ALGOR *pkeyalg; X509_ALGOR *pkeyalg;
ASN1_TYPE *pkey; /* Should be OCTET STRING but some are broken */ ASN1_TYPE *pkey; /* Should be OCTET STRING but some are broken */
STACK *attributes; STACK_OF(X509_ATTRIBUTE) *attributes;
} PKCS8_PRIV_KEY_INFO; } PKCS8_PRIV_KEY_INFO;
#include <openssl/x509_vfy.h> #include <openssl/x509_vfy.h>