summaryrefslogtreecommitdiff
path: root/auth.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
committerColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
commit327155e6824b3ee13837bdde04e4eb47e147ff46 (patch)
tree8f8743122403c7a2e6ed919156711fb1520c657f /auth.h
parent0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff)
parent74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff)
* 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).
Diffstat (limited to 'auth.h')
-rw-r--r--auth.h16
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 @@
1/* $OpenBSD: auth.h,v 1.72 2012/12/02 20:34:09 djm Exp $ */ 1/* $OpenBSD: auth.h,v 1.76 2013/07/19 07:37:48 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -61,6 +61,7 @@ struct Authctxt {
61 char *style; 61 char *style;
62 char *role; 62 char *role;
63 void *kbdintctxt; 63 void *kbdintctxt;
64 char *info; /* Extra info for next auth_log */
64 void *jpake_ctx; 65 void *jpake_ctx;
65#ifdef BSD_AUTH 66#ifdef BSD_AUTH
66 auth_session_t *as; 67 auth_session_t *as;
@@ -122,6 +123,8 @@ int auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
122int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); 123int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
123int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); 124int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
124int user_key_allowed(struct passwd *, Key *); 125int user_key_allowed(struct passwd *, Key *);
126void pubkey_auth_info(Authctxt *, const Key *, const char *, ...)
127 __attribute__((__format__ (printf, 3, 4)));
125 128
126struct stat; 129struct stat;
127int auth_secure_path(const char *, struct stat *, const char *, uid_t, 130int auth_secure_path(const char *, struct stat *, const char *, uid_t,
@@ -149,8 +152,10 @@ void disable_forwarding(void);
149void do_authentication(Authctxt *); 152void do_authentication(Authctxt *);
150void do_authentication2(Authctxt *); 153void do_authentication2(Authctxt *);
151 154
152void auth_log(Authctxt *, int, int, const char *, const char *, 155void auth_info(Authctxt *authctxt, const char *, ...)
153 const char *); 156 __attribute__((__format__ (printf, 2, 3)))
157 __attribute__((__nonnull__ (2)));
158void auth_log(Authctxt *, int, int, const char *, const char *);
154void userauth_finish(Authctxt *, int, const char *, const char *); 159void userauth_finish(Authctxt *, int, const char *, const char *);
155int auth_root_allowed(const char *); 160int auth_root_allowed(const char *);
156 161
@@ -158,8 +163,9 @@ void userauth_send_banner(const char *);
158 163
159char *auth2_read_banner(void); 164char *auth2_read_banner(void);
160int auth2_methods_valid(const char *, int); 165int auth2_methods_valid(const char *, int);
161int auth2_update_methods_lists(Authctxt *, const char *); 166int auth2_update_methods_lists(Authctxt *, const char *, const char *);
162int auth2_setup_methods_lists(Authctxt *); 167int auth2_setup_methods_lists(Authctxt *);
168int auth2_method_allowed(Authctxt *, const char *, const char *);
163 169
164void privsep_challenge_enable(void); 170void privsep_challenge_enable(void);
165 171
@@ -193,10 +199,12 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *,
193 199
194/* hostkey handling */ 200/* hostkey handling */
195Key *get_hostkey_by_index(int); 201Key *get_hostkey_by_index(int);
202Key *get_hostkey_public_by_index(int);
196Key *get_hostkey_public_by_type(int); 203Key *get_hostkey_public_by_type(int);
197Key *get_hostkey_private_by_type(int); 204Key *get_hostkey_private_by_type(int);
198int get_hostkey_index(Key *); 205int get_hostkey_index(Key *);
199int ssh1_session_key(BIGNUM *); 206int ssh1_session_key(BIGNUM *);
207void sshd_hostkey_sign(Key *, Key *, u_char **, u_int *, u_char *, u_int);
200 208
201/* debug messages during authentication */ 209/* debug messages during authentication */
202void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); 210void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2)));