1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c
index b141851514..cb7f72b365 100644
--- a/src/lib/libcrypto/pkcs12/p12_add.c
+++ b/src/lib/libcrypto/pkcs12/p12_add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_add.c,v 1.12 2015/02/14 12:43:07 miod Exp $ */
+/* $OpenBSD: p12_add.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.
  */
@@ -151,7 +151,7 @@ PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk)
                 return NULL;
         }
         p7->type = OBJ_nid2obj(NID_pkcs7_data);
-        if (!(p7->d.data = M_ASN1_OCTET_STRING_new())) {
+        if (!(p7->d.data = ASN1_OCTET_STRING_new())) {
                 PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
@@ -213,7 +213,7 @@ PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
         }
         X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm);
         p7->d.encrypted->enc_data->algorithm = pbe;
-        M_ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
+        ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
         if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt(
             pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass, passlen, bags, 1))) {
                 PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA,