diff options
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index d658ed07b..6f9ee42cd 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.314 2019/11/15 02:37:24 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.315 2020/01/21 05:56:27 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. |
@@ -1311,7 +1311,7 @@ sign_and_send_pubkey(struct ssh *ssh, Identity *id) | |||
1311 | error("%s: no mutual signature supported", __func__); | 1311 | error("%s: no mutual signature supported", __func__); |
1312 | goto out; | 1312 | goto out; |
1313 | } | 1313 | } |
1314 | debug3("%s: signing using %s", __func__, alg); | 1314 | debug3("%s: signing using %s %s", __func__, alg, fp); |
1315 | 1315 | ||
1316 | sshbuf_free(b); | 1316 | sshbuf_free(b); |
1317 | if ((b = sshbuf_new()) == NULL) | 1317 | if ((b = sshbuf_new()) == NULL) |
@@ -1358,7 +1358,9 @@ sign_and_send_pubkey(struct ssh *ssh, Identity *id) | |||
1358 | loc, sshkey_type(id->key), fp); | 1358 | loc, sshkey_type(id->key), fp); |
1359 | continue; | 1359 | continue; |
1360 | } | 1360 | } |
1361 | error("%s: signing failed: %s", __func__, ssh_err(r)); | 1361 | error("%s: signing failed for %s \"%s\"%s: %s", __func__, |
1362 | sshkey_type(sign_id->key), sign_id->filename, | ||
1363 | id->agent_fd != -1 ? " from agent" : "", ssh_err(r)); | ||
1362 | goto out; | 1364 | goto out; |
1363 | } | 1365 | } |
1364 | if (slen == 0 || signature == NULL) /* shouldn't happen */ | 1366 | if (slen == 0 || signature == NULL) /* shouldn't happen */ |