From 0ec69fad35d79387923d81efc10dc1deafa00e16 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 30 Sep 2015 18:45:56 +0000
Subject: Replace M_ASN1_ENUMERATED_(free|new) with ASN1_ENUMERATED_(free|new).

---
 src/lib/libcrypto/asn1/a_enum.c         | 6 +++---
 src/lib/libssl/src/crypto/asn1/a_enum.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c
index 3c059266be..142f6ed575 100644
--- a/src/lib/libcrypto/asn1/a_enum.c
+++ b/src/lib/libcrypto/asn1/a_enum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_enum.c,v 1.16 2014/09/21 12:17:42 miod Exp $ */
+/* $OpenBSD: a_enum.c,v 1.17 2015/09/30 18:45:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
 	int len, j;
 
 	if (ai == NULL)
-		ret = M_ASN1_ENUMERATED_new();
+		ret = ASN1_ENUMERATED_new();
 	else
 		ret = ai;
 	if (ret == NULL) {
@@ -172,7 +172,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
 
 err:
 	if (ret != ai)
-		M_ASN1_ENUMERATED_free(ret);
+		ASN1_ENUMERATED_free(ret);
 	return (NULL);
 }
 
diff --git a/src/lib/libssl/src/crypto/asn1/a_enum.c b/src/lib/libssl/src/crypto/asn1/a_enum.c
index 3c059266be..142f6ed575 100644
--- a/src/lib/libssl/src/crypto/asn1/a_enum.c
+++ b/src/lib/libssl/src/crypto/asn1/a_enum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_enum.c,v 1.16 2014/09/21 12:17:42 miod Exp $ */
+/* $OpenBSD: a_enum.c,v 1.17 2015/09/30 18:45:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
 	int len, j;
 
 	if (ai == NULL)
-		ret = M_ASN1_ENUMERATED_new();
+		ret = ASN1_ENUMERATED_new();
 	else
 		ret = ai;
 	if (ret == NULL) {
@@ -172,7 +172,7 @@ BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
 
 err:
 	if (ret != ai)
-		M_ASN1_ENUMERATED_free(ret);
+		ASN1_ENUMERATED_free(ret);
 	return (NULL);
 }
 
-- 
cgit v1.2.3-55-g6feb