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

  - sftp(1): add support for resuming partial downloads using the "reget"
    command and on the sftp commandline or on the "get" commandline using
    the "-a" (append) option (closes: #158590).
  - ssh(1): add an "IgnoreUnknown" configuration option to selectively
    suppress errors arising from unknown configuration directives (closes:
    #436052).
  - sftp(1): update progressmeter when data is acknowledged, not when it's
    sent (partially addresses #708372).
  - ssh(1): do not fatally exit when attempting to cleanup multiplexing-
    created channels that are incompletely opened (closes: #651357).

1 files changed, 12 insertions, 4 deletions

diff --git a/auth.h b/auth.h
index c2328f05b..ec95460cf 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.72 2012/12/02 20:34:09 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.76 2013/07/19 07:37:48 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -61,6 +61,7 @@ struct Authctxt {
         char            *style;
         char            *role;
         void            *kbdintctxt;
+        char            *info;          /* Extra info for next auth_log */
         void            *jpake_ctx;
 #ifdef BSD_AUTH
         auth_session_t  *as;
@@ -122,6 +123,8 @@ 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)));
 
 struct stat;
 int      auth_secure_path(const char *, struct stat *, const char *, uid_t,
@@ -149,8 +152,10 @@ void disable_forwarding(void);
 void    do_authentication(Authctxt *);
 void    do_authentication2(Authctxt *);
 
-void    auth_log(Authctxt *, int, int, const char *, const char *,
-    const 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    userauth_finish(Authctxt *, int, const char *, const char *);
 int     auth_root_allowed(const char *);
 
@@ -158,8 +163,9 @@ void	userauth_send_banner(const char *);
 
 char    *auth2_read_banner(void);
 int      auth2_methods_valid(const char *, int);
-int      auth2_update_methods_lists(Authctxt *, const char *);
+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);
 
@@ -193,10 +199,12 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *,
 
 /* hostkey handling */
 Key     *get_hostkey_by_index(int);
+Key     *get_hostkey_public_by_index(int);
 Key     *get_hostkey_public_by_type(int);
 Key     *get_hostkey_private_by_type(int);
 int      get_hostkey_index(Key *);
 int      ssh1_session_key(BIGNUM *);
+void     sshd_hostkey_sign(Key *, Key *, u_char **, u_int *, u_char *, u_int);
 
 /* debug messages during authentication */
 void     auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2)));