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/ec/ec_check.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/ec/ec_check.c')
| -rw-r--r-- | lib/libcrypto/ec/ec_check.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libcrypto/ec/ec_check.c b/lib/libcrypto/ec/ec_check.c index 21072305d5c..bbb03498ac2 100644 --- a/lib/libcrypto/ec/ec_check.c +++ b/lib/libcrypto/ec/ec_check.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_check.c,v 1.5 2015/02/08 22:25:03 miod Exp $ */ +/* $OpenBSD: ec_check.c,v 1.6 2017/01/29 17:49:23 beck Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -67,7 +67,7 @@ EC_GROUP_check(const EC_GROUP * group, BN_CTX * ctx) if (ctx == NULL) { ctx = new_ctx = BN_CTX_new(); if (ctx == NULL) { - ECerr(EC_F_EC_GROUP_CHECK, ERR_R_MALLOC_FAILURE); + ECerror(ERR_R_MALLOC_FAILURE); goto err; } } @@ -77,16 +77,16 @@ EC_GROUP_check(const EC_GROUP * group, BN_CTX * ctx) /* check the discriminant */ if (!EC_GROUP_check_discriminant(group, ctx)) { - ECerr(EC_F_EC_GROUP_CHECK, EC_R_DISCRIMINANT_IS_ZERO); + ECerror(EC_R_DISCRIMINANT_IS_ZERO); goto err; } /* check the generator */ if (group->generator == NULL) { - ECerr(EC_F_EC_GROUP_CHECK, EC_R_UNDEFINED_GENERATOR); + ECerror(EC_R_UNDEFINED_GENERATOR); goto err; } if (EC_POINT_is_on_curve(group, group->generator, ctx) <= 0) { - ECerr(EC_F_EC_GROUP_CHECK, EC_R_POINT_IS_NOT_ON_CURVE); + ECerror(EC_R_POINT_IS_NOT_ON_CURVE); goto err; } /* check the order of the generator */ @@ -95,13 +95,13 @@ EC_GROUP_check(const EC_GROUP * group, BN_CTX * ctx) if (!EC_GROUP_get_order(group, order, ctx)) goto err; if (BN_is_zero(order)) { - ECerr(EC_F_EC_GROUP_CHECK, EC_R_UNDEFINED_ORDER); + ECerror(EC_R_UNDEFINED_ORDER); goto err; } if (!EC_POINT_mul(group, point, order, NULL, NULL, ctx)) goto err; if (EC_POINT_is_at_infinity(group, point) <= 0) { - ECerr(EC_F_EC_GROUP_CHECK, EC_R_INVALID_GROUP_ORDER); + ECerror(EC_R_INVALID_GROUP_ORDER); goto err; } ret = 1; |