diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-08 19:09:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-08 19:09:35 +0000 |
| commit | 9d6b1ce6441c7cc6aed344f02d9f676ab5e04217 (patch) | |
| tree | 7329435a21d3289cb3caad6d3d6c065f484373e1 /crypto/pkcs12/p12_attr.c | |
| parent | 66ebbb6a56bc1688fa37878e4feec985b0c260d7 (diff) | |
| download | openssl-9d6b1ce6441c7cc6aed344f02d9f676ab5e04217.zip openssl-9d6b1ce6441c7cc6aed344f02d9f676ab5e04217.tar.gz openssl-9d6b1ce6441c7cc6aed344f02d9f676ab5e04217.tar.bz2 | |
Merge from the ASN1 branch of new ASN1 code
to main trunk.
Lets see if the makes it to openssl-cvs :-)
Diffstat (limited to 'crypto/pkcs12/p12_attr.c')
| -rw-r--r-- | crypto/pkcs12/p12_attr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c index f1a210b..64bf417 100644 --- a/crypto/pkcs12/p12_attr.c +++ b/crypto/pkcs12/p12_attr.c @@ -92,7 +92,7 @@ int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name, return 0; } sk_ASN1_TYPE_push (attrib->value.set,keyid); - attrib->set = 1; + attrib->single = 0; if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new_null ())) { PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); return 0; @@ -134,7 +134,7 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage) return 0; } sk_ASN1_TYPE_push (attrib->value.set,keyid); - attrib->set = 1; + attrib->single = 0; if (!p8->attributes && !(p8->attributes = sk_X509_ATTRIBUTE_new_null ())) { PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); @@ -201,7 +201,7 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag, return 0; } sk_ASN1_TYPE_push (attrib->value.set,fname); - attrib->set = 1; + attrib->single = 0; if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new_null ())) { PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI, ERR_R_MALLOC_FAILURE); |