* tests/test-md5-buffer.c: New file, based on tests/test-md5.c.
* tests/test-md5-stream.c: Renamed from tests/test-md5.c.
(main): Remove md5-buffer tests.
* modules/crypto/md5-buffer-tests: New file, based on
modules/crypto/md5-tests.
* modules/crypto/md5-tests: Remove tests that are now in
modules/crypto/md5-buffer-tests. Test tests/test-md5-stream.c instead
of tests/test-md5.c.
2021-09-18 Bruno Haible <bruno@clisp.org>
+ md5-buffer tests: New module.
+ * tests/test-md5-buffer.c: New file, based on tests/test-md5.c.
+ * tests/test-md5-stream.c: Renamed from tests/test-md5.c.
+ (main): Remove md5-buffer tests.
+ * modules/crypto/md5-buffer-tests: New file, based on
+ modules/crypto/md5-tests.
+ * modules/crypto/md5-tests: Remove tests that are now in
+ modules/crypto/md5-buffer-tests. Test tests/test-md5-stream.c instead
+ of tests/test-md5.c.
+
md5: Clarify module to source relation.
* lib/md5-stream.c: New file, extracted from lib/md5.c.
* lib/md5.c: Don't include stdlib.h, unlocked-io.h.
--- /dev/null
+Files:
+tests/test-md5-buffer.c
+tests/bench-md5.c
+tests/bench-digest.h
+
+Depends-on:
+c99
+getrusage
+gettimeofday
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-md5-buffer
+check_PROGRAMS += test-md5-buffer
+noinst_PROGRAMS += bench-md5
+test_md5_buffer_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_md5_LDADD = $(LDADD) @LIB_CRYPTO@
Files:
-tests/test-md5.c
+tests/test-md5-stream.c
tests/test-digest.h
-tests/bench-md5.c
-tests/bench-digest.h
tests/macros.h
Depends-on:
c99
-getrusage
-gettimeofday
configure.ac:
Makefile.am:
-TESTS += test-md5
-check_PROGRAMS += test-md5
-noinst_PROGRAMS += bench-md5
-test_md5_LDADD = $(LDADD) @LIB_CRYPTO@
-bench_md5_LDADD = $(LDADD) @LIB_CRYPTO@
+TESTS += test-md5-stream
+check_PROGRAMS += test-md5-stream
+test_md5_stream_LDADD = $(LDADD) @LIB_CRYPTO@
--- /dev/null
+/*
+ * Copyright (C) 2005, 2009-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 of the License, 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 <https://www.gnu.org/licenses/>. */
+
+/* Written by Simon Josefsson. */
+
+#include <config.h>
+
+#include "md5.h"
+
+#include <stdio.h>
+#include <string.h>
+
+int
+main (void)
+{
+ /* Test vectors from RFC 1321. */
+
+ const char *in1 = "abc";
+ const char *out1 =
+ "\x90\x01\x50\x98\x3C\xD2\x4F\xB0\xD6\x96\x3F\x7D\x28\xE1\x7F\x72";
+ const char *in2 = "message digest";
+ const char *out2 =
+ "\xF9\x6B\x69\x7D\x7C\xB7\x93\x8D\x52\x5A\x2F\x31\xAA\xF1\x61\xD0";
+ char buf[MD5_DIGEST_SIZE];
+
+ if (memcmp (md5_buffer (in1, strlen (in1), buf), out1, MD5_DIGEST_SIZE) != 0)
+ {
+ size_t i;
+ printf ("expected:\n");
+ for (i = 0; i < MD5_DIGEST_SIZE; i++)
+ printf ("%02x ", out1[i] & 0xFFu);
+ printf ("\ncomputed:\n");
+ for (i = 0; i < MD5_DIGEST_SIZE; i++)
+ printf ("%02x ", buf[i] & 0xFFu);
+ printf ("\n");
+ return 1;
+ }
+
+ if (memcmp (md5_buffer (in2, strlen (in2), buf), out2, MD5_DIGEST_SIZE) != 0)
+ {
+ size_t i;
+ printf ("expected:\n");
+ for (i = 0; i < MD5_DIGEST_SIZE; i++)
+ printf ("%02x ", out2[i] & 0xFFu);
+ printf ("\ncomputed:\n");
+ for (i = 0; i < MD5_DIGEST_SIZE; i++)
+ printf ("%02x ", buf[i] & 0xFFu);
+ printf ("\n");
+ return 1;
+ }
+
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright (C) 2005, 2009-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 of the License, 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 <https://www.gnu.org/licenses/>. */
+
+/* Written by Simon Josefsson. */
+
+#include <config.h>
+
+#include "md5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "macros.h"
+
+#define TESTFILE "test-md5.data"
+#include "test-digest.h"
+
+int
+main (void)
+{
+ /* Test md5_stream. */
+ test_digest_on_files (md5_stream, "md5_stream", 16,
+ "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42\x7e",
+ "\x0d\x70\x06\xcd\x05\x5e\x94\xcf\x61\x45\x87\xe1\xd2\xae\x0c\x8e",
+ "\xec\x99\x67\x9b\xff\xc0\xf9\xb0\x6d\x18\x30\x6b\x06\xd6\x56\x23");
+
+ return 0;
+}
+++ /dev/null
-/*
- * Copyright (C) 2005, 2009-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 of the License, 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 <https://www.gnu.org/licenses/>. */
-
-/* Written by Simon Josefsson. */
-
-#include <config.h>
-
-#include "md5.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-#define TESTFILE "test-md5.data"
-#include "test-digest.h"
-
-int
-main (void)
-{
- /* Test vectors from RFC 1321. */
-
- const char *in1 = "abc";
- const char *out1 =
- "\x90\x01\x50\x98\x3C\xD2\x4F\xB0\xD6\x96\x3F\x7D\x28\xE1\x7F\x72";
- const char *in2 = "message digest";
- const char *out2 =
- "\xF9\x6B\x69\x7D\x7C\xB7\x93\x8D\x52\x5A\x2F\x31\xAA\xF1\x61\xD0";
- char buf[MD5_DIGEST_SIZE];
-
- if (memcmp (md5_buffer (in1, strlen (in1), buf), out1, MD5_DIGEST_SIZE) != 0)
- {
- size_t i;
- printf ("expected:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", out1[i] & 0xFFu);
- printf ("\ncomputed:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", buf[i] & 0xFFu);
- printf ("\n");
- return 1;
- }
-
- if (memcmp (md5_buffer (in2, strlen (in2), buf), out2, MD5_DIGEST_SIZE) != 0)
- {
- size_t i;
- printf ("expected:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", out2[i] & 0xFFu);
- printf ("\ncomputed:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", buf[i] & 0xFFu);
- printf ("\n");
- return 1;
- }
-
- /* Test md5_stream. */
- test_digest_on_files (md5_stream, "md5_stream", 16,
- "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42\x7e",
- "\x0d\x70\x06\xcd\x05\x5e\x94\xcf\x61\x45\x87\xe1\xd2\xae\x0c\x8e",
- "\xec\x99\x67\x9b\xff\xc0\xf9\xb0\x6d\x18\x30\x6b\x06\xd6\x56\x23");
-
- return 0;
-}