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

Merge pull request #847 from dgarske/distro_options

Browse Source 
Fixes for --enable-distro to include more features by default
This commit is contained in:
toddouska
2017-04-12 13:56:24 -07:00
committed by GitHub
parent e1a53a6c36 dc65a9a277
commit 27d009475c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -151,6 +151,7 @@ then
enable_camellia=yes enable_camellia=yes
enable_ripemd=yes enable_ripemd=yes
enable_sha512=yes enable_sha512=yes
enable_sha224=yes
enable_sessioncerts=yes enable_sessioncerts=yes
enable_keygen=yes enable_keygen=yes
enable_certgen=yes enable_certgen=yes
@@ -192,6 +193,9 @@ then
enable_stunnel=yes enable_stunnel=yes
enable_nginx=yes enable_nginx=yes
enable_pwdbased=yes enable_pwdbased=yes
enable_aeskeywrap=yes
enable_x963kdf=yes
enable_scrypt=yes
fi fi
AM_CONDITIONAL([BUILD_DISTRO], [test "x$ENABLED_DISTRO" = "xyes"]) AM_CONDITIONAL([BUILD_DISTRO], [test "x$ENABLED_DISTRO" = "xyes"])
@@ -992,6 +996,12 @@ AC_ARG_ENABLE([ecccustcurves],
if test "$ENABLED_ECCCUSTCURVES" = "yes" if test "$ENABLED_ECCCUSTCURVES" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CUSTOM_CURVES" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CUSTOM_CURVES"
# For distro build, enable all curve types
if test "$ENABLED_DISTRO" = "yes"
then
AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC_SECPR2 -DHAVE_ECC_SECPR3 -DHAVE_ECC_BRAINPOOL -DHAVE_ECC_KOBLITZ"
fi
fi fi