summaryrefslogtreecommitdiff
path: root/monitor_wrap.h
diff options
context:
space:
mode:
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r--monitor_wrap.h16
1 files changed, 2 insertions, 14 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h
index 9fd02b30c..db5902f55 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.h,v 1.30 2016/03/07 19:02:43 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.32 2016/09/28 16:33:07 djm Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -31,7 +31,7 @@
31extern int use_privsep; 31extern int use_privsep;
32#define PRIVSEP(x) (use_privsep ? mm_##x : x) 32#define PRIVSEP(x) (use_privsep ? mm_##x : x)
33 33
34enum mm_keytype {MM_NOKEY, MM_HOSTKEY, MM_USERKEY, MM_RSAHOSTKEY, MM_RSAUSERKEY}; 34enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY };
35 35
36struct monitor; 36struct monitor;
37struct mm_master; 37struct mm_master;
@@ -49,12 +49,7 @@ int mm_key_allowed(enum mm_keytype, const char *, const char *, Key *, int);
49int mm_user_key_allowed(struct passwd *, Key *, int); 49int mm_user_key_allowed(struct passwd *, Key *, int);
50int mm_hostbased_key_allowed(struct passwd *, const char *, 50int mm_hostbased_key_allowed(struct passwd *, const char *,
51 const char *, Key *); 51 const char *, Key *);
52int mm_auth_rhosts_rsa_key_allowed(struct passwd *, const char *,
53 const char *, Key *);
54int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); 52int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int);
55int mm_auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
56int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *);
57BIGNUM *mm_auth_rsa_generate_challenge(Key *);
58 53
59#ifdef GSSAPI 54#ifdef GSSAPI
60OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); 55OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
@@ -84,10 +79,6 @@ void mm_terminate(void);
84int mm_pty_allocate(int *, int *, char *, size_t); 79int mm_pty_allocate(int *, int *, char *, size_t);
85void mm_session_pty_cleanup2(struct Session *); 80void mm_session_pty_cleanup2(struct Session *);
86 81
87/* SSHv1 interfaces */
88void mm_ssh1_session_id(u_char *);
89int mm_ssh1_session_key(BIGNUM *);
90
91/* Key export functions */ 82/* Key export functions */
92struct newkeys *mm_newkeys_from_blob(u_char *, int); 83struct newkeys *mm_newkeys_from_blob(u_char *, int);
93int mm_newkeys_to_blob(int, u_char **, u_int *); 84int mm_newkeys_to_blob(int, u_char **, u_int *);
@@ -104,7 +95,4 @@ int mm_bsdauth_respond(void *, u_int, char **);
104int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); 95int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **);
105int mm_skey_respond(void *, u_int, char **); 96int mm_skey_respond(void *, u_int, char **);
106 97
107/* zlib allocation hooks */
108void mm_init_compression(struct mm_master *);
109
110#endif /* _MM_WRAP_H_ */ 98#endif /* _MM_WRAP_H_ */