wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

FIPS Revalidation

Browse Source 
1. Enable SHA-224 by default if building for FIPSv2.
This commit is contained in:
John Safranek
2018-02-05 17:25:23 -08:00
parent fe8d46da95
commit aa968eac98
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@@ -2043,23 +2043,24 @@ then
AM_CFLAGS="$AM_CFLAGS -DHAVE_FIPS" AM_CFLAGS="$AM_CFLAGS -DHAVE_FIPS"
# Add the FIPS flag. # Add the FIPS flag.
AS_IF([test "x$FIPS_VERSION" = "xv2"], AS_IF([test "x$FIPS_VERSION" = "xv2"],
[AM_CFLAGS="$AM_CFLAGS -DHAVE_FIPS_VERSION=2 -DWOLFSSL_KEY_GEN" [AM_CFLAGS="$AM_CFLAGS -DHAVE_FIPS_VERSION=2 -DWOLFSSL_KEY_GEN -DWOLFSSL_SHA224"
ENABLED_KEYGEN="yes" ENABLED_KEYGEN="yes"
AS_IF([test "x$ENABLED_AESCCM" != "xyes"], ENABLED_SHA224="yes"
[ENABLED_AESCCM="yes" AS_IF([test "x$ENABLED_AESCCM" != "xyes"],
AM_CFLAGS="$AM_CFLAGS -DHAVE_AESCCM"]) [ENABLED_AESCCM="yes"
AM_CFLAGS="$AM_CFLAGS -DHAVE_AESCCM"])
AS_IF([test "x$ENABLED_RSAPSS" != "xyes"], AS_IF([test "x$ENABLED_RSAPSS" != "xyes"],
[ENABLED_RSAPSS="yes" [ENABLED_RSAPSS="yes"
AM_CFLAGS="$AM_CFLAGS -DWC_RSA_PSS"]) AM_CFLAGS="$AM_CFLAGS -DWC_RSA_PSS"])
AS_IF([test "x$ENABLED_ECC" != "xyes"], AS_IF([test "x$ENABLED_ECC" != "xyes"],
[ENABLED_ECC="yes" [ENABLED_ECC="yes"
AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256" AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256"
AS_IF([test "x$ENABLED_ECC_SHAMIR" = "xyes"], AS_IF([test "x$ENABLED_ECC_SHAMIR" = "xyes"],
[AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"])]) [AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"])])
AS_IF([test "x$ENABLED_CMAC" != "xyes"], AS_IF([test "x$ENABLED_CMAC" != "xyes"],
[ENABLED_CMAC="yes" [ENABLED_CMAC="yes"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CMAC -DWOLFSSL_AES_DIRECT"]) AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CMAC -DWOLFSSL_AES_DIRECT"])
]) ])
else else
if test "x$ENABLED_FORTRESS" = "xyes" if test "x$ENABLED_FORTRESS" = "xyes"
then then
@@ -2090,7 +2091,7 @@ AM_CONDITIONAL([BUILD_SELFTEST], [test "x$ENABLED_SELFTEST" = "xyes"])
SHA224_DEFAULT=no SHA224_DEFAULT=no
if test "$host_cpu" = "x86_64" || test "$host_cpu" = "aarch64" if test "$host_cpu" = "x86_64" || test "$host_cpu" = "aarch64"
then then
if test "x$ENABLED_FIPS" = "xno" if test "x$ENABLED_FIPS" = "xno" || test "x$FIPS_VERSION" = "xv2"
then then
SHA224_DEFAULT=yes SHA224_DEFAULT=yes
fi fi