diff options
| author | Ben Kibbey <bjk@luxsci.net> | 2016-08-09 00:40:03 +0200 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2016-08-09 10:47:46 +0200 |
| commit | 49829c29e541546084950b8a153067db371d101a (patch) | |
| tree | 5d2ffb8d53187a25e1fe34e37d7d83ba8111e655 /kbx | |
| parent | agent: SSH support improvement. (diff) | |
| download | gnupg2-49829c29e541546084950b8a153067db371d101a.tar.xz gnupg2-49829c29e541546084950b8a153067db371d101a.zip | |
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 <bjk@luxsci.net>
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/kbxutil.c | 8 |
1 files changed, 0 insertions, 8 deletions
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 */ |