# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1423840512 -28800
# Node ID 6c42bab6e0817b4653d6d1647ef90a31956bb187
# Parent  cb148f8d3d22145b4f5c86c3185154041fd5e6ab# Parent  a37f8730eb0f28f5fc0d744d8e5a93c55b101134
merge

diff -r cb148f8d3d22 -r 6c42bab6e081 common-algo.c
--- a/common-algo.c	Fri Feb 13 23:13:58 2015 +0800
+++ b/common-algo.c	Fri Feb 13 23:15:12 2015 +0800
@@ -183,18 +183,18 @@
 };
 
 algo_type sshhashes[] = {
+#ifdef DROPBEAR_SHA1_96_HMAC
+	{"hmac-sha1-96", 0, &dropbear_sha1_96, 1, NULL},
+#endif
+#ifdef DROPBEAR_SHA1_HMAC
+	{"hmac-sha1", 0, &dropbear_sha1, 1, NULL},
+#endif
 #ifdef DROPBEAR_SHA2_256_HMAC
 	{"hmac-sha2-256", 0, &dropbear_sha2_256, 1, NULL},
 #endif
 #ifdef DROPBEAR_SHA2_512_HMAC
 	{"hmac-sha2-512", 0, &dropbear_sha2_512, 1, NULL},
 #endif
-#ifdef DROPBEAR_SHA1_96_HMAC
-	{"hmac-sha1-96", 0, &dropbear_sha1_96, 1, NULL},
-#endif
-#ifdef DROPBEAR_SHA1_HMAC
-	{"hmac-sha1", 0, &dropbear_sha1, 1, NULL},
-#endif
 #ifdef DROPBEAR_MD5_HMAC
 	{"hmac-md5", 0, (void*)&dropbear_md5, 1, NULL},
 #endif