tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2021-05-26 01:47:24 +00:00 committed by Damien Miller
parent 9acd76e6e4
commit 2e1efcfd9f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clientloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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])) if (!sshkey_equal(l->key, ctx->old_keys[i]))
continue; continue;
debug3_f("found deprecated %s key at %s:%ld as %s", 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); hashed ? "[HASHED]" : l->hosts);
ctx->old_key_seen = 1; ctx->old_key_seen = 1;
break; break;