wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5280 from douzzer/20220623-enable-dh-const

Browse Source 
--enable-dh=const
This commit is contained in:
David Garske
2022-06-24 08:29:35 -07:00
committed by GitHub
parent 00b82888bc a5250482ce
commit 5ef507c78d
3 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
configure.ac
View File

@ -128,7 +128,6 @@ AC_TYPE_SIZE_T
AC_TYPE_UINT8_T AC_TYPE_UINT8_T
AC_TYPE_UINTPTR_T AC_TYPE_UINTPTR_T
AM_PROG_AS AM_PROG_AS
LT_LIB_M
OPTIMIZE_CFLAGS="-Os" OPTIMIZE_CFLAGS="-Os"
OPTIMIZE_FAST_CFLAGS="-O2" OPTIMIZE_FAST_CFLAGS="-O2"
@ -871,6 +870,15 @@ then
# Enable multiple attribute additions such as DC # Enable multiple attribute additions such as DC
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_MULTI_ATTRIB" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_MULTI_ATTRIB"
# Enable DH Extra
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_EXTRA"
# Enable deterministic ECC signing API with variant
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ECDSA_DETERMINISTIC_K_VARIANT"
# Store issuer name components when parsing certificates.
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_ISSUER_NAMES"
fi fi
@ -3417,7 +3425,7 @@ AC_ARG_ENABLE([dh],
[ ENABLED_DH=yes ] [ ENABLED_DH=yes ]
) )
if test "$ENABLED_OPENSSH" = "yes" if test "$ENABLED_OPENSSH" = "yes" && test "$ENABLED_DH" = "no"
then then
ENABLED_DH="yes" ENABLED_DH="yes"
fi fi
@ -3434,7 +3442,12 @@ else
fi fi
fi fi
if test "x$ENABLED_SNIFFER" = "xyes" && test "x$ENABLED_DH" = "xyes" if test "$ENABLED_DH" = "const"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_CONST"
fi
if test "$ENABLED_SNIFFER" = "yes" && test "$ENABLED_DH" != "no"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_EXTRA" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_EXTRA"
fi fi
@ -3454,7 +3467,7 @@ then
fi fi
if test "x$ENABLED_ANON" = "xyes" if test "x$ENABLED_ANON" = "xyes"
then then
if test "x$ENABLED_DH" != "xyes" if test "$ENABLED_DH" = "no"
then then
AC_MSG_ERROR([Anonymous suite requires DH.]) AC_MSG_ERROR([Anonymous suite requires DH.])
fi fi
@ -4539,7 +4552,7 @@ then
fi fi
# Diffie-Hellman # Diffie-Hellman
if test "$ENABLED_DH" = "yes" if test "$ENABLED_DH" != "no"
then then
if test "$ENABLED_TLS13" = "yes" || test "$ENABLED_SUPPORTED_CURVES" = "yes" if test "$ENABLED_TLS13" = "yes" || test "$ENABLED_SUPPORTED_CURVES" = "yes"
then then
@ -4578,7 +4591,7 @@ then
ENABLED_TLS13=no ENABLED_TLS13=no
fi fi
if test "$ENABLED_TLS13" = "yes" && (test "x$ENABLED_ECC" = "xyes" || \ if test "$ENABLED_TLS13" = "yes" && (test "x$ENABLED_ECC" = "xyes" || \
test "x$ENABLED_DH" = "xyes") test "$ENABLED_DH" != "no")
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_SUPPORTED_CURVES" AM_CFLAGS="$AM_CFLAGS -DHAVE_SUPPORTED_CURVES"
fi fi
@ -6326,7 +6339,7 @@ if test "$ENABLED_RSA" = "yes" && test "$ENABLED_SP_RSA" = "yes"; then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_RSA" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_RSA"
AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_RSA" AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_RSA"
fi fi
if test "$ENABLED_DH" = "yes" && test "$ENABLED_SP_DH" = "yes"; then if test "$ENABLED_DH" != "no" && test "$ENABLED_SP_DH" = "yes"; then
ENABLED_SP=yes ENABLED_SP=yes
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_DH" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_DH"
AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_DH" AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_DH"
@ -6411,7 +6424,7 @@ if test "$ENABLED_SP_MATH" = "yes"; then
if test "$ENABLED_SP_RSA" = "no" && test "$ENABLED_RSA" = "yes"; then if test "$ENABLED_SP_RSA" = "no" && test "$ENABLED_RSA" = "yes"; then
AC_MSG_ERROR([Cannot use RSA single precision only math and RSA]) AC_MSG_ERROR([Cannot use RSA single precision only math and RSA])
fi fi
if test "$ENABLED_SP_DH" = "no" && test "$ENABLED_DH" = "yes"; then if test "$ENABLED_SP_DH" = "no" && test "$ENABLED_DH" != "no"; then
AC_MSG_ERROR([Cannot use DH single precision only math and DH]) AC_MSG_ERROR([Cannot use DH single precision only math and DH])
fi fi
fi fi
@ -7624,6 +7637,12 @@ then
fi fi
# Link with the math library iff needed.
if test "$ENABLED_DH" != "no" && test "$ENABLED_DH" != "const"; then
LT_LIB_M
fi
################################################################################ ################################################################################
# USER SETTINGS # USER SETTINGS
@ -7826,7 +7845,7 @@ AM_CONDITIONAL([BUILD_ECCSI],[test "x$ENABLED_ECCSI" = "xyes" || test "x$ENABLED
AM_CONDITIONAL([BUILD_SAKKE],[test "x$ENABLED_SAKKE" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_SAKKE],[test "x$ENABLED_SAKKE" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_MEMORY],[test "x$ENABLED_MEMORY" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_MEMORY],[test "x$ENABLED_MEMORY" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_RSA],[test "x$ENABLED_RSA" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_RSA],[test "x$ENABLED_RSA" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_DH],[test "x$ENABLED_DH" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_DH],[test "x$ENABLED_DH" != "xno" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_ASN],[test "x$ENABLED_ASN" != "xno" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_ASN],[test "x$ENABLED_ASN" != "xno" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_AES],[test "x$ENABLED_AES" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_AES],[test "x$ENABLED_AES" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_CODING],[test "x$ENABLED_CODING" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_CODING],[test "x$ENABLED_CODING" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])

8
examples/client/client.c
View File

@ -1165,12 +1165,12 @@ static const char* client_usage_msg[][70] = {
"-D Override Date Errors example\n", /* 18 */ "-D Override Date Errors example\n", /* 18 */
"-e List Every cipher suite available, \n", /* 19 */ "-e List Every cipher suite available, \n", /* 19 */
"-g Send server HTTP GET\n", /* 20 */ "-g Send server HTTP GET\n", /* 20 */
"-u Use UDP DTLS,"
#ifndef WOLFSSL_DTLS13 #ifndef WOLFSSL_DTLS13
" add -v 2 for DTLSv1, -v 3 for DTLSv1.2 (default)\n", /* 21 */ "-u Use UDP DTLS, add -v 2 for DTLSv1, -v 3 for DTLSv1.2"
" (default)\n", /* 21 */
#else #else
" add -v 2 for DTLSv1, -v 3 for DTLSv1.2 (default), -v 4 for " "-u Use UDP DTLS, add -v 2 for DTLSv1, -v 3 for DTLSv1.2"
"DTLSv1.3\n", /* 21 */ " (default), -v 4 for DTLSv1.3\n", /* 21 */
#endif /* !WOLFSSL_DTLS13 */ #endif /* !WOLFSSL_DTLS13 */
#ifdef WOLFSSL_SCTP #ifdef WOLFSSL_SCTP
"-G Use SCTP DTLS," "-G Use SCTP DTLS,"

8
examples/server/server.c
View File

@ -828,12 +828,12 @@ static const char* server_usage_msg[][64] = {
"-d Disable client cert check\n", /* 12 */ "-d Disable client cert check\n", /* 12 */
"-b Bind to any interface instead of localhost only\n",/* 13 */ "-b Bind to any interface instead of localhost only\n",/* 13 */
"-s Use pre Shared keys\n", /* 14 */ "-s Use pre Shared keys\n", /* 14 */
"-u Use UDP DTLS,"
#ifndef WOLFSSL_DTLS13 #ifndef WOLFSSL_DTLS13
" add -v 2 for DTLSv1, -v 3 for DTLSv1.2 (default)\n", /* 21 */ "-u Use UDP DTLS, add -v 2 for DTLSv1, -v 3 for DTLSv1.2"
" (default)\n", /* 15 */
#else #else
" add -v 2 for DTLSv1, -v 3 for DTLSv1.2 (default), -v 4 for " "-u Use UDP DTLS, add -v 2 for DTLSv1, -v 3 for DTLSv1.2"
"DTLSv1.3\n", /* 21 */ " (default), -v 4 for DTLSv1.3\n", /* 15 */
#endif /* !WOLFSSL_DTLS13 */ #endif /* !WOLFSSL_DTLS13 */
#ifdef WOLFSSL_SCTP #ifdef WOLFSSL_SCTP
"-G Use SCTP DTLS," "-G Use SCTP DTLS,"