From: djm <djm@openbsd.org>
Date: Wed, 26 May 2021 01:47:24 +0000 (+0000)
Subject: fix SEGV in UpdateHostkeys debug() message, triggered when the update
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=31591a207de9a8a6a95cbaf7393100481674805f;p=openbsd

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@
---

diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index 33a43baf8e8..2c97c868b67 100644
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/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
@@ -1938,7 +1938,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;