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/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c
index c10feed0ef..29976b1d68 100644
--- a/src/lib/libcrypto/x509v3/v3_sxnet.c
+++ b/src/lib/libcrypto/x509v3/v3_sxnet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_sxnet.c,v 1.16 2015/07/29 16:13:49 jsing Exp $ */
+/* $OpenBSD: v3_sxnet.c,v 1.17 2015/09/30 17:30:16 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -272,10 +272,10 @@ SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen)
 {
         ASN1_INTEGER *izone = NULL;
 
-        if (!(izone = M_ASN1_INTEGER_new()) ||
+        if (!(izone = ASN1_INTEGER_new()) ||
             !ASN1_INTEGER_set(izone, lzone)) {
                 X509V3err(X509V3_F_SXNET_ADD_ID_ULONG, ERR_R_MALLOC_FAILURE);
-                M_ASN1_INTEGER_free(izone);
+                ASN1_INTEGER_free(izone);
                 return 0;
         }
         return SXNET_add_id_INTEGER(psx, izone, user, userlen);
@@ -350,7 +350,7 @@ SXNET_get_id_asc(SXNET *sx, char *zone)
                 return NULL;
         }
         oct = SXNET_get_id_INTEGER(sx, izone);
-        M_ASN1_INTEGER_free(izone);
+        ASN1_INTEGER_free(izone);
         return oct;
 }
 
@@ -360,14 +360,14 @@ SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
         ASN1_INTEGER *izone = NULL;
         ASN1_OCTET_STRING *oct;
 
-        if (!(izone = M_ASN1_INTEGER_new()) ||
+        if (!(izone = ASN1_INTEGER_new()) ||
             !ASN1_INTEGER_set(izone, lzone)) {
                 X509V3err(X509V3_F_SXNET_GET_ID_ULONG, ERR_R_MALLOC_FAILURE);
-                M_ASN1_INTEGER_free(izone);
+                ASN1_INTEGER_free(izone);
                 return NULL;
         }
         oct = SXNET_get_id_INTEGER(sx, izone);
-        M_ASN1_INTEGER_free(izone);
+        ASN1_INTEGER_free(izone);
         return oct;
 }