diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2017-01-29 17:49:24 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2017-01-29 17:49:24 +0000 |
| commit | c95f3b2c0c39020aafaffd84899a33ece0210769 (patch) | |
| tree | 6d6e55f6c8b4047319196f43823ad30170dfe061 /lib/libcrypto/x509v3/v3_pcons.c | |
| parent | b8dd3a8e12bfab2c15794994bc5bdc1397125536 (diff) | |
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 'lib/libcrypto/x509v3/v3_pcons.c')
| -rw-r--r-- | lib/libcrypto/x509v3/v3_pcons.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libcrypto/x509v3/v3_pcons.c b/lib/libcrypto/x509v3/v3_pcons.c index 144ba88e8dd..30487a4d18c 100644 --- a/lib/libcrypto/x509v3/v3_pcons.c +++ b/lib/libcrypto/x509v3/v3_pcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_pcons.c,v 1.10 2016/12/30 15:54:49 jsing Exp $ */ +/* $OpenBSD: v3_pcons.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -150,8 +150,7 @@ v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, int i; if (!(pcons = POLICY_CONSTRAINTS_new())) { - X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, - ERR_R_MALLOC_FAILURE); + X509V3error(ERR_R_MALLOC_FAILURE); return NULL; } for (i = 0; i < sk_CONF_VALUE_num(values); i++) { @@ -163,15 +162,13 @@ v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, if (!X509V3_get_value_int(val, &pcons->inhibitPolicyMapping)) goto err; } else { - X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, - X509V3_R_INVALID_NAME); + X509V3error(X509V3_R_INVALID_NAME); X509V3_conf_err(val); goto err; } } if (!pcons->inhibitPolicyMapping && !pcons->requireExplicitPolicy) { - X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, - X509V3_R_ILLEGAL_EMPTY_EXTENSION); + X509V3error(X509V3_R_ILLEGAL_EMPTY_EXTENSION); goto err; } |