]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
Update.
authorSimon Josefsson <simon@josefsson.org>
Fri, 28 Oct 2005 08:37:59 +0000 (08:37 +0000)
committerSimon Josefsson <simon@josefsson.org>
Fri, 28 Oct 2005 08:37:59 +0000 (08:37 +0000)
gl/gc-gnulib.c
gl/gc-libgcrypt.c
gl/gc.h

index 99e522da3d7785aaf8e01016c0b4cd5b111bbed9..de3b21340e5824b855a4bc0e15f4073f3f85f597 100644 (file)
@@ -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;
index c646561fc5ed85bd92e6ed37489e3afd48d46b38..dd41e5b4cd3493f7e6138a1f557df23b97022255 100644 (file)
@@ -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 52a7fa06a940efbb75f2c2cfd576ffa64c967659..f30bc2920955b4e994ad47f694bd5d4c94b67b92 100644 (file)
--- 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. */