tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2014/07/17 00:12:03

Browse Source 
[key.c]
     silence "incorrect passphrase" error spam; reported and ok dtucker@
This commit is contained in:
Damien Miller 2014-07-18 15:03:49 +10:00
parent f42f7684ec
commit dad9a4a0b7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -25,6 +25,9 @@
- djm@cvs.openbsd.org 2014/07/17 00:10:18 - djm@cvs.openbsd.org 2014/07/17 00:10:18
[mux.c] [mux.c]
preserve errno across syscall preserve errno across syscall
- djm@cvs.openbsd.org 2014/07/17 00:12:03
[key.c]
silence "incorrect passphrase" error spam; reported and ok dtucker@
20140717 20140717
- (djm) [digest-openssl.c] Preserve array order when disabling digests. - (djm) [digest-openssl.c] Preserve array order when disabling digests.

8
key.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: key.c,v 1.120 2014/07/09 03:02:15 djm Exp $ */ /* $OpenBSD: key.c,v 1.121 2014/07/17 00:12:03 djm Exp $ */
/* /*
* placed in the public domain * placed in the public domain
*/ */
@ -384,7 +384,8 @@ key_load_private(const char *path, const char *passphrase,
if ((r = sshkey_load_private(path, passphrase, &ret, commentp)) != 0) { if ((r = sshkey_load_private(path, passphrase, &ret, commentp)) != 0) {
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR);
/* Old authfile.c ignored all file errors. */ /* Old authfile.c ignored all file errors. */
if (r == SSH_ERR_SYSTEM_ERROR) if (r == SSH_ERR_SYSTEM_ERROR ||
r == SSH_ERR_KEY_WRONG_PASSPHRASE)
debug("%s: %s", __func__, ssh_err(r)); debug("%s: %s", __func__, ssh_err(r));
else else
error("%s: %s", __func__, ssh_err(r)); error("%s: %s", __func__, ssh_err(r));
@ -404,7 +405,8 @@ key_load_private_cert(int type, const char *filename, const char *passphrase,
&ret, perm_ok)) != 0) { &ret, perm_ok)) != 0) {
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR);
/* Old authfile.c ignored all file errors. */ /* Old authfile.c ignored all file errors. */
if (r == SSH_ERR_SYSTEM_ERROR) if (r == SSH_ERR_SYSTEM_ERROR ||
r == SSH_ERR_KEY_WRONG_PASSPHRASE)
debug("%s: %s", __func__, ssh_err(r)); debug("%s: %s", __func__, ssh_err(r));
else else
error("%s: %s", __func__, ssh_err(r)); error("%s: %s", __func__, ssh_err(r));