diff options
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 8277cbf45..2b7052202 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.40 2019/01/19 21:43:07 djm 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> |
@@ -42,8 +42,8 @@ struct sshauthopt; | |||
42 | void mm_log_handler(LogLevel, const char *, void *); | 42 | void mm_log_handler(LogLevel, const char *, void *); |
43 | int mm_is_monitor(void); | 43 | int mm_is_monitor(void); |
44 | DH *mm_choose_dh(int, int, int); | 44 | DH *mm_choose_dh(int, int, int); |
45 | int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t, | 45 | int mm_sshkey_sign(struct ssh *, struct sshkey *, u_char **, size_t *, |
46 | const char *, u_int compat); | 46 | const u_char *, size_t, const char *, u_int compat); |
47 | void mm_inform_authserv(char *, char *); | 47 | void mm_inform_authserv(char *, char *); |
48 | struct passwd *mm_getpwnamallow(struct ssh *, const char *); | 48 | struct passwd *mm_getpwnamallow(struct ssh *, const char *); |
49 | char *mm_auth2_read_banner(void); | 49 | char *mm_auth2_read_banner(void); |
@@ -52,7 +52,7 @@ int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, | |||
52 | int, struct sshauthopt **); | 52 | int, struct sshauthopt **); |
53 | int mm_user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int, | 53 | int mm_user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int, |
54 | struct sshauthopt **); | 54 | struct sshauthopt **); |
55 | int mm_hostbased_key_allowed(struct passwd *, const char *, | 55 | int mm_hostbased_key_allowed(struct ssh *, struct passwd *, const char *, |
56 | const char *, struct sshkey *); | 56 | const char *, struct sshkey *); |
57 | int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t, | 57 | int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t, |
58 | const u_char *, size_t, const char *, u_int); | 58 | const u_char *, size_t, const char *, u_int); |
@@ -89,8 +89,7 @@ void mm_session_pty_cleanup2(struct Session *); | |||
89 | struct newkeys *mm_newkeys_from_blob(u_char *, int); | 89 | struct newkeys *mm_newkeys_from_blob(u_char *, int); |
90 | int mm_newkeys_to_blob(int, u_char **, u_int *); | 90 | int mm_newkeys_to_blob(int, u_char **, u_int *); |
91 | 91 | ||
92 | void mm_get_keystate(struct monitor *); | 92 | void mm_send_keystate(struct ssh *, struct monitor*); |
93 | void mm_send_keystate(struct monitor*); | ||
94 | 93 | ||
95 | /* bsdauth */ | 94 | /* bsdauth */ |
96 | int mm_bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **); | 95 | int mm_bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **); |