diff options
author | beck <> | 2017-01-29 17:49:23 +0000 |
---|---|---|
committer | beck <> | 2017-01-29 17:49:23 +0000 |
commit | 957b11334a7afb14537322f0e4795b2e368b3f59 (patch) | |
tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/x509v3/v3_bcons.c | |
parent | df96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff) | |
download | openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.gz openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.bz2 openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.zip |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_bcons.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_bcons.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_bcons.c b/src/lib/libcrypto/x509v3/v3_bcons.c index 96b42e2e20..6c5823c44e 100644 --- a/src/lib/libcrypto/x509v3/v3_bcons.c +++ b/src/lib/libcrypto/x509v3/v3_bcons.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_bcons.c,v 1.14 2016/12/30 15:54:49 jsing Exp $ */ | 1 | /* $OpenBSD: v3_bcons.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 | */ |
@@ -159,7 +159,7 @@ v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
159 | int i; | 159 | int i; |
160 | 160 | ||
161 | if (!(bcons = BASIC_CONSTRAINTS_new())) { | 161 | if (!(bcons = BASIC_CONSTRAINTS_new())) { |
162 | X509V3err(X509V3_F_V2I_BASIC_CONSTRAINTS, ERR_R_MALLOC_FAILURE); | 162 | X509V3error(ERR_R_MALLOC_FAILURE); |
163 | return NULL; | 163 | return NULL; |
164 | } | 164 | } |
165 | for (i = 0; i < sk_CONF_VALUE_num(values); i++) { | 165 | for (i = 0; i < sk_CONF_VALUE_num(values); i++) { |
@@ -171,8 +171,7 @@ v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
171 | if (!X509V3_get_value_int(val, &bcons->pathlen)) | 171 | if (!X509V3_get_value_int(val, &bcons->pathlen)) |
172 | goto err; | 172 | goto err; |
173 | } else { | 173 | } else { |
174 | X509V3err(X509V3_F_V2I_BASIC_CONSTRAINTS, | 174 | X509V3error(X509V3_R_INVALID_NAME); |
175 | X509V3_R_INVALID_NAME); | ||
176 | X509V3_conf_err(val); | 175 | X509V3_conf_err(val); |
177 | goto err; | 176 | goto err; |
178 | } | 177 | } |