diff options
| author | Bodo Moeller <bmoeller@google.com> | 2013-09-16 12:59:21 +0200 |
|---|---|---|
| committer | Bodo Moeller <bmoeller@google.com> | 2013-09-16 12:59:21 +0200 |
| commit | ca567a03ad4595589b6062465a8404764da4e3fa (patch) | |
| tree | 27f54d569f3028a0b0f1d6ca1a3d531f9835ac06 /crypto/ec/ec_lib.c | |
| parent | 8e52a9063a8a016bdac780005256994d26f9c2f9 (diff) | |
| download | openssl-ca567a03ad4595589b6062465a8404764da4e3fa.zip openssl-ca567a03ad4595589b6062465a8404764da4e3fa.tar.gz openssl-ca567a03ad4595589b6062465a8404764da4e3fa.tar.bz2 | |
Fix overly lenient comparisons:
- EC_GROUP_cmp shouldn't consider curves equal just because
the curve name is the same. (They really *should* be the same
in this case, but there's an EC_GROUP_set_curve_name API,
which could be misused.)
- EC_POINT_cmp shouldn't return 0 for ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED
or EC_R_INCOMPATIBLE_OBJECTS errors because in a cmp API, 0 indicates
equality (not an error).
Reported by: king cope
Diffstat (limited to 'crypto/ec/ec_lib.c')
| -rw-r--r-- | crypto/ec/ec_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index b3db866..f7b2025 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -483,10 +483,10 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx) if (EC_METHOD_get_field_type(EC_GROUP_method_of(a)) != EC_METHOD_get_field_type(EC_GROUP_method_of(b))) return 1; - /* compare the curve name (if present) */ + /* compare the curve name (if present in both) */ if (EC_GROUP_get_curve_name(a) && EC_GROUP_get_curve_name(b) && - EC_GROUP_get_curve_name(a) == EC_GROUP_get_curve_name(b)) - return 0; + EC_GROUP_get_curve_name(a) != EC_GROUP_get_curve_name(b)) + return 1; if (!ctx) ctx_new = ctx = BN_CTX_new(); @@ -996,12 +996,12 @@ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN if (group->meth->point_cmp == 0) { ECerr(EC_F_EC_POINT_CMP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return 0; + return -1; } if ((group->meth != a->meth) || (a->meth != b->meth)) { ECerr(EC_F_EC_POINT_CMP, EC_R_INCOMPATIBLE_OBJECTS); - return 0; + return -1; } return group->meth->point_cmp(group, a, b, ctx); } |