summaryrefslogtreecommitdiffstats
path: root/debian/patches/mention-ssh-keygen-on-keychange.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-10 19:49:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-10 19:49:47 +0000
commit9c5dd847393c7c0f37ef557d7a0d402deedd8d2a (patch)
treedcb9b4740181f58a5d235e8ca52f9855494f486e /debian/patches/mention-ssh-keygen-on-keychange.patch
parentAdding upstream version 1:9.6p1. (diff)
downloadopenssh-9c5dd847393c7c0f37ef557d7a0d402deedd8d2a.tar.xz
openssh-9c5dd847393c7c0f37ef557d7a0d402deedd8d2a.zip
Adding debian version 1:9.6p1-4.debian/1%9.6p1-4
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/mention-ssh-keygen-on-keychange.patch')
-rw-r--r--debian/patches/mention-ssh-keygen-on-keychange.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
new file mode 100644
index 0000000..0aec751
--- /dev/null
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -0,0 +1,44 @@
+From d0ff89bd8fd3212fbfaaac8e116150c82bd76ca3 Mon Sep 17 00:00:00 2001
+From: Scott Moser <smoser@ubuntu.com>
+Date: Sun, 9 Feb 2014 16:10:03 +0000
+Subject: Mention ssh-keygen in ssh fingerprint changed warning
+
+Author: Chris Lamb <lamby@debian.org>
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
+Last-Update: 2023-12-11
+
+Patch-Name: mention-ssh-keygen-on-keychange.patch
+---
+ sshconnect.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/sshconnect.c b/sshconnect.c
+index 69256c354..f3096cad9 100644
+--- a/sshconnect.c
++++ b/sshconnect.c
+@@ -1277,9 +1277,13 @@ check_host_key(char *hostname, const struct ssh_conn_info *cinfo,
+ error("%s. This could either mean that", key_msg);
+ error("DNS SPOOFING is happening or the IP address for the host");
+ error("and its host key have changed at the same time.");
+- if (ip_status != HOST_NEW)
++ if (ip_status != HOST_NEW) {
+ error("Offending key for IP in %s:%lu",
+ ip_found->file, ip_found->line);
++ error(" remove with:");
++ error(" ssh-keygen -f '%s' -R '%s'",
++ ip_found->file, ip);
++ }
+ }
+ /* The host key has changed. */
+ warn_changed_key(host_key);
+@@ -1291,6 +1295,9 @@ check_host_key(char *hostname, const struct ssh_conn_info *cinfo,
+ error("Offending %s key in %s:%lu",
+ sshkey_type(host_found->key),
+ host_found->file, host_found->line);
++ error(" remove with:");
++ error(" ssh-keygen -f '%s' -R '%s'",
++ host_found->file, host);
+
+ /*
+ * If strict host key checking is in use, the user will have