From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 16 Nov 2011 13:28:11 +0000 (+0000)
Subject: In EC_KEY_set_public_key_affine_coordinates include explicit check to see passed... 
X-Git-Tag: OpenSSL-fips-2_0-rc3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=901b9b5c367ed81f2ce7879082a6ec600cb818d9;p=thirdparty%2Fopenssl.git

In EC_KEY_set_public_key_affine_coordinates include explicit check to see passed components do not exceed field order
---

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index f3331e1ce5e..24ae7075601 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);