From 01bee6293ae3d8aead596f6b170a3c9f9fe4163c Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 2 Dec 2021 23:45:36 +0000 Subject: [PATCH] hash full host:port when asked to hash output, fixes hashes for non- default ports. bz3367 ok dtucker@ --- usr.bin/ssh/ssh-keyscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index e3acfe018ed..356467dca8a 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.143 2021/11/18 03:31:44 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.144 2021/12/02 23:45:36 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres . * @@ -299,7 +299,7 @@ keyprint_one(const char *host, struct sshkey *key) hostport = put_host_port(host, ssh_port); lowercase(hostport); - if (hash_hosts && (hashed = host_hash(host, NULL, 0)) == NULL) + if (hash_hosts && (hashed = host_hash(hostport, NULL, 0)) == NULL) fatal("host_hash failed"); known_host = hash_hosts ? hashed : hostport; if (!get_cert) -- 2.20.1