RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2014/07/22 01:18:50 

[key.c]
     Prevent spam from key_load_private_pem during hostbased auth.  ok djm@
This commit is contained in:
Darren Tucker 2014-07-23 09:40:46 +10:00
parent c4ee219a66
commit 820763efef
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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

7
key.c
View File

@ -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;