- markus@cvs.openbsd.org 2001/04/03 23:32:12

     [kex.c kex.h packet.c sshconnect2.c sshd.c]
     undo parts of recent my changes: main part of keyexchange does not
     need dispatch-callbacks, since application data is delayed until
     the keyexchange completes (if i understand the drafts correctly).
     add some infrastructure for re-keying.

1 files changed, 4 insertions, 1 deletions

diff --git a/sshd.c b/sshd.c
index c54675962..bdcae2cd4 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.186 2001/04/03 19:53:29 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.187 2001/04/03 23:32:12 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -1434,6 +1434,9 @@ do_ssh2_kex(void)
         /* start key exchange */
         dispatch_run(DISPATCH_BLOCK, &kex->newkeys, kex);
 
+        session_id2 = kex->session_id;
+        session_id2_len = kex->session_id_len;
+
 #ifdef DEBUG_KEXDH
         /* send 1st encrypted/maced/compressed message */
         packet_start(SSH2_MSG_IGNORE);