diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-01-06 23:02:52 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-01-06 23:21:38 +0100 |
| commit | 8832402bd500d1661ccc80a476fd563335ef6cdc (patch) | |
| tree | 2cde4d2d990471f6de024c84e46f9ffd147e5c95 /hostfile.c | |
| parent | upstream: include rejected signature algorithm in error message (diff) | |
| download | openssh-8832402bd500d1661ccc80a476fd563335ef6cdc.tar.xz openssh-8832402bd500d1661ccc80a476fd563335ef6cdc.zip | |
upstream: piece of UpdateHostkeys client strictification: when
updating known_hosts with new keys, ignore NULL keys (forgot to include in
prior commit)
OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08
Diffstat (limited to 'hostfile.c')
| -rw-r--r-- | hostfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hostfile.c b/hostfile.c index a035b3813..bd49e3ac7 100644 --- a/hostfile.c +++ b/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 <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -642,7 +642,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) { |