From dad9a4a0b7c2b5d78605f8df28718f116524134e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 18 Jul 2014 15:03:49 +1000 Subject: [PATCH] - djm@cvs.openbsd.org 2014/07/17 00:12:03 [key.c] silence "incorrect passphrase" error spam; reported and ok dtucker@ --- ChangeLog | 3 +++ key.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a3dfb5b2..c2e52afcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ - djm@cvs.openbsd.org 2014/07/17 00:10:18 [mux.c] 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 - (djm) [digest-openssl.c] Preserve array order when disabling digests. diff --git a/key.c b/key.c index 70f4045ce..a8532061a 100644 --- a/key.c +++ b/key.c @@ -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 */ @@ -384,7 +384,8 @@ key_load_private(const char *path, const char *passphrase, if ((r = sshkey_load_private(path, passphrase, &ret, commentp)) != 0) { fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); /* 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)); else 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) { fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); /* 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)); else error("%s: %s", __func__, ssh_err(r));