diff options
| author |   markus <markus@openbsd.org> | 2015-01-19 19:52:16 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2015-01-19 19:52:16 +0000 |
| commit | 8eeb9388d919baa54f93ffd353c022bd9bbc6d57 (patch) | |
| tree | 7bc92fdb124c4cb575873bfc46e5c7603cf964bf /usr.bin/ssh/sshconnect2.c | |
| parent | Delete ABI compat for osockaddr: 20 years and many ABI bumps since sa_len added (diff) | |
| download | wireguard-openbsd-8eeb9388d919baa54f93ffd353c022bd9bbc6d57.tar.xz wireguard-openbsd-8eeb9388d919baa54f93ffd353c022bd9bbc6d57.zip | |
update packet.c & isolate, introduce struct ssh
a) switch packet.c to buffer api and isolate per-connection info into struct ssh
b) (de)serialization of the state is moved from monitor to packet.c
c) the old packet.c API is implemented in opacket.[ch]
d) compress.c/h is removed and integrated into packet.c
with and ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 0847df0e3aa..5266e487d5c 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.216 2015/01/18 13:33:34 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.217 2015/01/19 19:52:16 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -85,8 +85,6 @@ u_int session_id2_len = 0; char *xxx_host; struct sockaddr *xxx_hostaddr; -Kex *xxx_kex = NULL; - static int verify_host_key_callback(Key *hostkey) { @@ -201,6 +199,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) /* start key exchange */ kex = kex_setup(myproposal); + active_state->kex = kex; #ifdef WITH_OPENSSL kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; @@ -213,8 +212,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) kex->server_version_string=server_version_string; kex->verify_host_key=&verify_host_key_callback; - xxx_kex = kex; - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); if (options.use_roaming && !kex->roaming) { |