45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From aa7b21708511a6d4aed3839fc9f6e82e849dd4a1 Mon Sep 17 00:00:00 2001
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Date: Wed, 13 Dec 2023 03:28:19 +0000
|
|
Subject: [PATCH] upstream: when invoking KnownHostsCommand to determine the
|
|
order of
|
|
|
|
host key algorithms to request, ensure that the hostname passed to the
|
|
command is decorated with the port number for ports other than 22.
|
|
|
|
This matches the behaviour of KnownHostsCommand when invoked to look
|
|
up the actual host key.
|
|
|
|
bz3643, ok dtucker@
|
|
|
|
OpenBSD-Commit-ID: 5cfabc0b7c6c7ab473666df314f377b1f15420b1
|
|
|
|
Reference:https://github.com/openssh/openssh-portable/commit/aa7b21708511a6d4aed3839fc9f6e82e849dd4a1
|
|
Conflict:NA
|
|
---
|
|
sshconnect2.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sshconnect2.c b/sshconnect2.c
|
|
index 5831a00c6..df6caf817 100644
|
|
--- a/sshconnect2.c
|
|
+++ b/sshconnect2.c
|
|
@@ -1,4 +1,4 @@
|
|
-/* $OpenBSD: sshconnect2.c,v 1.370 2023/12/18 14:45:17 djm Exp $ */
|
|
+/* $OpenBSD: sshconnect2.c,v 1.369 2023/12/13 03:28:19 djm Exp $ */
|
|
/*
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
* Copyright (c) 2008 Damien Miller. All rights reserved.
|
|
@@ -140,7 +140,7 @@ order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port,
|
|
}
|
|
if (options.known_hosts_command != NULL) {
|
|
load_hostkeys_command(hostkeys, options.known_hosts_command,
|
|
- "ORDER", cinfo, NULL, host);
|
|
+ "ORDER", cinfo, NULL, hostname);
|
|
}
|
|
/*
|
|
* If a plain public key exists that matches the type of the best
|
|
--
|
|
2.33.0
|
|
|