diff options
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.96 2018/04/10 00:10:49 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.99 2019/01/19 21:43:56 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -132,8 +132,8 @@ auth_rhosts2(struct passwd *, const char *, const char *, const char *); | |||
132 | 132 | ||
133 | int auth_password(struct ssh *, const char *); | 133 | int auth_password(struct ssh *, const char *); |
134 | 134 | ||
135 | int hostbased_key_allowed(struct passwd *, const char *, char *, | 135 | int hostbased_key_allowed(struct ssh *, struct passwd *, |
136 | struct sshkey *); | 136 | const char *, char *, struct sshkey *); |
137 | int user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int, | 137 | int user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int, |
138 | struct sshauthopt **); | 138 | struct sshauthopt **); |
139 | int auth2_key_already_used(Authctxt *, const struct sshkey *); | 139 | int auth2_key_already_used(Authctxt *, const struct sshkey *); |
@@ -166,15 +166,13 @@ int auth_shadow_pwexpired(Authctxt *); | |||
166 | #include "audit.h" | 166 | #include "audit.h" |
167 | void remove_kbdint_device(const char *); | 167 | void remove_kbdint_device(const char *); |
168 | 168 | ||
169 | void do_authentication2(Authctxt *); | 169 | void do_authentication2(struct ssh *); |
170 | 170 | ||
171 | void auth_log(Authctxt *, int, int, const char *, const char *); | 171 | void auth_log(struct ssh *, int, int, const char *, const char *); |
172 | void auth_maxtries_exceeded(Authctxt *) __attribute__((noreturn)); | 172 | void auth_maxtries_exceeded(struct ssh *) __attribute__((noreturn)); |
173 | void userauth_finish(struct ssh *, int, const char *, const char *); | 173 | void userauth_finish(struct ssh *, int, const char *, const char *); |
174 | int auth_root_allowed(struct ssh *, const char *); | 174 | int auth_root_allowed(struct ssh *, const char *); |
175 | 175 | ||
176 | void userauth_send_banner(const char *); | ||
177 | |||
178 | char *auth2_read_banner(void); | 176 | char *auth2_read_banner(void); |
179 | int auth2_methods_valid(const char *, int); | 177 | int auth2_methods_valid(const char *, int); |
180 | int auth2_update_methods_lists(Authctxt *, const char *, const char *); | 178 | int auth2_update_methods_lists(Authctxt *, const char *, const char *); |
@@ -188,8 +186,8 @@ void auth2_challenge_stop(struct ssh *); | |||
188 | int bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **); | 186 | int bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **); |
189 | int bsdauth_respond(void *, u_int, char **); | 187 | int bsdauth_respond(void *, u_int, char **); |
190 | 188 | ||
191 | int allowed_user(struct passwd *); | 189 | int allowed_user(struct ssh *, struct passwd *); |
192 | struct passwd * getpwnamallow(const char *user); | 190 | struct passwd * getpwnamallow(struct ssh *, const char *user); |
193 | 191 | ||
194 | char *expand_authorized_keys(const char *, struct passwd *pw); | 192 | char *expand_authorized_keys(const char *, struct passwd *pw); |
195 | char *authorized_principals_file(struct passwd *); | 193 | char *authorized_principals_file(struct passwd *); |
@@ -210,8 +208,8 @@ struct sshkey *get_hostkey_public_by_index(int, struct ssh *); | |||
210 | struct sshkey *get_hostkey_public_by_type(int, int, struct ssh *); | 208 | struct sshkey *get_hostkey_public_by_type(int, int, struct ssh *); |
211 | struct sshkey *get_hostkey_private_by_type(int, int, struct ssh *); | 209 | struct sshkey *get_hostkey_private_by_type(int, int, struct ssh *); |
212 | int get_hostkey_index(struct sshkey *, int, struct ssh *); | 210 | int get_hostkey_index(struct sshkey *, int, struct ssh *); |
213 | int sshd_hostkey_sign(struct sshkey *, struct sshkey *, u_char **, | 211 | int sshd_hostkey_sign(struct ssh *, struct sshkey *, struct sshkey *, |
214 | size_t *, const u_char *, size_t, const char *, u_int); | 212 | u_char **, size_t *, const u_char *, size_t, const char *); |
215 | 213 | ||
216 | /* Key / cert options linkage to auth layer */ | 214 | /* Key / cert options linkage to auth layer */ |
217 | const struct sshauthopt *auth_options(struct ssh *); | 215 | const struct sshauthopt *auth_options(struct ssh *); |
@@ -224,7 +222,7 @@ void auth_log_authopts(const char *, const struct sshauthopt *, int); | |||
224 | /* debug messages during authentication */ | 222 | /* debug messages during authentication */ |
225 | void auth_debug_add(const char *fmt,...) | 223 | void auth_debug_add(const char *fmt,...) |
226 | __attribute__((format(printf, 1, 2))); | 224 | __attribute__((format(printf, 1, 2))); |
227 | void auth_debug_send(void); | 225 | void auth_debug_send(struct ssh *); |
228 | void auth_debug_reset(void); | 226 | void auth_debug_reset(void); |
229 | 227 | ||
230 | struct passwd *fakepw(void); | 228 | struct passwd *fakepw(void); |