From: Simon Josefsson Date: Thu, 6 Oct 2005 15:58:26 +0000 (+0000) Subject: Add hmac-md5 module. X-Git-Tag: cvs-readonly~2842 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=f6800ee02280d07036209444b32109c54c98ff64;p=gnulib.git Add hmac-md5 module. --- diff --git a/ChangeLog b/ChangeLog index 6fed35cec..d3bb34fbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-06 Simon Josefsson + + * tests/test-hmac-md5.c: New file. + + * modules/hmac-md5-tests: New file. + + * modules/hmac-md5: New file. + 2005-10-05 Bruno Haible * modules/stdint (License): Change to LGPL. diff --git a/lib/ChangeLog b/lib/ChangeLog index 0328348b7..d51d99e81 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,11 @@ 2005-10-06 Simon Josefsson + * hmac-md5.c: New file. + + * hmac.h: New file. + +2005-10-06 Simon Josefsson + * memxor.c (memxor): Avoid casts and warnings. 2005-10-05 Derek Price diff --git a/lib/hmac-md5.c b/lib/hmac-md5.c new file mode 100644 index 000000000..6df653d27 --- /dev/null +++ b/lib/hmac-md5.c @@ -0,0 +1,76 @@ +/* hmac-md5.c -- hashed message authentication codes + Copyright (C) 2005 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Simon Josefsson. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "hmac.h" + +#include "md5.h" + +#include + +#define IPAD 0x36 +#define OPAD 0x5c + +int +hmac_md5 (const void *key, size_t keylen, + const void *in, size_t inlen, void *resbuf) +{ + struct md5_ctx inner; + struct md5_ctx outer; + char optkeybuf[16]; + char block[64]; + char innerhash[16]; + + if (keylen > 64) + { + struct md5_ctx keyhash; + + md5_init_ctx (&keyhash); + md5_process_bytes (key, keylen, &keyhash); + md5_finish_ctx (&keyhash, optkeybuf); + + key = optkeybuf; + keylen = 16; + } + + md5_init_ctx (&inner); + + memset (block, IPAD, sizeof (block)); + memxor (block, key, keylen); + + md5_process_block (block, 64, &inner); + md5_process_bytes (in, inlen, &inner); + + md5_finish_ctx (&inner, innerhash); + + md5_init_ctx (&outer); + + memset (block, OPAD, sizeof (block)); + memxor (block, key, keylen); + + md5_process_block (block, 64, &outer); + md5_process_bytes (innerhash, 16, &outer); + + md5_finish_ctx (&outer, resbuf); + + return 0; +} diff --git a/lib/hmac.h b/lib/hmac.h new file mode 100644 index 000000000..444213ed2 --- /dev/null +++ b/lib/hmac.h @@ -0,0 +1,33 @@ +/* hmac.h -- hashed message authentication codes + Copyright (C) 2005 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Simon Josefsson. */ + +#ifndef HMAC_H +# define HMAC_H 1 + +#include + +/* Compute Hashed Message Authentication Code with MD5, as described + in RFC 2104, over BUFFER data of BUFLEN bytes using the KEY of + KEYLEN bytes, writing the output to pre-allocated 16 byte minimum + RESBUF buffer. Return 0 on success. */ +int +hmac_md5 (const void *key, size_t keylen, + const void *buffer, size_t buflen, void *resbuf); + +#endif /* HMAC_H */ diff --git a/m4/ChangeLog b/m4/ChangeLog index 90e952b94..591a95091 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,7 @@ 2005-10-06 Simon Josefsson + * hmac-md5.m4: New file. + * memxor.m4: Require gl_C_RESTRICT. 2005-10-05 Paul Eggert diff --git a/m4/hmac-md5.m4 b/m4/hmac-md5.m4 new file mode 100644 index 000000000..71cb9a6e8 --- /dev/null +++ b/m4/hmac-md5.m4 @@ -0,0 +1,11 @@ +# hmac-md5.m4 serial 1 +dnl Copyright (C) 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_HMAC_MD5], +[ + AC_LIBSOURCES([hmac.h, hmac-md5.c]) + AC_LIBOBJ([hmac-md5]) +]) diff --git a/modules/hmac-md5 b/modules/hmac-md5 new file mode 100644 index 000000000..acfce4b4b --- /dev/null +++ b/modules/hmac-md5 @@ -0,0 +1,25 @@ +Description: +Compute hashed message authentication codes with MD5. + +Files: +lib/hmac.h +lib/hmac-md5.c +m4/hmac-md5.m4 + +Depends-on: +memxor +md5 + +configure.ac: +gl_HMAC_MD5 + +Makefile.am: + +Include: +"hmac.h" + +License: +LGPL + +Maintainer: +Simon Josefsson diff --git a/modules/hmac-md5-tests b/modules/hmac-md5-tests new file mode 100644 index 000000000..99a5996eb --- /dev/null +++ b/modules/hmac-md5-tests @@ -0,0 +1,11 @@ +Files: +tests/test-hmac-md5.c + +Depends-on: + +configure.ac: + +Makefile.am: +TESTS += test-hmac-md5 +noinst_PROGRAMS += test-hmac-md5 +test_hmac_md5_SOURCES = test-hmac-md5.c diff --git a/tests/test-hmac-md5.c b/tests/test-hmac-md5.c new file mode 100644 index 000000000..0a85860f7 --- /dev/null +++ b/tests/test-hmac-md5.c @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2005 Free Software Foundation + * + * 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 + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. */ + +/* Written by Simon Josefsson. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include "hmac.h" + +/* Test vectors from RFC 2104. */ + +int +main (int argc, char *argv[]) +{ + { + /* + key = 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b + key_len = 16 bytes + data = "Hi There" + data_len = 8 bytes + digest = 0x9294727a3638bb1c13f48ef8158bfc9d + */ + char *key = + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"; + size_t key_len = 16; + char *data = "Hi There"; + size_t data_len = 8; + char *digest = + "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d"; + char out[16]; + + if (hmac_md5 (key, key_len, data, data_len, out) != 0) + { + printf ("call failure\n"); + return 1; + } + + if (memcmp (digest, out, 16) != 0) + { + size_t i; + printf ("hash 1 missmatch. expected:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", digest[i] & 0xFF); + printf ("\ncomputed:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", out[i] & 0xFF); + printf ("\n"); + return 1; + } + } + + { + /* + key = "Jefe" + data = "what do ya want for nothing?" + data_len = 28 bytes + digest = 0x750c783e6ab0b503eaa86e310a5db738 + */ + char *key = "Jefe"; + size_t key_len = 4; + char *data = "what do ya want for nothing?"; + size_t data_len = 28; + char *digest = + "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38"; + char out[16]; + + if (hmac_md5 (key, key_len, data, data_len, out) != 0) + { + printf ("call failure\n"); + return 1; + } + + if (memcmp (digest, out, 16) != 0) + { + size_t i; + printf ("hash 2 missmatch. expected:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", digest[i] & 0xFF); + printf ("\ncomputed:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", out[i] & 0xFF); + printf ("\n"); + return 1; + } + } + + { + /* + key = 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + key_len 16 bytes + data = 0xDDDDDDDDDDDDDDDDDDDD... + ..DDDDDDDDDDDDDDDDDDDD... + ..DDDDDDDDDDDDDDDDDDDD... + ..DDDDDDDDDDDDDDDDDDDD... + ..DDDDDDDDDDDDDDDDDDDD + data_len = 50 bytes + digest = 0x56be34521d144c88dbb8c733f0e8b3f6 + */ + char *key = + "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"; + size_t key_len = 16; + char *data = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" + "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" + "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" + "\xDD\xDD"; + size_t data_len = 50; + char *digest = + "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6"; + char out[16]; + + if (hmac_md5 (key, key_len, data, data_len, out) != 0) + { + printf ("call failure\n"); + return 1; + } + + if (memcmp (digest, out, 16) != 0) + { + size_t i; + printf ("hash 3 missmatch. expected:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", digest[i] & 0xFF); + printf ("\ncomputed:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", out[i] & 0xFF); + printf ("\n"); + return 1; + } + } + + return 0; +}