* gc-libgcrypt.c (gc_md5): Fix assert call.

(gc_md5): Fix typo.
* gc.h (gc_hash_buffer): Use gc_hash in prototype.
* gc-libgcrypt.c (gc_hash_buffer): Ditto.
* gc-gnulib.c (gc_hash_buffer): Ditto.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0697478daf873eea9196b8b452967dcb133799c9..413e3c179f8e0c97ac558299ec3d6e9eeeb4b5c5 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-12  Simon Josefsson  <jas@extundo.com>
+
+       * gc-libgcrypt.c (gc_md5): Fix assert call.
+       (gc_md5): Fix typo.
+
+       * gc.h (gc_hash_buffer): Use gc_hash in prototype.
+
+       * gc-libgcrypt.c (gc_hash_buffer): Ditto.
+
+       * gc-gnulib.c (gc_hash_buffer): Ditto.
+
 2005-10-11  Bruno Haible  <bruno@clisp.org>
 
        * c-strcasestr.h: New file, from GNU gettext.

diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c
index abb1bb466a3914567d8ba676ceea8a2142ae39e2..eac90390851ba3ec4b6d248781c4b645dd599b95 100644 (file)
--- a/lib/gc-gnulib.c
+++ b/lib/gc-gnulib.c
@@ -138,7 +138,7 @@ gc_set_allocators (gc_malloc_t func_malloc,
 /* Hashes. */
 
 int
-gc_hash_buffer (int hash, const void *in, size_t inlen, char *resbuf)
+gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
 {
   switch (hash)
     {

diff --git a/lib/gc-libgcrypt.c b/lib/gc-libgcrypt.c
index 65cc1b05712285cb521e80910d2f833261674be6..d821c1d49e4be26e6189ab122252f86ee2c3b2c4 100644 (file)
--- a/lib/gc-libgcrypt.c
+++ b/lib/gc-libgcrypt.c
@@ -97,7 +97,7 @@ gc_set_allocators (gc_malloc_t func_malloc,
 /* Hashes. */
 
 int
-gc_hash_buffer (int hash, const void *in, size_t inlen, char *resbuf)
+gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
 {
   int gcryalg;
 
@@ -126,7 +126,7 @@ gc_md5 (const void *in, size_t inlen, void *resbuf)
   gpg_error_t err;
   unsigned char *p;
 
-  assert (outlen == 16);
+  assert (outlen == GC_MD5_DIGEST_SIZE);
 
   err = gcry_md_open (&hd, GCRY_MD_MD5, 0);
   if (err != GPG_ERR_NO_ERROR)
@@ -137,7 +137,7 @@ gc_md5 (const void *in, size_t inlen, void *resbuf)
   p = gcry_md_read (hd, GCRY_MD_MD5);
   if (p == NULL)
     {
-      gcry_md_close (mdh);
+      gcry_md_close (hd);
       return GC_INVALID_HASH;
     }
 

diff --git a/lib/gc.h b/lib/gc.h
index acfd3b9cc3b11d38c3d57e6cf2b3ec8f6336db07..c966a99b291a1e1a2e8a67163e1e5b283a3a91d8 100644 (file)
--- a/lib/gc.h
+++ b/lib/gc.h
@@ -71,7 +71,7 @@ extern void gc_set_allocators (gc_malloc_t func_malloc,
    must be 16 bytes.  The return value is 0 (GC_OK) on success, or
    another Gc_rc error code. */
 extern int
-gc_hash_buffer (int hash, const void *in, size_t inlen, char *out);
+gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *out);
 
 /* One-call interface. */
 extern int gc_md5 (const void *in, size_t inlen, void *resbuf);