From 117e79dd88d1e208eb0d658d53e395471e7b537e Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 22 Jan 2015 00:57:19 +0000 Subject: [PATCH] Yet more changes to comments Conflicts: ssl/t1_enc.c Reviewed-by: Tim Hudson --- crypto/ec/ec2_smpl.c | 3 ++- crypto/ec/ecp_smpl.c | 3 ++- ssl/t1_enc.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c index 52cb94fb55..6c5c0c8c2e 100644 --- a/crypto/ec/ec2_smpl.c +++ b/crypto/ec/ec2_smpl.c @@ -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; diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c index 7c9d1d0a31..e68eb2fc28 100644 --- a/crypto/ec/ecp_smpl.c +++ b/crypto/ec/ecp_smpl.c @@ -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; diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index a1df6af7d9..c36de5212f 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -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 */ { -- 2.25.1