From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 28 Oct 2005 08:37:59 +0000 (+0000)
Subject: Update.
X-Git-Tag: gnutls_1_2_9~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ea5f35cd8ec79333ed45aac14d9ca3f1de0782c;p=thirdparty%2Fgnutls.git

Update.
---

diff --git a/gl/gc-gnulib.c b/gl/gc-gnulib.c
index 99e522da3d..de3b21340e 100644
--- a/gl/gc-gnulib.c
+++ b/gl/gc-gnulib.c
@@ -654,6 +654,10 @@ gc_hash_digest_length (Gc_hash hash)
       len = GC_MD5_DIGEST_SIZE;
       break;
 
+    case GC_RMD160:
+      len = GC_RMD160_DIGEST_SIZE;
+      break;
+
     case GC_SHA1:
       len = GC_SHA1_DIGEST_SIZE;
       break;
diff --git a/gl/gc-libgcrypt.c b/gl/gc-libgcrypt.c
index c646561fc5..dd41e5b4cd 100644
--- a/gl/gc-libgcrypt.c
+++ b/gl/gc-libgcrypt.c
@@ -286,35 +286,35 @@ gc_hash_clone (gc_hash_handle handle, gc_hash_handle * outhandle)
 size_t
 gc_hash_digest_length (Gc_hash hash)
 {
-  int gcryalg;
+  size_t len;
 
   switch (hash)
     {
     case GC_MD2:
-      gcryalg = GCRY_MD_MD2;
+      len = GC_MD2_DIGEST_SIZE;
       break;
 
     case GC_MD4:
-      gcryalg = GCRY_MD_MD4;
+      len = GC_MD4_DIGEST_SIZE;
       break;
 
     case GC_MD5:
-      gcryalg = GCRY_MD_MD5;
+      len = GC_MD5_DIGEST_SIZE;
       break;
 
-    case GC_SHA1:
-      gcryalg = GCRY_MD_SHA1;
+    case GC_RMD160:
+      len = GC_RMD160_DIGEST_SIZE;
       break;
 
-    case GC_RMD160:
-      gcryalg = GCRY_MD_RMD160;
+    case GC_SHA1:
+      len = GC_SHA1_DIGEST_SIZE;
       break;
 
     default:
       return 0;
     }
 
-  return gcry_md_get_algo_dlen (gcryalg);
+  return len;
 }
 
 void
diff --git a/gl/gc.h b/gl/gc.h
index 52a7fa06a9..f30bc29209 100644
--- a/gl/gc.h
+++ b/gl/gc.h
@@ -60,6 +60,7 @@ typedef void *gc_hash_handle;
 #define GC_MD2_DIGEST_SIZE 16
 #define GC_MD4_DIGEST_SIZE 16
 #define GC_MD5_DIGEST_SIZE 16
+#define GC_RMD160_DIGEST_SIZE 20
 #define GC_SHA1_DIGEST_SIZE 20
 
 /* Cipher types. */