diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-04 17:57:54 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-04 17:57:54 +0000 |
commit | 8ac9106c3dfbc1f02ddf237067cccd54ffac4e8d (patch) | |
tree | f7ec941db419252643adbf7a1b13895c92bca0d9 /serverloop.c | |
parent | 238abf6a14d6ed038918fa35f618089230e68fd6 (diff) |
- markus@cvs.openbsd.org 2001/04/04 14:34:58
[clientloop.c kex.c kex.h serverloop.c sshconnect2.c sshd.c]
enable server side rekeying + some rekey related clientup.
todo: we should not send any non-KEX messages after we send KEXINIT
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c index d1290ff22..4ae02fd10 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.55 2001/03/16 19:06:29 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.56 2001/04/04 14:34:58 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -53,9 +53,13 @@ RCSID("$OpenBSD: serverloop.c,v 1.55 2001/03/16 19:06:29 markus Exp $"); | |||
53 | #include "auth-options.h" | 53 | #include "auth-options.h" |
54 | #include "serverloop.h" | 54 | #include "serverloop.h" |
55 | #include "misc.h" | 55 | #include "misc.h" |
56 | #include "kex.h" | ||
56 | 57 | ||
57 | extern ServerOptions options; | 58 | extern ServerOptions options; |
58 | 59 | ||
60 | /* XXX */ | ||
61 | extern Kex *xxx_kex; | ||
62 | |||
59 | static Buffer stdin_buffer; /* Buffer for stdin data. */ | 63 | static Buffer stdin_buffer; /* Buffer for stdin data. */ |
60 | static Buffer stdout_buffer; /* Buffer for stdout data. */ | 64 | static Buffer stdout_buffer; /* Buffer for stdout data. */ |
61 | static Buffer stderr_buffer; /* Buffer for stderr data. */ | 65 | static Buffer stderr_buffer; /* Buffer for stderr data. */ |
@@ -391,7 +395,7 @@ drain_output(void) | |||
391 | void | 395 | void |
392 | process_buffered_input_packets(void) | 396 | process_buffered_input_packets(void) |
393 | { | 397 | { |
394 | dispatch_run(DISPATCH_NONBLOCK, NULL, NULL); | 398 | dispatch_run(DISPATCH_NONBLOCK, NULL, compat20 ? xxx_kex : NULL); |
395 | } | 399 | } |
396 | 400 | ||
397 | /* | 401 | /* |
@@ -905,6 +909,9 @@ server_init_dispatch_20(void) | |||
905 | dispatch_set(SSH2_MSG_CHANNEL_REQUEST, &channel_input_channel_request); | 909 | dispatch_set(SSH2_MSG_CHANNEL_REQUEST, &channel_input_channel_request); |
906 | dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust); | 910 | dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust); |
907 | dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &server_input_global_request); | 911 | dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &server_input_global_request); |
912 | |||
913 | /* rekeying */ | ||
914 | dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit); | ||
908 | } | 915 | } |
909 | void | 916 | void |
910 | server_init_dispatch_13(void) | 917 | server_init_dispatch_13(void) |