- (djm) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2013/03/05 20:16:09
     [sshconnect2.c]
     reset pubkey order on partial success; ok djm@

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3fd81aa35..3f80a25c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (djm) [auth.c configure.ac misc.c monitor.c monitor_wrap.c] Support
    platforms, such as Android, that lack struct passwd.pw_gecos. Report
    and initial patch from Nathan Osman bz#2086; feedback tim@ ok dtucker@
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2013/03/05 20:16:09
+     [sshconnect2.c]
+     reset pubkey order on partial success; ok djm@
 
 20130418
  - (djm) [config.guess config.sub] Update to last versions before they switch
diff --git a/sshconnect2.c b/sshconnect2.c
index 58015c0d3..1a6a5850d 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.193 2013/03/05 20:16:09 markus Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -540,8 +540,12 @@ input_userauth_failure(int type, u_int32_t seq, void *ctxt)
         partial = packet_get_char();
         packet_check_eom();
 
-        if (partial != 0)
+        if (partial != 0) {
                 logit("Authenticated with partial success.");
+                /* reset state */
+                pubkey_cleanup(authctxt);
+                pubkey_prepare(authctxt);
+        }
         debug("Authentications that can continue: %s", authlist);
 
         userauth(authctxt, authlist);