diff options
| author |   djm <djm@openbsd.org> | 2017-03-10 03:18:24 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-03-10 03:18:24 +0000 |
| commit | 320c48ad180354fce473b272feb93eae426266ba (patch) | |
| tree | 4a4ee78e9885059d8997af21c8f790bccc188eae /usr.bin/ssh/ssh-keyscan.c | |
| parent | don't truncate off \r\n from long stderr lines; bz#2688, reported by (diff) | |
| download | wireguard-openbsd-320c48ad180354fce473b272feb93eae426266ba.tar.xz wireguard-openbsd-320c48ad180354fce473b272feb93eae426266ba.zip | |
correctly hash hosts with a port number. Reported by Josh Powers in
bz#2692; ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 9f9ec9b6466..9c300c1dfda 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.107 2017/01/06 03:41:58 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.108 2017/03/10 03:18:24 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -301,16 +301,17 @@ keygrab_ssh2(con *c) } static void -keyprint_one(char *host, struct sshkey *key) +keyprint_one(const char *host, struct sshkey *key) { char *hostport; - - if (hash_hosts && (host = host_hash(host, NULL, 0)) == NULL) - fatal("host_hash failed"); + const char *known_host, *hashed; hostport = put_host_port(host, ssh_port); + if (hash_hosts && (hashed = host_hash(host, NULL, 0)) == NULL) + fatal("host_hash failed"); + known_host = hash_hosts ? hashed : hostport; if (!get_cert) - fprintf(stdout, "%s ", hostport); + fprintf(stdout, "%s ", known_host); sshkey_write(key, stdout); fputs("\n", stdout); free(hostport); |