summaryrefslogtreecommitdiffstats
path: root/kbx
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2024-04-23 16:21:49 +0200
committerWerner Koch <wk@gnupg.org>2024-04-23 16:21:49 +0200
commit54741685ced22bfa0cbd6db5c41e50ef2148d1e3 (patch)
tree654bfaa905bb71d0b6df484c0fa4807d3595cf39 /kbx
parenttests: Add two Kyber sample keys and messages. (diff)
downloadgnupg2-54741685ced22bfa0cbd6db5c41e50ef2148d1e3.tar.xz
gnupg2-54741685ced22bfa0cbd6db5c41e50ef2148d1e3.zip
Remove the deprecated gcry_set_log_handler.
* common/miscellaneous.c (my_gcry_logger): Remove. (setup_libgcrypt_logging): Do not call the deprecated gcry_set_log_handler. * kbx/kbxutil.c (my_gcry_logger): Remove. * tools/no-libgcrypt.c (gcry_set_log_handler): Remove stub.
Diffstat (limited to 'kbx')
-rw-r--r--kbx/kbxutil.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index f5bc8bd77..5a0543128 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -132,29 +132,6 @@ my_strusage( int level )
}
-/* Used by gcry for logging */
-static void
-my_gcry_logger (void *dummy, int level, const char *fmt, va_list arg_ptr)
-{
- (void)dummy;
-
- /* Map the log levels. */
- switch (level)
- {
- case GCRY_LOG_CONT: level = GPGRT_LOGLVL_CONT; break;
- case GCRY_LOG_INFO: level = GPGRT_LOGLVL_INFO; break;
- case GCRY_LOG_WARN: level = GPGRT_LOGLVL_WARN; break;
- case GCRY_LOG_ERROR:level = GPGRT_LOGLVL_ERROR; break;
- case GCRY_LOG_FATAL:level = GPGRT_LOGLVL_FATAL; break;
- case GCRY_LOG_BUG: level = GPGRT_LOGLVL_BUG; break;
- case GCRY_LOG_DEBUG:level = GPGRT_LOGLVL_DEBUG; break;
- default: level = GPGRT_LOGLVL_ERROR; break;
- }
- log_logv (level, fmt, arg_ptr);
-}
-
-
-
/* static void */
/* wrong_args( const char *text ) */
/* { */
@@ -481,8 +458,6 @@ main (int argc, char **argv)
i18n_init ();
init_common_subsystems (&argc, &argv);
- gcry_set_log_handler (my_gcry_logger, NULL);
-
/*create_dotlock(NULL); register locking cleanup */
/* We need to use the gcry malloc function because jnlib uses them. */