diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2014-07-23 01:40:46 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2014-07-23 01:40:46 +0200 |
| commit | 820763efef2d19d965602533036c2b4badc9d465 (patch) | |
| tree | f54c2b977a2c144424e243bb45609aeb0b08b4f4 | |
| parent | - (dtucker) [regress/unittests/sshkey/test_{file,fuzz,sshkey}.c] Wrap ecdsa- (diff) | |
| download | openssh-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@
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | key.c | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -6,6 +6,10 @@ error messages. - (dtucker) [regress/unittests/sshkey/test_{file,fuzz,sshkey}.c] Wrap ecdsa- specific tests inside OPENSSL_HAS_ECC. + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2014/07/22 01:18:50 + [key.c] + Prevent spam from key_load_private_pem during hostbased auth. ok djm@ 20140721 - OpenBSD CVS Sync @@ -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; |