RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-16 22:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Fix public key authentication when multiple
authentication is in use. Instead of deleting and re-preparing the entire
keys list, just reset the 'used' flags; the keys list is already in a good
order (with already- tried keys at the back)

Analysis and patch from Vincent Brillault on bz#2642; ok dtucker@

Upstream-ID: 7123f12dc2f3bcaae715853035a97923d7300176
This commit is contained in:
djm@openbsd.org 2016-12-04 23:54:02 +00:00 committed by Darren Tucker
parent f2398eb774
commit b9844a45c7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.250 2016/09/28 20:32:42 djm Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.251 2016/12/04 23:54:02 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -318,6 +318,7 @@ void userauth(Authctxt *, char *);
static int sign_and_send_pubkey(Authctxt *, Identity *); static int sign_and_send_pubkey(Authctxt *, Identity *);
static void pubkey_prepare(Authctxt *); static void pubkey_prepare(Authctxt *);
static void pubkey_cleanup(Authctxt *); static void pubkey_cleanup(Authctxt *);
static void pubkey_reset(Authctxt *);
static Key *load_identity_file(Identity *); static Key *load_identity_file(Identity *);
static Authmethod *authmethod_get(char *authlist); static Authmethod *authmethod_get(char *authlist);
@ -560,8 +561,7 @@ input_userauth_failure(int type, u_int32_t seq, void *ctxt)
if (partial != 0) { if (partial != 0) {
verbose("Authenticated with partial success."); verbose("Authenticated with partial success.");
/* reset state */ /* reset state */
pubkey_cleanup(authctxt); pubkey_reset(authctxt);
pubkey_prepare(authctxt);
} }
debug("Authentications that can continue: %s", authlist); debug("Authentications that can continue: %s", authlist);
@ -1414,6 +1414,15 @@ pubkey_cleanup(Authctxt *authctxt)
} }
} }
static void
pubkey_reset(Authctxt *authctxt)
{
Identity *id;
TAILQ_FOREACH(id, &authctxt->keys, next)
id->tried = 0;
}
static int static int
try_identity(Identity *id) try_identity(Identity *id)
{ {
@ -1462,6 +1471,7 @@ userauth_pubkey(Authctxt *authctxt)
} }
key_free(id->key); key_free(id->key);
id->key = NULL; id->key = NULL;
id->isprivate = 0;
} }
} }
if (sent) if (sent)