summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-22 00:57:19 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:46:13 +0000
commite3db68b766609ad5a3d1ab1fbf68d9286e6cf8b3 (patch)
treebad861f06b61941cacd48b4af354c19151a8dc4f
parentc583d40678a6be5d86cc421f45ff7894292c8d6c (diff)
Yet more changes to commentsOpenSSL_1_0_0-pre-auto-reformat
Reviewed-by: Tim Hudson <tjh@openssl.org>
-rw-r--r--crypto/ec/ec2_smpl.c3
-rw-r--r--crypto/ec/ecp_smpl.c3
-rw-r--r--ssl/t1_enc.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 1851cfdee1..f8441a20f9 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -724,7 +724,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 df287fdf04..c200839cc8 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -214,7 +214,8 @@ static int tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
goto err;
out+=j;
olen-=j;
- if (!HMAC_Final(&ctx_tmp,A1,&A1_len)) /* calc the next A1 value */
+ /* calc the next A1 value */
+ if (!HMAC_Final(&ctx_tmp,A1,&A1_len))
goto err;
}
else /* last one */