From 7c4bfa599fa69c3a942c8deea83737a4c5a0806e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 19 Aug 2013 11:22:11 +0200 Subject: [PATCH] gpgv: Init Libgcrypt to avoid syslog warning. * g10/gpgv.c (main): Check libgcrypt version and disable secure memory. -- GnuPG-bug-id: 1376 Signed-off-by: Werner Koch (cherry picked from commit 3966eb244518d5612385d35a5149f7164a9fb707) Resolved conflicts: g10/gpgv.c --- g10/gpgv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/g10/gpgv.c b/g10/gpgv.c index debde9dcf..d79b8994f 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -151,11 +151,18 @@ 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) ); + } + gcry_control (GCRYCTL_DISABLE_SECMEM, 0); + gnupg_init_signals (0, NULL); opt.command_fd = -1; /* no command fd */ opt.pgp2_workarounds = 1; - opt.keyserver_options.options|=KEYSERVER_AUTO_KEY_RETRIEVE; + opt.keyserver_options.options |= KEYSERVER_AUTO_KEY_RETRIEVE; opt.trust_model = TM_ALWAYS; opt.batch = 1; @@ -164,6 +171,7 @@ main( int argc, char **argv ) tty_no_terminal(1); tty_batchmode(1); dotlock_disable (); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); pargs.argc = &argc; pargs.argv = &argv;