From e23e0248c667348e4333b2144a66188d606a9067 Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 6 Jan 2022 22:02:52 +0000 Subject: [PATCH] piece of UpdateHostkeys client strictification: when updating known_hosts with new keys, ignore NULL keys (forgot to include in prior commit) --- usr.bin/ssh/hostfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/hostfile.c b/usr.bin/ssh/hostfile.c index 7736a980caf..e193d421734 100644 --- a/usr.bin/ssh/hostfile.c +++ b/usr.bin/ssh/hostfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hostfile.c,v 1.92 2021/10/02 03:17:01 dtucker Exp $ */ +/* $OpenBSD: hostfile.c,v 1.93 2022/01/06 22:02:52 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -635,7 +635,7 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip, /* Re-add the requested keys */ want = HKF_MATCH_HOST | (ip == NULL ? 0 : HKF_MATCH_IP); for (i = 0; i < nkeys; i++) { - if ((want & ctx.match_keys[i]) == want) + if (keys[i] == NULL || (want & ctx.match_keys[i]) == want) continue; if ((fp = sshkey_fingerprint(keys[i], hash_alg, SSH_FP_DEFAULT)) == NULL) { -- 2.20.1