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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c
index 9057185e74..aaf8decd6c 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.23 2015/09/30 17:30:15 jsing Exp $ */
+/* $OpenBSD: asn1_par.c,v 1.24 2015/09/30 18:41:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -286,7 +286,7 @@ asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offset,
                                                 nl = 1;
                                         }
                                 }
-                                M_ASN1_OCTET_STRING_free(os);
+                                ASN1_OCTET_STRING_free(os);
                                 os = NULL;
                         } else if (tag == V_ASN1_INTEGER) {
                                 ASN1_INTEGER *bs;
@@ -369,7 +369,7 @@ asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offset,
 end:
         if (o != NULL)
                 ASN1_OBJECT_free(o);
-        M_ASN1_OCTET_STRING_free(os);
+        ASN1_OCTET_STRING_free(os);
         *pp = p;
         return (ret);
 }
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c
index e5fcf26030..66f89c8b98 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.16 2015/09/30 17:30:15 jsing Exp $ */
+/* $OpenBSD: evp_asn1.c,v 1.17 2015/09/30 18:41:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,10 +68,10 @@ ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
 {
         ASN1_STRING *os;
 
-        if ((os = M_ASN1_OCTET_STRING_new()) == NULL)
+        if ((os = ASN1_OCTET_STRING_new()) == NULL)
                 return (0);
         if (!ASN1_STRING_set(os, data, len)) {
-                M_ASN1_OCTET_STRING_free(os);
+                ASN1_OCTET_STRING_free(os);
                 return (0);
         }
         ASN1_TYPE_set(a, V_ASN1_OCTET_STRING, os);
@@ -193,7 +193,7 @@ err:
                 ASN1err(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING,
                     ASN1_R_DATA_IS_WRONG);
         }
-        M_ASN1_OCTET_STRING_free(os);
+        ASN1_OCTET_STRING_free(os);
         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 0a6d18d154..9be7e0205c 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.22 2015/09/30 17:30:15 jsing Exp $ */
+/* $OpenBSD: p5_pbev2.c,v 1.23 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -303,7 +303,7 @@ PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid,
 
         if (!(kdf = PBKDF2PARAM_new()))
                 goto merr;
-        if (!(osalt = M_ASN1_OCTET_STRING_new()))
+        if (!(osalt = ASN1_OCTET_STRING_new()))
                 goto merr;
 
         kdf->salt->value.octet_string = osalt;
diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c
index 28e79858b5..701db0fc6d 100644
--- a/src/lib/libcrypto/asn1/x_pkey.c
+++ b/src/lib/libcrypto/asn1/x_pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_pkey.c,v 1.18 2015/07/27 12:53:56 jsing Exp $ */
+/* $OpenBSD: x_pkey.c,v 1.19 2015/09/30 18:41:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,7 +78,7 @@ X509_PKEY_new(void)
                 ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
-        if ((ret->enc_pkey = M_ASN1_OCTET_STRING_new()) == NULL) {
+        if ((ret->enc_pkey = ASN1_OCTET_STRING_new()) == NULL) {
                 ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
@@ -113,7 +113,7 @@ X509_PKEY_free(X509_PKEY *x)
 
         if (x->enc_algor != NULL)
                 X509_ALGOR_free(x->enc_algor);
-        M_ASN1_OCTET_STRING_free(x->enc_pkey);
+        ASN1_OCTET_STRING_free(x->enc_pkey);
         EVP_PKEY_free(x->dec_pkey);
         if ((x->key_data != NULL) && (x->key_free))
                 free(x->key_data);