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_mutl.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_mutl.c')
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index d5c2f732d5..9acd6ce316 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -173,8 +173,7 @@ EVP_MD *md_type; } if (!salt) RAND_bytes (p12->mac->salt->data, saltlen); else memcpy (p12->mac->salt->data, salt, saltlen); - M_ASN1_OBJECT_set(p12->mac->dinfo->algor->algorithm, - EVP_MD_type(md_type)); + p12->mac->dinfo->algor->algorithm = OBJ_nid2obj(EVP_MD_type(md_type)); if (!(p12->mac->dinfo->algor->parameter = ASN1_TYPE_new())) { PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); return 0; |