summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-09-26 20:16:30 +0000
committerChristian Grothoff <christian@grothoff.org>2012-09-26 20:16:30 +0000
commited40c38220a0c32976a0fda56aec1e7499df858b (patch)
tree696a0a16392032acfc6f5e4ab7bea90390c71143
parente96bf692ed1707f342c8db4cc97e1294683d0595 (diff)
releaxing libgcrypt version check, fixing Debian #684997
-rw-r--r--configure.ac16
-rw-r--r--src/util/crypto_random.c4
2 files changed, 16 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index f575af17f..165e66d44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,13 +221,25 @@ fi
# libgcrypt
gcrypt=0
-AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
+NEED_LIBGCRYPT_API=1
+NEED_LIBGCRYPT_VERSION=1.4.2
+
+
+AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
if test $gcrypt = 0
then
- AC_MSG_ERROR([GNUnet needs libgcrypt])
+ AC_MSG_ERROR([[
+***
+*** You need libgcrypt to build this program.
+** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API)
+*** is required.)
+***]])
fi
+AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version])
# Adam shostack suggests the following for Windows:
# -D_FORTIFY_SOURCE=2 -fstack-protector-all
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index 8dce1080c..29b25524d 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -335,12 +335,12 @@ killfind ()
void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
{
gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
- if (!gcry_check_version (GCRYPT_VERSION))
+ if (!gcry_check_version (NEED_LIBGCRYPT_VERSION))
{
FPRINTF (stderr,
_
("libgcrypt has not the expected version (version %s is required).\n"),
- GCRYPT_VERSION);
+ NEED_LIBGCRYPT_VERSION);
GNUNET_abort ();
}
#ifdef GCRYCTL_INITIALIZATION_FINISHED