QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-01 12:09:42 +00:00
Code Issues Projects Releases Wiki Activity

[ec/ecp_nistp*.c] restyle: use {} around else too

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9793)
This commit is contained in:
Nicola Tuveri 2019-09-06 14:05:26 +03:00
parent e3679b1547
commit 920e37e3a7
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/ec/ecp_nistp224.c
View File

@ -1495,14 +1495,12 @@ int ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
memset(secrets, 0, num_points * sizeof(felem_bytearray)); memset(secrets, 0, num_points * sizeof(felem_bytearray));
memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem)); memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem));
for (i = 0; i < num_points; ++i) { for (i = 0; i < num_points; ++i) {
if (i == num) if (i == num) {
/* the generator */ /* the generator */
{
p = EC_GROUP_get0_generator(group); p = EC_GROUP_get0_generator(group);
p_scalar = scalar; p_scalar = scalar;
} else } else {
/* the i^th point */ /* the i^th point */
{
p = points[i]; p = points[i];
p_scalar = scalars[i]; p_scalar = scalars[i];
} }
@ -1571,18 +1569,20 @@ int ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
goto err; goto err;
} }
num_bytes = bn_bn2lebinpad(tmp_scalar, g_secret, sizeof(g_secret)); num_bytes = bn_bn2lebinpad(tmp_scalar, g_secret, sizeof(g_secret));
} else } else {
num_bytes = bn_bn2lebinpad(scalar, g_secret, sizeof(g_secret)); num_bytes = bn_bn2lebinpad(scalar, g_secret, sizeof(g_secret));
}
/* do the multiplication with generator precomputation */ /* do the multiplication with generator precomputation */
batch_mul(x_out, y_out, z_out, batch_mul(x_out, y_out, z_out,
(const felem_bytearray(*))secrets, num_points, (const felem_bytearray(*))secrets, num_points,
g_secret, g_secret,
mixed, (const felem(*)[17][3])pre_comp, g_pre_comp); mixed, (const felem(*)[17][3])pre_comp, g_pre_comp);
} else } else {
/* do the multiplication without generator precomputation */ /* do the multiplication without generator precomputation */
batch_mul(x_out, y_out, z_out, batch_mul(x_out, y_out, z_out,
(const felem_bytearray(*))secrets, num_points, (const felem_bytearray(*))secrets, num_points,
NULL, mixed, (const felem(*)[17][3])pre_comp, NULL); NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
}
/* reduce the output to its unique minimal representation */ /* reduce the output to its unique minimal representation */
felem_contract(x_in, x_out); felem_contract(x_in, x_out);
felem_contract(y_in, y_out); felem_contract(y_in, y_out);

12
crypto/ec/ecp_nistp256.c
View File

@ -2084,17 +2084,15 @@ int ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
memset(secrets, 0, num_points * sizeof(felem_bytearray)); memset(secrets, 0, num_points * sizeof(felem_bytearray));
memset(pre_comp, 0, num_points * 17 * 3 * sizeof(smallfelem)); memset(pre_comp, 0, num_points * 17 * 3 * sizeof(smallfelem));
for (i = 0; i < num_points; ++i) { for (i = 0; i < num_points; ++i) {
if (i == num) if (i == num) {
/* /*
* we didn't have a valid precomputation, so we pick the * we didn't have a valid precomputation, so we pick the
* generator * generator
*/ */
{
p = EC_GROUP_get0_generator(group); p = EC_GROUP_get0_generator(group);
p_scalar = scalar; p_scalar = scalar;
} else } else {
/* the i^th point */ /* the i^th point */
{
p = points[i]; p = points[i];
p_scalar = scalars[i]; p_scalar = scalars[i];
} }
@ -2165,18 +2163,20 @@ int ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
goto err; goto err;
} }
num_bytes = bn_bn2lebinpad(tmp_scalar, g_secret, sizeof(g_secret)); num_bytes = bn_bn2lebinpad(tmp_scalar, g_secret, sizeof(g_secret));
} else } else {
num_bytes = bn_bn2lebinpad(scalar, g_secret, sizeof(g_secret)); num_bytes = bn_bn2lebinpad(scalar, g_secret, sizeof(g_secret));
}
/* do the multiplication with generator precomputation */ /* do the multiplication with generator precomputation */
batch_mul(x_out, y_out, z_out, batch_mul(x_out, y_out, z_out,
(const felem_bytearray(*))secrets, num_points, (const felem_bytearray(*))secrets, num_points,
g_secret, g_secret,
mixed, (const smallfelem(*)[17][3])pre_comp, g_pre_comp); mixed, (const smallfelem(*)[17][3])pre_comp, g_pre_comp);
} else } else {
/* do the multiplication without generator precomputation */ /* do the multiplication without generator precomputation */
batch_mul(x_out, y_out, z_out, batch_mul(x_out, y_out, z_out,
(const felem_bytearray(*))secrets, num_points, (const felem_bytearray(*))secrets, num_points,
NULL, mixed, (const smallfelem(*)[17][3])pre_comp, NULL); NULL, mixed, (const smallfelem(*)[17][3])pre_comp, NULL);
}
/* reduce the output to its unique minimal representation */ /* reduce the output to its unique minimal representation */
felem_contract(x_in, x_out); felem_contract(x_in, x_out);
felem_contract(y_in, y_out); felem_contract(y_in, y_out);

