wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 20:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #690 from embray/build/enable_aes_counter

Browse Source 
Add a configure flag specifically for enabling AES CTR mode
This commit is contained in:
dgarske
2017-04-25 15:14:13 -07:00
committed by GitHub
parent 1f923a11ee e3ec769107
commit 7db30ef550
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
configure.ac
View File

@@ -148,6 +148,7 @@ then
enable_pkcallbacks=yes enable_pkcallbacks=yes
enable_aesgcm=yes enable_aesgcm=yes
enable_aesccm=yes enable_aesccm=yes
enable_aesctr=yes
enable_camellia=yes enable_camellia=yes
enable_ripemd=yes enable_ripemd=yes
enable_sha512=yes enable_sha512=yes
@@ -602,6 +603,23 @@ fi
AM_CONDITIONAL([BUILD_AESCCM], [test "x$ENABLED_AESCCM" = "xyes"]) AM_CONDITIONAL([BUILD_AESCCM], [test "x$ENABLED_AESCCM" = "xyes"])
# AES-CTR
AC_ARG_ENABLE([aesctr],
[ --enable-aesctr Enable wolfSSL AES-CTR support (default: disabled)],
[ ENABLED_AESCTR=$enableval ],
[ ENABLED_AESCTR=no ]
)
if test "$ENABLED_AESCTR" = "yes"
then
if test "x$ENABLED_FORTRESS" != "xyes"
then
# This is already implied by fortress build
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_COUNTER -DWOLFSSL_AES_DIRECT"
fi
fi
# AES-ARM # AES-ARM
AC_ARG_ENABLE([armasm], AC_ARG_ENABLE([armasm],
[AS_HELP_STRING([--enable-armasm],[Enable wolfSSL ARMv8 ASM support (default: disabled)])], [AS_HELP_STRING([--enable-armasm],[Enable wolfSSL ARMv8 ASM support (default: disabled)])],
@@ -1369,6 +1387,10 @@ then
then then
AC_MSG_ERROR([AESCCM requires AES.]) AC_MSG_ERROR([AESCCM requires AES.])
fi fi
if test "$ENABLED_AESCTR" = "yes"
then
AC_MSG_ERROR([AESCTR requires AES.])
fi
else else
# turn off AES if leanpsk on # turn off AES if leanpsk on
if test "$ENABLED_LEANPSK" = "yes" if test "$ENABLED_LEANPSK" = "yes"
@@ -3023,7 +3045,12 @@ AC_ARG_ENABLE([mcapi],
if test "$ENABLED_MCAPI" = "yes" if test "$ENABLED_MCAPI" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_MCAPI -DWOLFSSL_AES_COUNTER -DWOLFSSL_AES_DIRECT" AM_CFLAGS="$AM_CFLAGS -DHAVE_MCAPI"
if test "x$ENABLED_AESCTR" != "xyes"
then
# These flags are already implied by --enable-aesctr
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_COUNTER -DWOLFSSL_AES_DIRECT"
fi
fi fi
if test "$ENABLED_MCAPI" = "yes" && test "$ENABLED_SHA512" = "no" if test "$ENABLED_MCAPI" = "yes" && test "$ENABLED_SHA512" = "no"
@@ -3516,6 +3543,7 @@ echo " * AES: $ENABLED_AES"
echo " * AES-NI: $ENABLED_AESNI" echo " * AES-NI: $ENABLED_AESNI"
echo " * AES-GCM: $ENABLED_AESGCM" echo " * AES-GCM: $ENABLED_AESGCM"
echo " * AES-CCM: $ENABLED_AESCCM" echo " * AES-CCM: $ENABLED_AESCCM"
echo " * AES-CTR: $ENABLED_AESCTR"
echo " * DES3: $ENABLED_DES3" echo " * DES3: $ENABLED_DES3"
echo " * IDEA: $ENABLED_IDEA" echo " * IDEA: $ENABLED_IDEA"
echo " * Camellia: $ENABLED_CAMELLIA" echo " * Camellia: $ENABLED_CAMELLIA"