diff common-kex.c @ 712:bf0ac0512ef7

Fix "-m none" case and ugly typo
author Matt Johnston <matt@ucc.asn.au>
date Wed, 20 Mar 2013 23:13:45 +0800
parents c37857676924
children d44325108d0e b07eb3dc23ec
line wrap: on
line diff
--- a/common-kex.c	Wed Mar 20 23:13:19 2013 +0800
+++ b/common-kex.c	Wed Mar 20 23:13:45 2013 +0800
@@ -354,17 +354,17 @@
 		}
 	}
 
-	/* MAC keys */
 	if (ses.newkeys->trans.algo_mac->hashdesc != NULL) {
 		hashkeys(ses.newkeys->trans.mackey, 
 				ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter);
+		ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hashdesc->name);
 	}
+
 	if (ses.newkeys->recv.algo_mac->hashdesc != NULL) {
 		hashkeys(ses.newkeys->recv.mackey, 
 				ses.newkeys->recv.algo_mac->keysize, &hs, macrecvletter);
+		ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hashdesc->name);
 	}
-	ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hashdesc->name),
-	ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hashdesc->name),
 
 #ifndef DISABLE_ZLIB
 	gen_new_zstreams();