ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-05-20 03:07:47 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli-kex.c
View File

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

4
common-kex.c
View File

@ -525,7 +525,7 @@ void recv_msg_kexinit() {
/* I_S, the payload of the server's SSH_MSG_KEXINIT */ /* I_S, the payload of the server's SSH_MSG_KEXINIT */
buf_setpos(ses.payload, 0); buf_setpos(ses.payload, 0);
buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len); buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len);
ses.requirenext[0] = SSH_MSG_KEXDH_REPLY; ses.requirenext = SSH_MSG_KEXDH_REPLY;
} else { } else {
/* SERVER */ /* SERVER */
@ -545,7 +545,7 @@ void recv_msg_kexinit() {
buf_putstring(ses.kexhashbuf, buf_putstring(ses.kexhashbuf,
ses.transkexinit->data, ses.transkexinit->len); ses.transkexinit->data, ses.transkexinit->len);
ses.requirenext[0] = SSH_MSG_KEXDH_INIT; ses.requirenext = SSH_MSG_KEXDH_INIT;
} }
buf_free(ses.transkexinit); buf_free(ses.transkexinit);

2
common-session.c
View File

@ -82,7 +82,7 @@ void common_session_init(int sock_in, int sock_out) {
initqueue(&ses.writequeue); initqueue(&ses.writequeue);
ses.requirenext[0] = SSH_MSG_KEXINIT; ses.requirenext = SSH_MSG_KEXINIT;
ses.dataallowed = 1; /* we can send data until we actually ses.dataallowed = 1; /* we can send data until we actually
send the SSH_MSG_KEXINIT */ send the SSH_MSG_KEXINIT */
ses.ignorenext = 0; ses.ignorenext = 0;

2
debug.h
View File

@ -39,7 +39,7 @@
* Caution: Don't use this in an unfriendly environment (ie unfirewalled), * Caution: Don't use this in an unfriendly environment (ie unfirewalled),
* since the printing may not sanitise strings etc. This will add a reasonable * since the printing may not sanitise strings etc. This will add a reasonable
* amount to your executable size. */ * amount to your executable size. */
/* #define DEBUG_TRACE */ #define DEBUG_TRACE
/* All functions writing to the cleartext payload buffer call /* All functions writing to the cleartext payload buffer call
* CHECKCLEARTOWRITE() before writing. This is only really useful if you're * CHECKCLEARTOWRITE() before writing. This is only really useful if you're

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

5
session.h
View File

@ -135,9 +135,8 @@ struct sshsession {
unsigned dataallowed : 1; /* whether we can send data packets or we are in unsigned dataallowed : 1; /* whether we can send data packets or we are in
the middle of a KEX or something */ the middle of a KEX or something */
unsigned char requirenext[2]; /* bytes indicating what packets we require next, unsigned char requirenext; /* byte indicating what packets we require next,
or 0x00 for any. Second option can only be or 0x00 for any. */
used if the first byte is also set */
unsigned char ignorenext; /* whether to ignore the next packet, unsigned char ignorenext; /* whether to ignore the next packet,
used for kex_follows stuff */ used for kex_follows stuff */

3
svr-kex.c
View File

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

2
sysoptions.h
View File

@ -16,7 +16,7 @@
#define KEX_REKEY_TIMEOUT (3600 * 8) #define KEX_REKEY_TIMEOUT (3600 * 8)
#endif #endif
#ifndef KEX_REKEY_DATA #ifndef KEX_REKEY_DATA
#define KEX_REKEY_DATA (1<<30) /* 2^30 == 1GB, this value must be < INT_MAX */ #define KEX_REKEY_DATA (1<<20) /* 2^30 == 1GB, this value must be < INT_MAX */
#endif #endif
/* Close connections to clients which haven't authorised after AUTH_TIMEOUT */ /* Close connections to clients which haven't authorised after AUTH_TIMEOUT */
#ifndef AUTH_TIMEOUT #ifndef AUTH_TIMEOUT