From 1db596967564cad38c222f82e6fad0b117a6dbc5 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Fri, 21 Oct 2005 12:49:28 +0000 Subject: [PATCH] * hmac-md5.c (hmac_md5): Add comments, suggested by Bruno Haible . * hmac-sha1.c (hmac_sha1): Likewise. --- lib/ChangeLog | 5 +++++ lib/hmac-md5.c | 6 ++++++ lib/hmac-sha1.c | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/lib/ChangeLog b/lib/ChangeLog index ae05d1b5a9..5206f03a3d 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,10 @@ 2005-10-21 Simon Josefsson + * hmac-md5.c (hmac_md5): Add comments, suggested by Bruno Haible + . + + * hmac-sha1.c (hmac_sha1): Likewise. + * crc.c (crc32_update): Actually use crc parameter, suggested by Bruno Haible . diff --git a/lib/hmac-md5.c b/lib/hmac-md5.c index ecd0714960..816762b798 100644 --- a/lib/hmac-md5.c +++ b/lib/hmac-md5.c @@ -41,6 +41,8 @@ hmac_md5 (const void *key, size_t keylen, char block[64]; char innerhash[16]; + /* Reduce the key's size, so that it becomes <= 64 bytes large. */ + if (keylen > 64) { struct md5_ctx keyhash; @@ -53,6 +55,8 @@ hmac_md5 (const void *key, size_t keylen, keylen = 16; } + /* Compute INNERHASH from KEY and IN. */ + md5_init_ctx (&inner); memset (block, IPAD, sizeof (block)); @@ -63,6 +67,8 @@ hmac_md5 (const void *key, size_t keylen, md5_finish_ctx (&inner, innerhash); + /* Compute result from KEY and INNERHASH. */ + md5_init_ctx (&outer); memset (block, OPAD, sizeof (block)); diff --git a/lib/hmac-sha1.c b/lib/hmac-sha1.c index 9c95791295..f7a3fda43e 100644 --- a/lib/hmac-sha1.c +++ b/lib/hmac-sha1.c @@ -41,6 +41,8 @@ hmac_sha1 (const void *key, size_t keylen, char block[64]; char innerhash[20]; + /* Reduce the key's size, so that it becomes <= 64 bytes large. */ + if (keylen > 64) { struct sha1_ctx keyhash; @@ -53,6 +55,8 @@ hmac_sha1 (const void *key, size_t keylen, keylen = 20; } + /* Compute INNERHASH from KEY and IN. */ + sha1_init_ctx (&inner); memset (block, IPAD, sizeof (block)); @@ -63,6 +67,8 @@ hmac_sha1 (const void *key, size_t keylen, sha1_finish_ctx (&inner, innerhash); + /* Compute result from KEY and INNERHASH. */ + sha1_init_ctx (&outer); memset (block, OPAD, sizeof (block)); -- 2.30.2