diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-01-20 20:16:21 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-26 23:53:56 +1100 |
commit | 57e783c8ba2c0797f93977e83b2a8644a03065d8 (patch) | |
tree | ac590a804baf8817720a49d8b1055e61e015f24e /sshconnect2.c | |
parent | 1d6424a6ff94633c221297ae8f42d54e12a20912 (diff) |
upstream commit
kex_setup errors are fatal()
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 6 |
1 files changed, 4 insertions, 2 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; |