summaryrefslogtreecommitdiff
path: root/monitor_wrap.h
diff options
context:
space:
mode:
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r--monitor_wrap.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h
index 00e93fe9c..f99c31c43 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.h,v 1.24 2014/01/29 06:18:35 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.26 2015/02/16 22:13:32 djm Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -40,7 +40,7 @@ struct Authctxt;
40void mm_log_handler(LogLevel, const char *, void *); 40void mm_log_handler(LogLevel, const char *, void *);
41int mm_is_monitor(void); 41int mm_is_monitor(void);
42DH *mm_choose_dh(int, int, int); 42DH *mm_choose_dh(int, int, int);
43int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); 43int mm_key_sign(Key *, u_char **, u_int *, const u_char *, u_int);
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 *);
@@ -90,7 +90,7 @@ void mm_ssh1_session_id(u_char *);
90int mm_ssh1_session_key(BIGNUM *); 90int mm_ssh1_session_key(BIGNUM *);
91 91
92/* Key export functions */ 92/* Key export functions */
93struct Newkeys *mm_newkeys_from_blob(u_char *, int); 93struct newkeys *mm_newkeys_from_blob(u_char *, int);
94int mm_newkeys_to_blob(int, u_char **, u_int *); 94int mm_newkeys_to_blob(int, u_char **, u_int *);
95 95
96void monitor_apply_keystate(struct monitor *); 96void monitor_apply_keystate(struct monitor *);
@@ -106,9 +106,6 @@ int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **);
106int mm_skey_respond(void *, u_int, char **); 106int mm_skey_respond(void *, u_int, char **);
107 107
108/* zlib allocation hooks */ 108/* zlib allocation hooks */
109
110void *mm_zalloc(struct mm_master *, u_int, u_int);
111void mm_zfree(struct mm_master *, void *);
112void mm_init_compression(struct mm_master *); 109void mm_init_compression(struct mm_master *);
113 110
114#ifdef USE_CONSOLEKIT 111#ifdef USE_CONSOLEKIT