summaryrefslogtreecommitdiff
path: root/monitor_wrap.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2019-06-05 06:41:44 +0100
committerColin Watson <cjwatson@debian.org>2019-06-05 06:41:44 +0100
commit102062f825fb26a74295a1c089c00c4c4c76b68a (patch)
tree3db66bc8c8483cce66516dff36f6ef56065143d9 /monitor_wrap.h
parent3d246f10429fc9a37b98eabef94fe8dc7c61002b (diff)
parentfd0fa130ecf06d7d092932adcd5d77f1549bfc8d (diff)
Import openssh_8.0p1.orig.tar.gz
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r--monitor_wrap.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h
index 644da081d..fdebb3aa4 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.h,v 1.38 2018/07/11 18:53:29 markus Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.41 2019/01/19 21:43:56 djm Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -33,6 +33,7 @@ extern int use_privsep;
33 33
34enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY }; 34enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY };
35 35
36struct ssh;
36struct monitor; 37struct monitor;
37struct Authctxt; 38struct Authctxt;
38struct sshkey; 39struct sshkey;
@@ -41,17 +42,17 @@ struct sshauthopt;
41void mm_log_handler(LogLevel, const char *, void *); 42void mm_log_handler(LogLevel, const char *, void *);
42int mm_is_monitor(void); 43int mm_is_monitor(void);
43DH *mm_choose_dh(int, int, int); 44DH *mm_choose_dh(int, int, int);
44int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t, 45int mm_sshkey_sign(struct ssh *, struct sshkey *, u_char **, size_t *,
45 const char *, u_int compat); 46 const u_char *, size_t, const char *, u_int compat);
46void mm_inform_authserv(char *, char *); 47void mm_inform_authserv(char *, char *);
47struct passwd *mm_getpwnamallow(const char *); 48struct passwd *mm_getpwnamallow(struct ssh *, const char *);
48char *mm_auth2_read_banner(void); 49char *mm_auth2_read_banner(void);
49int mm_auth_password(struct ssh *, char *); 50int mm_auth_password(struct ssh *, char *);
50int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, 51int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *,
51 int, struct sshauthopt **); 52 int, struct sshauthopt **);
52int mm_user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int, 53int mm_user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int,
53 struct sshauthopt **); 54 struct sshauthopt **);
54int mm_hostbased_key_allowed(struct passwd *, const char *, 55int mm_hostbased_key_allowed(struct ssh *, struct passwd *, const char *,
55 const char *, struct sshkey *); 56 const char *, struct sshkey *);
56int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t, 57int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t,
57 const u_char *, size_t, const char *, u_int); 58 const u_char *, size_t, const char *, u_int);
@@ -65,7 +66,7 @@ OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
65#endif 66#endif
66 67
67#ifdef USE_PAM 68#ifdef USE_PAM
68void mm_start_pam(struct Authctxt *); 69void mm_start_pam(struct ssh *ssh);
69u_int mm_do_pam_account(void); 70u_int mm_do_pam_account(void);
70void *mm_sshpam_init_ctx(struct Authctxt *); 71void *mm_sshpam_init_ctx(struct Authctxt *);
71int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **); 72int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **);
@@ -75,7 +76,7 @@ void mm_sshpam_free_ctx(void *);
75 76
76#ifdef SSH_AUDIT_EVENTS 77#ifdef SSH_AUDIT_EVENTS
77#include "audit.h" 78#include "audit.h"
78void mm_audit_event(ssh_audit_event_t); 79void mm_audit_event(struct ssh *, ssh_audit_event_t);
79void mm_audit_run_command(const char *); 80void mm_audit_run_command(const char *);
80#endif 81#endif
81 82
@@ -88,10 +89,7 @@ void mm_session_pty_cleanup2(struct Session *);
88struct newkeys *mm_newkeys_from_blob(u_char *, int); 89struct newkeys *mm_newkeys_from_blob(u_char *, int);
89int mm_newkeys_to_blob(int, u_char **, u_int *); 90int mm_newkeys_to_blob(int, u_char **, u_int *);
90 91
91void monitor_clear_keystate(struct monitor *); 92void mm_send_keystate(struct ssh *, struct monitor*);
92void monitor_apply_keystate(struct monitor *);
93void mm_get_keystate(struct monitor *);
94void mm_send_keystate(struct monitor*);
95 93
96/* bsdauth */ 94/* bsdauth */
97int mm_bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **); 95int mm_bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **);