server/bulkcrypto.c: Abstract out MAC-failure tracing.

diff --git a/server/bulkcrypto.c b/server/bulkcrypto.c
index b528bb5db35bf4dc43f950e2edb913cd0e1c6ff2..26ae9ede1233022bf8cdad553237013529361dcf 100644 (file)
--- a/server/bulkcrypto.c
+++ b/server/bulkcrypto.c
@@ -45,6 +45,11 @@
   trace_block(T_CRYPTO, "crypto: computed MAC", (qmac), (tagsz));      \
 }) } while (0)
 
   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);                                         \
 #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) {                                                          \
   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)
     return (KSERR_DECRYPT);                                            \
   }                                                                    \
 } while (0)