diff options
-rw-r--r-- | ssh-agent.c | 6 | ||||
-rw-r--r-- | sshconnect2.c | 3 |
2 files changed, 5 insertions, 4 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 */ |
diff --git a/sshconnect2.c b/sshconnect2.c index 98b67e73e..250278ffe 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.233 2015/12/11 00:20:04 mmcc Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.234 2015/12/11 02:20:28 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1129,6 +1129,7 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id) | |||
1129 | ret = identity_sign(id, &signature, &slen, | 1129 | ret = identity_sign(id, &signature, &slen, |
1130 | buffer_ptr(&b), buffer_len(&b), datafellows); | 1130 | buffer_ptr(&b), buffer_len(&b), datafellows); |
1131 | if (ret != 0) { | 1131 | if (ret != 0) { |
1132 | error("%s: signing failed: %s", __func__, ssh_err(ret)); | ||
1132 | free(blob); | 1133 | free(blob); |
1133 | buffer_free(&b); | 1134 | buffer_free(&b); |
1134 | return 0; | 1135 | return 0; |