diff options
| author |   markus <markus@openbsd.org> | 2015-01-20 20:16:21 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2015-01-20 20:16:21 +0000 |
| commit | db83b7180a686ecfa48da1ec83f31aa495de4a1d (patch) | |
| tree | dce1e114639015aee65321b2f2789948ee3b127d /usr.bin/ssh/sshconnect2.c | |
| parent | If _dl_progname exceeds half the syslog buffer, truncate it with "...", (diff) | |
| download | wireguard-openbsd-db83b7180a686ecfa48da1ec83f31aa495de4a1d.tar.xz wireguard-openbsd-db83b7180a686ecfa48da1ec83f31aa495de4a1d.zip | |
kex_setup errors are fatal()
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index b8b5a55db39..e8fe45a68f9 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.220 2015/01/20 07:56:44 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.221 2015/01/20 20:16:21 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -152,6 +152,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) { char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT }; struct kex *kex; + int r; xxx_host = host; xxx_hostaddr = hostaddr; @@ -198,7 +199,8 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) (time_t)options.rekey_interval); /* start key exchange */ - kex_setup(active_state, myproposal); + if ((r = kex_setup(active_state, myproposal)) != 0) + fatal("kex_setup: %s", ssh_err(r)); kex = active_state->kex; #ifdef WITH_OPENSSL kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |