diff options
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -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 **); | |||
122 | int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); | 123 | int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); |
123 | int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); | 124 | int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); |
124 | int user_key_allowed(struct passwd *, Key *); | 125 | int user_key_allowed(struct passwd *, Key *); |
126 | void pubkey_auth_info(Authctxt *, const Key *, const char *, ...) | ||
127 | __attribute__((__format__ (printf, 3, 4))); | ||
125 | 128 | ||
126 | struct stat; | 129 | struct stat; |
127 | int auth_secure_path(const char *, struct stat *, const char *, uid_t, | 130 | int auth_secure_path(const char *, struct stat *, const char *, uid_t, |
@@ -149,8 +152,10 @@ void disable_forwarding(void); | |||
149 | void do_authentication(Authctxt *); | 152 | void do_authentication(Authctxt *); |
150 | void do_authentication2(Authctxt *); | 153 | void do_authentication2(Authctxt *); |
151 | 154 | ||
152 | void auth_log(Authctxt *, int, int, const char *, const char *, | 155 | void auth_info(Authctxt *authctxt, const char *, ...) |
153 | const char *); | 156 | __attribute__((__format__ (printf, 2, 3))) |
157 | __attribute__((__nonnull__ (2))); | ||
158 | void auth_log(Authctxt *, int, int, const char *, const char *); | ||
154 | void userauth_finish(Authctxt *, int, const char *, const char *); | 159 | void userauth_finish(Authctxt *, int, const char *, const char *); |
155 | int auth_root_allowed(const char *); | 160 | int auth_root_allowed(const char *); |
156 | 161 | ||
@@ -158,8 +163,9 @@ void userauth_send_banner(const char *); | |||
158 | 163 | ||
159 | char *auth2_read_banner(void); | 164 | char *auth2_read_banner(void); |
160 | int auth2_methods_valid(const char *, int); | 165 | int auth2_methods_valid(const char *, int); |
161 | int auth2_update_methods_lists(Authctxt *, const char *); | 166 | int auth2_update_methods_lists(Authctxt *, const char *, const char *); |
162 | int auth2_setup_methods_lists(Authctxt *); | 167 | int auth2_setup_methods_lists(Authctxt *); |
168 | int auth2_method_allowed(Authctxt *, const char *, const char *); | ||
163 | 169 | ||
164 | void privsep_challenge_enable(void); | 170 | void 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 */ |
195 | Key *get_hostkey_by_index(int); | 201 | Key *get_hostkey_by_index(int); |
202 | Key *get_hostkey_public_by_index(int); | ||
196 | Key *get_hostkey_public_by_type(int); | 203 | Key *get_hostkey_public_by_type(int); |
197 | Key *get_hostkey_private_by_type(int); | 204 | Key *get_hostkey_private_by_type(int); |
198 | int get_hostkey_index(Key *); | 205 | int get_hostkey_index(Key *); |
199 | int ssh1_session_key(BIGNUM *); | 206 | int ssh1_session_key(BIGNUM *); |
207 | void 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 */ |
202 | void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); | 210 | void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); |