diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ec_key.c')
-rw-r--r-- | src/lib/libcrypto/ec/ec_key.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index 1154c4dbf5..f9904b4ee9 100644 --- a/src/lib/libcrypto/ec/ec_key.c +++ b/src/lib/libcrypto/ec/ec_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_key.c,v 1.9 2014/07/12 16:03:37 miod Exp $ */ | 1 | /* $OpenBSD: ec_key.c,v 1.10 2015/02/08 22:25:03 miod Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -277,7 +277,7 @@ EC_KEY_check_key(const EC_KEY * eckey) | |||
277 | ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_PASSED_NULL_PARAMETER); | 277 | ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_PASSED_NULL_PARAMETER); |
278 | return 0; | 278 | return 0; |
279 | } | 279 | } |
280 | if (EC_POINT_is_at_infinity(eckey->group, eckey->pub_key)) { | 280 | if (EC_POINT_is_at_infinity(eckey->group, eckey->pub_key) > 0) { |
281 | ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_AT_INFINITY); | 281 | ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_AT_INFINITY); |
282 | goto err; | 282 | goto err; |
283 | } | 283 | } |
@@ -287,7 +287,7 @@ EC_KEY_check_key(const EC_KEY * eckey) | |||
287 | goto err; | 287 | goto err; |
288 | 288 | ||
289 | /* testing whether the pub_key is on the elliptic curve */ | 289 | /* testing whether the pub_key is on the elliptic curve */ |
290 | if (!EC_POINT_is_on_curve(eckey->group, eckey->pub_key, ctx)) { | 290 | if (EC_POINT_is_on_curve(eckey->group, eckey->pub_key, ctx) <= 0) { |
291 | ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_IS_NOT_ON_CURVE); | 291 | ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_IS_NOT_ON_CURVE); |
292 | goto err; | 292 | goto err; |
293 | } | 293 | } |
@@ -301,7 +301,7 @@ EC_KEY_check_key(const EC_KEY * eckey) | |||
301 | ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB); | 301 | ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB); |
302 | goto err; | 302 | goto err; |
303 | } | 303 | } |
304 | if (!EC_POINT_is_at_infinity(eckey->group, point)) { | 304 | if (EC_POINT_is_at_infinity(eckey->group, point) <= 0) { |
305 | ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER); | 305 | ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER); |
306 | goto err; | 306 | goto err; |
307 | } | 307 | } |