Replace M_ASN1_INTEGER_(new|free) with ASN1_INTEGER_(new|free) - this is

different from the macro expansion, but the result is the same. Also
replace some ASN1_STRING_dup() with ASN1_INTEGER_dup().

ok beck@ doug@

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
index cbe68ec6d8..5c0103ba36 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.29 2015/09/30 17:04:09 jsing Exp $ */
+/* $OpenBSD: a_int.c,v 1.30 2015/09/30 17:30:15 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -196,7 +196,7 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len)
         int i;
 
         if ((a == NULL) || ((*a) == NULL)) {
-                if ((ret = M_ASN1_INTEGER_new()) == NULL)
+                if ((ret = ASN1_INTEGER_new()) == NULL)
                         return (NULL);
         } else
                 ret = (*a);
@@ -268,7 +268,7 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len)
 err:
         ASN1err(ASN1_F_C2I_ASN1_INTEGER, i);
         if (a == NULL || *a != ret)
-                M_ASN1_INTEGER_free(ret);
+                ASN1_INTEGER_free(ret);
         return (NULL);
 }
 
@@ -289,7 +289,7 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length)
         int i;
 
         if ((a == NULL) || ((*a) == NULL)) {
-                if ((ret = M_ASN1_INTEGER_new()) == NULL)
+                if ((ret = ASN1_INTEGER_new()) == NULL)
                         return (NULL);
         } else
                 ret = (*a);
@@ -334,7 +334,7 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length)
 err:
         ASN1err(ASN1_F_D2I_ASN1_UINTEGER, i);
         if (a == NULL || *a != ret)
-                M_ASN1_INTEGER_free(ret);
+                ASN1_INTEGER_free(ret);
         return (NULL);
 }
 
@@ -412,7 +412,7 @@ BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai)
         int len, j;
 
         if (ai == NULL)
-                ret = M_ASN1_INTEGER_new();
+                ret = ASN1_INTEGER_new();
         else
                 ret = ai;
         if (ret == NULL) {
@@ -444,7 +444,7 @@ BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai)
 
 err:
         if (ret != ai)
-                M_ASN1_INTEGER_free(ret);
+                ASN1_INTEGER_free(ret);
         return (NULL);
 }