summaryrefslogtreecommitdiff
path: root/monitor_wrap.h
diff options
context:
space:
mode:
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r--monitor_wrap.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h
index 3e75867cd..a9ccb243e 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.h,v 1.32 2016/09/28 16:33:07 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.35 2017/05/31 08:09:45 markus Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -34,23 +34,25 @@ extern int use_privsep;
34enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY }; 34enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY };
35 35
36struct monitor; 36struct monitor;
37struct mm_master;
38struct Authctxt; 37struct Authctxt;
39 38
40void mm_log_handler(LogLevel, const char *, void *); 39void mm_log_handler(LogLevel, const char *, void *);
41int mm_is_monitor(void); 40int mm_is_monitor(void);
42DH *mm_choose_dh(int, int, int); 41DH *mm_choose_dh(int, int, int);
43int mm_key_sign(Key *, u_char **, u_int *, const u_char *, u_int, const char *); 42int mm_key_sign(struct sshkey *, u_char **, u_int *, const u_char *, u_int,
43 const char *);
44void mm_inform_authserv(char *, char *, char *); 44void mm_inform_authserv(char *, char *, char *);
45void mm_inform_authrole(char *); 45void mm_inform_authrole(char *);
46struct passwd *mm_getpwnamallow(const char *); 46struct passwd *mm_getpwnamallow(const char *);
47char *mm_auth2_read_banner(void); 47char *mm_auth2_read_banner(void);
48int mm_auth_password(struct Authctxt *, char *); 48int mm_auth_password(struct Authctxt *, char *);
49int mm_key_allowed(enum mm_keytype, const char *, const char *, Key *, int); 49int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *,
50int mm_user_key_allowed(struct passwd *, Key *, int); 50 int);
51int mm_user_key_allowed(struct passwd *, struct sshkey *, int);
51int mm_hostbased_key_allowed(struct passwd *, const char *, 52int mm_hostbased_key_allowed(struct passwd *, const char *,
52 const char *, Key *); 53 const char *, struct sshkey *);
53int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); 54int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t,
55 const u_char *, size_t, u_int);
54 56
55#ifdef GSSAPI 57#ifdef GSSAPI
56OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); 58OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
@@ -86,6 +88,7 @@ void mm_session_pty_cleanup2(struct Session *);
86struct newkeys *mm_newkeys_from_blob(u_char *, int); 88struct newkeys *mm_newkeys_from_blob(u_char *, int);
87int mm_newkeys_to_blob(int, u_char **, u_int *); 89int mm_newkeys_to_blob(int, u_char **, u_int *);
88 90
91void monitor_clear_keystate(struct monitor *);
89void monitor_apply_keystate(struct monitor *); 92void monitor_apply_keystate(struct monitor *);
90void mm_get_keystate(struct monitor *); 93void mm_get_keystate(struct monitor *);
91void mm_send_keystate(struct monitor*); 94void mm_send_keystate(struct monitor*);