Skip to content

Commit fafb9e8

Browse files
committed
Add support for AES EAX mode, as described in https://eprint.iacr.org/2003/069
1 parent ecf666a commit fafb9e8

8 files changed

Lines changed: 1303 additions & 17 deletions

File tree

configure.ac

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,7 @@ then
723723
test "$enable_aesgcm_stream" = "" && enable_aesgcm_stream=yes
724724
test "$enable_aesccm" = "" && enable_aesccm=yes
725725
test "$enable_aesctr" = "" && enable_aesctr=yes
726+
test "$enable_aeseax" = "" && enable_aeseax=yes
726727
test "$enable_aesofb" = "" && enable_aesofb=yes
727728
test "$enable_aescfb" = "" && enable_aescfb=yes
728729
test "$enable_aescbc_length_checks" = "" && enable_aescbc_length_checks=yes
@@ -909,6 +910,7 @@ then
909910
test "$enable_aesgcm_stream" = "" && enable_aesgcm_stream=yes
910911
test "$enable_aesccm" = "" && enable_aesccm=yes
911912
test "$enable_aesctr" = "" && enable_aesctr=yes
913+
test "$enable_aeseax" = "" && enable_aeseax=yes
912914
test "$enable_aesofb" = "" && enable_aesofb=yes
913915
test "$enable_aescfb" = "" && enable_aescfb=yes
914916
test "$enable_aescbc_length_checks" = "" && enable_aescbc_length_checks=yes
@@ -2330,6 +2332,18 @@ then
23302332
AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_AESCCM"
23312333
fi
23322334

2335+
# AES-EAX
2336+
AC_ARG_ENABLE([aeseax],
2337+
[AS_HELP_STRING([--enable-aeseax],[Enable wolfSSL AES-EAX support (default: disabled)])],
2338+
[ ENABLED_AESEAX=$enableval ],
2339+
[ ENABLED_AESEAX=no ]
2340+
)
2341+
2342+
if test "$ENABLED_AESEAX" = "yes"
2343+
then
2344+
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_EAX"
2345+
fi
2346+
23332347
# AES-SIV (RFC 5297)
23342348
AC_ARG_ENABLE([aessiv],
23352349
[AS_HELP_STRING([--enable-aessiv],[Enable AES-SIV (RFC 5297) (default: disabled)])],
@@ -2342,13 +2356,13 @@ then
23422356
ENABLED_AESSIV=yes
23432357
fi
23442358

2345-
# AES-CTRf
2359+
# AES-CTR
23462360
AC_ARG_ENABLE([aesctr],
23472361
[AS_HELP_STRING([--enable-aesctr],[Enable wolfSSL AES-CTR support (default: disabled)])],
23482362
[ ENABLED_AESCTR=$enableval ],
23492363
[ ENABLED_AESCTR=no ]
23502364
)
2351-
if test "$ENABLED_OPENVPN" = "yes" || test "$ENABLED_LIBSSH2" = "yes" || test "$ENABLED_AESSIV" = "yes" || test "$ENABLED_WOLFENGINE" = "yes"
2365+
if test "$ENABLED_OPENVPN" = "yes" || test "$ENABLED_LIBSSH2" = "yes" || test "$ENABLED_AESSIV" = "yes" || test "$ENABLED_WOLFENGINE" = "yes" || test "$ENABLED_AESEAX" = "yes"
23522366
then
23532367
ENABLED_AESCTR=yes
23542368
fi
@@ -4646,7 +4660,7 @@ AC_ARG_ENABLE([cmac],
46464660
[ ENABLED_CMAC=no ]
46474661
)
46484662

4649-
if test "$ENABLED_WPAS" != "no" || test "$ENABLED_NTP" = "yes" || test "$ENABLED_AESSIV" = "yes" || test "$ENABLED_WOLFENGINE" = "yes"
4663+
if test "$ENABLED_WPAS" != "no" || test "$ENABLED_NTP" = "yes" || test "$ENABLED_AESSIV" = "yes" || test "$ENABLED_WOLFENGINE" = "yes" || test "$ENABLED_AESEAX" = "yes"
46504664
then
46514665
ENABLED_CMAC=yes
46524666
fi
@@ -9366,6 +9380,7 @@ echo " * AES-CTR: $ENABLED_AESCTR"
93669380
echo " * AES-CFB: $ENABLED_AESCFB"
93679381
echo " * AES-OFB: $ENABLED_AESOFB"
93689382
echo " * AES-SIV: $ENABLED_AESSIV"
9383+
echo " * AES-EAX: $ENABLED_AESEAX"
93699384
echo " * ARIA: $ENABLED_ARIA"
93709385
echo " * DES3: $ENABLED_DES3"
93719386
echo " * Camellia: $ENABLED_CAMELLIA"

0 commit comments

Comments
 (0)