diff options
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 9fd02b30c..1bc76afff 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.31 2016/08/13 17:47:41 markus 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 @@ | |||
31 | extern int use_privsep; | 31 | extern int use_privsep; |
32 | #define PRIVSEP(x) (use_privsep ? mm_##x : x) | 32 | #define PRIVSEP(x) (use_privsep ? mm_##x : x) |
33 | 33 | ||
34 | enum mm_keytype {MM_NOKEY, MM_HOSTKEY, MM_USERKEY, MM_RSAHOSTKEY, MM_RSAUSERKEY}; | 34 | enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY }; |
35 | 35 | ||
36 | struct monitor; | 36 | struct monitor; |
37 | struct mm_master; | 37 | struct mm_master; |
@@ -49,12 +49,7 @@ int mm_key_allowed(enum mm_keytype, const char *, const char *, Key *, int); | |||
49 | int mm_user_key_allowed(struct passwd *, Key *, int); | 49 | int mm_user_key_allowed(struct passwd *, Key *, int); |
50 | int mm_hostbased_key_allowed(struct passwd *, const char *, | 50 | int mm_hostbased_key_allowed(struct passwd *, const char *, |
51 | const char *, Key *); | 51 | const char *, Key *); |
52 | int mm_auth_rhosts_rsa_key_allowed(struct passwd *, const char *, | ||
53 | const char *, Key *); | ||
54 | int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); | 52 | int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); |
55 | int mm_auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **); | ||
56 | int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); | ||
57 | BIGNUM *mm_auth_rsa_generate_challenge(Key *); | ||
58 | 53 | ||
59 | #ifdef GSSAPI | 54 | #ifdef GSSAPI |
60 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 55 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
@@ -84,10 +79,6 @@ void mm_terminate(void); | |||
84 | int mm_pty_allocate(int *, int *, char *, size_t); | 79 | int mm_pty_allocate(int *, int *, char *, size_t); |
85 | void mm_session_pty_cleanup2(struct Session *); | 80 | void mm_session_pty_cleanup2(struct Session *); |
86 | 81 | ||
87 | /* SSHv1 interfaces */ | ||
88 | void mm_ssh1_session_id(u_char *); | ||
89 | int mm_ssh1_session_key(BIGNUM *); | ||
90 | |||
91 | /* Key export functions */ | 82 | /* Key export functions */ |
92 | struct newkeys *mm_newkeys_from_blob(u_char *, int); | 83 | struct newkeys *mm_newkeys_from_blob(u_char *, int); |
93 | int mm_newkeys_to_blob(int, u_char **, u_int *); | 84 | int mm_newkeys_to_blob(int, u_char **, u_int *); |