Split parts of the gc module into gc-md5 and gc-hmac-md5 modules.

diff --git a/ChangeLog b/ChangeLog
index de50dc6dded2871a6fb01203815a5e9f716fa0ce..64e8d396c7be1eda9a33376b55f3f863722f3250 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-12  Simon Josefsson  <jas@extundo.com>
+
+       * modules/gc-md5, modules/gc-hmac-md5: New files.
+
+       * modules/gc (Files): Remove md5, memxor and hmac files.
+
 2005-10-11  Bruno Haible  <bruno@clisp.org>
 
        * modules/c-strcasestr: New file.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 413e3c179f8e0c97ac558299ec3d6e9eeeb4b5c5..b67eec2a8eef457416b9db889133ba0034af470a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-12  Simon Josefsson  <jas@extundo.com>
 
+       * gc-gnulib.c: Condition MD5 and HMAC-MD5 use on GC_USE_MD5 and
+       GC_USE_HMAC_MD5, respectively.
+
        * gc-libgcrypt.c (gc_md5): Fix assert call.
        (gc_md5): Fix typo.
 

diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c
index eac90390851ba3ec4b6d248781c4b645dd599b95..00bab976d226fa0d436636e38c7520dbefb9d20a 100644 (file)
--- a/lib/gc-gnulib.c
+++ b/lib/gc-gnulib.c
@@ -37,8 +37,12 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "md5.h"
-#include "hmac.h"
+#ifdef GC_USE_MD5
+# include "md5.h"
+#endif
+#ifdef GC_USE_HMAC_MD5
+# include "hmac.h"
+#endif
 
 int
 gc_init (void)
@@ -142,9 +146,11 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
 {
   switch (hash)
     {
+#ifdef GC_USE_MD5
     case GC_MD5:
       md5_buffer (in, inlen, resbuf);
       break;
+#endif
 
     default:
       return GC_INVALID_HASH;
@@ -153,13 +159,16 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
   return GC_OK;
 }
 
+#ifdef GC_USE_MD5
 int
 gc_md5 (const void *in, size_t inlen, void *resbuf)
 {
   md5_buffer (in, inlen, resbuf);
   return 0;
 }
+#endif
 
+#ifdef GC_USE_HMAC_MD5
 int
 gc_hmac_md5 (const void *key, size_t keylen,
             const void *in, size_t inlen, char *resbuf)
@@ -167,3 +176,4 @@ gc_hmac_md5 (const void *key, size_t keylen,
   hmac_md5 (key, keylen, in, inlen, resbuf);
   return 0;
 }
+#endif

diff --git a/lib/gc-libgcrypt.c b/lib/gc-libgcrypt.c
index d821c1d49e4be26e6189ab122252f86ee2c3b2c4..0c7e2c34fd2c21a5e7a728cd2b633ad02c6b8774 100644 (file)
--- a/lib/gc-libgcrypt.c
+++ b/lib/gc-libgcrypt.c
@@ -103,9 +103,11 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
 
   switch (hash)
     {
+#ifdef GC_USE_MD5
     case GC_MD5:
       gcryalg = GCRY_MD_MD5;
       break;
+#endif
 
     default:
       return GC_INVALID_HASH;
@@ -118,6 +120,7 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
 
 /* One-call interface. */
 
+#ifdef GC_USE_MD5
 int
 gc_md5 (const void *in, size_t inlen, void *resbuf)
 {
@@ -147,7 +150,9 @@ gc_md5 (const void *in, size_t inlen, void *resbuf)
 
   return GC_OK;
 }
+#endif
 
+#ifdef GC_USE_HMAC_MD5
 int
 gc_hmac_md5 (const void *key, size_t keylen,
             const void *in, size_t inlen, char *resbuf)
@@ -185,3 +190,4 @@ gc_hmac_md5 (const void *key, size_t keylen,
 
   return GC_OK;
 }
+#endif

diff --git a/m4/ChangeLog b/m4/ChangeLog
index b2b564197330435e7406143ddbf7f42e93fa8755..5678658c4a0ed9f05d25396743ccef0132e8e1ab 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-12  Simon Josefsson  <jas@extundo.com>
+
+       * gc-md5.m4, gc-hmac-md5: New files.
+
+       * gc.m4: Don't call gl_MD5, gl_MEMXOR or gl_HMAC_MD5.
+
 2005-10-11  Simon Josefsson  <jas@extundo.com>
 
        * crc.m4: New file.

diff --git a/m4/gc-hmac-md5.m4 b/m4/gc-hmac-md5.m4
new file mode 100644 (file)
index 0000000..bae70b6
--- /dev/null
+++ b/m4/gc-hmac-md5.m4
@@ -0,0 +1,17 @@
+# gc-hmac-md5.m4 serial 1
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_GC_HMAC_MD5],
+[
+  AC_REQUIRE([gl_GC])
+  AC_DEFINE(GC_USE_HMAC_MD5, 1,
+    [Define to if you want to support HMAC-MD5 through GC.])
+  if test "$ac_cv_libgcrypt" != yes; then
+    gl_MD5
+    gl_HMAC_MD5
+    gl_MEMXOR
+  fi
+])

