Mercurial > dropbear

comparison common-kex.c @ 781:f110d321fe7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build when zlib is disabled, from http://freetz.org/browser/trunk/make/dropbear/patches/350-no_zlib_fix.patch
author Matt Johnston <matt@ucc.asn.au>
date Tue, 16 Apr 2013 22:16:32 +0800
parents 2f1c199b6e4b
children 7dcb46da72d9
comparison
equal deleted inserted replaced
780:029e769c33c6 781:f110d321fe7a
169 if (!ses.keys) { 169 if (!ses.keys) {
170 ses.keys = m_malloc(sizeof(*ses.newkeys)); 170 ses.keys = m_malloc(sizeof(*ses.newkeys));
171 } 171 }
172 if (ses.kexstate.recvnewkeys && ses.newkeys->recv.valid) { 172 if (ses.kexstate.recvnewkeys && ses.newkeys->recv.valid) {
173 TRACE(("switch_keys recv")) 173 TRACE(("switch_keys recv"))
174 #ifndef DISABLE_ZLIB
174 gen_new_zstream_recv(); 175 gen_new_zstream_recv();
176 #endif
175 ses.keys->recv = ses.newkeys->recv; 177 ses.keys->recv = ses.newkeys->recv;
176 m_burn(&ses.newkeys->recv, sizeof(ses.newkeys->recv)); 178 m_burn(&ses.newkeys->recv, sizeof(ses.newkeys->recv));
177 ses.newkeys->recv.valid = 0; 179 ses.newkeys->recv.valid = 0;
178 } 180 }
179 if (ses.kexstate.sentnewkeys && ses.newkeys->trans.valid) { 181 if (ses.kexstate.sentnewkeys && ses.newkeys->trans.valid) {
180 TRACE(("switch_keys trans")) 182 TRACE(("switch_keys trans"))
183 #ifndef DISABLE_ZLIB
181 gen_new_zstream_trans(); 184 gen_new_zstream_trans();
185 #endif
182 ses.keys->trans = ses.newkeys->trans; 186 ses.keys->trans = ses.newkeys->trans;
183 m_burn(&ses.newkeys->trans, sizeof(ses.newkeys->trans)); 187 m_burn(&ses.newkeys->trans, sizeof(ses.newkeys->trans));
184 ses.newkeys->trans.valid = 0; 188 ses.newkeys->trans.valid = 0;
185 } 189 }
186 if (ses.kexstate.sentnewkeys && ses.kexstate.recvnewkeys) 190 if (ses.kexstate.sentnewkeys && ses.kexstate.recvnewkeys)