summaryrefslogtreecommitdiffhomepage
path: root/common-kex.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2013-03-20 23:13:45 +0800
committerMatt Johnston <matt@ucc.asn.au>2013-03-20 23:13:45 +0800
commit2259ce4cdfee91409ad346089df50f76a3451496 (patch)
tree2dbe457c592b29feeefe0155984dc93bc84c1d7f /common-kex.c
parent34f9b2a8f7fa284f7d23cdd54cf3f3a2964200d0 (diff)
Fix "-m none" case and ugly typo
Diffstat (limited to 'common-kex.c')
-rw-r--r--common-kex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common-kex.c b/common-kex.c
index a7fbb70..56b206d 100644
--- a/common-kex.c
+++ b/common-kex.c
@@ -354,17 +354,17 @@ void gen_new_keys() {
}
}
- /* 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();