diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-30 18:21:51 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-30 18:21:51 +0000 |
| commit | d260536199ef23624e1f09110728617b2f522e16 (patch) | |
| tree | 5301b5aee43f87756fb6a1a4fcc829ec051e9931 /lib/libssl | |
| parent | 4a9fb2cbc35621afa6cb57e7a5d08c94651bb5bc (diff) | |
Replace M_ASN1_IA5STRING_(new|free) with ASN1_IA5STRING_(new|free). Same
with one s/M_ASN1_VISIBLESTRING_new/ASN1_VISIBLESTRING_new/.
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/src/crypto/x509v3/v3_alt.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/x509v3/v3_cpols.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/x509v3/v3_ia5.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/libssl/src/crypto/x509v3/v3_alt.c b/lib/libssl/src/crypto/x509v3/v3_alt.c index 4b3755e4e7e..75c68d3cdb3 100644 --- a/lib/libssl/src/crypto/x509v3/v3_alt.c +++ b/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/lib/libssl/src/crypto/x509v3/v3_cpols.c b/lib/libssl/src/crypto/x509v3/v3_cpols.c index cea82afde91..5ca001ad55c 100644 --- a/lib/libssl/src/crypto/x509v3/v3_cpols.c +++ b/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/lib/libssl/src/crypto/x509v3/v3_ia5.c b/lib/libssl/src/crypto/x509v3/v3_ia5.c index 62f40aaff96..20e44ec2b1a 100644 --- a/lib/libssl/src/crypto/x509v3/v3_ia5.c +++ b/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; |