From 3e9bdb76717e5b5a4dc9ff76db852eee4583c871 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 11 Jul 2023 10:26:40 -0700 Subject: [PATCH 1/2] Fix `defaultdhparams` typo fix logic. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c8da54698..3df68781c 100644 --- a/configure.ac +++ b/configure.ac @@ -7743,13 +7743,13 @@ then AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HASH_FLAGS" fi -# Support for enabling setting default DH parameters in +# Support for enabling setting default DH parameters in TLS AC_ARG_ENABLE([defaultdhparams], - [AS_HELP_STRING([--enable-dhdefaultparams],[Enables option for default dh parameters (default: disabled)])], + [AS_HELP_STRING([--enable-defaultdhparams],[Enables option for default dh parameters (default: disabled)])], [ ENABLED_DHDEFAULTPARAMS=$enableval ], - [ ENABLED_DHDEFAULTPARAMS=no ] + [ ENABLED_DHDEFAULTPARAMS=yes ] ) -if test "$ENABLED_DHDEFAULTPARAMS" = "yes" || test "$ENABLED_QT" = "no" +if test "x$ENABLED_DH" = "xyes" && test "x$ENABLED_DHDEFAULTPARAMS" = "xyes" && test "x$ENABLED_QT" != "xyes" then ENABLED_DHDEFAULTPARAMS=yes AM_CFLAGS="$AM_CFLAGS -DHAVE_DH_DEFAULT_PARAMS" From 36c1d20bb2fe48cac65edf4fa2d228069e189f84 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 11 Jul 2023 11:51:40 -0700 Subject: [PATCH 2/2] If malloc is disabled make sure it is also disabled in SP math --- wolfssl/wolfcrypt/settings.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 2412c0a52..46120511e 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2871,6 +2871,12 @@ extern void uITRON4_free(void *p) ; #error Small stack cannot be used with no malloc (WOLFSSL_NO_MALLOC) #endif +/* If malloc is disabled make sure it is also disabled in SP math */ +#if defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_SP_NO_MALLOC) && \ + (defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)) + #define WOLFSSL_SP_NO_MALLOC +#endif + /* Enable DH Extra for QT, openssl all, openssh and static ephemeral */ /* Allows export/import of DH key and params as DER */ #if !defined(NO_DH) && !defined(WOLFSSL_DH_EXTRA) && \