From 05e5d9a5bb40624d103cbce35faadc1092d0662f Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 30 Sep 2015 18:26:07 +0000
Subject: Replace M_ASN1_UTCTIME_(new|free) with ASN1_UTCTIME_(new|free).

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

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/asn1/a_utctm.c b/src/lib/libcrypto/asn1/a_utctm.c
index aed855608d..ca19a8c7a0 100644
--- a/src/lib/libcrypto/asn1/a_utctm.c
+++ b/src/lib/libcrypto/asn1/a_utctm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_utctm.c,v 1.27 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_utctm.c,v 1.28 2015/09/30 18:26:07 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -197,7 +197,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec)
 	ASN1_UTCTIME *tmp = NULL, *ret;
 
 	if (s == NULL) {
-		tmp = M_ASN1_UTCTIME_new();
+		tmp = ASN1_UTCTIME_new();
 		if (tmp == NULL)
 			return NULL;
 		s = tmp;
@@ -205,7 +205,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec)
 
 	ret = ASN1_UTCTIME_adj_internal(s, t, offset_day, offset_sec);
 	if (ret == NULL && tmp != NULL)
-		M_ASN1_UTCTIME_free(tmp);
+		ASN1_UTCTIME_free(tmp);
 
 	return ret;
 }
diff --git a/src/lib/libssl/src/crypto/asn1/a_utctm.c b/src/lib/libssl/src/crypto/asn1/a_utctm.c
index aed855608d..ca19a8c7a0 100644
--- a/src/lib/libssl/src/crypto/asn1/a_utctm.c
+++ b/src/lib/libssl/src/crypto/asn1/a_utctm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_utctm.c,v 1.27 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_utctm.c,v 1.28 2015/09/30 18:26:07 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -197,7 +197,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec)
 	ASN1_UTCTIME *tmp = NULL, *ret;
 
 	if (s == NULL) {
-		tmp = M_ASN1_UTCTIME_new();
+		tmp = ASN1_UTCTIME_new();
 		if (tmp == NULL)
 			return NULL;
 		s = tmp;
@@ -205,7 +205,7 @@ ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, int offset_day, long offset_sec)
 
 	ret = ASN1_UTCTIME_adj_internal(s, t, offset_day, offset_sec);
 	if (ret == NULL && tmp != NULL)
-		M_ASN1_UTCTIME_free(tmp);
+		ASN1_UTCTIME_free(tmp);
 
 	return ret;
 }
-- 
cgit v1.2.3-55-g6feb