From 4b2596fb0f28cb59c8918b16cdae591454312175 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 29 Jul 2015 14:58:34 +0000
Subject: Expand obsolete M_ASN1.*(cmp|dup|print|set) macros - no change in
 generated assembly.

ok bcook@
---
 src/lib/libcrypto/x509v3/v3_alt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 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 2592288bdb..5b0dae2af6 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.22 2014/10/28 05:46:56 miod Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.23 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -390,7 +390,7 @@ copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
 	while ((i = X509_NAME_get_index_by_NID(nm,
 	    NID_pkcs9_emailAddress, i)) >= 0) {
 		ne = X509_NAME_get_entry(nm, i);
-		email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
+		email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
 		if (move_p) {
 			X509_NAME_delete_entry(nm, i);
 			X509_NAME_ENTRY_free(ne);
-- 
cgit v1.2.3-55-g6feb