diff options
| author | beck <> | 2017-01-29 17:49:23 +0000 |
|---|---|---|
| committer | beck <> | 2017-01-29 17:49:23 +0000 |
| commit | d1f47bd292f36094480caa49ada36b99a69c59b0 (patch) | |
| tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/x509v3/v3_pmaps.c | |
| parent | f8c627888330b75c2eea8a3c27d0efe947a4f9da (diff) | |
| download | openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.gz openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.bz2 openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.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_pmaps.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_pmaps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_pmaps.c b/src/lib/libcrypto/x509v3/v3_pmaps.c index 8c92098006..32ef6be866 100644 --- a/src/lib/libcrypto/x509v3/v3_pmaps.c +++ b/src/lib/libcrypto/x509v3/v3_pmaps.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: v3_pmaps.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */ | 1 | /* $OpenBSD: v3_pmaps.c,v 1.11 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. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -174,7 +174,7 @@ v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
| 174 | int i, rc; | 174 | int i, rc; |
| 175 | 175 | ||
| 176 | if (!(pmaps = sk_POLICY_MAPPING_new_null())) { | 176 | if (!(pmaps = sk_POLICY_MAPPING_new_null())) { |
| 177 | X509V3err(X509V3_F_V2I_POLICY_MAPPINGS, ERR_R_MALLOC_FAILURE); | 177 | X509V3error(ERR_R_MALLOC_FAILURE); |
| 178 | return NULL; | 178 | return NULL; |
| 179 | } | 179 | } |
| 180 | 180 | ||
| @@ -208,7 +208,7 @@ v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
| 208 | 208 | ||
| 209 | err: | 209 | err: |
| 210 | sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free); | 210 | sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free); |
| 211 | X509V3err(X509V3_F_V2I_POLICY_MAPPINGS, rc); | 211 | X509V3error(rc); |
| 212 | if (rc == X509V3_R_INVALID_OBJECT_IDENTIFIER) | 212 | if (rc == X509V3_R_INVALID_OBJECT_IDENTIFIER) |
| 213 | X509V3_conf_err(val); | 213 | X509V3_conf_err(val); |
| 214 | ASN1_OBJECT_free(obj1); | 214 | ASN1_OBJECT_free(obj1); |
