diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-03-14 16:20:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-04-28 01:44:07 +0100 |
commit | 43a633de1cabe77e652125dac394a99ad9cac3b4 (patch) | |
tree | 7cf97f2250aab93164adae731ad1984566aebb1c | |
parent | 7f3fb4e5fdddc6600e70ae663c21511fbcf2c64c (diff) |
upstream commit
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
Upstream-ID: f939cd76d68e6a9a3d1711b5a943d6ed1e623966
Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=c38905ba391434834da86abfc988a2b8b9b62477
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1575961
Last-Update: 2016-04-28
Patch-Name: unbreak-certificate-auth.patch
-rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index b452eae24..40facdab5 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.239 2016/02/23 01:34:14 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.240 2016/03/14 16:20:54 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. |
@@ -1224,12 +1224,8 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id) | |||
1224 | "certificate", __func__, id->filename, | 1224 | "certificate", __func__, id->filename, |
1225 | id->agent_fd != -1 ? " from agent" : ""); | 1225 | id->agent_fd != -1 ? " from agent" : ""); |
1226 | } else { | 1226 | } else { |
1227 | /* XXX maybe verbose/error? */ | 1227 | debug("%s: no separate private key for certificate " |
1228 | debug("%s: no private key for certificate " | ||
1229 | "\"%s\"", __func__, id->filename); | 1228 | "\"%s\"", __func__, id->filename); |
1230 | free(blob); | ||
1231 | buffer_free(&b); | ||
1232 | return 0; | ||
1233 | } | 1229 | } |
1234 | } | 1230 | } |
1235 | 1231 | ||