diff options
| author | jsing <> | 2015-09-29 13:54:40 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-29 13:54:40 +0000 |
| commit | 7ee31307a09e454f1d18f1904dbae11610fd0b50 (patch) | |
| tree | 742ffab301d8bdb3b31aaef2b4c50dc018af8970 /src/lib/libcrypto/x509v3/v3_bitst.c | |
| parent | cd11a75d1ba630fdc614df713c4cdf04feab7c78 (diff) | |
| download | openbsd-7ee31307a09e454f1d18f1904dbae11610fd0b50.tar.gz openbsd-7ee31307a09e454f1d18f1904dbae11610fd0b50.tar.bz2 openbsd-7ee31307a09e454f1d18f1904dbae11610fd0b50.zip | |
Replace remaining M_ASN1_BIT_STRING_(new|free) macros with calls to
ASN1_BIT_STRING_(new|free).
ok beck@ doug@
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_bitst.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_bitst.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ | |||
| 1 | /* $OpenBSD: v3_bitst.c,v 1.11 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_bitst.c,v 1.12 2015/09/29 13:54:40 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -144,7 +144,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
| 144 | int i; | 144 | int i; |
| 145 | BIT_STRING_BITNAME *bnam; | 145 | BIT_STRING_BITNAME *bnam; |
| 146 | 146 | ||
| 147 | if (!(bs = M_ASN1_BIT_STRING_new())) { | 147 | if (!(bs = ASN1_BIT_STRING_new())) { |
| 148 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, ERR_R_MALLOC_FAILURE); | 148 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, ERR_R_MALLOC_FAILURE); |
| 149 | return NULL; | 149 | return NULL; |
| 150 | } | 150 | } |
| @@ -157,7 +157,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
| 157 | bnam->bitnum, 1)) { | 157 | bnam->bitnum, 1)) { |
| 158 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, | 158 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, |
| 159 | ERR_R_MALLOC_FAILURE); | 159 | ERR_R_MALLOC_FAILURE); |
| 160 | M_ASN1_BIT_STRING_free(bs); | 160 | ASN1_BIT_STRING_free(bs); |
| 161 | return NULL; | 161 | return NULL; |
| 162 | } | 162 | } |
| 163 | break; | 163 | break; |
| @@ -167,7 +167,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
| 167 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, | 167 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, |
| 168 | X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT); | 168 | X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT); |
| 169 | X509V3_conf_err(val); | 169 | X509V3_conf_err(val); |
| 170 | M_ASN1_BIT_STRING_free(bs); | 170 | ASN1_BIT_STRING_free(bs); |
| 171 | return NULL; | 171 | return NULL; |
| 172 | } | 172 | } |
| 173 | } | 173 | } |
