wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: fix handling of ENABLED_FIPS->REPRODUCIBLE_BUILD_DEFAULT=yes; take JNI back out of from enable-all feature set because it adds -DNO_ERROR_QUEUE to flags; fix typo in FIPS test for --with-max-rsa-bits setup.

Browse Source
This commit is contained in:
Daniel Pouzzner
2021-10-07 22:33:12 -05:00
parent 32349749a6
commit 61df408d70
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@@ -205,11 +205,6 @@ AC_ARG_ENABLE([fips],
[ENABLED_FIPS=$enableval], [ENABLED_FIPS=$enableval],
[ENABLED_FIPS="no"]) [ENABLED_FIPS="no"])
if test "$ENABLED_FIPS" != "no"
then
REPRODUCIBLE_BUILD_DEFAULT=yes
fi
# The FIPS options are: # The FIPS options are:
# v5-RC8 - FIPS 140-3 (wolfCrypt WCv5.0-RC8) # v5-RC8 - FIPS 140-3 (wolfCrypt WCv5.0-RC8)
# v5 - alias for v5-RC8 (may change) # v5 - alias for v5-RC8 (may change)
@@ -282,6 +277,11 @@ then
HAVE_FIPS_VERSION=0 HAVE_FIPS_VERSION=0
fi fi
if test "$ENABLED_FIPS" != "no"
then
REPRODUCIBLE_BUILD_DEFAULT=yes
fi
AS_CASE([$FIPS_VERSION], AS_CASE([$FIPS_VERSION],
[none], [none],
[ [
@@ -559,8 +559,6 @@ then
fi fi
# S/MIME support requires PKCS7, which requires no FIPS. # S/MIME support requires PKCS7, which requires no FIPS.
test "$enable_smime" = "" && enable_smime=yes test "$enable_smime" = "" && enable_smime=yes
# JNI uses pkcallbacks.
test "$enable_jni" = "" && enable_jni=yes
fi fi
test "$enable_opensslextra" = "" && enable_opensslextra=yes test "$enable_opensslextra" = "" && enable_opensslextra=yes
test "$enable_opensslall" = "" && enable_opensslall=yes test "$enable_opensslall" = "" && enable_opensslall=yes
@@ -6429,7 +6427,7 @@ if test -n "$WITH_MAX_CLASSIC_ASYM_KEY_BITS"; then
if test "$WITH_MAX_CLASSIC_ASYM_KEY_BITS" -lt 1024 -o "$WITH_MAX_CLASSIC_ASYM_KEY_BITS" -gt 16384; then if test "$WITH_MAX_CLASSIC_ASYM_KEY_BITS" -lt 1024 -o "$WITH_MAX_CLASSIC_ASYM_KEY_BITS" -gt 16384; then
AC_MSG_ERROR([--with-max-rsa-bits argument must be between 1024 and 16384 inclusive]) AC_MSG_ERROR([--with-max-rsa-bits argument must be between 1024 and 16384 inclusive])
fi fi
if test "$ENABLED_FIPS" = "n" if test "$ENABLED_FIPS" = "no"
then then
AM_CFLAGS="$AM_CFLAGS -DRSA_MAX_SIZE=$WITH_MAX_CLASSIC_ASYM_KEY_BITS" AM_CFLAGS="$AM_CFLAGS -DRSA_MAX_SIZE=$WITH_MAX_CLASSIC_ASYM_KEY_BITS"
fi fi