From eb9a5125585674addb533705d49a7eb41bd2abc5 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Tue, 28 Jul 2015 20:26:10 -0400 Subject: [PATCH] Set the TLS audit log callback. --- src/pwmd.c | 3 ++- src/tls.c | 7 +++++++ src/tls.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pwmd.c b/src/pwmd.c index 52fd411d..68188993 100644 --- a/src/pwmd.c +++ b/src/pwmd.c @@ -2655,8 +2655,9 @@ main (int argc, char *argv[]) #ifdef WITH_GNUTLS gnutls_global_init (); - gnutls_global_set_log_function (tls_log); gnutls_global_set_log_level (1); + gnutls_global_set_log_function (tls_log); + gnutls_global_set_audit_log_function (tls_audit_log); tls_fd = -1; tls6_fd = -1; #endif diff --git a/src/tls.c b/src/tls.c index 96cba516..5f96c9d6 100644 --- a/src/tls.c +++ b/src/tls.c @@ -194,6 +194,13 @@ tls_log (int level, const char *msg) log_write ("TLS: %i: %s", level, msg); } +void +tls_audit_log (gnutls_session_t s, const char *msg) +{ + (void)s; + log_write ("TLS: %s", msg); +} + ssize_t tls_read_hook (assuan_context_t ctx, assuan_fd_t fd, void *data, size_t len) { diff --git a/src/tls.h b/src/tls.h index d717dbca..d44137b8 100644 --- a/src/tls.h +++ b/src/tls.h @@ -39,6 +39,7 @@ struct tls_s *tls_init (int fd, int timeout, const char *prio); int tls_get_params (gnutls_session_t ses, gnutls_params_type_t type, gnutls_params_st * st); void tls_log (int level, const char *msg); +void tls_audit_log (gnutls_session_t, const char *); ssize_t tls_read_hook (assuan_context_t ctx, assuan_fd_t fd, void *data, size_t len); ssize_t tls_write_hook (assuan_context_t ctx, assuan_fd_t fd, -- 2.11.4.GIT