Commit 117e79dd authored by Matt Caswell's avatar Matt Caswell
Browse files

Yet more changes to comments 



Conflicts:
	ssl/t1_enc.c

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent bc912216

crypto/ec/ec2_smpl.c

+2 −1
Original line number Diff line number Diff line
@@ -657,7 +657,8 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point, 
		if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;

		}

	

	if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */

	/* test required by X9.62 */

	if (!EC_POINT_is_on_curve(group, point, ctx))

		{

		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);

		goto err;

crypto/ec/ecp_smpl.c

+2 −1
Original line number Diff line number Diff line
@@ -987,7 +987,8 @@ int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point, 
		if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;

		}

	

	if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */

	/* test required by X9.62 */

	if (!EC_POINT_is_on_curve(group, point, ctx))

		{

		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);

		goto err;

ssl/t1_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec, 
			HMAC_Final(&ctx,out,&j);

			out+=j;

			olen-=j;

			HMAC_Final(&ctx_tmp,A1,&A1_len); /* calc the next A1 value */

			/* calc the next A1 value */

			HMAC_Final(&ctx_tmp,A1,&A1_len);

			}

		else	/* last one */

			{