Mercurial > dropbear

comparison cli-session.c @ 750:a813e2752fdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix leftover kexguess debugging
author Matt Johnston <matt@ucc.asn.au>
date Wed, 03 Apr 2013 07:34:18 +0800
parents 077bbe1eb220
children d63ef1e211ea
comparison
equal deleted inserted replaced
749:f62e82c474d5 750:a813e2752fdb
112 } 112 }
113 113
114 #ifdef USE_KEX_FIRST_FOLLOWS 114 #ifdef USE_KEX_FIRST_FOLLOWS
115 static void cli_send_kex_first_guess() { 115 static void cli_send_kex_first_guess() {
116 send_msg_kexdh_init(); 116 send_msg_kexdh_init();
117 dropbear_log(LOG_INFO, "kexdh_init guess sent");
118 } 117 }
119 #endif 118 #endif
120 119
121 static void cli_session_init() { 120 static void cli_session_init() {
122 121
195 194
196 if (ses.lastpacket == SSH_MSG_KEXINIT && cli_ses.kex_state == KEX_NOTHING) { 195 if (ses.lastpacket == SSH_MSG_KEXINIT && cli_ses.kex_state == KEX_NOTHING) {
197 /* We initiate the KEXDH. If DH wasn't the correct type, the KEXINIT 196 /* We initiate the KEXDH. If DH wasn't the correct type, the KEXINIT
198 * negotiation would have failed. */ 197 * negotiation would have failed. */
199 if (!ses.kexstate.our_first_follows_matches) { 198 if (!ses.kexstate.our_first_follows_matches) {
200 dropbear_log(LOG_INFO, "kexdh_init after remote's kexinit");
201 send_msg_kexdh_init(); 199 send_msg_kexdh_init();
202 } 200 }
203 cli_ses.kex_state = KEXDH_INIT_SENT; 201 cli_ses.kex_state = KEXDH_INIT_SENT;
204 TRACE(("leave cli_sessionloop: done with KEXINIT_RCVD")) 202 TRACE(("leave cli_sessionloop: done with KEXINIT_RCVD"))
205 return; 203 return;