Skip to content

Commit 47dd864

Browse files
committed
configure.ac:
* add a kernel-appropriate subset of enable-all-crypto to enable whenever KERNEL_MODE_DEFAULTS (almost all of these overlap with FIPS v5/v6 settings); * move ocspstapling features from enable-all-crypto to enable-all.
1 parent f957288 commit 47dd864

1 file changed

Lines changed: 38 additions & 2 deletions

File tree

configure.ac

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,6 +1203,8 @@ then
12031203
test "$enable_dtls13" = "" && enable_dtls13=yes
12041204
fi
12051205

1206+
test "$enable_ocspstapling" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling=yes
1207+
test "$enable_ocspstapling2" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling2=yes
12061208
test "$enable_savesession" = "" && enable_savesession=yes
12071209
test "$enable_savecert" = "" && enable_savecert=yes
12081210
test "$enable_postauth" = "" && enable_postauth=yes
@@ -1477,8 +1479,6 @@ then
14771479
test "$enable_cmac_kdf" = "" && enable_cmac_kdf=yes
14781480
test "$enable_siphash" = "" && enable_siphash=yes
14791481
test "$enable_ocsp" = "" && enable_ocsp=yes
1480-
test "$enable_ocspstapling" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling=yes
1481-
test "$enable_ocspstapling2" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling2=yes
14821482
test "$enable_crl" = "" && enable_crl=yes
14831483
test "$enable_supportedcurves" = "" && enable_supportedcurves=yes
14841484
test "$enable_tlsx" = "" && enable_tlsx=yes
@@ -1587,6 +1587,42 @@ then
15871587
AM_CFLAGS="$AM_CFLAGS -DWC_KDF_NIST_SP_800_56C"
15881588
fi
15891589

1590+
# kernel-appropriate settings, also in enable-all-crypto above:
1591+
if test "$KERNEL_MODE_DEFAULTS" = "yes" && test "$ENABLED_ALL_CRYPT" != "yes"
1592+
then
1593+
# note several of these are currently on by default, including aesgcm, sha512
1594+
test "$enable_aesgcm" = "" && enable_aesgcm=yes
1595+
test "$enable_aesccm" = "" && enable_aesccm=yes
1596+
test "$enable_aesecb" = "" && enable_aesecb=yes
1597+
test "$enable_aesctr" = "" && enable_aesctr=yes
1598+
test "$enable_aesofb" = "" && enable_aesofb=yes
1599+
test "$enable_aescfb" = "" && enable_aescfb=yes
1600+
test "$enable_cmac" = "" && enable_cmac=yes
1601+
test "$enable_sha224" = "" && enable_sha224=yes
1602+
test "$enable_sha512" = "" && enable_sha512=yes
1603+
test "$enable_sha3" = "" && enable_sha3=yes
1604+
test "$enable_keygen" = "" && enable_keygen=yes
1605+
test "$enable_hkdf" = "" && enable_hkdf=yes
1606+
test "$enable_eccencrypt" = "" && test "$enable_ecc" != "no" && enable_eccencrypt=yes
1607+
test "$enable_fpecc" = "" && test "$enable_ecc" != "no" && enable_fpecc=yes
1608+
test "$enable_supportedcurves" = "" && enable_supportedcurves=yes
1609+
test "$enable_rng_bank" = "" && enable_rng_bank=yes
1610+
if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -ge 6
1611+
then
1612+
test "$enable_aesgcm_stream" = "" && test "$enable_aesgcm" = "yes" && enable_aesgcm_stream=yes
1613+
test "$enable_aesxts" = "" && enable_aesxts=yes
1614+
test "$enable_aesxts_stream" = "" && test "$enable_aesxts" = "yes" && enable_aesxts_stream=yes
1615+
test "$enable_shake128" = "" && enable_shake128=yes
1616+
test "$enable_shake256" = "" && enable_shake256=yes
1617+
test "$enable_compkey" = "" && enable_compkey=yes
1618+
fi
1619+
# Enable DH const table speedups (eliminates `-lm` math lib dependency)
1620+
AM_CFLAGS="$AM_CFLAGS -DHAVE_FFDHE_2048 -DHAVE_FFDHE_3072"
1621+
DEFAULT_MAX_CLASSIC_ASYM_KEY_BITS=4096
1622+
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_EXTRA"
1623+
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ECDSA_DETERMINISTIC_K_VARIANT"
1624+
fi
1625+
15901626
# wolfGuard
15911627
AC_ARG_ENABLE([wolfguard],
15921628
[AS_HELP_STRING([--enable-wolfguard],[Enable wolfGuard dependencies (default: disabled)])],

0 commit comments

Comments
 (0)