diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-05-26 01:47:24 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-05-26 12:46:01 +1000 |
| commit | 2e1efcfd9f94352ca5f4b6958af8a454f8cf48cd (patch) | |
| tree | d1799c757f792bcc3ff9badeb5990fc5b942f6a1 | |
| parent | 9acd76e6e4d2b519773e7119c33cf77f09534909 (diff) | |
upstream: fix SEGV in UpdateHostkeys debug() message, triggered
when the update removed more host keys than remain present. Fix tested by
reporter James Cook, via bugs@
OpenBSD-Commit-ID: 44f641f6ee02bb957f0c1d150495b60cf7b869d3
| -rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index bdd67686..4fa57de8 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.363 2021/05/19 01:24:05 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.364 2021/05/26 01:47:24 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1952,7 +1952,7 @@ hostkeys_check_old(struct hostkey_foreach_line *l, void *_ctx) if (!sshkey_equal(l->key, ctx->old_keys[i])) continue; debug3_f("found deprecated %s key at %s:%ld as %s", - sshkey_ssh_name(ctx->keys[i]), l->path, l->linenum, + sshkey_ssh_name(ctx->old_keys[i]), l->path, l->linenum, hashed ? "[HASHED]" : l->hosts); ctx->old_key_seen = 1; break; |