merge in HEAD

--HG--
branch : ecc
This commit is contained in:
Matt Johnston
2013-05-21 12:09:35 +08:00
52 changed files with 1354 additions and 978 deletions

View File

@@ -71,7 +71,8 @@ void recv_msg_kexdh_init() {
}
send_msg_newkeys();
ses.requirenext = SSH_MSG_NEWKEYS;
ses.requirenext[0] = SSH_MSG_NEWKEYS;
ses.requirenext[1] = 0;
TRACE(("leave recv_msg_kexdh_init"))
}