X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/609affae0305784d87f2357488fba35699a04098..8f2287ef5c05d496fcb9b012629af007fe56f897:/symm/hmac-def.h

diff --git a/symm/hmac-def.h b/symm/hmac-def.h
index e639b8cb..e3f12ced 100644
--- a/symm/hmac-def.h
+++ b/symm/hmac-def.h
@@ -208,9 +208,7 @@ void pre##_macinit(pre##_macctx *ctx, const pre##_mackey *key)		\
  */									\
 									\
 void pre##_machash(pre##_macctx *ctx, const void *buf, size_t sz)	\
-{									\
-  pre##_hash(&ctx->ctx, buf, sz);					\
-}									\
+  { pre##_hash(&ctx->ctx, buf, sz); }					\
 									\
 /* --- @pre_macdone@ --- *						\
  *									\
@@ -232,7 +230,7 @@ void pre##_macdone(pre##_macctx *ctx, void *mac)			\
 									\
 /* --- Generic MAC interface --- */					\
 									\
-static const gmac_ops gkops;						\
+static const gmac_ops gkops, gnkops, gsslkops;				\
 static const ghash_ops gops, gnops, gsslops;				\
 									\
 typedef struct gkctx {							\
@@ -270,7 +268,7 @@ static gmac *gnkey(const void *k, size_t sz)				\
   gkctx *gk = S_CREATE(gkctx);						\
   const octet *kk = k;							\
   assert(keysz(sz, pre##_nmackeysz) == sz);				\
-  gk->m.ops = &gkops;							\
+  gk->m.ops = &gnkops;							\
   gk->gops = &gnops;							\
   pre##_nmacinit(&gk->k, kk, kk + PRE##_STATESZ);			\
   return (&gk->m);							\
@@ -279,7 +277,7 @@ static gmac *gnkey(const void *k, size_t sz)				\
 static gmac *gsslkey(const void *k, size_t sz)				\
 {									\
   gkctx *gk = S_CREATE(gkctx);						\
-  gk->m.ops = &gkops;							\
+  gk->m.ops = &gsslkops;						\
   gk->gops = &gsslops;							\
   pre##_sslmacinit(&gk->k, k, sz);					\
   return (&gk->m);							\
@@ -342,10 +340,10 @@ static const ghash_ops gops =						\
   { &gch, ghhash, ghdone, ghdestroy, ghcopy };				\
 static const gchash gnch = { name "-nmac", PRE##_HASHSZ, ghinit };	\
 static const ghash_ops gnops =						\
-  { &gch, ghhash, ghdone, ghdestroy, ghcopy };				\
+  { &gnch, ghhash, ghdone, ghdestroy, ghcopy };				\
 static const gchash gsslch = { name "-sslmac", PRE##_HASHSZ, ghinit };	\
 static const ghash_ops gsslops =					\
-  { &gch, ghhash, ghdone, ghdestroy, ghcopy };				\
+  { &gsslch, ghhash, ghdone, ghdestroy, ghcopy };			\
 									\
 HMAC_TESTX(PRE, pre, name, fname)