diff options
| author | Ben Kibbey <[email protected]> | 2016-08-08 22:40:03 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-08-09 08:47:46 +0000 |
| commit | 49829c29e541546084950b8a153067db371d101a (patch) | |
| tree | 5d2ffb8d53187a25e1fe34e37d7d83ba8111e655 /agent/protect-tool.c | |
| parent | agent: SSH support improvement. (diff) | |
| download | gnupg-49829c29e541546084950b8a153067db371d101a.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'agent/protect-tool.c')
| -rw-r--r-- | agent/protect-tool.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/agent/protect-tool.c b/agent/protect-tool.c index c2bf87d4a..f41cc0b5f 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -566,16 +566,9 @@ main (int argc, char **argv ) i18n_init (); init_common_subsystems (&argc, &argv); - 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, 16384, 0); - pargs.argc = &argc; pargs.argv = &argv; pargs.flags= 1; /* (do not remove the args) */ |