feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

1. Enable the extension ECC Supported Curves by default.

Browse Source 
2. Force the extention disabled if ECC is disabled.
This commit is contained in:
John Safranek
2016-09-16 13:26:56 -07:00
parent 03ebb4825e
commit 781e800486
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configure.ac
View File

@ -1953,14 +1953,15 @@ fi
# Supported Elliptic Curves Extensions # Supported Elliptic Curves Extensions
AC_ARG_ENABLE([supportedcurves], AC_ARG_ENABLE([supportedcurves],
[AS_HELP_STRING([--enable-supportedcurves],[Enable Supported Elliptic Curves (default: disabled)])], [AS_HELP_STRING([--enable-supportedcurves],[Enable Supported Elliptic Curves (default: enabled)])],
[ ENABLED_SUPPORTED_CURVES=$enableval ], [ENABLED_SUPPORTED_CURVES=$enableval],
[ ENABLED_SUPPORTED_CURVES=no ] [ENABLED_SUPPORTED_CURVES=$ECC_DEFAULT])
)
if test "x$ENABLED_SUPPORTED_CURVES" = "xyes" if test "x$ENABLED_SUPPORTED_CURVES" = "xyes"
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SUPPORTED_CURVES" AS_IF([test "x$ENABLED_ECC" = "xno"],
[ENABLED_SUPPORTED_CURVES=no],
[AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SUPPORTED_CURVES"])
fi fi
# Session Ticket Extension # Session Ticket Extension
@ -1996,12 +1997,15 @@ AC_ARG_ENABLE([tlsx],
if test "x$ENABLED_TLSX" = "xyes" if test "x$ENABLED_TLSX" = "xyes"
then then
ENABLED_SNI=yes ENABLED_SNI=yes
ENABLED_MAX_FRAGMENT=yes ENABLED_MAX_FRAGMENT=yes
ENABLED_TRUNCATED_HMAC=yes ENABLED_TRUNCATED_HMAC=yes
ENABLED_SUPPORTED_CURVES=yes ENABLED_ALPN=yes
ENABLED_ALPN=yes AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SNI -DHAVE_MAX_FRAGMENT -DHAVE_TRUNCATED_HMAC -DHAVE_ALPN"
AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SNI -DHAVE_MAX_FRAGMENT -DHAVE_TRUNCATED_HMAC -DHAVE_SUPPORTED_CURVES -DHAVE_ALPN" # Check the ECC supported curves prereq
AS_IF([test "x$ENABLED_ECC" = "xyes"],
[ENABLED_SUPPORTED_CURVES=yes
AM_CFLAGS="$AM_CFLAGS -DHAVE_SUPPORTED_CURVES"])
fi fi
# PKCS7 # PKCS7