diff options
-rw-r--r-- | sshconnect2.c | 6 | ||||
-rw-r--r-- | sshd.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 03238ffdc..8da4d70dd 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.220 2015/01/20 07:56:44 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.221 2015/01/20 20:16:21 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. |
@@ -158,6 +158,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
158 | { | 158 | { |
159 | char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT }; | 159 | char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT }; |
160 | struct kex *kex; | 160 | struct kex *kex; |
161 | int r; | ||
161 | 162 | ||
162 | xxx_host = host; | 163 | xxx_host = host; |
163 | xxx_hostaddr = hostaddr; | 164 | xxx_hostaddr = hostaddr; |
@@ -204,7 +205,8 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
204 | (time_t)options.rekey_interval); | 205 | (time_t)options.rekey_interval); |
205 | 206 | ||
206 | /* start key exchange */ | 207 | /* start key exchange */ |
207 | kex_setup(active_state, myproposal); | 208 | if ((r = kex_setup(active_state, myproposal)) != 0) |
209 | fatal("kex_setup: %s", ssh_err(r)); | ||
208 | kex = active_state->kex; | 210 | kex = active_state->kex; |
209 | #ifdef WITH_OPENSSL | 211 | #ifdef WITH_OPENSSL |
210 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 212 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.436 2015/01/19 20:20:20 markus Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.437 2015/01/20 20:16:21 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2466,6 +2466,7 @@ do_ssh2_kex(void) | |||
2466 | { | 2466 | { |
2467 | char *myproposal[PROPOSAL_MAX] = { KEX_SERVER }; | 2467 | char *myproposal[PROPOSAL_MAX] = { KEX_SERVER }; |
2468 | struct kex *kex; | 2468 | struct kex *kex; |
2469 | int r; | ||
2469 | 2470 | ||
2470 | if (options.ciphers != NULL) { | 2471 | if (options.ciphers != NULL) { |
2471 | myproposal[PROPOSAL_ENC_ALGS_CTOS] = | 2472 | myproposal[PROPOSAL_ENC_ALGS_CTOS] = |
@@ -2501,7 +2502,8 @@ do_ssh2_kex(void) | |||
2501 | list_hostkey_types()); | 2502 | list_hostkey_types()); |
2502 | 2503 | ||
2503 | /* start key exchange */ | 2504 | /* start key exchange */ |
2504 | kex_setup(active_state, myproposal); | 2505 | if ((r = kex_setup(active_state, myproposal)) != 0) |
2506 | fatal("kex_setup: %s", ssh_err(r)); | ||
2505 | kex = active_state->kex; | 2507 | kex = active_state->kex; |
2506 | #ifdef WITH_OPENSSL | 2508 | #ifdef WITH_OPENSSL |
2507 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; | 2509 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; |