diff options
| author | Werner Koch <[email protected]> | 2007-04-20 16:59:37 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-04-20 16:59:37 +0000 |
| commit | b89d98e3353f6101bc256476c0269f48a92d3f56 (patch) | |
| tree | 6da6c9dd9e7b78f97ae6e89e54e6603f314cc644 /agent/protect-tool.c | |
| parent | * certcheck.c (do_encode_md): Add arg PKEY. Add support for DSA2 (diff) | |
| download | gnupg-b89d98e3353f6101bc256476c0269f48a92d3f56.tar.gz gnupg-b89d98e3353f6101bc256476c0269f48a92d3f56.zip | |
Improved logging for error orginating from libgcrypt.
Diffstat (limited to '')
| -rw-r--r-- | agent/protect-tool.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/agent/protect-tool.c b/agent/protect-tool.c index 937b0ef0c..8496601b5 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -177,25 +177,6 @@ i18n_init (void) -/* Used by gcry for logging */ -static void -my_gcry_logger (void *dummy, int level, const char *fmt, va_list arg_ptr) -{ - /* translate the log levels */ - switch (level) - { - case GCRY_LOG_CONT: level = JNLIB_LOG_CONT; break; - case GCRY_LOG_INFO: level = JNLIB_LOG_INFO; break; - case GCRY_LOG_WARN: level = JNLIB_LOG_WARN; break; - case GCRY_LOG_ERROR:level = JNLIB_LOG_ERROR; break; - case GCRY_LOG_FATAL:level = JNLIB_LOG_FATAL; break; - case GCRY_LOG_BUG: level = JNLIB_LOG_BUG; break; - case GCRY_LOG_DEBUG:level = JNLIB_LOG_DEBUG; break; - default: level = JNLIB_LOG_ERROR; break; } - log_logv (level, fmt, arg_ptr); -} - - /* static void */ /* print_mpi (const char *text, gcry_mpi_t a) */ /* { */ @@ -1075,12 +1056,11 @@ main (int argc, char **argv ) if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) { - log_fatal( _("libgcrypt is too old (need %s, have %s)\n"), + 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); - + setup_libgcrypt_logging (); gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0); |