diff options
| author |   djm <djm@openbsd.org> | 2016-03-14 16:20:54 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-03-14 16:20:54 +0000 |
| commit | abd2e8e8228b336a6dd8c1ff5beff64cd0f8fe82 (patch) | |
| tree | f9cbbfc966c180be843be8c9724b75e0a092247b /usr.bin/ssh/sshconnect2.c | |
| parent | zdump(8) needs to read files so it needs pledge(2) rpath promise (diff) | |
| download | wireguard-openbsd-abd2e8e8228b336a6dd8c1ff5beff64cd0f8fe82.tar.xz wireguard-openbsd-abd2e8e8228b336a6dd8c1ff5beff64cd0f8fe82.zip | |
unbreak authentication using lone certificate keys in ssh-agent:
when attempting pubkey auth with a certificate, if no separate
private key is found among the keys then try with the certificate
key itself.
bz#2550 reported by Peter Moody
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 507ce7e7a06..4f669a5b7ee 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.239 2016/02/23 01:34:14 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.240 2016/03/14 16:20:54 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1104,12 +1104,8 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id) "certificate", __func__, id->filename, id->agent_fd != -1 ? " from agent" : ""); } else { - /* XXX maybe verbose/error? */ - debug("%s: no private key for certificate " + debug("%s: no separate private key for certificate " "\"%s\"", __func__, id->filename); - free(blob); - buffer_free(&b); - return 0; } } |