summaryrefslogtreecommitdiff
path: root/monitor_wrap.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2017-05-30 08:52:19 +0000
committerDamien Miller <djm@mindrot.org>2017-05-31 10:47:31 +1000
commit54d90ace1d3535b44d92a8611952dc109a74a031 (patch)
tree1b5ff69321b88b32fba058fe2c966bf177c95b28 /monitor_wrap.h
parentc221219b1fbee47028dcaf66613f4f8d6b7640e9 (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.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h
index db5902f5..a1552d0c 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.h,v 1.32 2016/09/28 16:33:07 djm Exp $ */
+/* $OpenBSD: monitor_wrap.h,v 1.33 2017/05/30 08:52:19 markus Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -40,16 +40,18 @@ struct Authctxt;
void mm_log_handler(LogLevel, const char *, void *);
int mm_is_monitor(void);
DH *mm_choose_dh(int, int, int);
-int mm_key_sign(Key *, u_char **, u_int *, const u_char *, u_int, const char *);
+int mm_key_sign(struct sshkey *, u_char **, u_int *, const u_char *, u_int,
+ const char *);
void mm_inform_authserv(char *, char *);
struct passwd *mm_getpwnamallow(const char *);
char *mm_auth2_read_banner(void);
int mm_auth_password(struct Authctxt *, char *);
-int mm_key_allowed(enum mm_keytype, const char *, const char *, Key *, int);
-int mm_user_key_allowed(struct passwd *, Key *, int);
+int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *,
+ int);
+int mm_user_key_allowed(struct passwd *, struct sshkey *, int);
int mm_hostbased_key_allowed(struct passwd *, const char *,
- const char *, Key *);
-int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int);
+ const char *, struct sshkey *);
+int mm_key_verify(struct sshkey *, u_char *, u_int, u_char *, u_int);
#ifdef GSSAPI
OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);