From 31591a207de9a8a6a95cbaf7393100481674805f Mon Sep 17 00:00:00 2001 From: djm Date: Wed, 26 May 2021 01:47:24 +0000 Subject: [PATCH] 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@ --- usr.bin/ssh/clientloop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 * Copyright (c) 1995 Tatu Ylonen , 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; -- 2.20.1