diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_extku.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_extku.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_extku.c b/src/lib/libcrypto/x509v3/v3_extku.c index 88682f6818..527e80b28e 100644 --- a/src/lib/libcrypto/x509v3/v3_extku.c +++ b/src/lib/libcrypto/x509v3/v3_extku.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_extku.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */ | 1 | /* $OpenBSD: v3_extku.c,v 1.15 2017/01/29 17:49:23 beck 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 | */ |
@@ -175,8 +175,7 @@ v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
175 | int i; | 175 | int i; |
176 | 176 | ||
177 | if (!(extku = sk_ASN1_OBJECT_new_null())) { | 177 | if (!(extku = sk_ASN1_OBJECT_new_null())) { |
178 | X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE, | 178 | X509V3error(ERR_R_MALLOC_FAILURE); |
179 | ERR_R_MALLOC_FAILURE); | ||
180 | return NULL; | 179 | return NULL; |
181 | } | 180 | } |
182 | 181 | ||
@@ -188,16 +187,14 @@ v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
188 | extval = val->name; | 187 | extval = val->name; |
189 | if (!(objtmp = OBJ_txt2obj(extval, 0))) { | 188 | if (!(objtmp = OBJ_txt2obj(extval, 0))) { |
190 | sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free); | 189 | sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free); |
191 | X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE, | 190 | X509V3error(X509V3_R_INVALID_OBJECT_IDENTIFIER); |
192 | X509V3_R_INVALID_OBJECT_IDENTIFIER); | ||
193 | X509V3_conf_err(val); | 191 | X509V3_conf_err(val); |
194 | return NULL; | 192 | return NULL; |
195 | } | 193 | } |
196 | if (sk_ASN1_OBJECT_push(extku, objtmp) == 0) { | 194 | if (sk_ASN1_OBJECT_push(extku, objtmp) == 0) { |
197 | ASN1_OBJECT_free(objtmp); | 195 | ASN1_OBJECT_free(objtmp); |
198 | sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free); | 196 | sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free); |
199 | X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE, | 197 | X509V3error(ERR_R_MALLOC_FAILURE); |
200 | ERR_R_MALLOC_FAILURE); | ||
201 | return NULL; | 198 | return NULL; |
202 | } | 199 | } |
203 | } | 200 | } |