12
crypto/ec/ecp_nistp521.c
View File

@ -1896,17 +1896,15 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
memset(secrets, 0, num_points * sizeof(felem_bytearray)); memset(secrets, 0, num_points * sizeof(felem_bytearray));
memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem)); memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem));
for (i = 0; i < num_points; ++i) { for (i = 0; i < num_points; ++i) {
if (i == num) if (i == num) {
/* /*
* we didn't have a valid precomputation, so we pick the * we didn't have a valid precomputation, so we pick the
* generator * generator
*/ */
{
p = EC_GROUP_get0_generator(group); p = EC_GROUP_get0_generator(group);
p_scalar = scalar; p_scalar = scalar;
} else } else {
/* the i^th point */ /* the i^th point */
{
p = points[i]; p = points[i];
p_scalar = scalars[i]; p_scalar = scalars[i];
} }
@ -1975,19 +1973,21 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
goto err; goto err;
} }
num_bytes = bn_bn2lebinpad(tmp_scalar, g_secret, sizeof(g_secret)); num_bytes = bn_bn2lebinpad(tmp_scalar, g_secret, sizeof(g_secret));
} else } else {
num_bytes = bn_bn2lebinpad(scalar, g_secret, sizeof(g_secret)); num_bytes = bn_bn2lebinpad(scalar, g_secret, sizeof(g_secret));
}
/* do the multiplication with generator precomputation */ /* do the multiplication with generator precomputation */
batch_mul(x_out, y_out, z_out, batch_mul(x_out, y_out, z_out,
(const felem_bytearray(*))secrets, num_points, (const felem_bytearray(*))secrets, num_points,
g_secret, g_secret,
mixed, (const felem(*)[17][3])pre_comp, mixed, (const felem(*)[17][3])pre_comp,
(const felem(*)[3])g_pre_comp); (const felem(*)[3])g_pre_comp);
} else } else {
/* do the multiplication without generator precomputation */ /* do the multiplication without generator precomputation */
batch_mul(x_out, y_out, z_out, batch_mul(x_out, y_out, z_out,
(const felem_bytearray(*))secrets, num_points, (const felem_bytearray(*))secrets, num_points,
NULL, mixed, (const felem(*)[17][3])pre_comp, NULL); NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
}
/* reduce the output to its unique minimal representation */ /* reduce the output to its unique minimal representation */
felem_contract(x_in, x_out); felem_contract(x_in, x_out);
felem_contract(y_in, y_out); felem_contract(y_in, y_out);