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 --- kbx/kbxutil.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'kbx') diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index d55a11871..e452b4de5 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -460,14 +460,6 @@ main( int argc, char **argv ) i18n_init (); init_common_subsystems (&argc, &argv); - /* Check that the libraries are suitable. Do it here because - the option parsing may need services of the library. */ - 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) ); - } - gcry_set_log_handler (my_gcry_logger, NULL); /*create_dotlock(NULL); register locking cleanup */ -- cgit v1.2.3