--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-31  Simon Josefsson  <simon@josefsson.org>
+
+	* tests/test-sha1.c: New file, based on test-md5.c.
+
+	* modules/crypto/sha1-tests: New file.
+
 2008-01-31  Simon Josefsson  <simon@josefsson.org>
 
 	* lib/sha1.h (SHA1_DIGEST_SIZE): Add.

new file mode 100644
--- /dev/null
+++ b/modules/crypto/sha1-tests
@@ -0,0 +1,10 @@
+Files:
+tests/test-sha1.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sha1
+check_PROGRAMS += test-sha1

new file mode 100644
--- /dev/null
+++ b/tests/test-sha1.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2005, 2008 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 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 <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include "sha1.h"
+
+int
+main (int argc, char *argv[])
+{
+  char *in1 = "abcdefgh";
+  char *out1 = "\x42\x5a\xf1\x2a\x07\x43\x50\x2b"
+    "\x32\x2e\x93\xa0\x15\xbc\xf8\x68\xe3\x24\xd5\x6a";
+  char buf[SHA1_DIGEST_SIZE];
+
+  if (memcmp (sha1_buffer (in1, strlen (in1), buf),
+	      out1, SHA1_DIGEST_SIZE) != 0)
+    {
+      size_t i;
+      printf ("expected:\n");
+      for (i = 0; i < SHA1_DIGEST_SIZE; i++)
+	printf ("%02x ", out1[i] & 0xFF);
+      printf ("\ncomputed:\n");
+      for (i = 0; i < SHA1_DIGEST_SIZE; i++)
+	printf ("%02x ", buf[i] & 0xFF);
+      printf ("\n");
+      return 1;
+    }
+
+  return 0;
+}