Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 1 insertions, 10 deletions

diff --git a/auth2.c b/auth2.c
index b55bbcd95..70f29250d 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.129 2013/05/19 02:42:42 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.130 2014/01/29 06:18:35 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -72,9 +72,6 @@ extern Authmethod method_hostbased;
 extern Authmethod method_gsskeyex;
 extern Authmethod method_gssapi;
 #endif
-#ifdef JPAKE
-extern Authmethod method_jpake;
-#endif
 
 Authmethod *authmethods[] = {
         &method_none,
@@ -83,9 +80,6 @@ Authmethod *authmethods[] = {
         &method_gsskeyex,
         &method_gssapi,
 #endif
-#ifdef JPAKE
-        &method_jpake,
-#endif
         &method_passwd,
         &method_kbdint,
         &method_hostbased,
@@ -278,9 +272,6 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
         }
         /* reset state */
         auth2_challenge_stop(authctxt);
-#ifdef JPAKE
-        auth2_jpake_stop(authctxt);
-#endif
 
 #ifdef GSSAPI
         /* XXX move to auth2_gssapi_stop() */