Attachment 2758 Details for Bug 2507 – Call error() on identity_sign() failure, fix typos in ssherr() calls.

[patch] Call error() on identity_sign() failure, fix typos in ssherr() calls.

missing_or_misleading_error_messages.patch (text/plain), 1.10 KB, created by Tomas Kuthan on 2015-11-27 02:06:16 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Kuthan

Created: 2015-11-27 02:06:16 AEDT

Size: 1.10 KB

patch

obsolete

>diff -pur old/ssh-agent.c new/ssh-agent.c
>--- old/ssh-agent.c
>+++ new/ssh-agent.c
>@@ -389,7 +389,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) {
>@@ -402,7 +402,7 @@ process_sign_request2(SocketEntry *e)
> 	}
> 	if ((r = sshkey_sign(id->key, &signature, &slen,
> 	    data, dlen, compat)) != 0) {
>-		error("%s: sshkey_sign: %s", __func__, ssh_err(ok));
>+		error("%s: sshkey_sign: %s", __func__, ssh_err(r));
> 		goto send;
> 	}
> 	/* Success */
>diff -pur old/sshconnect2.c new/sshconnect2.c
>--- old/sshconnect2.c
>+++ new/sshconnect2.c
>@@ -1167,6 +1167,7 @@ sign_and_send_pubkey(Authctxt *authctxt,
> 	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;

Actions: View | Diff

Attachments on bug 2507: 2758