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/asn1/a_bitstr.c | 4 ++--
 src/lib/libcrypto/asn1/a_int.c    | 4 ++--
 src/lib/libcrypto/asn1/a_octet.c  | 8 ++++----
 src/lib/libcrypto/asn1/evp_asn1.c | 4 ++--
 src/lib/libcrypto/asn1/t_req.c    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index 5575a5c939..c0259ad815 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_bitstr.c,v 1.21 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: a_bitstr.c,v 1.22 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -65,7 +65,7 @@
 int
 ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {
-	return M_ASN1_BIT_STRING_set(x, d, len);
+	return ASN1_STRING_set(x, d, len);
 }
 
 int
diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
index 7d17aae2a2..6a378c0884 100644
--- a/src/lib/libcrypto/asn1/a_int.c
+++ b/src/lib/libcrypto/asn1/a_int.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_int.c,v 1.27 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: a_int.c,v 1.28 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,7 +66,7 @@
 ASN1_INTEGER *
 ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {
-	return M_ASN1_INTEGER_dup(x);
+	return ASN1_STRING_dup(x);
 }
 
 int
diff --git a/src/lib/libcrypto/asn1/a_octet.c b/src/lib/libcrypto/asn1/a_octet.c
index 8c57592174..d998675d3f 100644
--- a/src/lib/libcrypto/asn1/a_octet.c
+++ b/src/lib/libcrypto/asn1/a_octet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_octet.c,v 1.9 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_octet.c,v 1.10 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,17 +63,17 @@
 ASN1_OCTET_STRING *
 ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
 {
-	return M_ASN1_OCTET_STRING_dup(x);
+	return ASN1_STRING_dup(x);
 }
 
 int
 ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b)
 {
-	return M_ASN1_OCTET_STRING_cmp(a, b);
+	return ASN1_STRING_cmp(a, b);
 }
 
 int
 ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *x, const unsigned char *d, int len)
 {
-	return M_ASN1_OCTET_STRING_set(x, d, len);
+	return ASN1_STRING_set(x, d, len);
 }
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c
index 5e21f3c8ae..5ee4751763 100644
--- a/src/lib/libcrypto/asn1/evp_asn1.c
+++ b/src/lib/libcrypto/asn1/evp_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_asn1.c,v 1.13 2014/07/12 16:03:36 miod Exp $ */
+/* $OpenBSD: evp_asn1.c,v 1.14 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -70,7 +70,7 @@ ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
 
 	if ((os = M_ASN1_OCTET_STRING_new()) == NULL)
 		return (0);
-	if (!M_ASN1_OCTET_STRING_set(os, data, len)) {
+	if (!ASN1_STRING_set(os, data, len)) {
 		M_ASN1_OCTET_STRING_free(os);
 		return (0);
 	}
diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c
index 51f711acf7..8db456708a 100644
--- a/src/lib/libcrypto/asn1/t_req.c
+++ b/src/lib/libcrypto/asn1/t_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t_req.c,v 1.17 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: t_req.c,v 1.18 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -239,7 +239,7 @@ get_next:
 					goto err;
 				if (!X509V3_EXT_print(bp, ex, cflag, 16)) {
 					BIO_printf(bp, "%16s", "");
-					M_ASN1_OCTET_STRING_print(bp, ex->value);
+					ASN1_STRING_print(bp, ex->value);
 				}
 				if (BIO_write(bp, "\n", 1) <= 0)
 					goto err;
-- 
cgit v1.2.3-55-g6feb