diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-30 17:30:17 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-30 17:30:17 +0000 |
| commit | 6cd4c5a8730cea97715af5f2349cba6243e18ded (patch) | |
| tree | 7e6a048ec6fbf864d08e35b7d77a2749bcd314be /lib/libcrypto/pkcs12/p12_mutl.c | |
| parent | e6df0276f19a838a7047a5da99979a94d36a3423 (diff) | |
Replace M_ASN1_INTEGER_(new|free) with ASN1_INTEGER_(new|free) - this is
different from the macro expansion, but the result is the same. Also
replace some ASN1_STRING_dup() with ASN1_INTEGER_dup().
ok beck@ doug@
Diffstat (limited to 'lib/libcrypto/pkcs12/p12_mutl.c')
| -rw-r--r-- | lib/libcrypto/pkcs12/p12_mutl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/pkcs12/p12_mutl.c b/lib/libcrypto/pkcs12/p12_mutl.c index 00acf1f210c..bf88c782702 100644 --- a/lib/libcrypto/pkcs12/p12_mutl.c +++ b/lib/libcrypto/pkcs12/p12_mutl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_mutl.c,v 1.20 2015/07/29 14:58:34 jsing Exp $ */ +/* $OpenBSD: p12_mutl.c,v 1.21 2015/09/30 17:30:15 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -176,7 +176,7 @@ PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, if (!(p12->mac = PKCS12_MAC_DATA_new())) return PKCS12_ERROR; if (iter > 1) { - if (!(p12->mac->iter = M_ASN1_INTEGER_new())) { + if (!(p12->mac->iter = ASN1_INTEGER_new())) { PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); return 0; |