summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-09 16:10:03 +0000
committerColin Watson <cjwatson@debian.org>2016-12-26 00:55:59 +0000
commit04923a79cca487e1295685638a6113dbe5ec54bd (patch)
tree4d8881d10dae22ec2e184188b967b7f0cb70a882
parentf7088f0a3d04473cfdcf11fe6b084b81beb7041c (diff)
Mention ssh-keygen in ssh fingerprint changed warning
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843 Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607 Last-Update: 2015-09-08 Patch-Name: mention-ssh-keygen-on-keychange.patch
-rw-r--r--sshconnect.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 698a07114..1cc556e86 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1080,9 +1080,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
1080 error("%s. This could either mean that", key_msg); 1080 error("%s. This could either mean that", key_msg);
1081 error("DNS SPOOFING is happening or the IP address for the host"); 1081 error("DNS SPOOFING is happening or the IP address for the host");
1082 error("and its host key have changed at the same time."); 1082 error("and its host key have changed at the same time.");
1083 if (ip_status != HOST_NEW) 1083 if (ip_status != HOST_NEW) {
1084 error("Offending key for IP in %s:%lu", 1084 error("Offending key for IP in %s:%lu",
1085 ip_found->file, ip_found->line); 1085 ip_found->file, ip_found->line);
1086 error(" remove with:");
1087 error(" ssh-keygen -f \"%s\" -R %s",
1088 ip_found->file, ip);
1089 }
1086 } 1090 }
1087 /* The host key has changed. */ 1091 /* The host key has changed. */
1088 warn_changed_key(host_key); 1092 warn_changed_key(host_key);
@@ -1090,6 +1094,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
1090 user_hostfiles[0]); 1094 user_hostfiles[0]);
1091 error("Offending %s key in %s:%lu", key_type(host_found->key), 1095 error("Offending %s key in %s:%lu", key_type(host_found->key),
1092 host_found->file, host_found->line); 1096 host_found->file, host_found->line);
1097 error(" remove with:");
1098 error(" ssh-keygen -f \"%s\" -R %s", host_found->file, host);
1093 1099
1094 /* 1100 /*
1095 * If strict host key checking is in use, the user will have 1101 * If strict host key checking is in use, the user will have