Commit 8e32ec7a authored by Matt Caswell's avatar Matt Caswell
Browse files

Improve readability of f_impl.c and f_impl.h 



Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)
parent cb5ed326

crypto/ec/curve448/arch_32/f_impl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ void gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b) 
    uint32_t mask = (1 << 28) - 1;

    uint32_t mask = (1 << 28) - 1;

    int i;

    int i;





    assert(b < 1 << 28);

    assert(b <= mask);





    for (i = 0; i < 8; i++) {

    for (i = 0; i < 8; i++) {

        accum0 += widemul(b, a[i]);

        accum0 += widemul(b, a[i]);

crypto/ec/curve448/arch_32/f_impl.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -42,16 +42,16 @@ void gf_bias(gf a, int amt) 
    uint32_t co1 = ((1 << 28) - 1) * amt, co2 = co1 - amt;

    uint32_t co1 = ((1 << 28) - 1) * amt, co2 = co1 - amt;





    for (i = 0; i < NLIMBS; i++)

    for (i = 0; i < NLIMBS; i++)

        a->limb[i] += (i == sizeof(*a) / sizeof(a->limb[0]) / 2) ? co2 : co1;

        a->limb[i] += (i == NLIMBS / 2) ? co2 : co1;

}

}





void gf_weak_reduce(gf a)

void gf_weak_reduce(gf a)

{

{

    uint32_t mask = (1 << 28) - 1;

    uint32_t mask = (1 << 28) - 1;

    uint32_t tmp = a->limb[15] >> 28;

    uint32_t tmp = a->limb[NLIMBS - 1] >> 28;

    unsigned int i;

    unsigned int i;





    a->limb[8] += tmp;

    a->limb[NLIMBS / 2] += tmp;

    for (i = 15; i > 0; i--)

    for (i = 15; i > 0; i--)

        a->limb[i] = (a->limb[i] & mask) + (a->limb[i - 1] >> 28);

        a->limb[i] = (a->limb[i] & mask) + (a->limb[i - 1] >> 28);

    a->limb[0] = (a->limb[0] & mask) + tmp;

    a->limb[0] = (a->limb[0] & mask) + tmp;