From 88c2657f2a985387094ecf26d1b0373151ea65d2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 19 Sep 2021 01:33:31 +0200 Subject: md4-buffer tests: New module. * tests/test-md4-buffer.c: Renamed from tests/test-md4.c. * modules/crypto/md4-buffer-tests: Renamed from modules/crypto/md4-tests. Test tests/test-md4-buffer.c instead of tests/test-md4.c. --- ChangeLog | 6 ++++ modules/crypto/md4-buffer-tests | 10 ++++++ modules/crypto/md4-tests | 10 ------ tests/test-md4-buffer.c | 67 +++++++++++++++++++++++++++++++++++++++++ tests/test-md4.c | 67 ----------------------------------------- 5 files changed, 83 insertions(+), 77 deletions(-) create mode 100644 modules/crypto/md4-buffer-tests delete mode 100644 modules/crypto/md4-tests create mode 100644 tests/test-md4-buffer.c delete mode 100644 tests/test-md4.c diff --git a/ChangeLog b/ChangeLog index 5ee0f7f1c1..312cbb8403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2021-09-18 Bruno Haible + md4-buffer tests: New module. + * tests/test-md4-buffer.c: Renamed from tests/test-md4.c. + * modules/crypto/md4-buffer-tests: Renamed from + modules/crypto/md4-tests. Test tests/test-md4-buffer.c instead of + tests/test-md4.c. + md4-buffer: New module. * lib/md4-stream.c: New file, extracted from lib/md4.c. * lib/md4.c: Don't include stdlib.h, unlocked-io.h. diff --git a/modules/crypto/md4-buffer-tests b/modules/crypto/md4-buffer-tests new file mode 100644 index 0000000000..8238db40db --- /dev/null +++ b/modules/crypto/md4-buffer-tests @@ -0,0 +1,10 @@ +Files: +tests/test-md4-buffer.c + +Depends-on: + +configure.ac: + +Makefile.am: +TESTS += test-md4-buffer +check_PROGRAMS += test-md4-buffer diff --git a/modules/crypto/md4-tests b/modules/crypto/md4-tests deleted file mode 100644 index b4b851e859..0000000000 --- a/modules/crypto/md4-tests +++ /dev/null @@ -1,10 +0,0 @@ -Files: -tests/test-md4.c - -Depends-on: - -configure.ac: - -Makefile.am: -TESTS += test-md4 -check_PROGRAMS += test-md4 diff --git a/tests/test-md4-buffer.c b/tests/test-md4-buffer.c new file mode 100644 index 0000000000..fb2266525b --- /dev/null +++ b/tests/test-md4-buffer.c @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2005, 2010-2021 Free Software Foundation, Inc. + * 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 3, 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, see . */ + +/* Written by Simon Josefsson. */ + +#include + +#include "md4.h" + +#include +#include + +int +main (int argc, char *argv[]) +{ + const char *in1 = "abc"; + const char *out1 = + "\xa4\x48\x01\x7a\xaf\x21\xd8\x52\x5f\xc1\x0a\xe8\x7a\xa6\x72\x9d"; + const char *in2 = "abcdefghijklmnopqrstuvwxyz"; + const char *out2 = + "\xd7\x9e\x1c\x30\x8a\xa5\xbb\xcd\xee\xa8\xed\x63\xdf\x41\x2d\xa9"; + char buf[MD4_DIGEST_SIZE]; + + if (memcmp (md4_buffer (in1, strlen (in1), buf), out1, MD4_DIGEST_SIZE) != + 0) + { + size_t i; + printf ("expected:\n"); + for (i = 0; i < MD4_DIGEST_SIZE; i++) + printf ("%02x ", out1[i] & 0xFF); + printf ("\ncomputed:\n"); + for (i = 0; i < MD4_DIGEST_SIZE; i++) + printf ("%02x ", buf[i] & 0xFF); + printf ("\n"); + return 1; + } + + if (memcmp (md4_buffer (in2, strlen (in2), buf), out2, MD4_DIGEST_SIZE) != + 0) + { + size_t i; + printf ("expected:\n"); + for (i = 0; i < MD4_DIGEST_SIZE; i++) + printf ("%02x ", out2[i] & 0xFF); + printf ("\ncomputed:\n"); + for (i = 0; i < MD4_DIGEST_SIZE; i++) + printf ("%02x ", buf[i] & 0xFF); + printf ("\n"); + return 1; + } + + return 0; +} diff --git a/tests/test-md4.c b/tests/test-md4.c deleted file mode 100644 index fb2266525b..0000000000 --- a/tests/test-md4.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2005, 2010-2021 Free Software Foundation, Inc. - * 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 3, 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, see . */ - -/* Written by Simon Josefsson. */ - -#include - -#include "md4.h" - -#include -#include - -int -main (int argc, char *argv[]) -{ - const char *in1 = "abc"; - const char *out1 = - "\xa4\x48\x01\x7a\xaf\x21\xd8\x52\x5f\xc1\x0a\xe8\x7a\xa6\x72\x9d"; - const char *in2 = "abcdefghijklmnopqrstuvwxyz"; - const char *out2 = - "\xd7\x9e\x1c\x30\x8a\xa5\xbb\xcd\xee\xa8\xed\x63\xdf\x41\x2d\xa9"; - char buf[MD4_DIGEST_SIZE]; - - if (memcmp (md4_buffer (in1, strlen (in1), buf), out1, MD4_DIGEST_SIZE) != - 0) - { - size_t i; - printf ("expected:\n"); - for (i = 0; i < MD4_DIGEST_SIZE; i++) - printf ("%02x ", out1[i] & 0xFF); - printf ("\ncomputed:\n"); - for (i = 0; i < MD4_DIGEST_SIZE; i++) - printf ("%02x ", buf[i] & 0xFF); - printf ("\n"); - return 1; - } - - if (memcmp (md4_buffer (in2, strlen (in2), buf), out2, MD4_DIGEST_SIZE) != - 0) - { - size_t i; - printf ("expected:\n"); - for (i = 0; i < MD4_DIGEST_SIZE; i++) - printf ("%02x ", out2[i] & 0xFF); - printf ("\ncomputed:\n"); - for (i = 0; i < MD4_DIGEST_SIZE; i++) - printf ("%02x ", buf[i] & 0xFF); - printf ("\n"); - return 1; - } - - return 0; -} -- cgit v1.2.1