From 9a361a98e47bdade7bf107666441f41b4cb67dd9 Mon Sep 17 00:00:00 2001 Message-Id: <9a361a98e47bdade7bf107666441f41b4cb67dd9.1714569181.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 26 May 2016 09:26:09 +0100 Subject: [PATCH] server/bulkcrypto.c: Abstract out MAC-failure tracing. Organization: Straylight/Edgeware From: Mark Wooding --- server/bulkcrypto.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/bulkcrypto.c b/server/bulkcrypto.c index b528bb5d..26ae9ede 100644 --- a/server/bulkcrypto.c +++ b/server/bulkcrypto.c @@ -45,6 +45,11 @@ trace_block(T_CRYPTO, "crypto: computed MAC", (qmac), (tagsz)); \ }) } while (0) +#define TRACE_MACERR(pmac, tagsz) do { IF_TRACING(T_KEYSET, { \ + trace(T_KEYSET, "keyset: incorrect MAC: decryption failed"); \ + trace_block(T_CRYPTO, "crypto: expected MAC", (pmac), (tagsz)); \ +}) } while (0) + #define CHECK_MAC(h, pmac, tagsz) do { \ ghash *_h = (h); \ const octet *_pmac = (pmac); \ @@ -54,10 +59,7 @@ TRACE_MAC(_mac, _tagsz); \ GH_DESTROY(_h); \ if (!_eq) { \ - IF_TRACING(T_KEYSET, { \ - trace(T_KEYSET, "keyset: incorrect MAC: decryption failed"); \ - trace_block(T_CRYPTO, "crypto: expected MAC", _pmac, _tagsz); \ - }) \ + TRACE_MACERR(_pmac, _tagsz); \ return (KSERR_DECRYPT); \ } \ } while (0) -- [mdw]