Commit 909c68ae authored by Matt Caswell's avatar Matt Caswell
Browse files

Yet more style updates to the curve448 code 



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

crypto/ec/curve448/curve448.c

+15 −10
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ static const curve448_scalar_t precomputed_scalarmul_adjustment = { 
    }

    }

};

};





#define TWISTED_D ((EDWARDS_D)-1)

#define TWISTED_D (EDWARDS_D - 1)





#define WBITS C448_WORD_BITS   /* NB this may be different from ARCH_WORD_BITS */

#define WBITS C448_WORD_BITS   /* NB this may be different from ARCH_WORD_BITS */
@@ -385,7 +385,7 @@ c448_error_t x448_int(uint8_t out[X_PUBLIC_BYTES], 
    mask_t swap = 0;

    mask_t swap = 0;

    mask_t nz;

    mask_t nz;





    ignore_result(gf_deserialize(x1, base, 1, 0));

    (void)gf_deserialize(x1, base, 1, 0);

    gf_copy(x2, ONE);

    gf_copy(x2, ONE);

    gf_copy(z2, ZERO);

    gf_copy(z2, ZERO);

    gf_copy(x3, x1);

    gf_copy(x3, x1);
@@ -409,6 +409,11 @@ c448_error_t x448_int(uint8_t out[X_PUBLIC_BYTES], 
        gf_cond_swap(z2, z3, swap);

        gf_cond_swap(z2, z3, swap);

        swap = k_t;

        swap = k_t;





        /*

         * The "_nr" below skips coefficient reduction. In the following

         * comments, "2+e" is saying that the coefficients are at most 2+epsilon

         * times the reduction limit.

         */

        gf_add_nr(t1, x2, z2);  /* A = x2 + z2 */ /* 2+e */

        gf_add_nr(t1, x2, z2);  /* A = x2 + z2 */ /* 2+e */

        gf_sub_nr(t2, x2, z2);  /* B = x2 - z2 */ /* 3+e */

        gf_sub_nr(t2, x2, z2);  /* B = x2 - z2 */ /* 3+e */

        gf_sub_nr(z2, x3, z3);  /* D = x3 - z3 */ /* 3+e */

        gf_sub_nr(z2, x3, z3);  /* D = x3 - z3 */ /* 3+e */

crypto/ec/curve448/point_448.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -92,8 +92,7 @@ extern const niels_t *curve448_wnaf_base; 
 * C448_FAILURE: The scalar was greater than the modulus, and has been reduced

 * C448_FAILURE: The scalar was greater than the modulus, and has been reduced

 * modulo that modulus.

 * modulo that modulus.

 */

 */

__owur c448_error_t curve448_scalar_decode(

c448_error_t curve448_scalar_decode(curve448_scalar_t out,

                            curve448_scalar_t out,

                                    const unsigned char ser[C448_SCALAR_BYTES]);

                                    const unsigned char ser[C448_SCALAR_BYTES]);





/*

/*

crypto/ec/curve448/scalar.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -198,7 +198,7 @@ void curve448_scalar_decode_long(curve448_scalar_t s, 
    while (i) {

    while (i) {

        i -= C448_SCALAR_BYTES;

        i -= C448_SCALAR_BYTES;

        sc_montmul(t1, t1, sc_r2);

        sc_montmul(t1, t1, sc_r2);

        ignore_result(curve448_scalar_decode(t2, ser + i));

        (void)curve448_scalar_decode(t2, ser + i);

        curve448_scalar_add(t1, t1, t2);

        curve448_scalar_add(t1, t1, t2);

    }

    }

crypto/ec/curve448/word.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -101,9 +101,4 @@ static ossl_inline mask_t bool_to_mask(c448_bool_t m) 
    return ret;

    return ret;

}

}





static ossl_inline void ignore_result(c448_bool_t boo)

{

    (void)boo;

}



#endif                          /* HEADER_WORD_H */
 
#endif                          /* HEADER_WORD_H */