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

  - Add support for multiple required authentication in SSH protocol 2 via
    an AuthenticationMethods option (closes: #195716).
  - Fix Sophie Germain formula in moduli(5) (closes: #698612).
  - Update ssh-copy-id to Phil Hands' greatly revised version (closes:
    #99785, #322228, #620428; LP: #518883, #835901, #1074798).

1 files changed, 15 insertions, 4 deletions

diff --git a/auth.h b/auth.h
index 568212f9d..c2328f05b 100644
--- 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.72 2012/12/02 20:34:09 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -65,6 +65,8 @@ struct Authctxt {
 #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;
@@ -121,6 +123,10 @@ 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 *);
 
+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 *);
 int     auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt);
@@ -143,12 +149,17 @@ 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_log(Authctxt *, int, int, const char *, const char *,
+    const char *);
+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 *);
+int      auth2_setup_methods_lists(Authctxt *);
 
 void    privsep_challenge_enable(void);