From 1ea794a34403a618e59bf5993912503fe1f64d11 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 26 Nov 2012 16:33:35 +0000 Subject: Add mention of ssh-keygen in ssh connect warning (Scott Moser). --- .../patches/mention-ssh-keygen-on-keychange.patch | 33 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/mention-ssh-keygen-on-keychange.patch (limited to 'debian/patches') 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 000000000..42b32638c --- /dev/null +++ b/debian/patches/mention-ssh-keygen-on-keychange.patch @@ -0,0 +1,33 @@ +Description: Mention ssh-keygen in ssh fingerprint changed warning +Author: Scott Moser +Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607 +Last-Update: 2010-12-14 + +Index: b/sshconnect.c +=================================================================== +--- a/sshconnect.c ++++ b/sshconnect.c +@@ -956,9 +956,12 @@ + 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: ssh-keygen -f \"%s\" -R %s", ++ ip_found->file, ip); ++ } + } + /* The host key has changed. */ + warn_changed_key(host_key); +@@ -966,6 +969,8 @@ + user_hostfiles[0]); + error("Offending %s key in %s:%lu", key_type(host_found->key), + host_found->file, host_found->line); ++ error(" remove with: ssh-keygen -f \"%s\" -R %s", ++ host_found->file, host); + + /* + * If strict host key checking is in use, the user will have diff --git a/debian/patches/series b/debian/patches/series index c940d8384..cb6be9a28 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,7 @@ scp-quoting.patch shell-path.patch dnssec-sshfp.patch auth-log-verbosity.patch +mention-ssh-keygen-on-keychange.patch # Versioning package-versioning.patch -- cgit v1.2.3