summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-12-11 02:20:28 +0000
committerDamien Miller <djm@mindrot.org>2015-12-11 13:23:14 +1100
commit39736be06c7498ef57d6970f2d85cf066ae57c82 (patch)
tree712b3b83d580441c4482b03cad0fa849705751c0 /ssh-agent.c
parent94141b7ade24afceeb6762a3f99e09e47a6c42b6 (diff)
upstream commit
correct error messages; from Tomas Kuthan bz#2507 Upstream-ID: 7454a0affeab772398052954c79300aa82077093
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index ed5dc571d..d384cfbd0 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.208 2015/12/04 16:41:28 markus Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.209 2015/12/11 02:20:28 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -401,7 +401,7 @@ process_sign_request2(SocketEntry *e)
401 if (flags & SSH_AGENT_OLD_SIGNATURE) 401 if (flags & SSH_AGENT_OLD_SIGNATURE)
402 compat = SSH_BUG_SIGBLOB; 402 compat = SSH_BUG_SIGBLOB;
403 if ((r = sshkey_from_blob(blob, blen, &key)) != 0) { 403 if ((r = sshkey_from_blob(blob, blen, &key)) != 0) {
404 error("%s: cannot parse key blob: %s", __func__, ssh_err(ok)); 404 error("%s: cannot parse key blob: %s", __func__, ssh_err(r));
405 goto send; 405 goto send;
406 } 406 }
407 if ((id = lookup_identity(key, 2)) == NULL) { 407 if ((id = lookup_identity(key, 2)) == NULL) {
@@ -414,7 +414,7 @@ process_sign_request2(SocketEntry *e)
414 } 414 }
415 if ((r = sshkey_sign(id->key, &signature, &slen, 415 if ((r = sshkey_sign(id->key, &signature, &slen,
416 data, dlen, agent_decode_alg(key, flags), compat)) != 0) { 416 data, dlen, agent_decode_alg(key, flags), compat)) != 0) {
417 error("%s: sshkey_sign: %s", __func__, ssh_err(ok)); 417 error("%s: sshkey_sign: %s", __func__, ssh_err(r));
418 goto send; 418 goto send;
419 } 419 }
420 /* Success */ 420 /* Success */