diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 08:52:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:47:31 +1000 |
commit | 54d90ace1d3535b44d92a8611952dc109a74a031 (patch) | |
tree | 1b5ff69321b88b32fba058fe2c966bf177c95b28 /monitor_wrap.h | |
parent | c221219b1fbee47028dcaf66613f4f8d6b7640e9 (diff) |
upstream commit
switch from Key typedef with struct sshkey; ok djm@
Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index db5902f55..a1552d0c9 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.33 2017/05/30 08:52:19 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -40,16 +40,18 @@ struct Authctxt; | |||
40 | void mm_log_handler(LogLevel, const char *, void *); | 40 | void mm_log_handler(LogLevel, const char *, void *); |
41 | int mm_is_monitor(void); | 41 | int mm_is_monitor(void); |
42 | DH *mm_choose_dh(int, int, int); | 42 | DH *mm_choose_dh(int, int, int); |
43 | int mm_key_sign(Key *, u_char **, u_int *, const u_char *, u_int, const char *); | 43 | int mm_key_sign(struct sshkey *, u_char **, u_int *, const u_char *, u_int, |
44 | const char *); | ||
44 | void mm_inform_authserv(char *, char *); | 45 | void mm_inform_authserv(char *, char *); |
45 | struct passwd *mm_getpwnamallow(const char *); | 46 | struct passwd *mm_getpwnamallow(const char *); |
46 | char *mm_auth2_read_banner(void); | 47 | char *mm_auth2_read_banner(void); |
47 | int mm_auth_password(struct Authctxt *, char *); | 48 | int mm_auth_password(struct Authctxt *, char *); |
48 | int mm_key_allowed(enum mm_keytype, const char *, const char *, Key *, int); | 49 | int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, |
49 | int mm_user_key_allowed(struct passwd *, Key *, int); | 50 | int); |
51 | int mm_user_key_allowed(struct passwd *, struct sshkey *, int); | ||
50 | int mm_hostbased_key_allowed(struct passwd *, const char *, | 52 | int mm_hostbased_key_allowed(struct passwd *, const char *, |
51 | const char *, Key *); | 53 | const char *, struct sshkey *); |
52 | int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); | 54 | int mm_key_verify(struct sshkey *, u_char *, u_int, u_char *, u_int); |
53 | 55 | ||
54 | #ifdef GSSAPI | 56 | #ifdef GSSAPI |
55 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 57 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |