summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-04-03 23:32:11 +0000
committermarkus <markus@openbsd.org>2001-04-03 23:32:11 +0000
commit5250c0739811b44b983aedc8704fd84fc21be882 (patch)
treedae5d3a3e09e0e0e0abcc02a44fb4fb20488a663 /usr.bin/ssh/sshconnect2.c
parentMinor clean-ups: (diff)
downloadwireguard-openbsd-5250c0739811b44b983aedc8704fd84fc21be882.tar.xz
wireguard-openbsd-5250c0739811b44b983aedc8704fd84fc21be882.zip
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.
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index 4ed39a23ee6..dd3f36b5773 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/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);