Attachment #2758 for bug #2507

View | Details | Raw Unified | Return to bug 2507
Collapse All | Expand All

Lines 389-395 process_sign_request2(SocketEntry *e) Link Here

(-)old/ssh-agent.c (-2 / +2 lines)
389	if (flags & SSH_AGENT_OLD_SIGNATURE)	389	if (flags & SSH_AGENT_OLD_SIGNATURE)
390	compat = SSH_BUG_SIGBLOB;	390	compat = SSH_BUG_SIGBLOB;
391	if ((r = sshkey_from_blob(blob, blen, &key)) != 0) {	391	if ((r = sshkey_from_blob(blob, blen, &key)) != 0) {
392	error("%s: cannot parse key blob: %s", __func__, ssh_err(ok));	392	error("%s: cannot parse key blob: %s", __func__, ssh_err(r));
393	goto send;	393	goto send;
394	}	394	}
395	if ((id = lookup_identity(key, 2)) == NULL) {	395	if ((id = lookup_identity(key, 2)) == NULL) {
Lines 402-408 process_sign_request2(SocketEntry *e) Link Here
402	}	402	}
403	if ((r = sshkey_sign(id->key, &signature, &slen,	403	if ((r = sshkey_sign(id->key, &signature, &slen,
404	data, dlen, compat)) != 0) {	404	data, dlen, compat)) != 0) {
405	error("%s: sshkey_sign: %s", __func__, ssh_err(ok));	405	error("%s: sshkey_sign: %s", __func__, ssh_err(r));
406	goto send;	406	goto send;
407	}	407	}
408	/* Success */	408	/* Success */

Lines 1167-1172 sign_and_send_pubkey(Authctxt *authctxt, Link Here

(-)old/sshconnect2.c (+1 lines)
1167	ret = identity_sign(id, &signature, &slen,	1167	ret = identity_sign(id, &signature, &slen,
1168	buffer_ptr(&b), buffer_len(&b), datafellows);	1168	buffer_ptr(&b), buffer_len(&b), datafellows);
1169	if (ret != 0) {	1169	if (ret != 0) {
		1170	error("%s: signing failed: %s", __func__, ssh_err(ret));
1170	free(blob);	1171	free(blob);
1171	buffer_free(&b);	1172	buffer_free(&b);
1172	return 0;	1173	return 0;

Return to bug 2507