diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-03-29 22:18:54 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-03-29 22:18:54 +0000 |
| commit | bc37a6b81c9a5e295481a1dd9ee572a4bddbf5ec (patch) | |
| tree | 370def1e5b4597f6ac908edb421bfad02b98feea /crypto/pkcs12/p12_attr.c | |
| parent | ee0508d4114e2b2291953a7d4c81a09b624b8821 (diff) | |
Remove deleted PKCS#12 functions from pkcs12.h, get rid of object creation
kludge, remove CRs from ssl_ciph.c and update Win32 functions for PKCS#12
code. It might compile under Win32 now ...
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 49b9a88db4..f534745dc9 100644 --- a/crypto/pkcs12/p12_attr.c +++ b/crypto/pkcs12/p12_attr.c @@ -88,7 +88,7 @@ int namelen; PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); return 0; } - M_ASN1_OBJECT_set(attrib->object, NID_localKeyID); + attrib->object = OBJ_nid2obj(NID_localKeyID); if (!(attrib->value.set = sk_new(NULL))) { PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); return 0; @@ -132,7 +132,7 @@ int usage; PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); return 0; } - M_ASN1_OBJECT_set(attrib->object, NID_key_usage); + attrib->object = OBJ_nid2obj(NID_key_usage); if (!(attrib->value.set = sk_new(NULL))) { PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); return 0; @@ -196,7 +196,7 @@ int namelen; PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI,ERR_R_MALLOC_FAILURE); return 0; } - M_ASN1_OBJECT_set(attrib->object, NID_friendlyName); + attrib->object = OBJ_nid2obj(NID_friendlyName); if (!(attrib->value.set = sk_new(NULL))) { PKCS12err(PKCS12_F_ADD_FRIENDLYNAME,ERR_R_MALLOC_FAILURE); return 0; |