diff --git a/m4/gc-md5.m4 b/m4/gc-md5.m4
new file mode 100644 (file)
index 0000000..bb9a2b3
--- /dev/null
+++ b/m4/gc-md5.m4
@@ -0,0 +1,14 @@
+# gc-md5.m4 serial 1
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_GC_MD5],
+[
+  AC_REQUIRE([gl_GC])
+  AC_DEFINE(GC_USE_MD5, 1, [Define to if you want to support MD5 through GC.])
+  if test "$ac_cv_libgcrypt" != yes; then
+    gl_MD5
+  fi
+])

diff --git a/m4/gc.m4 b/m4/gc.m4
index a36c2a9ace4c1ddfc6ad45882c8c7736875867c6..bf46b92e64b2150c716927554918a08df3f61739 100644 (file)
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -18,9 +18,6 @@ AC_DEFUN([gl_GC],
     AC_LIBOBJ([gc-libgcrypt])
   else
     AC_LIBOBJ([gc-gnulib])
-    gl_MD5
-    gl_MEMXOR
-    gl_HMAC_MD5
 
     # Devices with randomness.
     # FIXME: Are these the best defaults?

diff --git a/modules/gc b/modules/gc
index 129cf6dc35a253bd252fbeb18c5df0ee10abf0d9..cb771c367d743f76255eaba49b2e84dc629cb8b0 100644 (file)
--- a/modules/gc
+++ b/modules/gc
@@ -6,16 +6,6 @@ lib/gc.h
 lib/gc-libgcrypt.c
 lib/gc-gnulib.c
 m4/gc.m4
-lib/md5.h
-lib/md5.c
-m4/md5.m4
-m4/uint32_t.m4
-lib/hmac.h
-lib/hmac-md5.c
-m4/hmac-md5.m4
-lib/memxor.h
-lib/memxor.c
-m4/memxor.m4
 
 Depends-on:
 havelib

diff --git a/modules/gc-hmac-md5 b/modules/gc-hmac-md5
new file mode 100644 (file)
index 0000000..4091736
--- /dev/null
+++ b/modules/gc-hmac-md5
@@ -0,0 +1,32 @@
+Description:
+Generic crypto wrappers for HMAC-MD5 functions.
+
+Files:
+m4/gc-hmac-md5.m4
+lib/md5.h
+lib/md5.c
+m4/md5.m4
+lib/hmac.h
+lib/hmac-md5.c
+m4/hmac-md5.m4
+lib/memxor.h
+lib/memxor.c
+m4/memxor.m4
+
+Depends-on:
+stdint
+gc
+
+configure.ac:
+gl_GC_HMAC_MD5
+
+Makefile.am:
+
+Include:
+"gc.h"
+
+License:
+LGPL
+
+Maintainer:
+Simon Josefsson

diff --git a/modules/gc-md5 b/modules/gc-md5
new file mode 100644 (file)
index 0000000..662ed5f
--- /dev/null
+++ b/modules/gc-md5
@@ -0,0 +1,26 @@
+Description:
+Generic crypto wrappers for MD5 functions.
+
+Files:
+m4/gc-md5.m4
+lib/md5.h
+lib/md5.c
+m4/md5.m4
+
+Depends-on:
+stdint
+gc
+
+configure.ac:
+gl_GC_MD5
+
+Makefile.am:
+
+Include:
+"gc.h"
+
+License:
+LGPL
+
+Maintainer:
+Simon Josefsson