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

2 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index 7755c3c30e..50e4fe39c1 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_doit.c,v 1.37 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: pk7_doit.c,v 1.38 2015/09/30 18:41:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -745,7 +745,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                 si_sk = p7->d.signed_and_enveloped->signer_info;
                 os = p7->d.signed_and_enveloped->enc_data->enc_data;
                 if (!os) {
-                        os = M_ASN1_OCTET_STRING_new();
+                        os = ASN1_OCTET_STRING_new();
                         if (!os) {
                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,
                                     ERR_R_MALLOC_FAILURE);
@@ -758,7 +758,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                 /* XXX */
                 os = p7->d.enveloped->enc_data->enc_data;
                 if (!os) {
-                        os = M_ASN1_OCTET_STRING_new();
+                        os = ASN1_OCTET_STRING_new();
                         if (!os) {
                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,
                                     ERR_R_MALLOC_FAILURE);
@@ -776,7 +776,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                 }
                 /* If detached data then the content is excluded */
                 if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
-                        M_ASN1_OCTET_STRING_free(os);
+                        ASN1_OCTET_STRING_free(os);
                         os = NULL;
                         p7->d.sign->contents->d.data = NULL;
                 }
@@ -791,7 +791,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                 /* If detached data then the content is excluded */
                 if (PKCS7_type_is_data(p7->d.digest->contents) &&
                     p7->detached) {
-                        M_ASN1_OCTET_STRING_free(os);
+                        ASN1_OCTET_STRING_free(os);
                         os = NULL;
                         p7->d.digest->contents->d.data = NULL;
                 }
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 7aedc3c44e..b3dc068f3d 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_lib.c,v 1.17 2015/09/30 17:30:15 jsing Exp $ */
+/* $OpenBSD: pk7_lib.c,v 1.18 2015/09/30 18:41:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -181,7 +181,7 @@ PKCS7_set_type(PKCS7 *p7, int type)
                 break;
         case NID_pkcs7_data:
                 p7->type = obj;
-                if ((p7->d.data = M_ASN1_OCTET_STRING_new()) == NULL)
+                if ((p7->d.data = ASN1_OCTET_STRING_new()) == NULL)
                         goto err;
                 break;
         case NID_pkcs7_signedAndEnveloped:
@@ -636,7 +636,7 @@ PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
         case NID_pkcs7_signedAndEnveloped:
                 os = p7->d.signed_and_enveloped->enc_data->enc_data;
                 if (os == NULL) {
-                        os = M_ASN1_OCTET_STRING_new();
+                        os = ASN1_OCTET_STRING_new();
                         p7->d.signed_and_enveloped->enc_data->enc_data = os;
                 }
                 break;
@@ -644,7 +644,7 @@ PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
         case NID_pkcs7_enveloped:
                 os = p7->d.enveloped->enc_data->enc_data;
                 if (os == NULL) {
-                        os = M_ASN1_OCTET_STRING_new();
+                        os = ASN1_OCTET_STRING_new();
                         p7->d.enveloped->enc_data->enc_data = os;
                 }
                 break;