summaryrefslogtreecommitdiffstats
path: root/key.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-07-23 01:40:46 +0200
committerDarren Tucker <dtucker@zip.com.au>2014-07-23 01:40:46 +0200
commit820763efef2d19d965602533036c2b4badc9d465 (patch)
treef54c2b977a2c144424e243bb45609aeb0b08b4f4 /key.c
parent - (dtucker) [regress/unittests/sshkey/test_{file,fuzz,sshkey}.c] Wrap ecdsa- (diff)
downloadopenssh-820763efef2d19d965602533036c2b4badc9d465.tar.xz
openssh-820763efef2d19d965602533036c2b4badc9d465.zip
- dtucker@cvs.openbsd.org 2014/07/22 01:18:50
[key.c] Prevent spam from key_load_private_pem during hostbased auth. ok djm@
Diffstat (limited to 'key.c')
-rw-r--r--key.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/key.c b/key.c
index 84bbeae38..206076159 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.121 2014/07/17 00:12:03 djm Exp $ */
+/* $OpenBSD: key.c,v 1.122 2014/07/22 01:18:50 dtucker Exp $ */
/*
* placed in the public domain
*/
@@ -447,7 +447,10 @@ key_load_private_pem(int fd, int type, const char *passphrase,
if ((r = sshkey_load_private_pem(fd, type, passphrase,
&ret, commentp)) != 0) {
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR);
- error("%s: %s", __func__, ssh_err(r));
+ if (r == SSH_ERR_KEY_WRONG_PASSPHRASE)
+ debug("%s: %s", __func__, ssh_err(r));
+ else
+ error("%s: %s", __func__, ssh_err(r));
return NULL;
}
return ret;