feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #1321 from SparkiDev/fe_init_small_fix

Browse Source 
Fix fe_init implementation to appear for small Ed25519
This commit is contained in:
dgarske
2018-01-17 08:30:13 -08:00
committed by GitHub
parent 3415b05732 c09d972012
commit 2dc60b9e01
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -1308,9 +1308,6 @@ then
fi fi
AM_CONDITIONAL([BUILD_CURVE25519], [test "x$ENABLED_CURVE25519" = "xyes"])
AM_CONDITIONAL([BUILD_CURVE25519_SMALL], [test "x$ENABLED_CURVE25519_SMALL" = "xyes"])
# ED25519 # ED25519
AC_ARG_ENABLE([ed25519], AC_ARG_ENABLE([ed25519],
[AS_HELP_STRING([--enable-ed25519],[Enable ED25519 (default: disabled)])], [AS_HELP_STRING([--enable-ed25519],[Enable ED25519 (default: disabled)])],
@@ -1330,6 +1327,7 @@ then
then then
AM_CFLAGS="$AM_CFLAGS -DED25519_SMALL" AM_CFLAGS="$AM_CFLAGS -DED25519_SMALL"
ENABLED_ED25519_SMALL=yes ENABLED_ED25519_SMALL=yes
ENABLED_CURVE25519_SMALL=yes
ENABLED_ED25519=yes ENABLED_ED25519=yes
fi fi
@@ -1346,6 +1344,9 @@ AM_CONDITIONAL([BUILD_ED25519], [test "x$ENABLED_ED25519" = "xyes"])
AM_CONDITIONAL([BUILD_ED25519_SMALL], [test "x$ENABLED_ED25519_SMALL" = "xyes"]) AM_CONDITIONAL([BUILD_ED25519_SMALL], [test "x$ENABLED_ED25519_SMALL" = "xyes"])
AM_CONDITIONAL([BUILD_FEMATH], [test "x$ENABLED_FEMATH" = "xyes"]) AM_CONDITIONAL([BUILD_FEMATH], [test "x$ENABLED_FEMATH" = "xyes"])
AM_CONDITIONAL([BUILD_GEMATH], [test "x$ENABLED_GEMATH" = "xyes"]) AM_CONDITIONAL([BUILD_GEMATH], [test "x$ENABLED_GEMATH" = "xyes"])
AM_CONDITIONAL([BUILD_CURVE25519], [test "x$ENABLED_CURVE25519" = "xyes"])
AM_CONDITIONAL([BUILD_CURVE25519_SMALL], [test "x$ENABLED_CURVE25519_SMALL" = "xyes"])
# FP ECC, Fixed Point cache ECC # FP ECC, Fixed Point cache ECC
AC_ARG_ENABLE([fpecc], AC_ARG_ENABLE([fpecc],

6
src/include.am
View File

@@ -254,17 +254,11 @@ endif
if BUILD_GEMATH if BUILD_GEMATH
if BUILD_ED25519_SMALL if BUILD_ED25519_SMALL
src_libwolfssl_la_SOURCES += wolfcrypt/src/ge_low_mem.c src_libwolfssl_la_SOURCES += wolfcrypt/src/ge_low_mem.c
if !BUILD_CURVE25519_SMALL
src_libwolfssl_la_SOURCES += wolfcrypt/src/fe_low_mem.c
endif
else else
src_libwolfssl_la_SOURCES += wolfcrypt/src/ge_operations.c src_libwolfssl_la_SOURCES += wolfcrypt/src/ge_operations.c
if !BUILD_FEMATH if !BUILD_FEMATH
src_libwolfssl_la_SOURCES += wolfcrypt/src/fe_operations.c src_libwolfssl_la_SOURCES += wolfcrypt/src/fe_operations.c
endif endif
if BUILD_CURVE25519_SMALL
src_libwolfssl_la_SOURCES += wolfcrypt/src/fe_operations.c
endif
endif endif
endif endif

4
wolfcrypt/src/fe_low_mem.c
View File

@@ -55,14 +55,14 @@ void lm_copy(byte* x, const byte* a)
x[i] = a[i]; x[i] = a[i];
} }
#ifdef CURVE25519_SMALL
#ifndef FREESCALE_LTC_ECC #ifndef FREESCALE_LTC_ECC
void fe_init() void fe_init()
{ {
} }
#endif #endif
#ifdef CURVE25519_SMALL
/* Double an X-coordinate */ /* Double an X-coordinate */
static void xc_double(byte *x3, byte *z3, static void xc_double(byte *x3, byte *z3,
const byte *x1, const byte *z1) const byte *x1, const byte *z1)