From b9bcc77d6ca13463c2e4bede91fc1782795f1eae Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 10 Mar 2011 18:39:34 +0100 Subject: Make use of gcry_kdf_derive. Factoring common code out is always a Good Thing. Also added a configure test to print an error if gcry_kdf_derive is missing in Libgcrypt. --- configure.ac | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f265dc393..ab40c6fd0 100644 --- a/configure.ac +++ b/configure.ac @@ -742,6 +742,22 @@ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION", AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", have_libgcrypt=yes,have_libgcrypt=no) +# FIxme: Remove this test after libgcrypt 1.5.0 has been released. +AC_CACHE_CHECK([whether Libgcrypt has gcry_kdf_derive], + gnupg_cv_gcry_kdf_derive, + [ _gnupg_gcry_save_cflags=$CFLAGS + _gnupg_gcry_save_libs=$LIBS + CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" + LIBS="$LIBS $LIBGCRYPT_LIBS" + AC_TRY_LINK( + [#include ], + [ return gcry_kdf_derive (NULL,0,0,0,NULL,0,0,0,NULL); ], + gnupg_cv_gcry_kdf_derive=yes, + gnupg_cv_gcry_kdf_derive=no) + LIBS=$_gnupg_gcry_save_libs + CFLAGS=$_gnupg_gcry_save_cflags]) + + # # libassuan is used for IPC # @@ -1605,6 +1621,15 @@ if test "$have_libgcrypt" = "no"; then *** ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/ *** (at least version $NEED_LIBGCRYPT_VERSION using API $NEED_LIBGCRYPT_API is required.) ***]]) +elif test "$gnupg_cv_gcry_kdf_derive" = no; then + die=yes + AC_MSG_NOTICE([[ +*** +*** Libgcrypt 1.5.0 has not yet been released and thus the API +*** is a bit in a flux. Your version misses the function +*** gcry_kdf_derive +*** You need to install a newer Libgcrypt version. +***]]) fi if test "$have_libassuan" = "no"; then die=yes -- cgit v1.2.3