summaryrefslogtreecommitdiffstats
path: root/kex.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-04 23:50:21 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-04 23:50:21 +0000
commit8e312f3db05059499cf6655663ce31e73d508817 (patch)
treedcf867a6a612d588a31427948ac16adf791b84d5 /kex.c
parent0cae04005ec358e5f64ee141af5e38eb3a756a30 (diff)
- markus@cvs.openbsd.org 2001/04/04 22:04:35
[kex.c kexgex.c serverloop.c] parse full kexinit packet. make server-side more robust, too.
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/kex.c b/kex.c
index da9c56eb..0720c073 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.30 2001/04/04 20:25:37 markus Exp $");
+RCSID("$OpenBSD: kex.c,v 1.31 2001/04/04 22:04:34 markus Exp $");
#include <openssl/crypto.h>
@@ -166,6 +166,7 @@ kex_input_kexinit(int type, int plen, void *ctxt)
{
char *ptr;
int dlen;
+ int i;
Kex *kex = (Kex *)ctxt;
debug("SSH2_MSG_KEXINIT received");
@@ -175,6 +176,15 @@ kex_input_kexinit(int type, int plen, void *ctxt)
ptr = packet_get_raw(&dlen);
buffer_append(&kex->peer, ptr, dlen);
+ /* discard packet */
+ for (i = 0; i < KEX_COOKIE_LEN; i++)
+ packet_get_char();
+ for (i = 0; i < PROPOSAL_MAX; i++)
+ xfree(packet_get_string(NULL));
+ packet_get_char();
+ packet_get_int();
+ packet_done();
+
kex_kexinit_finish(kex);
}