diff options
author | Damien Miller <djm@mindrot.org> | 2011-01-06 22:42:04 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-01-06 22:42:04 +1100 |
commit | 05c8997b33cf391784d6a5f9f0d85d275dcf7ce5 (patch) | |
tree | e0f0a078b4def06f81b8df2b491519bd88a19214 | |
parent | 907998df72d7206d4dd5c37d8f185f9b2988b007 (diff) |
- markus@cvs.openbsd.org 2010/12/14 11:59:06
[sshconnect.c]
don't mention key type in key-changed-warning, since we also print
this warning if a new key type appears. ok djm@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshconnect.c | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -9,6 +9,10 @@ | |||
9 | [scp.1 scp.c] | 9 | [scp.1 scp.c] |
10 | scp.1: grammer fix | 10 | scp.1: grammer fix |
11 | scp.c: add -3 to usage() | 11 | scp.c: add -3 to usage() |
12 | - markus@cvs.openbsd.org 2010/12/14 11:59:06 | ||
13 | [sshconnect.c] | ||
14 | don't mention key type in key-changed-warning, since we also print | ||
15 | this warning if a new key type appears. ok djm@ | ||
12 | 16 | ||
13 | 20110104 | 17 | 20110104 |
14 | - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage | 18 | - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage |
diff --git a/sshconnect.c b/sshconnect.c index 064bb74b3..45ba6ed12 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.229 2010/11/29 23:45:51 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.230 2010/12/14 11:59:06 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1234,7 +1234,6 @@ static void | |||
1234 | warn_changed_key(Key *host_key) | 1234 | warn_changed_key(Key *host_key) |
1235 | { | 1235 | { |
1236 | char *fp; | 1236 | char *fp; |
1237 | const char *type = key_type(host_key); | ||
1238 | 1237 | ||
1239 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); | 1238 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); |
1240 | 1239 | ||
@@ -1243,9 +1242,9 @@ warn_changed_key(Key *host_key) | |||
1243 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 1242 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
1244 | error("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"); | 1243 | error("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"); |
1245 | error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); | 1244 | error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); |
1246 | error("It is also possible that the %s host key has just been changed.", type); | 1245 | error("It is also possible that a host key has just been changed."); |
1247 | error("The fingerprint for the %s key sent by the remote host is\n%s.", | 1246 | error("The fingerprint for the %s key sent by the remote host is\n%s.", |
1248 | type, fp); | 1247 | key_type(host_key), fp); |
1249 | error("Please contact your system administrator."); | 1248 | error("Please contact your system administrator."); |
1250 | 1249 | ||
1251 | xfree(fp); | 1250 | xfree(fp); |