root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix a travis failure in the curve448 code 

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)
This commit is contained in:
Matt Caswell 2018-02-07 12:08:47 +00:00
parent 2abe3cad23
commit 434149c744
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/ec/curve448/curve448.c
View File

@ -36,8 +36,6 @@ static const curve448_scalar_t precomputed_scalarmul_adjustment = {
#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 */
extern const struct curve448_precomputed_s *curve448_precomputed_base;
/* Inverse. */ /* Inverse. */
static void gf_invert(gf y, const gf x, int assert_nonzero) static void gf_invert(gf y, const gf x, int assert_nonzero)
{ {
@ -620,8 +618,6 @@ static void prepare_wnaf_table(pniels_t * output,
OPENSSL_cleanse(twop, sizeof(twop)); OPENSSL_cleanse(twop, sizeof(twop));
} }
extern const niels_t *curve448_wnaf_base;
void curve448_base_double_scalarmul_non_secret(curve448_point_t combo, void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
const curve448_scalar_t scalar1, const curve448_scalar_t scalar1,
const curve448_point_t base2, const curve448_point_t base2,

4
crypto/ec/curve448/curve448_tables.c
View File

@ -13,7 +13,7 @@
#include "point_448.h" #include "point_448.h"
const curve448_precomputed_s curve448_precomputed_base_table = { static const curve448_precomputed_s curve448_precomputed_base_table = {
{ {
{{ {{
{FIELD_LITERAL(0x00cc3b062366f4cc,0x003d6e34e314aa3c,0x00d51c0a7521774d,0x0094e060eec6ab8b,0x00d21291b4d80082,0x00befed12b55ef1e,0x00c3dd2df5c94518,0x00e0a7b112b8d4e6)}, {FIELD_LITERAL(0x00cc3b062366f4cc,0x003d6e34e314aa3c,0x00d51c0a7521774d,0x0094e060eec6ab8b,0x00d21291b4d80082,0x00befed12b55ef1e,0x00c3dd2df5c94518,0x00e0a7b112b8d4e6)},
@ -341,7 +341,7 @@ const curve448_precomputed_s curve448_precomputed_base_table = {
const struct curve448_precomputed_s *curve448_precomputed_base const struct curve448_precomputed_s *curve448_precomputed_base
= &curve448_precomputed_base_table; = &curve448_precomputed_base_table;
const niels_t curve448_wnaf_base_table[32] = { static const niels_t curve448_wnaf_base_table[32] = {
{{ {{
{FIELD_LITERAL(0x00303cda6feea532,0x00860f1d5a3850e4,0x00226b9fa4728ccd,0x00e822938a0a0c0c,0x00263a61c9ea9216,0x001204029321b828,0x006a468360983c65,0x0002846f0a782143)}, {FIELD_LITERAL(0x00303cda6feea532,0x00860f1d5a3850e4,0x00226b9fa4728ccd,0x00e822938a0a0c0c,0x00263a61c9ea9216,0x001204029321b828,0x006a468360983c65,0x0002846f0a782143)},
{FIELD_LITERAL(0x00303cda6feea532,0x00860f1d5a3850e4,0x00226b9fa4728ccd,0x006822938a0a0c0c,0x00263a61c9ea9215,0x001204029321b828,0x006a468360983c65,0x0082846f0a782143)}, {FIELD_LITERAL(0x00303cda6feea532,0x00860f1d5a3850e4,0x00226b9fa4728ccd,0x006822938a0a0c0c,0x00263a61c9ea9215,0x001204029321b828,0x006a468360983c65,0x0082846f0a782143)},

1
crypto/ec/curve448/point_448.h
View File

@ -79,6 +79,7 @@ extern const curve448_point_t curve448_point_identity;
/* Precomputed table for the base point on the curve. */ /* Precomputed table for the base point on the curve. */
extern const struct curve448_precomputed_s *curve448_precomputed_base; extern const struct curve448_precomputed_s *curve448_precomputed_base;
extern const niels_t *curve448_wnaf_base;
/* /*
* Read a scalar from wire format or from bytes. * Read a scalar from wire format or from bytes.