summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/p12_init.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-03-29 22:18:54 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-03-29 22:18:54 +0000
commitbc37a6b81c9a5e295481a1dd9ee572a4bddbf5ec (patch)
tree370def1e5b4597f6ac908edb421bfad02b98feea /crypto/pkcs12/p12_init.c
parentee0508d4114e2b2291953a7d4c81a09b624b8821 (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_init.c')
-rw-r--r--crypto/pkcs12/p12_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index f6846a8dec..6ec6fb478b 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -79,7 +79,7 @@ int mode;
PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
return NULL;
}
- M_ASN1_OBJECT_set(pkcs12->authsafes->type, mode);
+ pkcs12->authsafes->type = OBJ_nid2obj(mode);
switch (mode) {
case NID_pkcs7_data:
if (!(pkcs12->authsafes->d.data =