From 1c7e31c2bbb07475f068a459f144cb492d148ec2 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 30 Sep 2015 17:30:16 +0000
Subject: 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@
---
 src/lib/libcrypto/pkcs12/p12_mutl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/libcrypto/pkcs12')

diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index 00acf1f210..bf88c78270 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/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;
-- 
cgit v1.2.3-55-g6feb