diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-10-20 05:50:23 +0400 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-10-20 05:50:23 +0400 |
commit | 08e9c1af6c26f74ef7f7524be4b89241ff232a8c (patch) | |
tree | 7fe3f66fdfb1f20a5bfcbbf98369032374f3a79b /crypto/pkcs12/p12_mutl.c | |
parent | 023c8d0b0aec445b680ef5aea2bd2154adb59974 (diff) |
Replace the macros in asn1.h with function equivalents. Also make UTF8Strings
tolerated in certificates.
Diffstat (limited to 'crypto/pkcs12/p12_mutl.c')
-rw-r--r-- | crypto/pkcs12/p12_mutl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index bac558d6b9..3cb782fa60 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -131,7 +131,7 @@ int PKCS12_set_mac (PKCS12 *p12, const char *pass, int passlen, PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_GENERATION_ERROR); return 0; } - if (!(ASN1_OCTET_STRING_set (p12->mac->dinfo->digest, mac, maclen))) { + if (!(M_ASN1_OCTET_STRING_set (p12->mac->dinfo->digest, mac, maclen))) { PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_STRING_SET_ERROR); return 0; } @@ -142,13 +142,13 @@ int PKCS12_set_mac (PKCS12 *p12, const char *pass, int passlen, int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen, EVP_MD *md_type) { - if (!(p12->mac = PKCS12_MAC_DATA_new ())) return PKCS12_ERROR; + if (!(p12->mac = PKCS12_MAC_DATA_new())) return PKCS12_ERROR; if (iter > 1) { - if(!(p12->mac->iter = ASN1_INTEGER_new())) { + if(!(p12->mac->iter = M_ASN1_INTEGER_new())) { PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); return 0; } - ASN1_INTEGER_set (p12->mac->iter, iter); + ASN1_INTEGER_set(p12->mac->iter, iter); } if (!saltlen) saltlen = PKCS12_SALT_LEN; p12->mac->salt->length = saltlen; |