Commit dd616752 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

oops, revert mistakenly committed EC changes

parent 198ce9a6

crypto/ec/ec2_smpl.c

+1 −18
Original line number Diff line number Diff line
@@ -363,11 +363,6 @@ int ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT 
	if (!BN_copy(&point->Z, BN_value_one())) goto err;

	BN_set_negative(&point->Z, 0);

	point->Z_is_one = 1;

	if (BN_num_bits(x) > BN_num_bits(&group->field))

		ret = 2;

	else if (BN_num_bits(y) > BN_num_bits(&group->field))

		ret = 2;

	else

	ret = 1;



  err:
@@ -943,9 +938,6 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT 
		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;

		}

	

	if (EC_POINT_is_at_infinity(group, b))

		return 1;

	

	if (a->Z_is_one && b->Z_is_one)

		{

		return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;
@@ -975,15 +967,6 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT 
	return ret;

	}



int ec_GF2m_simple_range(const EC_GROUP *group, const EC_POINT *a)

	{

	if (BN_num_bits(&a->X) > BN_num_bits(&group->field))

		return 0;

	if (BN_num_bits(&a->Y) > BN_num_bits(&group->field))

		return 0;

	return 1;

	}





/* Forces the given EC_POINT to internally use affine coordinates. */

int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)

crypto/ec/ec_key.c

+1 −7
Original line number Diff line number Diff line
@@ -305,12 +305,6 @@ int EC_KEY_check_key(const EC_KEY *eckey) 
		return 0;

		}

	

	if (EC_POINT_is_at_infinity(eckey->group, eckey->pub_key))

		{

		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_AT_INFINITY);

		goto err;

		}



	if ((ctx = BN_CTX_new()) == NULL)

		goto err;

	if ((point = EC_POINT_new(eckey->group)) == NULL)

crypto/ec/ec_lcl.h

+0 −2
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ int ec_GFp_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *); 
int ec_GFp_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);

int ec_GFp_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);

int ec_GFp_simple_cmp(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b, BN_CTX *);

int ec_GFp_simple_range(const EC_GROUP *group, const EC_POINT *a);

int ec_GFp_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);

int ec_GFp_simple_points_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);

int ec_GFp_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
@@ -380,7 +379,6 @@ int ec_GF2m_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *); 
int ec_GF2m_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);

int ec_GF2m_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);

int ec_GF2m_simple_cmp(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b, BN_CTX *);

int ec_GF2m_simple_range(const EC_GROUP *group, const EC_POINT *a);

int ec_GF2m_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);

int ec_GF2m_simple_points_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);

int ec_GF2m_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);

crypto/ec/ecp_smpl.c

+3 −8
Original line number Diff line number Diff line
@@ -442,9 +442,6 @@ int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POIN 
		point->Z_is_one = Z_is_one;

		}

	

	if (BN_cmp(&point->X, x) || BN_cmp(&point->Y, y))

		ret = 2;

	else

	ret = 1;

	

 err:
@@ -1410,9 +1407,6 @@ int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT * 
		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;

		}

	

	if (EC_POINT_is_at_infinity(group, b))

		return 1;

	

	if (a->Z_is_one && b->Z_is_one)

		{

		return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;
@@ -1500,6 +1494,7 @@ int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT * 
	return ret;

	}





int ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)

	{

	BN_CTX *new_ctx = NULL;