Check for required minumum gcrypt version.

(also ensure that gcrypt global init is called,
see http://lists.gnupg.org/pipermail/gcrypt-devel/2003-August/000458.html)

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@176 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/ChangeLog b/ChangeLog
index a4c78fd..86a2df0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-01-10  Milan Broz  <mbroz@redhat.com>
        * Fix initialisation of gcrypt duting luksFormat.
        * Convert hash name to lower case in header (fix sha1 backward comatible header)
+       * Check for minimum required gcrypt version.
 
 2009-12-30  Milan Broz  <mbroz@redhat.com>
        * Fix key slot iteration count calculation (small -i value was the same as default).

diff --git a/lib/gcrypt.c b/lib/gcrypt.c
index 0971daf..630f18f 100644 (file)
--- a/lib/gcrypt.c
+++ b/lib/gcrypt.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 #include <gcrypt.h>
 
 #include "libcryptsetup.h"
@@ -12,8 +13,8 @@
 int init_crypto(void)
 {
        if (!gcry_control (GCRYCTL_INITIALIZATION_FINISHED_P)) {
-               //if (!gcry_check_version (GCRYPT_VERSION))
-               //      return -ENOSYS;
+               if (!gcry_check_version (GCRYPT_REQ_VERSION))
+                       return -ENOSYS;
                gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
                gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
                gcry_control (GCRYCTL_RESUME_SECMEM_WARN);