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 d5b3334dc..3e75867cd 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;
@@ -50,12 +50,7 @@ int mm_key_allowed(enum mm_keytype, const char *, const char *, Key *, int);
50int mm_user_key_allowed(struct passwd *, Key *, int); 50int mm_user_key_allowed(struct passwd *, Key *, int);
51int mm_hostbased_key_allowed(struct passwd *, const char *, 51int mm_hostbased_key_allowed(struct passwd *, const char *,
52 const char *, Key *); 52 const char *, Key *);
53int mm_auth_rhosts_rsa_key_allowed(struct passwd *, const char *,
54 const char *, Key *);
55int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); 53int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int);
56int mm_auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
57int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *);
58BIGNUM *mm_auth_rsa_generate_challenge(Key *);
59 54
60#ifdef GSSAPI 55#ifdef GSSAPI
61OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); 56OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
@@ -87,10 +82,6 @@ void mm_terminate(void);
87int mm_pty_allocate(int *, int *, char *, size_t); 82int mm_pty_allocate(int *, int *, char *, size_t);
88void mm_session_pty_cleanup2(struct Session *); 83void mm_session_pty_cleanup2(struct Session *);
89 84
90/* SSHv1 interfaces */
91void mm_ssh1_session_id(u_char *);
92int mm_ssh1_session_key(BIGNUM *);
93
94/* Key export functions */ 85/* Key export functions */
95struct newkeys *mm_newkeys_from_blob(u_char *, int); 86struct newkeys *mm_newkeys_from_blob(u_char *, int);
96int mm_newkeys_to_blob(int, u_char **, u_int *); 87int mm_newkeys_to_blob(int, u_char **, u_int *);
@@ -107,7 +98,4 @@ int mm_bsdauth_respond(void *, u_int, char **);
107int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); 98int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **);
108int mm_skey_respond(void *, u_int, char **); 99int mm_skey_respond(void *, u_int, char **);
109 100
110/* zlib allocation hooks */
111void mm_init_compression(struct mm_master *);
112
113#endif /* _MM_WRAP_H_ */ 101#endif /* _MM_WRAP_H_ */