Mercurial > dropbear
changeset 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 | f4232b65b316 |
| children | e22d5f5f6e37 |
| files | common-kex.c session.h |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
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();
--- a/session.h Wed Mar 20 23:13:19 2013 +0800 +++ b/session.h Wed Mar 20 23:13:45 2013 +0800 @@ -63,9 +63,9 @@ /* crypto parameters that are stored individually for transmit and receive */ struct key_context_directional { - const struct dropbear_cipher *algo_crypt; /* NULL for none */ + const struct dropbear_cipher *algo_crypt; const struct dropbear_cipher_mode *crypt_mode; - const struct dropbear_hash *algo_mac; /* NULL for none */ + const struct dropbear_hash *algo_mac; int hash_index; /* lookup for libtomcrypt */ char algo_comp; /* compression */ #ifndef DISABLE_ZLIB