- 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/sshconnect2.c b/sshconnect2.c
index 4ed39a23e..dd3f36b57 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.61 2001/04/03 19:53:29 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.62 2001/04/03 23:32:12 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -117,6 +117,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
         /* 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);