Replace M_ASN1_IA5STRING_(new|free) with ASN1_IA5STRING_(new|free). Same

with one s/M_ASN1_VISIBLESTRING_new/ASN1_VISIBLESTRING_new/.

6 files changed, 18 insertions, 18 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
index 4b3755e4e7..75c68d3cdb 100644
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ b/src/lib/libcrypto/x509v3/v3_alt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_alt.c,v 1.24 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.25 2015/09/30 18:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -439,7 +439,7 @@ copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
 
 err:
         GENERAL_NAME_free(gen);
-        M_ASN1_IA5STRING_free(email);
+        ASN1_IA5STRING_free(email);
         return 0;
 }
 
@@ -557,7 +557,7 @@ a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
         }
 
         if (is_string) {
-                if (!(gen->d.ia5 = M_ASN1_IA5STRING_new()) ||
+                if (!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
                     !ASN1_STRING_set(gen->d.ia5, (unsigned char*)value,
                         strlen(value))) {
                         X509V3err(X509V3_F_A2I_GENERAL_NAME,
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c
index cea82afde9..5ca001ad55 100644
--- a/src/lib/libcrypto/x509v3/v3_cpols.c
+++ b/src/lib/libcrypto/x509v3/v3_cpols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_cpols.c,v 1.22 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_cpols.c,v 1.23 2015/09/30 18:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -497,7 +497,7 @@ policy_section(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *polstrs, int ia5org)
                         if ((nqual = POLICYQUALINFO_new()) == NULL)
                                 goto merr;
                         nqual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
-                        nqual->d.cpsuri = M_ASN1_IA5STRING_new();
+                        nqual->d.cpsuri = ASN1_IA5STRING_new();
                         if (nqual->d.cpsuri == NULL)
                                 goto merr;
                         if (ASN1_STRING_set(nqual->d.cpsuri, cnf->value,
@@ -583,7 +583,7 @@ notice_section(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *unot, int ia5org)
                 cnf = sk_CONF_VALUE_value(unot, i);
                 if (!strcmp(cnf->name, "explicitText")) {
                         if (not->exptext == NULL) {
-                                not->exptext = M_ASN1_VISIBLESTRING_new();
+                                not->exptext = ASN1_VISIBLESTRING_new();
                                 if (not->exptext == NULL)
                                         goto merr;
                         }
diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
index 62f40aaff9..20e44ec2b1 100644
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ b/src/lib/libcrypto/x509v3/v3_ia5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_ia5.c,v 1.14 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_ia5.c,v 1.15 2015/09/30 18:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -224,11 +224,11 @@ s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
                     X509V3_R_INVALID_NULL_ARGUMENT);
                 return NULL;
         }
-        if (!(ia5 = M_ASN1_IA5STRING_new()))
+        if (!(ia5 = ASN1_IA5STRING_new()))
                 goto err;
         if (!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char*)str,
             strlen(str))) {
-                M_ASN1_IA5STRING_free(ia5);
+                ASN1_IA5STRING_free(ia5);
                 goto err;
         }
         return ia5;
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_alt.c b/src/lib/libssl/src/crypto/x509v3/v3_alt.c
index 4b3755e4e7..75c68d3cdb 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_alt.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_alt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_alt.c,v 1.24 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.25 2015/09/30 18:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -439,7 +439,7 @@ copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
 
 err:
         GENERAL_NAME_free(gen);
-        M_ASN1_IA5STRING_free(email);
+        ASN1_IA5STRING_free(email);
         return 0;
 }
 
@@ -557,7 +557,7 @@ a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
         }
 
         if (is_string) {
-                if (!(gen->d.ia5 = M_ASN1_IA5STRING_new()) ||
+                if (!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
                     !ASN1_STRING_set(gen->d.ia5, (unsigned char*)value,
                         strlen(value))) {
                         X509V3err(X509V3_F_A2I_GENERAL_NAME,
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_cpols.c b/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
index cea82afde9..5ca001ad55 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_cpols.c,v 1.22 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_cpols.c,v 1.23 2015/09/30 18:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -497,7 +497,7 @@ policy_section(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *polstrs, int ia5org)
                         if ((nqual = POLICYQUALINFO_new()) == NULL)
                                 goto merr;
                         nqual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
-                        nqual->d.cpsuri = M_ASN1_IA5STRING_new();
+                        nqual->d.cpsuri = ASN1_IA5STRING_new();
                         if (nqual->d.cpsuri == NULL)
                                 goto merr;
                         if (ASN1_STRING_set(nqual->d.cpsuri, cnf->value,
@@ -583,7 +583,7 @@ notice_section(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *unot, int ia5org)
                 cnf = sk_CONF_VALUE_value(unot, i);
                 if (!strcmp(cnf->name, "explicitText")) {
                         if (not->exptext == NULL) {
-                                not->exptext = M_ASN1_VISIBLESTRING_new();
+                                not->exptext = ASN1_VISIBLESTRING_new();
                                 if (not->exptext == NULL)
                                         goto merr;
                         }
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_ia5.c b/src/lib/libssl/src/crypto/x509v3/v3_ia5.c
index 62f40aaff9..20e44ec2b1 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_ia5.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_ia5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_ia5.c,v 1.14 2015/07/29 16:13:48 jsing Exp $ */
+/* $OpenBSD: v3_ia5.c,v 1.15 2015/09/30 18:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -224,11 +224,11 @@ s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
                     X509V3_R_INVALID_NULL_ARGUMENT);
                 return NULL;
         }
-        if (!(ia5 = M_ASN1_IA5STRING_new()))
+        if (!(ia5 = ASN1_IA5STRING_new()))
                 goto err;
         if (!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char*)str,
             strlen(str))) {
-                M_ASN1_IA5STRING_free(ia5);
+                ASN1_IA5STRING_free(ia5);
                 goto err;
         }
         return ia5;