diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-05-04 14:40:07 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-05-04 14:40:07 +0000 |
| commit | d51399272886d909fbc40f2c5e26db3e87a45a0a (patch) | |
| tree | 5afe042bbd3dc91d4c11e49c06bf0998cdb1e1a5 /configure.ac | |
| parent | cb5171409a8e8e9b6127e0acaa0136411b46fcd0 (diff) | |
| parent | d28e3b5a886f7f5a6ee0170be15143a716e641f5 (diff) | |
| download | gnutls-d51399272886d909fbc40f2c5e26db3e87a45a0a.tar.gz | |
Merge branch 'tmp-siv' into 'master'
nettle: expose SIV-CMAC through the AEAD interface
Closes #974 and #463
See merge request gnutls/gnutls!1238
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index de4c54d508..2aca4b9fca 100644 --- a/configure.ac +++ b/configure.ac @@ -602,9 +602,8 @@ LIBS=$save_LIBS # Check if nettle has CFB8 support if test -z "$ac_cv_func_nettle_cfb8_encrypt"; then - # nettle_cfb8_decrypt in nettle 3.5 is known to be broken - ver=`$PKG_CONFIG --modversion nettle` - if expr "$ver" : '^3\.5\b' >/dev/null; then + # nettle_cfb8_decrypt in nettle upto 3.6 is known to be broken + if ! $PKG_CONFIG --atleast-version=3.6 nettle; then ac_cv_func_nettle_cfb8_encrypt=no fi fi @@ -613,18 +612,26 @@ save_LIBS=$LIBS LIBS="$LIBS $NETTLE_LIBS" AC_CHECK_FUNCS(nettle_cfb8_encrypt) LIBS=$save_LIBS +AM_CONDITIONAL(NEED_CFB, [test "$ac_cv_func_nettle_cfb8_encrypt" != "yes"]) # Check if nettle has CMAC support +save_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS $NETTLE_CFLAGS" +AC_CHECK_TYPES([union nettle_block8], , , [[#include <nettle/nettle-types.h>]]) +CFLAGS=$save_CFLAGS + save_LIBS=$LIBS LIBS="$LIBS $NETTLE_LIBS" AC_CHECK_FUNCS(nettle_cmac128_update) LIBS=$save_LIBS +AM_CONDITIONAL(NEED_CMAC, [test "$ac_cv_func_nettle_cmac128_update" != "yes"]) # Check if nettle has XTS support save_LIBS=$LIBS LIBS="$LIBS $NETTLE_LIBS" AC_CHECK_FUNCS(nettle_xts_encrypt_message) LIBS=$save_LIBS +AM_CONDITIONAL(NEED_XTS, [test "$ac_cv_func_nettle_xts_encrypt_message" != "yes"]) # Check for Gosthash94 with CryptoPro S-box support save_LIBS=$LIBS @@ -663,6 +670,13 @@ AC_CHECK_FUNCS([nettle_chacha_set_counter], LIBS=$save_LIBS AM_CONDITIONAL(NEED_CHACHA, [test "$have_chacha_set_counter" != "yes"]) +# Check for SIV-CMAC +save_LIBS=$LIBS +LIBS="$LIBS $NETTLE_LIBS" +AC_CHECK_FUNCS(nettle_siv_cmac_aes128_set_key) +LIBS=$save_LIBS +AM_CONDITIONAL(NEED_SIV, [test "$ac_cv_func_nettle_siv_cmac_aes128_set_key" != "yes"]) + # Check sonames of the linked libraries needed for FIPS selftests. save_LIBS=$LIBS LIBS="$LIBS $GMP_LIBS" |