Replace M_ASN1_OCTET_STRING_(free|new) with ASN1_OCTET_STRING_(free|new).

4 files changed, 16 insertions, 16 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c
index 2b652deee8..3071baf9ac 100644
--- a/src/lib/libcrypto/x509v3/v3_akey.c
+++ b/src/lib/libcrypto/x509v3/v3_akey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_akey.c,v 1.16 2015/09/30 17:30:16 jsing Exp $ */
+/* $OpenBSD: v3_akey.c,v 1.17 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -210,6 +210,6 @@ err:
         sk_GENERAL_NAME_free(gens);
         X509_NAME_free(isname);
         ASN1_INTEGER_free(serial);
-        M_ASN1_OCTET_STRING_free(ikeyid);
+        ASN1_OCTET_STRING_free(ikeyid);
         return NULL;
 }
diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c
index d48a4ac65c..37834813c7 100644
--- a/src/lib/libcrypto/x509v3/v3_conf.c
+++ b/src/lib/libcrypto/x509v3/v3_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_conf.c,v 1.17 2015/02/17 05:14:38 miod Exp $ */
+/* $OpenBSD: v3_conf.c,v 1.18 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -203,7 +203,7 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit,
                 p = ext_der;
                 method->i2d(ext_struc, &p);
         }
-        if (!(ext_oct = M_ASN1_OCTET_STRING_new()))
+        if (!(ext_oct = ASN1_OCTET_STRING_new()))
                 goto merr;
         ext_oct->data = ext_der;
         ext_oct->length = ext_len;
@@ -211,12 +211,12 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit,
         ext = X509_EXTENSION_create_by_NID(NULL, ext_nid, crit, ext_oct);
         if (!ext)
                 goto merr;
-        M_ASN1_OCTET_STRING_free(ext_oct);
+        ASN1_OCTET_STRING_free(ext_oct);
 
         return ext;
 
 merr:
-        M_ASN1_OCTET_STRING_free(ext_oct);
+        ASN1_OCTET_STRING_free(ext_oct);
         X509V3err(X509V3_F_DO_EXT_I2D, ERR_R_MALLOC_FAILURE);
         return NULL;
 
@@ -302,7 +302,7 @@ v3_generic_extension(const char *ext, char *value, int crit, int gen_type,
                 goto err;
         }
 
-        if (!(oct = M_ASN1_OCTET_STRING_new())) {
+        if (!(oct = ASN1_OCTET_STRING_new())) {
                 X509V3err(X509V3_F_V3_GENERIC_EXTENSION, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
@@ -315,7 +315,7 @@ v3_generic_extension(const char *ext, char *value, int crit, int gen_type,
 
 err:
         ASN1_OBJECT_free(obj);
-        M_ASN1_OCTET_STRING_free(oct);
+        ASN1_OCTET_STRING_free(oct);
         free(ext_der);
         return extension;
 }
diff --git a/src/lib/libcrypto/x509v3/v3_ocsp.c b/src/lib/libcrypto/x509v3/v3_ocsp.c
index 9d1390a520..696eee5adc 100644
--- a/src/lib/libcrypto/x509v3/v3_ocsp.c
+++ b/src/lib/libcrypto/x509v3/v3_ocsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_ocsp.c,v 1.12 2015/07/29 16:13:49 jsing Exp $ */
+/* $OpenBSD: v3_ocsp.c,v 1.13 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -312,7 +312,7 @@ d2i_ocsp_nonce(void *a, const unsigned char **pp, long length)
 
 err:
         if (pos == NULL || *pos != os)
-                M_ASN1_OCTET_STRING_free(os);
+                ASN1_OCTET_STRING_free(os);
         OCSPerr(OCSP_F_D2I_OCSP_NONCE, ERR_R_MALLOC_FAILURE);
         return NULL;
 }
@@ -320,7 +320,7 @@ err:
 static void
 ocsp_nonce_free(void *a)
 {
-        M_ASN1_OCTET_STRING_free(a);
+        ASN1_OCTET_STRING_free(a);
 }
 
 static int
diff --git a/src/lib/libcrypto/x509v3/v3_skey.c b/src/lib/libcrypto/x509v3/v3_skey.c
index 252fec3b08..f742b67b33 100644
--- a/src/lib/libcrypto/x509v3/v3_skey.c
+++ b/src/lib/libcrypto/x509v3/v3_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_skey.c,v 1.12 2015/07/29 16:13:49 jsing Exp $ */
+/* $OpenBSD: v3_skey.c,v 1.13 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -94,13 +94,13 @@ s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
         ASN1_OCTET_STRING *oct;
         long length;
 
-        if (!(oct = M_ASN1_OCTET_STRING_new())) {
+        if (!(oct = ASN1_OCTET_STRING_new())) {
                 X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
 
         if (!(oct->data = string_to_hex(str, &length))) {
-                M_ASN1_OCTET_STRING_free(oct);
+                ASN1_OCTET_STRING_free(oct);
                 return NULL;
         }
 
@@ -120,7 +120,7 @@ s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
         if (strcmp(str, "hash"))
                 return s2i_ASN1_OCTET_STRING(method, ctx, str);
 
-        if (!(oct = M_ASN1_OCTET_STRING_new())) {
+        if (!(oct = ASN1_OCTET_STRING_new())) {
                 X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
@@ -155,6 +155,6 @@ s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
         return oct;
 
 err:
-        M_ASN1_OCTET_STRING_free(oct);
+        ASN1_OCTET_STRING_free(oct);
         return NULL;
 }