summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-11-16 13:28:35 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-11-16 13:28:35 +0000
commitd674bb4bc84e6e8cf510adfe7049cb19a2c29cf8 (patch)
tree330bef8479d434e63292f38fa9c3a20a45aef989
parente0af04056cafff7cbfd2f4426cd0b44700a374a4 (diff)
In EC_KEY_set_public_key_affine_coordinates include explicit check to see passed components do not exceed field order
-rw-r--r--crypto/ec/ec_key.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index f3331e1ce5..24ae707560 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -511,10 +511,12 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, BIGNUM *y)
tx, ty, ctx))
goto err;
}
- /* Check if retrieved coordinates match originals: if not values
- * are out of range.
+ /* Check if retrieved coordinates match originals and are less than
+ * field order: if not values are out of range.
*/
- if (BN_cmp(x, tx) || BN_cmp(y, ty))
+ if (BN_cmp(x, tx) || BN_cmp(y, ty)
+ || (BN_cmp(x, &key->group->field) >= 0)
+ || (BN_cmp(y, &key->group->field) >= 0))
{
ECerr(EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES,
EC_R_COORDINATES_OUT_OF_RANGE);