Mercurial > dropbear

comparison common-session.c @ 844:68facbc41273

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge again
author Matt Johnston <matt@ucc.asn.au>
date Fri, 01 Nov 2013 00:19:25 +0800
parents 7dcb46da72d9
children c19acba28590
comparison
equal deleted inserted replaced
834:e378da7eae5d 844:68facbc41273
99 ses.keys->trans.crypt_mode = &dropbear_mode_none; 99 ses.keys->trans.crypt_mode = &dropbear_mode_none;
100 100
101 ses.keys->recv.algo_mac = &dropbear_nohash; 101 ses.keys->recv.algo_mac = &dropbear_nohash;
102 ses.keys->trans.algo_mac = &dropbear_nohash; 102 ses.keys->trans.algo_mac = &dropbear_nohash;
103 103
104 ses.keys->algo_kex = -1; 104 ses.keys->algo_kex = NULL;
105 ses.keys->algo_hostkey = -1; 105 ses.keys->algo_hostkey = -1;
106 ses.keys->recv.algo_comp = DROPBEAR_COMP_NONE; 106 ses.keys->recv.algo_comp = DROPBEAR_COMP_NONE;
107 ses.keys->trans.algo_comp = DROPBEAR_COMP_NONE; 107 ses.keys->trans.algo_comp = DROPBEAR_COMP_NONE;
108 108
109 #ifndef DISABLE_ZLIB 109 #ifndef DISABLE_ZLIB
243 243
244 if (ses.extra_session_cleanup) { 244 if (ses.extra_session_cleanup) {
245 ses.extra_session_cleanup(); 245 ses.extra_session_cleanup();
246 } 246 }
247 247
248 m_free(ses.session_id); 248 if (ses.session_id) {
249 buf_burn(ses.session_id);
250 buf_free(ses.session_id);
251 ses.session_id = NULL;
252 }
253 if (ses.hash) {
254 buf_burn(ses.hash);
255 buf_free(ses.hash);
256 ses.hash = NULL;
257 }
249 m_burn(ses.keys, sizeof(struct key_context)); 258 m_burn(ses.keys, sizeof(struct key_context));
250 m_free(ses.keys); 259 m_free(ses.keys);
251 260
252 chancleanup(); 261 chancleanup();
253 262