security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-17 14:07:03 +01:00
Code Activity

Remove check for gcry_kdf_derive

Browse Source 
This is not anymore required because we require Libgcrypt 1.5.0 which
features this function.
This commit is contained in:
Werner Koch 2011-09-27 17:17:06 +02:00
parent b73ae3ca36
commit 537be4ca47
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-23 Werner Koch <wk@g10code.com>
* configure.ac: Remove check for gcry_kdf_derive.
2011-08-10 Werner Koch <wk@g10code.com> 2011-08-10 Werner Koch <wk@g10code.com>
* configure.ac: Fix new autoconf warnings. * configure.ac: Fix new autoconf warnings.

33
configure.ac
View File

@ -742,21 +742,6 @@ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION",
have_libgcrypt=yes,have_libgcrypt=no) 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 <gcrypt.h>],
[ 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 # libassuan is used for IPC
@ -1621,15 +1606,15 @@ if test "$have_libgcrypt" = "no"; then
*** ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/ *** ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/
*** (at least version $NEED_LIBGCRYPT_VERSION using API $NEED_LIBGCRYPT_API is required.) *** (at least version $NEED_LIBGCRYPT_VERSION using API $NEED_LIBGCRYPT_API is required.)
***]]) ***]])
elif test "$gnupg_cv_gcry_kdf_derive" = no; then dnl elif test "$gnupg_cv_gcry_kdf_derive" = no; then
die=yes dnl die=yes
AC_MSG_NOTICE([[ dnl AC_MSG_NOTICE([[
*** dnl ***
*** Libgcrypt 1.5.0 has not yet been released and thus the API dnl *** Libgcrypt 1.5.0 has not yet been released and thus the API
*** is a bit in a flux. Your version misses the function dnl *** is a bit in a flux. Your version misses the function
*** gcry_kdf_derive dnl *** gcry_kdf_derive
*** You need to install a newer Libgcrypt version. dnl *** You need to install a newer Libgcrypt version.
***]]) dnl #***]])
fi fi
if test "$have_libassuan" = "no"; then if test "$have_libassuan" = "no"; then
die=yes die=yes