WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6595 from dgarske/various 

Fix for no malloc with SP and fix defaultdhparams typo
pull/6598/head
Sean Parkinson 2023-07-12 07:19:52 +10:00 committed by GitHub
parent fd72b885b6 36c1d20bb2
commit d6a6cbb83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -7768,13 +7768,13 @@ then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HASH_FLAGS" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HASH_FLAGS"
fi fi
# Support for enabling setting default DH parameters in # Support for enabling setting default DH parameters in TLS
AC_ARG_ENABLE([defaultdhparams], 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=$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 then
ENABLED_DHDEFAULTPARAMS=yes ENABLED_DHDEFAULTPARAMS=yes
AM_CFLAGS="$AM_CFLAGS -DHAVE_DH_DEFAULT_PARAMS" AM_CFLAGS="$AM_CFLAGS -DHAVE_DH_DEFAULT_PARAMS"

6
wolfssl/wolfcrypt/settings.h
View File

@ -2872,6 +2872,12 @@ extern void uITRON4_free(void *p) ;
#error Small stack cannot be used with no malloc (WOLFSSL_NO_MALLOC) #error Small stack cannot be used with no malloc (WOLFSSL_NO_MALLOC)
#endif #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 */ /* Enable DH Extra for QT, openssl all, openssh and static ephemeral */
/* Allows export/import of DH key and params as DER */ /* Allows export/import of DH key and params as DER */
#if !defined(NO_DH) && !defined(WOLFSSL_DH_EXTRA) && \ #if !defined(NO_DH) && !defined(WOLFSSL_DH_EXTRA) && \