X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/eee161205f1139ee49e81c8efa33fe18380c917b..c850c0da81ad9f72315f8e6e26bdfbd98daf9d89:/hmac-def.h diff --git a/hmac-def.h b/hmac-def.h index a8f2640..19df631 100644 --- a/hmac-def.h +++ b/hmac-def.h @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: hmac-def.h,v 1.4 2000/07/15 10:00:58 mdw Exp $ + * $Id: hmac-def.h,v 1.5 2000/10/15 19:09:20 mdw Exp $ * * Definitions for HMAC and NMAC * @@ -30,6 +30,10 @@ /*----- Revision history --------------------------------------------------* * * $Log: hmac-def.h,v $ + * Revision 1.5 2000/10/15 19:09:20 mdw + * Support HMAC mode for hash functions which need to store more state than + * the hash output size. + * * Revision 1.4 2000/07/15 10:00:58 mdw * New generic hash operation for copying hash contexts. * @@ -89,7 +93,7 @@ \ /* --- Useful constants --- */ \ \ -const octet pre##_mackeysz[] = { KSZ_ANY, PRE##_HASHSZ }; \ +const octet pre##_mackeysz[] = { KSZ_ANY, PRE##_STATESZ }; \ \ /* --- @pre_nmacinit@ --- * \ * \ @@ -104,8 +108,8 @@ const octet pre##_mackeysz[] = { KSZ_ANY, PRE##_HASHSZ }; \ \ void pre##_nmacinit(pre##_mackey *key, const void *ok, const void *ik) \ { \ - memcpy(key->ochain, ok, PRE##_HASHSZ); \ - memcpy(key->ichain, ik, PRE##_HASHSZ); \ + memcpy(key->ochain, ok, PRE##_STATESZ); \ + memcpy(key->ichain, ik, PRE##_STATESZ); \ key->ocount = key->icount = 0; \ } \ \ @@ -169,7 +173,7 @@ void pre##_hmacinit(pre##_mackey *key, const void *k, size_t sz) \ \ void pre##_macinit(pre##_macctx *ctx, const pre##_mackey *key) \ { \ - memcpy(ctx->chain, key->ochain, PRE##_HASHSZ); \ + memcpy(ctx->chain, key->ochain, PRE##_STATESZ); \ ctx->count = key->ocount; \ pre##_set(&ctx->ctx, key->ichain, key->icount); \ } \