summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-04 11:12:56 +1100
committerDamien Miller <djm@mindrot.org>2014-02-04 11:12:56 +1100
commit7cc194f70d4a5ec9a82d19422eaf18db4a6624c6 (patch)
tree8bf6b25f93b3ee74dc184349a45125738e89df5b /auth2.c
parentb0f26544cf6f4feeb1a4f6db09fca834f5c9867d (diff)
- djm@cvs.openbsd.org 2014/01/29 06:18:35
[Makefile.in auth.h auth2-jpake.c auth2.c jpake.c jpake.h monitor.c] [monitor.h monitor_wrap.c monitor_wrap.h readconf.c readconf.h] [schnorr.c schnorr.h servconf.c servconf.h ssh2.h sshconnect2.c] remove experimental, never-enabled JPAKE code; ok markus@
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/auth2.c b/auth2.c
index f0cab8cc0..a5490c009 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.129 2013/05/19 02:42:42 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.130 2014/01/29 06:18:35 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -71,9 +71,6 @@ extern Authmethod method_hostbased;
71#ifdef GSSAPI 71#ifdef GSSAPI
72extern Authmethod method_gssapi; 72extern Authmethod method_gssapi;
73#endif 73#endif
74#ifdef JPAKE
75extern Authmethod method_jpake;
76#endif
77 74
78Authmethod *authmethods[] = { 75Authmethod *authmethods[] = {
79 &method_none, 76 &method_none,
@@ -81,9 +78,6 @@ Authmethod *authmethods[] = {
81#ifdef GSSAPI 78#ifdef GSSAPI
82 &method_gssapi, 79 &method_gssapi,
83#endif 80#endif
84#ifdef JPAKE
85 &method_jpake,
86#endif
87 &method_passwd, 81 &method_passwd,
88 &method_kbdint, 82 &method_kbdint,
89 &method_hostbased, 83 &method_hostbased,
@@ -270,9 +264,6 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
270 } 264 }
271 /* reset state */ 265 /* reset state */
272 auth2_challenge_stop(authctxt); 266 auth2_challenge_stop(authctxt);
273#ifdef JPAKE
274 auth2_jpake_stop(authctxt);
275#endif
276 267
277#ifdef GSSAPI 268#ifdef GSSAPI
278 /* XXX move to auth2_gssapi_stop() */ 269 /* XXX move to auth2_gssapi_stop() */