From 49829c29e541546084950b8a153067db371d101a Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Mon, 8 Aug 2016 18:40:03 -0400 Subject: Cleanup initialization of libgcrypt. * common/init.c (init_common_subsystems): Initialize libgcrypt. * dirmngr/Makefile.am (dirmngr_ldap): Link with libgcrypt. -- Most other modules already call gcry_check_version() after init_common_subsystems() so may as well move initialization of libgcrypt to here. Also fixes a warning in the system log from gpgconf --homedir. Signed-off-by: Ben Kibbey --- tools/gpg-check-pattern.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tools/gpg-check-pattern.c') diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c index 37283a1d4..aa228a737 100644 --- a/tools/gpg-check-pattern.c +++ b/tools/gpg-check-pattern.c @@ -171,13 +171,6 @@ main (int argc, char **argv ) i18n_init (); init_common_subsystems (&argc, &argv); - /* We need Libgcrypt for hashing. */ - if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) - { - log_fatal ( _("%s is too old (need %s, have %s)\n"), "libgcrypt", - NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) ); - } - setup_libgcrypt_logging (); gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0); -- cgit v1.2.3