diff options
| author | Damien Miller <djm@mindrot.org> | 2014-07-18 07:03:49 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-07-18 07:03:49 +0200 |
| commit | dad9a4a0b7c2b5d78605f8df28718f116524134e (patch) | |
| tree | de8e8c43ecbc142a286686289f576de11e9aeeeb /key.c | |
| parent | - djm@cvs.openbsd.org 2014/07/17 00:10:18 (diff) | |
| download | openssh-dad9a4a0b7c2b5d78605f8df28718f116524134e.tar.xz openssh-dad9a4a0b7c2b5d78605f8df28718f116524134e.zip | |
- djm@cvs.openbsd.org 2014/07/17 00:12:03
[key.c]
silence "incorrect passphrase" error spam; reported and ok dtucker@
Diffstat (limited to 'key.c')
| -rw-r--r-- | key.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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)); |