Mercurial > dropbear

comparison common-kex.c @ 712:bf0ac0512ef7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
711:f4232b65b316 712:bf0ac0512ef7
352 &ses.newkeys->trans.cipher_state) != CRYPT_OK) { 352 &ses.newkeys->trans.cipher_state) != CRYPT_OK) {
353 dropbear_exit("Crypto error"); 353 dropbear_exit("Crypto error");
354 } 354 }
355 } 355 }
356 356
357 /* MAC keys */
358 if (ses.newkeys->trans.algo_mac->hashdesc != NULL) { 357 if (ses.newkeys->trans.algo_mac->hashdesc != NULL) {
359 hashkeys(ses.newkeys->trans.mackey, 358 hashkeys(ses.newkeys->trans.mackey,
360 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter); 359 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter);
361 } 360 ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hashdesc->name);
361 }
362
362 if (ses.newkeys->recv.algo_mac->hashdesc != NULL) { 363 if (ses.newkeys->recv.algo_mac->hashdesc != NULL) {
363 hashkeys(ses.newkeys->recv.mackey, 364 hashkeys(ses.newkeys->recv.mackey,
364 ses.newkeys->recv.algo_mac->keysize, &hs, macrecvletter); 365 ses.newkeys->recv.algo_mac->keysize, &hs, macrecvletter);
365 } 366 ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hashdesc->name);
366 ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hashdesc->name), 367 }
367 ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hashdesc->name),
368 368
369 #ifndef DISABLE_ZLIB 369 #ifndef DISABLE_ZLIB
370 gen_new_zstreams(); 370 gen_new_zstreams();
371 #endif 371 #endif
372 372