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

30 files changed, 98 insertions, 98 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);
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,
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
index 00195f0a98..ad4e0bc660 100644
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ b/src/lib/libcrypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_decr.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: p12_decr.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.
  */
@@ -159,7 +159,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
         unsigned char *in = NULL;
         int inlen;
 
-        if (!(oct = M_ASN1_OCTET_STRING_new ())) {
+        if (!(oct = ASN1_OCTET_STRING_new ())) {
                 PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,
                     ERR_R_MALLOC_FAILURE);
                 return NULL;
@@ -183,7 +183,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
 
 err:
         free(in);
-        M_ASN1_OCTET_STRING_free(oct);
+        ASN1_OCTET_STRING_free(oct);
         return NULL;
 }
 
diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c
index 2db73d34c2..cd01196b6f 100644
--- a/src/lib/libcrypto/pkcs12/p12_init.c
+++ b/src/lib/libcrypto/pkcs12/p12_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_init.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: p12_init.c,v 1.10 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -77,7 +77,7 @@ PKCS12_init(int mode)
         switch (mode) {
         case NID_pkcs7_data:
                 if (!(pkcs12->authsafes->d.data =
-                    M_ASN1_OCTET_STRING_new())) {
+                    ASN1_OCTET_STRING_new())) {
                         PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
diff --git a/src/lib/libcrypto/pkcs12/p12_p8e.c b/src/lib/libcrypto/pkcs12/p12_p8e.c
index 24ed7f69ed..db3db87214 100644
--- a/src/lib/libcrypto/pkcs12/p12_p8e.c
+++ b/src/lib/libcrypto/pkcs12/p12_p8e.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_p8e.c,v 1.5 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: p12_p8e.c,v 1.6 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -84,7 +84,7 @@ PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
         }
         X509_ALGOR_free(p8->algor);
         p8->algor = pbe;
-        M_ASN1_OCTET_STRING_free(p8->digest);
+        ASN1_OCTET_STRING_free(p8->digest);
         p8->digest = PKCS12_item_i2d_encrypt(pbe,
             ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8inf, 1);
         if (!p8->digest) {
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;
diff --git a/src/lib/libcrypto/rsa/rsa_saos.c b/src/lib/libcrypto/rsa/rsa_saos.c
index 0a4f37a3da..5dbc10dbb2 100644
--- a/src/lib/libcrypto/rsa/rsa_saos.c
+++ b/src/lib/libcrypto/rsa/rsa_saos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_saos.c,v 1.18 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: rsa_saos.c,v 1.19 2015/09/30 18:41:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ RSA_verify_ASN1_OCTET_STRING(int dtype, const unsigned char *m,
         } else
                 ret = 1;
 err:
-        M_ASN1_OCTET_STRING_free(sig);
+        ASN1_OCTET_STRING_free(sig);
         if (s != NULL) {
                 explicit_bzero(s, (unsigned int)siglen);
                 free(s);
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;
 }
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_par.c b/src/lib/libssl/src/crypto/asn1/asn1_par.c
index 9057185e74..aaf8decd6c 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1_par.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/evp_asn1.c b/src/lib/libssl/src/crypto/asn1/evp_asn1.c
index e5fcf26030..66f89c8b98 100644
--- a/src/lib/libssl/src/crypto/asn1/evp_asn1.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p5_pbev2.c b/src/lib/libssl/src/crypto/asn1/p5_pbev2.c
index 0a6d18d154..9be7e0205c 100644
--- a/src/lib/libssl/src/crypto/asn1/p5_pbev2.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/x_pkey.c b/src/lib/libssl/src/crypto/asn1/x_pkey.c
index 28e79858b5..701db0fc6d 100644
--- a/src/lib/libssl/src/crypto/asn1/x_pkey.c
+++ b/src/lib/libssl/src/crypto/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);
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_add.c b/src/lib/libssl/src/crypto/pkcs12/p12_add.c
index b141851514..cb7f72b365 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_add.c
+++ b/src/lib/libssl/src/crypto/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,
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_decr.c b/src/lib/libssl/src/crypto/pkcs12/p12_decr.c
index 00195f0a98..ad4e0bc660 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_decr.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_decr.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: p12_decr.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.
  */
@@ -159,7 +159,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
         unsigned char *in = NULL;
         int inlen;
 
-        if (!(oct = M_ASN1_OCTET_STRING_new ())) {
+        if (!(oct = ASN1_OCTET_STRING_new ())) {
                 PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,
                     ERR_R_MALLOC_FAILURE);
                 return NULL;
@@ -183,7 +183,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
 
 err:
         free(in);
-        M_ASN1_OCTET_STRING_free(oct);
+        ASN1_OCTET_STRING_free(oct);
         return NULL;
 }
 
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_init.c b/src/lib/libssl/src/crypto/pkcs12/p12_init.c
index 2db73d34c2..cd01196b6f 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_init.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_init.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: p12_init.c,v 1.10 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -77,7 +77,7 @@ PKCS12_init(int mode)
         switch (mode) {
         case NID_pkcs7_data:
                 if (!(pkcs12->authsafes->d.data =
-                    M_ASN1_OCTET_STRING_new())) {
+                    ASN1_OCTET_STRING_new())) {
                         PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_p8e.c b/src/lib/libssl/src/crypto/pkcs12/p12_p8e.c
index 24ed7f69ed..db3db87214 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_p8e.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_p8e.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_p8e.c,v 1.5 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: p12_p8e.c,v 1.6 2015/09/30 18:41:06 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -84,7 +84,7 @@ PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
         }
         X509_ALGOR_free(p8->algor);
         p8->algor = pbe;
-        M_ASN1_OCTET_STRING_free(p8->digest);
+        ASN1_OCTET_STRING_free(p8->digest);
         p8->digest = PKCS12_item_i2d_encrypt(pbe,
             ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8inf, 1);
         if (!p8->digest) {
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
index 7755c3c30e..50e4fe39c1 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pkcs7/pk7_lib.c b/src/lib/libssl/src/crypto/pkcs7/pk7_lib.c
index 7aedc3c44e..b3dc068f3d 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pk7_lib.c
+++ b/src/lib/libssl/src/crypto/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;
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_saos.c b/src/lib/libssl/src/crypto/rsa/rsa_saos.c
index 0a4f37a3da..5dbc10dbb2 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_saos.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_saos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_saos.c,v 1.18 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: rsa_saos.c,v 1.19 2015/09/30 18:41:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ RSA_verify_ASN1_OCTET_STRING(int dtype, const unsigned char *m,
         } else
                 ret = 1;
 err:
-        M_ASN1_OCTET_STRING_free(sig);
+        ASN1_OCTET_STRING_free(sig);
         if (s != NULL) {
                 explicit_bzero(s, (unsigned int)siglen);
                 free(s);
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_akey.c b/src/lib/libssl/src/crypto/x509v3/v3_akey.c
index 2b652deee8..3071baf9ac 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_akey.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509v3/v3_conf.c b/src/lib/libssl/src/crypto/x509v3/v3_conf.c
index d48a4ac65c..37834813c7 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_conf.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509v3/v3_ocsp.c b/src/lib/libssl/src/crypto/x509v3/v3_ocsp.c
index 9d1390a520..696eee5adc 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_ocsp.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509v3/v3_skey.c b/src/lib/libssl/src/crypto/x509v3/v3_skey.c
index 252fec3b08..f742b67b33 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_skey.c
+++ b/src/lib/libssl/src/crypto/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;
 }