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@

4 files changed, 14 insertions, 14 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);
 }
 
diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c
index b5742fe97d..9057185e74 100644
--- a/src/lib/libcrypto/asn1/asn1_par.c
+++ b/src/lib/libcrypto/asn1/asn1_par.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_par.c,v 1.22 2015/02/07 13:19:15 doug Exp $ */
+/* $OpenBSD: asn1_par.c,v 1.23 2015/09/30 17:30:15 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -313,7 +313,7 @@ asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offset,
                                         if (BIO_write(bp, "BAD INTEGER", 11) <= 0)
                                                 goto end;
                                 }
-                                M_ASN1_INTEGER_free(bs);
+                                ASN1_INTEGER_free(bs);
                         } else if (tag == V_ASN1_ENUMERATED) {
                                 ASN1_ENUMERATED *bs;
                                 int i;
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c
index a982866f2e..e5fcf26030 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.15 2015/09/10 14:29:22 jsing Exp $ */
+/* $OpenBSD: evp_asn1.c,v 1.16 2015/09/30 17:30:15 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -194,6 +194,6 @@ err:
                     ASN1_R_DATA_IS_WRONG);
         }
         M_ASN1_OCTET_STRING_free(os);
-        M_ASN1_INTEGER_free(ai);
+        ASN1_INTEGER_free(ai);
         return (ret);
 }
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
index 795721fad2..0a6d18d154 100644
--- a/src/lib/libcrypto/asn1/p5_pbev2.c
+++ b/src/lib/libcrypto/asn1/p5_pbev2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p5_pbev2.c,v 1.21 2015/02/11 04:00:39 jsing Exp $ */
+/* $OpenBSD: p5_pbev2.c,v 1.22 2015/09/30 17:30:15 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -330,9 +330,9 @@ PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid,
         /* If have a key len set it up */
 
         if (keylen > 0) {
-                if (!(kdf->keylength = M_ASN1_INTEGER_new()))
+                if (!(kdf->keylength = ASN1_INTEGER_new()))
                         goto merr;
-                if (!ASN1_INTEGER_set (kdf->keylength, keylen))
+                if (!ASN1_INTEGER_set(kdf->keylength, keylen))
                         goto merr;
         }