Commit ed0ac119 authored by Nicola Tuveri's avatar Nicola Tuveri
Browse files

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



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9511)

(cherry picked from commit 4fe2ee3a449a8ca2886584e221f34ff0ef5de119)
parent 61387fd3

crypto/ec/ecp_nistp224.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1463,14 +1463,12 @@ int ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r, 
         * i.e., they contribute nothing to the linear combination

         * i.e., they contribute nothing to the linear combination

         */

         */

        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];

            }

            }
@@ -1539,18 +1537,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);

crypto/ec/ecp_nistp256.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -2088,17 +2088,15 @@ int ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r, 
        memset(secrets, 0, sizeof(*secrets) * num_points);

        memset(secrets, 0, sizeof(*secrets) * num_points);

        memset(pre_comp, 0, sizeof(*pre_comp) * num_points);

        memset(pre_comp, 0, sizeof(*pre_comp) * num_points);

        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];

            }

            }
@@ -2169,18 +2167,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);

crypto/ec/ecp_nistp521.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1928,17 +1928,15 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r, 
         * i.e., they contribute nothing to the linear combination

         * i.e., they contribute nothing to the linear combination

         */

         */

        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];

            }

            }
@@ -2007,19 +2005,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);