===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth.h,v
retrieving revision 1.7.2.6
retrieving revision 1.8
diff -u -r1.7.2.6 -r1.8
--- src/usr.bin/ssh/auth.h	2002/03/08 17:04:41	1.7.2.6
+++ src/usr.bin/ssh/auth.h	2000/12/28 14:25:51	1.8
@@ -1,5 +1,3 @@
-/*	$OpenBSD: auth.h,v 1.7.2.6 2002/03/08 17:04:41 brad Exp $	*/
-
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -23,129 +21,32 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ * $OpenBSD: auth.h,v 1.8 2000/12/28 14:25:51 markus Exp $
  */
-
 #ifndef AUTH_H
 #define AUTH_H
 
-#include "key.h"
-#include "hostfile.h"
-#include <openssl/rsa.h>
-
-#ifdef HAVE_LOGIN_CAP
-#include <login_cap.h>
-#endif
-#ifdef BSD_AUTH
-#include <bsd_auth.h>
-#endif
-#ifdef KRB5
-#include <krb5.h>
-#endif
-
 typedef struct Authctxt Authctxt;
-typedef struct KbdintDevice KbdintDevice;
-
 struct Authctxt {
-	int		 success;
-	int		 postponed;
-	int		 valid;
-	int		 attempt;
-	int		 failures;
-	char		*user;
-	char		*service;
-	struct passwd	*pw;
-	char		*style;
-	void		*kbdintctxt;
-#ifdef BSD_AUTH
-	auth_session_t	*as;
-#endif
-#ifdef KRB4
-	char		*krb4_ticket_file;
-#endif
-#ifdef KRB5
-	krb5_context	 krb5_ctx;
-	krb5_auth_context krb5_auth_ctx;
-	krb5_ccache	 krb5_fwd_ccache;
-	krb5_principal	 krb5_user;
-	char		*krb5_ticket_file;
-#endif
+	int success;
+	int valid;
+	int attempt;
+	int failures;
+	char *user;
+	char *service;
+	struct passwd *pw;
 };
 
-/*
- * Keyboard interactive device:
- * init_ctx	returns: non NULL upon success
- * query	returns: 0 - success, otherwise failure
- * respond	returns: 0 - success, 1 - need further interaction,
- *		otherwise - failure
- */
-struct KbdintDevice
-{
-	const char *name;
-	void*	(*init_ctx)(Authctxt*);
-	int	(*query)(void *ctx, char **name, char **infotxt,
-		    u_int *numprompts, char ***prompts, u_int **echo_on);
-	int	(*respond)(void *ctx, u_int numresp, char **responses);
-	void	(*free_ctx)(void *ctx);
-};
-
-int     auth_rhosts(struct passwd *, const char *);
-int
-auth_rhosts2(struct passwd *, const char *, const char *, const char *);
-
-int	 auth_rhosts_rsa(struct passwd *, const char *, Key *);
-int      auth_password(Authctxt *, const char *);
-int      auth_rsa(struct passwd *, BIGNUM *);
-int      auth_rsa_challenge_dialog(RSA *);
-
-#ifdef KRB4
-#include <krb.h>
-int     auth_krb4(Authctxt *, KTEXT, char **);
-int	auth_krb4_password(Authctxt *, const char *);
-void    krb4_cleanup_proc(void *);
-
-#ifdef AFS
-#include <kafs.h>
-int     auth_krb4_tgt(Authctxt *, const char *);
-int     auth_afs_token(Authctxt *, const char *);
-#endif /* AFS */
-
-#endif /* KRB4 */
-
-#ifdef KRB5
-int	auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client);
-int	auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt);
-int	auth_krb5_password(Authctxt *authctxt, const char *password);
-void	krb5_cleanup_proc(void *authctxt);
-#endif /* KRB5 */
-
 void	do_authentication(void);
 void	do_authentication2(void);
 
-Authctxt *authctxt_new(void);
-void	auth_log(Authctxt *, int, char *, char *);
-void	userauth_finish(Authctxt *, int, char *);
-int	auth_root_allowed(char *);
+void	userauth_log(Authctxt *authctxt, int authenticated, char *method);
+void	userauth_reply(Authctxt *authctxt, int authenticated);
 
-int	auth2_challenge(Authctxt *, char *);
-void	auth2_challenge_stop(Authctxt *);
+int	auth2_skey(Authctxt *authctxt);
 
-int	allowed_user(struct passwd *);
-
-char	*get_challenge(Authctxt *);
-int	verify_response(Authctxt *, const char *);
-
+int	allowed_user(struct passwd * pw);
 struct passwd * auth_get_user(void);
-
-char	*expand_filename(const char *, struct passwd *);
-char	*authorized_keys_file(struct passwd *);
-char	*authorized_keys_file2(struct passwd *);
-
-int
-secure_filename(FILE *, const char *, struct passwd *, char *, size_t);
-
-HostStatus
-check_key_in_hostfiles(struct passwd *, Key *, const char *,
-    const char *, const char *);
 
 #define AUTH_FAIL_MAX 6
 #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2)