summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-05 14:03:03 +1100
committerDamien Miller <djm@mindrot.org>2010-03-05 14:03:03 +1100
commitb068d0ad6dd1cf63ecd636bb2e24ce4c74406cb2 (patch)
treecb21a8f98d1f099cc884e7eddcc75e1d49776bc9
parent48b6021721fb2083898be696a72b261a9136c293 (diff)
- djm@cvs.openbsd.org 2010/03/05 02:58:11
[auth.c] make the warning for a revoked key louder and more noticable
-rw-r--r--ChangeLog3
-rw-r--r--auth.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ee1804fd8..25a0f8716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 [auth-options.c ssh-keygen.c] 20 [auth-options.c ssh-keygen.c]
21 "force-command" is not spelled "forced-command"; spotted by 21 "force-command" is not spelled "forced-command"; spotted by
22 imorgan AT nas.nasa.gov 22 imorgan AT nas.nasa.gov
23 - djm@cvs.openbsd.org 2010/03/05 02:58:11
24 [auth.c]
25 make the warning for a revoked key louder and more noticable
23 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older 26 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
24 compilers. OK djm@ 27 compilers. OK djm@
25 - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure 28 - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure
diff --git a/auth.c b/auth.c
index e680efbcc..e8fbe9fd5 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.85 2010/03/04 10:36:03 djm Exp $ */ 1/* $OpenBSD: auth.c,v 1.86 2010/03/05 02:58:11 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -604,7 +604,8 @@ auth_key_is_revoked(Key *key)
604 case 1: 604 case 1:
605 /* Key revoked */ 605 /* Key revoked */
606 key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); 606 key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
607 error("%s key %s is revoked", key_type(key), key_fp); 607 error("WARNING: authentication attempt with a revoked "
608 "%s key %s ", key_type(key), key_fp);
608 xfree(key_fp); 609 xfree(key_fp);
609 return 1; 610 return 1;
610 } 611 }