X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fhmac-sha1.c;h=5d89d8152c44b8fb87d17f2bd7ab7ab0ac6fe8ec;hb=55898ee1c7c12e63772c65e772577f10bb7adb31;hp=9c95791295b50ab26ee9818dd9549f3ab06c0c47;hpb=11ad180881e62f7d8758936af419c2cc88e9cf79;p=gnulib.git diff --git a/lib/hmac-sha1.c b/lib/hmac-sha1.c index 9c9579129..5d89d8152 100644 --- a/lib/hmac-sha1.c +++ b/lib/hmac-sha1.c @@ -1,5 +1,5 @@ /* hmac-sha1.c -- hashed message authentication codes - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ /* Written by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "hmac.h" @@ -33,7 +31,7 @@ int hmac_sha1 (const void *key, size_t keylen, - const void *in, size_t inlen, void *resbuf) + const void *in, size_t inlen, void *resbuf) { struct sha1_ctx inner; struct sha1_ctx outer; @@ -41,6 +39,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 +53,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 +65,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));