summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-03-14 16:20:54 +0000
committerDamien Miller <djm@mindrot.org>2016-03-15 03:23:46 +1100
commitc38905ba391434834da86abfc988a2b8b9b62477 (patch)
treece683981db6518d546190996f6da217c6118f102
parent4b4bfb01cd40b9ddb948e6026ddd287cc303d871 (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
-rw-r--r--sshconnect2.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index f79c96beb..1cf48a2ee 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.
@@ -1112,12 +1112,8 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id)
1112 "certificate", __func__, id->filename, 1112 "certificate", __func__, id->filename,
1113 id->agent_fd != -1 ? " from agent" : ""); 1113 id->agent_fd != -1 ? " from agent" : "");
1114 } else { 1114 } else {
1115 /* XXX maybe verbose/error? */ 1115 debug("%s: no separate private key for certificate "
1116 debug("%s: no private key for certificate "
1117 "\"%s\"", __func__, id->filename); 1116 "\"%s\"", __func__, id->filename);
1118 free(blob);
1119 buffer_free(&b);
1120 return 0;
1121 } 1117 }
1122 } 1118 }
1123 1119