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 /common/init.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 'common/init.c')
| -rw-r--r-- | common/init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/common/init.c b/common/init.c index c406ffe58..591c85468 100644 --- a/common/init.c +++ b/common/init.c @@ -47,7 +47,9 @@ # include <assuan.h> /* For _assuan_w32ce_finish_pipe. */ #endif +#include <gcrypt.h> #include "util.h" +#include "i18n.h" /* This object is used to register memory cleanup functions. Technically they are not needed but they can avoid frequent @@ -186,6 +188,12 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp) atexit (sleep_on_exit); #endif + 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)); + } + /* Initialize the Estream library. */ gpgrt_init (); gpgrt_set_alloc_func (gcry_realloc); |