ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-06-26 18:17:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

requirenext doesn't need two values

Browse Source
This commit is contained in:
Matt Johnston
2014-01-23 22:25:52 +08:00
parent 8128b15e41
commit 55a0c5068f
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
process-packet.c
View File

@@ -74,13 +74,11 @@ void process_packet() {
/* This applies for KEX, where the spec says the next packet MUST be
* NEWKEYS */
if (ses.requirenext[0] != 0) {
if (ses.requirenext[0] == type || ses.requirenext[1] == type)
if (ses.requirenext != 0) {
if (ses.requirenext == type)
{
/* Got what we expected */
TRACE(("got expeced packet %d during kexinit", type))
ses.requirenext[0] = 0;
ses.requirenext[1] = 0;
TRACE(("got expected packet %d during kexinit", type))
}
else
{
@@ -99,8 +97,8 @@ void process_packet() {
else
{
TRACE(("disallowed packet during kexinit"))
dropbear_exit("Unexpected packet type %d, expected [%d,%d]", type,
ses.requirenext[0], ses.requirenext[1]);
dropbear_exit("Unexpected packet type %d, expected %d", type,
ses.requirenext);
}
}
}
@@ -113,6 +111,12 @@ void process_packet() {
goto out;
}
/* Only clear the flag after we have checked ignorenext */
if (ses.requirenext != 0 && ses.requirenext == type)
{
ses.requirenext = 0;
}
/* Kindly the protocol authors gave all the preauth packets type values
* less-than-or-equal-to 60 ( == MAX_UNAUTH_PACKET_TYPE ).