diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2014-01-23 22:25:52 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2014-01-23 22:25:52 +0800 |
| commit | 55a0c5068ff7cccf4938f354c6acf97dcfd7d3f3 (patch) | |
| tree | 684437415ca2d198c2ce959978bd9c5fe3b4cc5a /process-packet.c | |
| parent | 8128b15e4157abc382f360eaf95c0fabefe5bc61 (diff) | |
requirenext doesn't need two values
Diffstat (limited to 'process-packet.c')
| -rw-r--r-- | process-packet.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/process-packet.c b/process-packet.c index 97de203..1c2ca7b 100644 --- a/process-packet.c +++ b/process-packet.c @@ -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 ). |