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

configure: split SHA3 and SHAKE256 to work with ED448

Browse Source 
Define flags and defaults early, but set CFLAGS later to allow
override.
This commit is contained in:
Elms
2021-02-22 10:13:59 -08:00
parent 31d3dfdd4d
commit c4d2e7cfdb
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
configure.ac
View File

@ -1703,11 +1703,6 @@ then
ENABLED_SHA3="yes" ENABLED_SHA3="yes"
fi fi
if test "$ENABLED_SHA3" = "yes" && test "$ENABLED_32BIT" = "no"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA3"
fi
# SHAKE256 # SHAKE256
AC_ARG_ENABLE([shake256], AC_ARG_ENABLE([shake256],
[AS_HELP_STRING([--enable-shake256],[Enable wolfSSL SHAKE256 support (default: enabled on x86_64/aarch64)])], [AS_HELP_STRING([--enable-shake256],[Enable wolfSSL SHAKE256 support (default: enabled on x86_64/aarch64)])],
@ -1715,19 +1710,6 @@ AC_ARG_ENABLE([shake256],
[ ENABLED_SHAKE256=$ENABLED_SHA3 ] [ ENABLED_SHAKE256=$ENABLED_SHA3 ]
) )
if test "$ENABLED_SHAKE256" = "yes" || test "$ENABLED_SHAKE256" = "small"
then
if test "$ENABLED_32BIT" = "no"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHAKE256"
if test "$ENABLED_SHA3" = "no"
then
AC_MSG_ERROR([Must have SHA-3 enabled: --enable-sha3])
fi
fi
fi
# SHA512 # SHA512
AC_ARG_ENABLE([sha512], AC_ARG_ENABLE([sha512],
[AS_HELP_STRING([--enable-sha512],[Enable wolfSSL SHA-512 support (default: enabled)])], [AS_HELP_STRING([--enable-sha512],[Enable wolfSSL SHA-512 support (default: enabled)])],
@ -2161,7 +2143,7 @@ then
AM_CFLAGS="$AM_CFLAGS -DHAVE_ED448" AM_CFLAGS="$AM_CFLAGS -DHAVE_ED448"
# EdDSA448 requires SHAKE256 which requires SHA-3 # EdDSA448 requires SHAKE256 which requires SHA-3
ENABLED_SHAKE3=yes ENABLED_SHA3=yes
ENABLED_SHAKE256=yes ENABLED_SHAKE256=yes
ENABLED_CERTS=yes ENABLED_CERTS=yes
@ -3034,6 +3016,27 @@ then
POLY1305_DEFAULT=no POLY1305_DEFAULT=no
fi fi
# Set SHA-3 and SHAKE256 flags
if test "$ENABLED_SHA3" = "yes" && test "$ENABLED_32BIT" = "no"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA3"
fi
if test "$ENABLED_SHAKE256" = "yes" || test "$ENABLED_SHAKE256" = "small"
then
if test "$ENABLED_32BIT" = "no"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHAKE256"
if test "$ENABLED_SHA3" = "no"
then
AC_MSG_ERROR([Must have SHA-3 enabled: --enable-sha3])
fi
fi
fi
# POLY1305 # POLY1305
AC_ARG_ENABLE([poly1305], AC_ARG_ENABLE([poly1305],
[AS_HELP_STRING([--enable-poly1305],[Enable wolfSSL POLY1305 support (default: enabled)])], [AS_HELP_STRING([--enable-poly1305],[Enable wolfSSL POLY1305 support (default: enabled)])],