--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-13  Simon Josefsson  <jas@extundo.com>
+
+	* 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  <jas@extundo.com>
 
 	* modules/gc-pbkdf2-sha1, modules/gc-pbkdf2-sha1-tests: New files.

new file mode 100644
--- /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

new file mode 100644
--- /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

new file mode 100644
--- /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 <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#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;
+}

new file mode 100644
--- /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 <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#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;
+}

--- a/tests/test-gc.c
+++ b/tests/test-gc.c
@@ -28,77 +28,17 @@
 int
 main (int argc, char *argv[])
 {
-
-  /* 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;
-      }
-  }
-
-    /* Test vectors from RFC 2104. */
+  Gc_rc rc;
+  char buf1[8], buf2[8];
 
-  {
-    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
-    */
+  rc = gc_init ();
+  if (rc != GC_OK)
+    {
+      printf ("gc_init() failed\n");
+      return 1;
+    }
 
-    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;
 }