- 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
diff --git a/sshconnect2.c b/sshconnect2.c
index 8951567..2f26aa5 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.64 2001/04/04 09:48:35 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.65 2001/04/04 14:34:58 markus Exp $");
#include <openssl/bn.h>
#include <openssl/md5.h>
@@ -111,6 +111,7 @@
myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
}
+ /* start key exchange */
kex = kex_setup(myproposal);
kex->client_version_string=client_version_string;
kex->server_version_string=server_version_string;
@@ -118,7 +119,6 @@
xxx_kex = kex;
- /* start key exchange */
dispatch_run(DISPATCH_BLOCK, &kex->newkeys, kex);
session_id2 = kex->session_id;
@@ -213,7 +213,6 @@
Authctxt authctxt;
int type;
int plen;
- int i;
if (options.challenge_reponse_authentication)
options.kbd_interactive_authentication = 1;
@@ -254,10 +253,7 @@
/* initial userauth request */
userauth_none(&authctxt);
- /* dispatch_init(&input_userauth_error); */
- for (i = 50; i <= 254; i++) {
- dispatch_set(i, &input_userauth_error);
- }
+ dispatch_init(&input_userauth_error);
dispatch_set(SSH2_MSG_USERAUTH_SUCCESS, &input_userauth_success);
dispatch_set(SSH2_MSG_USERAUTH_FAILURE, &input_userauth_failure);
dispatch_set(SSH2_MSG_USERAUTH_BANNER, &input_userauth_banner);