Yet more changes to comments

Conflicts:
	ssl/t1_enc.c

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 52cb94fb551b9d09455951ef562e5e9a8fa5d75b..6c5c0c8c2e9ef1b2046c6c7bdd1f7a21eedcba00 100644 (file)
--- 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 7c9d1d0a31f0ac1a0f76d8cafe2b7b3bddc4807e..e68eb2fc2838954705a345ac34c3203523f6c7bd 100644 (file)
--- 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 a1df6af7d947acc25f2910bcfadc477775f8562c..c36de5212f42edac93fc41374ea4b173e6678891 100644 (file)
--- 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 */
                        {