diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2020-06-08 01:20:31 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2020-06-08 01:20:31 +0200 |
| commit | 6c10fd5e3e563791008a22803a536e7436fee073 (patch) | |
| tree | 15515ede47c465a29facb2d4be34ebee23ea2711 /common-sodium.c | |
| parent | 2d8bfaab51c2dd42d73c348e238802912e870b22 (diff) | |
log_bin2hex_sodium cares about logging prio set, fixed missing cleanup on bufferevent failure
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'common-sodium.c')
| -rw-r--r-- | common-sodium.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/common-sodium.c b/common-sodium.c index a69196d..1f3c88e 100644 --- a/common-sodium.c +++ b/common-sodium.c @@ -4,11 +4,15 @@ #include "logging.h" #include "protocol.h" -void log_bin2hex_sodium(char const * const prefix, uint8_t const * const buffer, size_t size) +void log_bin2hex_sodium(enum log_priority log_prio, char const * const prefix, + uint8_t const * const buffer, size_t size) { char hexstr[2 * size + 1]; - LOG(NOTICE, "%s: %s", prefix, sodium_bin2hex(hexstr, sizeof(hexstr), buffer, size)); - sodium_memzero(hexstr, sizeof(hexstr)); + + if (log_prio >= lower_prio) { + LOG(log_prio, "%s: %s", prefix, sodium_bin2hex(hexstr, sizeof(hexstr), buffer, size)); + sodium_memzero(hexstr, sizeof(hexstr)); + } } struct longterm_keypair * generate_keypair_sodium(void) @@ -84,8 +88,8 @@ int generate_session_keypair_sodium(struct connection * const state) return 1; } - log_bin2hex_sodium("Generated session rx key", state->session_keys->rx, crypto_kx_SESSIONKEYBYTES); - log_bin2hex_sodium("Generated session tx key", state->session_keys->tx, crypto_kx_SESSIONKEYBYTES); + log_bin2hex_sodium(NOTICE, "Generated session rx key", state->session_keys->rx, crypto_kx_SESSIONKEYBYTES); + log_bin2hex_sodium(NOTICE, "Generated session tx key", state->session_keys->tx, crypto_kx_SESSIONKEYBYTES); return 0; } |