diff options
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 2a7bf7c87..1e6f8b30e 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.21 2008/11/04 08:22:13 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -57,9 +57,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *); | |||
57 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 57 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
58 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, | 58 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, |
59 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); | 59 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); |
60 | int mm_ssh_gssapi_userok(char *user); | 60 | int mm_ssh_gssapi_userok(char *user, struct passwd *); |
61 | OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); | 61 | OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); |
62 | OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); | 62 | OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); |
63 | int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); | ||
63 | #endif | 64 | #endif |
64 | 65 | ||
65 | #ifdef USE_PAM | 66 | #ifdef USE_PAM |
@@ -102,6 +103,26 @@ int mm_bsdauth_respond(void *, u_int, char **); | |||
102 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); | 103 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); |
103 | int mm_skey_respond(void *, u_int, char **); | 104 | int mm_skey_respond(void *, u_int, char **); |
104 | 105 | ||
106 | /* jpake */ | ||
107 | struct jpake_group; | ||
108 | void mm_auth2_jpake_get_pwdata(struct Authctxt *, BIGNUM **, char **, char **); | ||
109 | void mm_jpake_step1(struct jpake_group *, u_char **, u_int *, | ||
110 | BIGNUM **, BIGNUM **, BIGNUM **, BIGNUM **, | ||
111 | u_char **, u_int *, u_char **, u_int *); | ||
112 | void mm_jpake_step2(struct jpake_group *, BIGNUM *, | ||
113 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, | ||
114 | const u_char *, u_int, const u_char *, u_int, | ||
115 | const u_char *, u_int, const u_char *, u_int, | ||
116 | BIGNUM **, u_char **, u_int *); | ||
117 | void mm_jpake_key_confirm(struct jpake_group *, BIGNUM *, BIGNUM *, | ||
118 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, | ||
119 | const u_char *, u_int, const u_char *, u_int, | ||
120 | const u_char *, u_int, const u_char *, u_int, | ||
121 | BIGNUM **, u_char **, u_int *); | ||
122 | int mm_jpake_check_confirm(const BIGNUM *, | ||
123 | const u_char *, u_int, const u_char *, u_int, const u_char *, u_int); | ||
124 | |||
125 | |||
105 | /* zlib allocation hooks */ | 126 | /* zlib allocation hooks */ |
106 | 127 | ||
107 | void *mm_zalloc(struct mm_master *, u_int, u_int); | 128 | void *mm_zalloc(struct mm_master *, u_int, u_int); |