aboutsummaryrefslogtreecommitdiffstats
path: root/common/miscellaneous.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2024-04-23 14:21:49 +0000
committerWerner Koch <[email protected]>2024-04-23 14:21:49 +0000
commit54741685ced22bfa0cbd6db5c41e50ef2148d1e3 (patch)
tree654bfaa905bb71d0b6df484c0fa4807d3595cf39 /common/miscellaneous.c
parenttests: Add two Kyber sample keys and messages. (diff)
downloadgnupg-54741685ced22bfa0cbd6db5c41e50ef2148d1e3.tar.gz
gnupg-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 'common/miscellaneous.c')
-rw-r--r--common/miscellaneous.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index 28d3e7a2e..a41acc240 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -36,27 +36,6 @@
#include "iobuf.h"
#include "i18n.h"
-/* Used by libgcrypt 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);
-}
-
/* This function is called by libgcrypt on a fatal error. */
static void
@@ -100,7 +79,6 @@ my_gcry_outofcore_handler (void *opaque, size_t req_n, unsigned int flags)
void
setup_libgcrypt_logging (void)
{
- gcry_set_log_handler (my_gcry_logger, NULL);
gcry_set_fatalerror_handler (my_gcry_fatalerror_handler, NULL);
gcry_set_outofcore_handler (my_gcry_outofcore_handler, NULL);
}