From 555bb33dc9c76e32d2066b5520aa5eabf3b1b761 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 30 Sep 2015 18:21:50 +0000
Subject: Replace M_ASN1_IA5STRING_(new|free) with ASN1_IA5STRING_(new|free).
 Same with one s/M_ASN1_VISIBLESTRING_new/ASN1_VISIBLESTRING_new/.

---
 src/lib/libcrypto/x509v3/v3_alt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/x509v3/v3_alt.c')

diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
index 4b3755e4e7..75c68d3cdb 100644
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ b/src/lib/libcrypto/x509v3/v3_alt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_alt.c,v 1.24 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.25 2015/09/30 18:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -439,7 +439,7 @@ copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
 
 err:
 	GENERAL_NAME_free(gen);
-	M_ASN1_IA5STRING_free(email);
+	ASN1_IA5STRING_free(email);
 	return 0;
 }
 
@@ -557,7 +557,7 @@ a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
 	}
 
 	if (is_string) {
-		if (!(gen->d.ia5 = M_ASN1_IA5STRING_new()) ||
+		if (!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
 		    !ASN1_STRING_set(gen->d.ia5, (unsigned char*)value,
 			strlen(value))) {
 			X509V3err(X509V3_F_A2I_GENERAL_NAME,
-- 
cgit v1.2.3-55-g6feb