diff options
| author |   djm <djm@openbsd.org> | 2015-01-18 13:33:34 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-01-18 13:33:34 +0000 |
| commit | 26c264562d829a2e05fdd8fd76783115b5b60be5 (patch) | |
| tree | 22b18f16e7ed284cf390f600d8fc6fc32f1909fd /usr.bin/ssh/sshconnect2.c | |
| parent | infer key length correctly when user specified a fully- (diff) | |
| download | wireguard-openbsd-26c264562d829a2e05fdd8fd76783115b5b60be5.tar.xz wireguard-openbsd-26c264562d829a2e05fdd8fd76783115b5b60be5.zip | |
avoid trailing ',' in host key algorithms
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index d3c1729602c..0847df0e3aa 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.215 2015/01/15 11:04:36 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.216 2015/01/18 13:33:34 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -135,7 +135,8 @@ order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) ALG_APPEND(last, alg); } #undef ALG_APPEND - xasprintf(&ret, "%s%s%s", first, *first == '\0' ? "" : ",", last); + xasprintf(&ret, "%s%s%s", first, + (*first == '\0' || *last == '\0') ? "" : ",", last); if (*first != '\0') debug3("%s: prefer hostkeyalgs: %s", __func__, first); |