diff options
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index aee49a478..ba34762ea 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.216 2015/01/18 13:33:34 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.217 2015/01/19 19:52:16 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -91,8 +91,6 @@ u_int session_id2_len = 0; | |||
91 | char *xxx_host; | 91 | char *xxx_host; |
92 | struct sockaddr *xxx_hostaddr; | 92 | struct sockaddr *xxx_hostaddr; |
93 | 93 | ||
94 | Kex *xxx_kex = NULL; | ||
95 | |||
96 | static int | 94 | static int |
97 | verify_host_key_callback(Key *hostkey) | 95 | verify_host_key_callback(Key *hostkey) |
98 | { | 96 | { |
@@ -207,6 +205,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
207 | 205 | ||
208 | /* start key exchange */ | 206 | /* start key exchange */ |
209 | kex = kex_setup(myproposal); | 207 | kex = kex_setup(myproposal); |
208 | active_state->kex = kex; | ||
210 | #ifdef WITH_OPENSSL | 209 | #ifdef WITH_OPENSSL |
211 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 210 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |
212 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | 211 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; |
@@ -219,8 +218,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
219 | kex->server_version_string=server_version_string; | 218 | kex->server_version_string=server_version_string; |
220 | kex->verify_host_key=&verify_host_key_callback; | 219 | kex->verify_host_key=&verify_host_key_callback; |
221 | 220 | ||
222 | xxx_kex = kex; | ||
223 | |||
224 | dispatch_run(DISPATCH_BLOCK, &kex->done, kex); | 221 | dispatch_run(DISPATCH_BLOCK, &kex->done, kex); |
225 | 222 | ||
226 | if (options.use_roaming && !kex->roaming) { | 223 | if (options.use_roaming && !kex->roaming) { |