Removed an unused header include

[android-x86/external-openssh.git] / auth.h

diff --git a/auth.h b/auth.h
index 0d786c4..db86037 100644 (file)
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.69 2011/05/23 03:30:07 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.82 2015/02/16 22:13:32 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -42,6 +42,9 @@
 #include <krb5.h>
 #endif
 
+struct ssh;
+struct sshkey;
+
 typedef struct Authctxt Authctxt;
 typedef struct Authmethod Authmethod;
 typedef struct KbdintDevice KbdintDevice;
@@ -60,10 +63,12 @@ struct Authctxt {
        struct passwd   *pw;            /* set if 'valid' */
        char            *style;
        void            *kbdintctxt;
-       void            *jpake_ctx;
+       char            *info;          /* Extra info for next auth_log */
 #ifdef BSD_AUTH
        auth_session_t  *as;
 #endif
+       char            **auth_methods; /* modified from server config */
+       u_int            num_auth_methods;
 #ifdef KRB5
        krb5_context     krb5_ctx;
        krb5_ccache      krb5_fwd_ccache;
@@ -73,6 +78,9 @@ struct Authctxt {
 #endif
        Buffer          *loginmsg;
        void            *methoddata;
+
+       struct sshkey   **prev_userkeys;
+       u_int            nprev_userkeys;
 };
 /*
  * Every authentication method has to handle authentication requests for
@@ -119,6 +127,14 @@ int         auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
 int     auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
 int     hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
 int     user_key_allowed(struct passwd *, Key *);
+void    pubkey_auth_info(Authctxt *, const Key *, const char *, ...)
+           __attribute__((__format__ (printf, 3, 4)));
+void    auth2_record_userkey(Authctxt *, struct sshkey *);
+int     auth2_userkey_already_used(Authctxt *, struct sshkey *);
+
+struct stat;
+int     auth_secure_path(const char *, struct stat *, const char *, uid_t,
+    char *, size_t);
 
 #ifdef KRB5
 int    auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *);
@@ -142,12 +158,21 @@ void disable_forwarding(void);
 void   do_authentication(Authctxt *);
 void   do_authentication2(Authctxt *);
 
-void   auth_log(Authctxt *, int, char *, char *);
-void   userauth_finish(Authctxt *, int, char *);
+void   auth_info(Authctxt *authctxt, const char *, ...)
+           __attribute__((__format__ (printf, 2, 3)))
+           __attribute__((__nonnull__ (2)));
+void   auth_log(Authctxt *, int, int, const char *, const char *);
+void   auth_maxtries_exceeded(Authctxt *) __attribute__((noreturn));
+void   userauth_finish(Authctxt *, int, const char *, const char *);
+int    auth_root_allowed(const char *);
+
 void   userauth_send_banner(const char *);
-int    auth_root_allowed(char *);
 
 char   *auth2_read_banner(void);
+int     auth2_methods_valid(const char *, int);
+int     auth2_update_methods_lists(Authctxt *, const char *, const char *);
+int     auth2_setup_methods_lists(Authctxt *);
+int     auth2_method_allowed(Authctxt *, const char *, const char *);
 
 void   privsep_challenge_enable(void);
 
@@ -158,9 +183,6 @@ int bsdauth_respond(void *, u_int, char **);
 int    skey_query(void *, char **, char **, u_int *, char ***, u_int **);
 int    skey_respond(void *, u_int, char **);
 
-void   auth2_jpake_get_pwdata(Authctxt *, BIGNUM **, char **, char **);
-void   auth2_jpake_stop(Authctxt *);
-
 int    allowed_user(struct passwd *);
 struct passwd * getpwnamallow(const char *user);
 
@@ -181,10 +203,13 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *,
 
 /* hostkey handling */
 Key    *get_hostkey_by_index(int);
-Key    *get_hostkey_public_by_type(int);
-Key    *get_hostkey_private_by_type(int);
-int     get_hostkey_index(Key *);
+Key    *get_hostkey_public_by_index(int, struct ssh *);
+Key    *get_hostkey_public_by_type(int, int, struct ssh *);
+Key    *get_hostkey_private_by_type(int, int, struct ssh *);
+int     get_hostkey_index(Key *, int, struct ssh *);
 int     ssh1_session_key(BIGNUM *);
+int     sshd_hostkey_sign(Key *, Key *, u_char **, size_t *,
+            const u_char *, size_t, u_int);
 
 /* debug messages during authentication */
 void    auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2)));
@@ -195,8 +220,6 @@ struct passwd *fakepw(void);
 
 int     sys_auth_passwd(Authctxt *, const char *);
 
-#define AUTH_FAIL_MSG "Too many authentication failures for %.100s"
-
 #define SKEY_PROMPT "\nS/Key Password: "
 
 #if defined(KRB5) && !defined(HEIMDAL)