Deleted Added
sdiff udiff text old ( 247485 ) new ( 251135 )
full compact
auth.h (247485) auth.h (251135)
1/* $OpenBSD: auth.h,v 1.69 2011/05/23 03:30:07 djm Exp $ */
1/* $OpenBSD: auth.h,v 1.72 2012/12/02 20:34:09 djm Exp $ */
2
3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 49 unchanged lines hidden (view full) ---

59 char *service;
60 struct passwd *pw; /* set if 'valid' */
61 char *style;
62 void *kbdintctxt;
63 void *jpake_ctx;
64#ifdef BSD_AUTH
65 auth_session_t *as;
66#endif
2
3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 49 unchanged lines hidden (view full) ---

59 char *service;
60 struct passwd *pw; /* set if 'valid' */
61 char *style;
62 void *kbdintctxt;
63 void *jpake_ctx;
64#ifdef BSD_AUTH
65 auth_session_t *as;
66#endif
67 char **auth_methods; /* modified from server config */
68 u_int num_auth_methods;
67#ifdef KRB5
68 krb5_context krb5_ctx;
69 krb5_ccache krb5_fwd_ccache;
70 krb5_principal krb5_user;
71 char *krb5_ticket_file;
72 char *krb5_ccname;
73#endif
74 Buffer *loginmsg;

--- 40 unchanged lines hidden (view full) ---

115BIGNUM *auth_rsa_generate_challenge(Key *);
116int auth_rsa_verify_response(Key *, BIGNUM *, u_char[]);
117int auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
118
119int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
120int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
121int user_key_allowed(struct passwd *, Key *);
122
69#ifdef KRB5
70 krb5_context krb5_ctx;
71 krb5_ccache krb5_fwd_ccache;
72 krb5_principal krb5_user;
73 char *krb5_ticket_file;
74 char *krb5_ccname;
75#endif
76 Buffer *loginmsg;

--- 40 unchanged lines hidden (view full) ---

117BIGNUM *auth_rsa_generate_challenge(Key *);
118int auth_rsa_verify_response(Key *, BIGNUM *, u_char[]);
119int auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
120
121int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
122int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
123int user_key_allowed(struct passwd *, Key *);
124
125struct stat;
126int auth_secure_path(const char *, struct stat *, const char *, uid_t,
127 char *, size_t);
128
123#ifdef KRB5
124int auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *);
125int auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt);
126int auth_krb5_password(Authctxt *authctxt, const char *password);
127void krb5_cleanup_proc(Authctxt *authctxt);
128#endif /* KRB5 */
129
130#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)

--- 6 unchanged lines hidden (view full) ---

137#include "audit.h"
138void remove_kbdint_device(const char *);
139
140void disable_forwarding(void);
141
142void do_authentication(Authctxt *);
143void do_authentication2(Authctxt *);
144
129#ifdef KRB5
130int auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *);
131int auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt);
132int auth_krb5_password(Authctxt *authctxt, const char *password);
133void krb5_cleanup_proc(Authctxt *authctxt);
134#endif /* KRB5 */
135
136#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)

--- 6 unchanged lines hidden (view full) ---

143#include "audit.h"
144void remove_kbdint_device(const char *);
145
146void disable_forwarding(void);
147
148void do_authentication(Authctxt *);
149void do_authentication2(Authctxt *);
150
145void auth_log(Authctxt *, int, char *, char *);
146void userauth_finish(Authctxt *, int, char *);
151void auth_log(Authctxt *, int, int, const char *, const char *,
152 const char *);
153void userauth_finish(Authctxt *, int, const char *, const char *);
154int auth_root_allowed(const char *);
155
147void userauth_send_banner(const char *);
156void userauth_send_banner(const char *);
148int auth_root_allowed(char *);
149
150char *auth2_read_banner(void);
157
158char *auth2_read_banner(void);
159int auth2_methods_valid(const char *, int);
160int auth2_update_methods_lists(Authctxt *, const char *);
161int auth2_setup_methods_lists(Authctxt *);
151
152void privsep_challenge_enable(void);
153
154int auth2_challenge(Authctxt *, char *);
155void auth2_challenge_stop(Authctxt *);
156int bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **);
157int bsdauth_respond(void *, u_int, char **);
158int skey_query(void *, char **, char **, u_int *, char ***, u_int **);

--- 48 unchanged lines hidden --- 		162
163void privsep_challenge_enable(void);
164
165int auth2_challenge(Authctxt *, char *);
166void auth2_challenge_stop(Authctxt *);
167int bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **);
168int bsdauth_respond(void *, u_int, char **);
169int skey_query(void *, char **, char **, u_int *, char ***, u_int **);

--- 48 unchanged lines hidden ---