From: Simon Josefsson Date: Thu, 13 Oct 2005 08:06:07 +0000 (+0000) Subject: 2005-10-13 Simon Josefsson X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d81362eca692dbf1cf13feec81b98130565a1761;p=pspp 2005-10-13 Simon Josefsson * tests/test-gc.c (main): Remove MD5 and HMAC-MD5 tests. * modules/gc-hmac-md5-tests: New file. * tests/test-gc-md5.c: New file. * modules/gc-md5-tests: New file. --- diff --git a/ChangeLog b/ChangeLog index f2e83ad4c3..53919bf929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-10-13 Simon Josefsson + + * tests/test-gc.c (main): Remove MD5 and HMAC-MD5 tests. + + * modules/gc-hmac-md5-tests: New file. + + * tests/test-gc-md5.c: New file. + + * modules/gc-md5-tests: New file. + 2005-10-12 Simon Josefsson * modules/gc-pbkdf2-sha1, modules/gc-pbkdf2-sha1-tests: New files. diff --git a/modules/gc-hmac-md5-tests b/modules/gc-hmac-md5-tests new file mode 100644 index 0000000000..0a271a4652 --- /dev/null +++ b/modules/gc-hmac-md5-tests @@ -0,0 +1,11 @@ +Files: +tests/test-gc-hmac-md5.c + +Depends-on: + +configure.ac: + +Makefile.am: +TESTS += test-gc-hmac-md5 +noinst_PROGRAMS += test-gc-hmac-md5 +test_gc_hmac_md5_SOURCES = test-gc-hmac-md5.c diff --git a/modules/gc-md5-tests b/modules/gc-md5-tests new file mode 100644 index 0000000000..4be7551445 --- /dev/null +++ b/modules/gc-md5-tests @@ -0,0 +1,11 @@ +Files: +tests/test-gc-md5.c + +Depends-on: + +configure.ac: + +Makefile.am: +TESTS += test-gc-md5 +noinst_PROGRAMS += test-gc-md5 +test_gc_md5_SOURCES = test-gc-md5.c diff --git a/tests/test-gc-hmac-md5.c b/tests/test-gc-hmac-md5.c new file mode 100644 index 0000000000..1abc559bdc --- /dev/null +++ b/tests/test-gc-hmac-md5.c @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2005 Free Software Foundation + * Written by Simon Josefsson + * + * 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. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include "gc.h" + +int +main (int argc, char *argv[]) +{ + Gc_rc rc; + + rc = gc_init (); + if (rc != GC_OK) + { + printf ("gc_init() failed\n"); + return 1; + } + + /* Test vectors from RFC 2104. */ + + { + 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]; + + /* + key = 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b + key_len = 16 bytes + data = "Hi There" + data_len = 8 bytes + digest = 0x9294727a3638bb1c13f48ef8158bfc9d + */ + + if (gc_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; + } + } + + gc_done (); + + return 0; +} diff --git a/tests/test-gc-md5.c b/tests/test-gc-md5.c new file mode 100644 index 0000000000..6aadc567b6 --- /dev/null +++ b/tests/test-gc-md5.c @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2005 Free Software Foundation + * Written by Simon Josefsson + * + * 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. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include "gc.h" + +int +main (int argc, char *argv[]) +{ + Gc_rc rc; + + rc = gc_init (); + if (rc != GC_OK) + { + printf ("gc_init() failed\n"); + return 1; + } + + /* Test vectors from RFC 1321. */ + + { + char *in = "abcdefghijklmnopqrstuvwxyz"; + size_t inlen = strlen (in); + char *expect = + "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00\x7d\xfb\x49\x6c\xca\x67\xe1\x3b"; + char out[16]; + + /* MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b */ + + if (gc_md5 (in, inlen, out) != 0) + { + printf ("gc_md5 call failed\n"); + return 1; + } + + if (memcmp (out, expect, 16) != 0) + { + size_t i; + printf ("md5 1 missmatch. expected:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", expect[i] & 0xFF); + printf ("\ncomputed:\n"); + for (i = 0; i < 16; i++) + printf ("%02x ", out[i] & 0xFF); + printf ("\n"); + return 1; + } + } + + gc_done (); + + return 0; +} diff --git a/tests/test-gc.c b/tests/test-gc.c index fd153c3f31..7a9f1c6c95 100644 --- a/tests/test-gc.c +++ b/tests/test-gc.c @@ -28,77 +28,17 @@ int main (int argc, char *argv[]) { + Gc_rc rc; + char buf1[8], buf2[8]; - /* Test vectors from RFC 1321. */ + rc = gc_init (); + if (rc != GC_OK) + { + printf ("gc_init() failed\n"); + return 1; + } - { - char *in = "abcdefghijklmnopqrstuvwxyz"; - size_t inlen = strlen (in); - char *expect = - "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00\x7d\xfb\x49\x6c\xca\x67\xe1\x3b"; - char out[16]; - - /* MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b */ - - if (gc_md5 (in, inlen, out) != 0) - { - printf ("gc_md5 call failed\n"); - return 1; - } - - if (memcmp (out, expect, 16) != 0) - { - size_t i; - printf ("md5 1 missmatch. expected:\n"); - for (i = 0; i < 16; i++) - printf ("%02x ", expect[i] & 0xFF); - printf ("\ncomputed:\n"); - for (i = 0; i < 16; i++) - printf ("%02x ", out[i] & 0xFF); - printf ("\n"); - return 1; - } - } - - /* Test vectors from RFC 2104. */ - - { - 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]; - - /* - key = 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b - key_len = 16 bytes - data = "Hi There" - data_len = 8 bytes - digest = 0x9294727a3638bb1c13f48ef8158bfc9d - */ - - if (gc_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; - } - } + gc_done (); return 0; }