From: Pekka Riikonen <priikone@silcnet.org>
Date: Wed, 16 Nov 2005 14:03:42 +0000 (+0000)
Subject: 	SHA-256 precedence.
X-Git-Tag: silc.toolkit.1.0.1~12
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=ac37febd90c3fe5023049655efbe8155610f23e6

	SHA-256 precedence.
---

diff --git a/lib/silccrypt/silchash.c b/lib/silccrypt/silchash.c
index 7fcbf441..d315b506 100644
--- a/lib/silccrypt/silchash.c
+++ b/lib/silccrypt/silchash.c
@@ -38,10 +38,10 @@ SilcDList silc_hash_list = NULL;
 /* Default hash functions for silc_hash_register_default(). */
 const SilcHashObject silc_default_hash[] = 
 {
-  { "sha1", 20, 64, silc_sha1_init, silc_sha1_update, silc_sha1_final,
-    silc_sha1_transform, silc_sha1_context_len },
   { "sha256", 32, 64, silc_sha256_init, silc_sha256_update, silc_sha256_final,
     silc_sha256_transform, silc_sha256_context_len },
+  { "sha1", 20, 64, silc_sha1_init, silc_sha1_update, silc_sha1_final,
+    silc_sha1_transform, silc_sha1_context_len },
   { "md5", 16, 64, silc_md5_init, silc_md5_update, silc_md5_final,
     silc_md5_transform, silc_md5_context_len },
 
diff --git a/lib/silccrypt/silchmac.c b/lib/silccrypt/silchmac.c
index 9647aa5e..2ec0160a 100644
--- a/lib/silccrypt/silchmac.c
+++ b/lib/silccrypt/silchmac.c
@@ -39,11 +39,11 @@ SilcDList silc_hmac_list = NULL;
 /* Default hmacs for silc_hmac_register_default(). */
 const SilcHmacObject silc_default_hmacs[] =
 {
-  { "hmac-sha1-96", 12 },
   { "hmac-sha256-96", 12 },
+  { "hmac-sha1-96", 12 },
   { "hmac-md5-96", 12 },
-  { "hmac-sha1", 20 },
   { "hmac-sha256", 32 },
+  { "hmac-sha1", 20 },
   { "hmac-md5", 16 },
 
   { NULL, 0 }