diff options
| author |   djm <djm@openbsd.org> | 2018-08-12 20:19:13 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-08-12 20:19:13 +0000 |
| commit | ce5af731b6d0313ef957df6cb6ca70746614d7e1 (patch) | |
| tree | 08644bc23b05066383a0a8b8133a8b40dcb2d35d /usr.bin/ssh/readconf.c | |
| parent | Drop reference to dmabuf "file" as fnew() returns one that has two (diff) | |
| download | wireguard-openbsd-ce5af731b6d0313ef957df6cb6ca70746614d7e1.tar.xz wireguard-openbsd-ce5af731b6d0313ef957df6cb6ca70746614d7e1.zip | |
better diagnosics on alg list assembly errors; ok deraadt@ markus@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 8115da393db..b2103575206 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.296 2018/07/27 05:34:42 dtucker Exp $ */ +/* $OpenBSD: readconf.c,v 1.297 2018/08/12 20:19:13 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -38,6 +38,7 @@ #include "xmalloc.h" #include "ssh.h" +#include "ssherr.h" #include "compat.h" #include "cipher.h" #include "pathnames.h" @@ -1909,6 +1910,7 @@ void fill_default_options(Options * options) { char *all_cipher, *all_mac, *all_kex, *all_key; + int r; if (options->forward_agent == -1) options->forward_agent = 0; @@ -2058,17 +2060,18 @@ fill_default_options(Options * options) all_mac = mac_alg_list(','); all_kex = kex_alg_list(','); all_key = sshkey_alg_list(0, 0, 1, ','); - if (kex_assemble_names(&options->ciphers, - KEX_CLIENT_ENCRYPT, all_cipher) != 0 || - kex_assemble_names(&options->macs, - KEX_CLIENT_MAC, all_mac) != 0 || - kex_assemble_names(&options->kex_algorithms, - KEX_CLIENT_KEX, all_kex) != 0 || - kex_assemble_names(&options->hostbased_key_types, - KEX_DEFAULT_PK_ALG, all_key) != 0 || - kex_assemble_names(&options->pubkey_key_types, - KEX_DEFAULT_PK_ALG, all_key) != 0) - fatal("%s: kex_assemble_names failed", __func__); +#define ASSEMBLE(what, defaults, all) \ + do { \ + if ((r = kex_assemble_names(&options->what, \ + defaults, all)) != 0) \ + fatal("%s: %s: %s", __func__, #what, ssh_err(r)); \ + } while (0) + ASSEMBLE(ciphers, KEX_SERVER_ENCRYPT, all_cipher); + ASSEMBLE(macs, KEX_SERVER_MAC, all_mac); + ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex); + ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key); + ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key); +#undef ASSEMBLE free(all_cipher); free(all_mac); free(all_kex); |