Replace remaining M_ASN1_BIT_STRING_(new|free) macros with calls to

ASN1_BIT_STRING_(new|free).

ok beck@ doug@

6 files changed, 18 insertions, 18 deletions

diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index c0259ad815..c847b471d6 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_bitstr.c,v 1.22 2015/07/29 14:58:34 jsing Exp $ */
+/* $OpenBSD: a_bitstr.c,v 1.23 2015/09/29 13:54:40 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **pp, long len)
         }
 
         if ((a == NULL) || ((*a) == NULL)) {
-                if ((ret = M_ASN1_BIT_STRING_new()) == NULL)
+                if ((ret = ASN1_BIT_STRING_new()) == NULL)
                         return (NULL);
         } else
                 ret = (*a);
@@ -178,7 +178,7 @@ c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **pp, long len)
 err:
         ASN1err(ASN1_F_C2I_ASN1_BIT_STRING, i);
         if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                M_ASN1_BIT_STRING_free(ret);
+                ASN1_BIT_STRING_free(ret);
         return (NULL);
 }
 
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index ae6ed63afd..44f1597896 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.17 2015/09/10 14:29:22 jsing Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.18 2015/09/29 13:54:40 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -1459,7 +1459,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
                 }
         }
         if (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key != NULL) {
-                priv_key->publicKey = M_ASN1_BIT_STRING_new();
+                priv_key->publicKey = ASN1_BIT_STRING_new();
                 if (priv_key->publicKey == NULL) {
                         ECerr(EC_F_I2D_ECPRIVATEKEY,
                             ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c
index 894608fadb..0670aa306e 100644
--- a/src/lib/libcrypto/x509v3/v3_bitst.c
+++ b/src/lib/libcrypto/x509v3/v3_bitst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_bitst.c,v 1.11 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_bitst.c,v 1.12 2015/09/29 13:54:40 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -144,7 +144,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         int i;
         BIT_STRING_BITNAME *bnam;
 
-        if (!(bs = M_ASN1_BIT_STRING_new())) {
+        if (!(bs = ASN1_BIT_STRING_new())) {
                 X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
@@ -157,7 +157,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                                     bnam->bitnum, 1)) {
                                         X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
                                             ERR_R_MALLOC_FAILURE);
-                                        M_ASN1_BIT_STRING_free(bs);
+                                        ASN1_BIT_STRING_free(bs);
                                         return NULL;
                                 }
                                 break;
@@ -167,7 +167,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                         X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
                             X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT);
                         X509V3_conf_err(val);
-                        M_ASN1_BIT_STRING_free(bs);
+                        ASN1_BIT_STRING_free(bs);
                         return NULL;
                 }
         }
diff --git a/src/lib/libssl/src/crypto/asn1/a_bitstr.c b/src/lib/libssl/src/crypto/asn1/a_bitstr.c
index c0259ad815..c847b471d6 100644
--- a/src/lib/libssl/src/crypto/asn1/a_bitstr.c
+++ b/src/lib/libssl/src/crypto/asn1/a_bitstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_bitstr.c,v 1.22 2015/07/29 14:58:34 jsing Exp $ */
+/* $OpenBSD: a_bitstr.c,v 1.23 2015/09/29 13:54:40 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **pp, long len)
         }
 
         if ((a == NULL) || ((*a) == NULL)) {
-                if ((ret = M_ASN1_BIT_STRING_new()) == NULL)
+                if ((ret = ASN1_BIT_STRING_new()) == NULL)
                         return (NULL);
         } else
                 ret = (*a);
@@ -178,7 +178,7 @@ c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **pp, long len)
 err:
         ASN1err(ASN1_F_C2I_ASN1_BIT_STRING, i);
         if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                M_ASN1_BIT_STRING_free(ret);
+                ASN1_BIT_STRING_free(ret);
         return (NULL);
 }
 
diff --git a/src/lib/libssl/src/crypto/ec/ec_asn1.c b/src/lib/libssl/src/crypto/ec/ec_asn1.c
index ae6ed63afd..44f1597896 100644
--- a/src/lib/libssl/src/crypto/ec/ec_asn1.c
+++ b/src/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.17 2015/09/10 14:29:22 jsing Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.18 2015/09/29 13:54:40 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -1459,7 +1459,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
                 }
         }
         if (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key != NULL) {
-                priv_key->publicKey = M_ASN1_BIT_STRING_new();
+                priv_key->publicKey = ASN1_BIT_STRING_new();
                 if (priv_key->publicKey == NULL) {
                         ECerr(EC_F_I2D_ECPRIVATEKEY,
                             ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_bitst.c b/src/lib/libssl/src/crypto/x509v3/v3_bitst.c
index 894608fadb..0670aa306e 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_bitst.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_bitst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_bitst.c,v 1.11 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_bitst.c,v 1.12 2015/09/29 13:54:40 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -144,7 +144,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         int i;
         BIT_STRING_BITNAME *bnam;
 
-        if (!(bs = M_ASN1_BIT_STRING_new())) {
+        if (!(bs = ASN1_BIT_STRING_new())) {
                 X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
@@ -157,7 +157,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                                     bnam->bitnum, 1)) {
                                         X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
                                             ERR_R_MALLOC_FAILURE);
-                                        M_ASN1_BIT_STRING_free(bs);
+                                        ASN1_BIT_STRING_free(bs);
                                         return NULL;
                                 }
                                 break;
@@ -167,7 +167,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                         X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
                             X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT);
                         X509V3_conf_err(val);
-                        M_ASN1_BIT_STRING_free(bs);
+                        ASN1_BIT_STRING_free(bs);
                         return NULL;
                 }
         }