summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2020-01-21 05:56:28 +0000
committerDamien Miller <djm@cvs.openbsd.org>2020-01-21 05:56:28 +0000
commitab24168d498a01126bec0c5b1c860740c41e3da6 (patch)
treefcb3c78db94b1f216f3a7a2b6f87828b7e8c846e
parentb700219915c6fc80d44bc74b205f608a28d06d89 (diff)
a little more verbosity in sign_and_send_pubkey() debug messages
-rw-r--r--usr.bin/ssh/sshconnect2.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index 5fcfb5a70f8..4a690eda58c 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.314 2019/11/15 02:37:24 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.315 2020/01/21 05:56:27 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1304,7 +1304,7 @@ sign_and_send_pubkey(struct ssh *ssh, Identity *id)
error("%s: no mutual signature supported", __func__);
goto out;
}
- debug3("%s: signing using %s", __func__, alg);
+ debug3("%s: signing using %s %s", __func__, alg, fp);
sshbuf_free(b);
if ((b = sshbuf_new()) == NULL)
@@ -1351,7 +1351,9 @@ sign_and_send_pubkey(struct ssh *ssh, Identity *id)
loc, sshkey_type(id->key), fp);
continue;
}
- error("%s: signing failed: %s", __func__, ssh_err(r));
+ error("%s: signing failed for %s \"%s\"%s: %s", __func__,
+ sshkey_type(sign_id->key), sign_id->filename,
+ id->agent_fd != -1 ? " from agent" : "", ssh_err(r));
goto out;
}
if (slen == 0 || signature == NULL) /* shouldn't happen */