diff options
| author |   djm <djm@openbsd.org> | 2015-12-11 02:20:28 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-12-11 02:20:28 +0000 |
| commit | d0e7138021e88fd9911c9ec8cd96348fba944e38 (patch) | |
| tree | 28ee568435746713c469136a7048115c6e5549f0 /usr.bin/ssh | |
| parent | Pass (char *)NULL rather than (char *)0 to execl and execlp. (diff) | |
| download | wireguard-openbsd-d0e7138021e88fd9911c9ec8cd96348fba944e38.tar.xz wireguard-openbsd-d0e7138021e88fd9911c9ec8cd96348fba944e38.zip | |
correct error messages; from Tomas Kuthan bz#2507
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index a654e9ad454..86d972aba0a 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.208 2015/12/04 16:41:28 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.209 2015/12/11 02:20:28 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -384,7 +384,7 @@ process_sign_request2(SocketEntry *e) if (flags & SSH_AGENT_OLD_SIGNATURE) compat = SSH_BUG_SIGBLOB; if ((r = sshkey_from_blob(blob, blen, &key)) != 0) { - error("%s: cannot parse key blob: %s", __func__, ssh_err(ok)); + error("%s: cannot parse key blob: %s", __func__, ssh_err(r)); goto send; } if ((id = lookup_identity(key, 2)) == NULL) { @@ -397,7 +397,7 @@ process_sign_request2(SocketEntry *e) } if ((r = sshkey_sign(id->key, &signature, &slen, data, dlen, agent_decode_alg(key, flags), compat)) != 0) { - error("%s: sshkey_sign: %s", __func__, ssh_err(ok)); + error("%s: sshkey_sign: %s", __func__, ssh_err(r)); goto send; } /* Success */ diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 5b8bb27f1b4..07dc1c4d9da 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.233 2015/12/11 00:20:04 mmcc Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.234 2015/12/11 02:20:28 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1121,6 +1121,7 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id) ret = identity_sign(id, &signature, &slen, buffer_ptr(&b), buffer_len(&b), datafellows); if (ret != 0) { + error("%s: signing failed: %s", __func__, ssh_err(ret)); free(blob); buffer_free(&b); return 0; |