-const gcmac pre##_hmac = { { #pre "-hmac", PRE##_HASHSZ }, gkey }; \
-static const gmac_ops gkops = { &pre##_hmac.b, gkinit, gkdestroy }; \
+const gcmac pre##_hmac = \
+ { #pre "-hmac", PRE##_HASHSZ, pre##_mackeysz, gkey }; \
+static const gmac_ops gkops = { &pre##_hmac, gkinit, gkdestroy }; \
+static const gchash gch = { #pre "-hmac", PRE##_HASHSZ, ghinit }; \