svc/conntrack.in: Maintain config groups in a dictionary.

[tripe] / server / bulkcrypto.c

diff --git a/server/bulkcrypto.c b/server/bulkcrypto.c
index 96469bca66272b08944a841d19884b485df3cbae..7d754cd7accb7d283bf335b66a1faf3ab088b9ca 100644 (file)
--- a/server/bulkcrypto.c
+++ b/server/bulkcrypto.c
@@ -72,7 +72,7 @@ typedef struct gencomp_algs {
 
 typedef struct gencomp_chal {
   bulkchal _b;
-  gmac *m; size_t tagsz;
+  gmac *m;
 } gencomp_chal;
 
 static int gencomp_getalgs(gencomp_algs *a, const algswitch *asw,
@@ -536,7 +536,8 @@ static void iiv_tracealgs(const bulkalgs *aa)
   const iiv_algs *a = (const iiv_algs *)aa;
 
   gencomp_tracealgs(&a->ga);
-  trace(T_CRYPTO, "crypto: blkc = %.*s", strlen(a->b->name) - 4, a->b->name);
+  trace(T_CRYPTO,
+       "crypto: blkc = %.*s", (int)strlen(a->b->name) - 4, a->b->name);
 }
 #endif
 
@@ -1046,6 +1047,7 @@ static int naclbox_decrypt(bulkctx *bbc, unsigned ty,
 
   poly1305_hash(&poly, ppk, sz);
   poly1305_done(&poly, buf_u);
+  TRACE_MAC(buf_u, POLY1305_TAGSZ);
   if (!ct_memeq(buf_u, pmac, POLY1305_TAGSZ)) {
     TRACE_MACERR(pmac, POLY1305_TAGSZ);
     return (KSERR_DECRYPT);