diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /auth.h | |
parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) |
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.61 2008/07/02 12:03:51 dtucker Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.62 2008/11/04 08:22:12 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -60,6 +60,7 @@ struct Authctxt { | |||
60 | struct passwd *pw; /* set if 'valid' */ | 60 | struct passwd *pw; /* set if 'valid' */ |
61 | char *style; | 61 | char *style; |
62 | void *kbdintctxt; | 62 | void *kbdintctxt; |
63 | void *jpake_ctx; | ||
63 | #ifdef BSD_AUTH | 64 | #ifdef BSD_AUTH |
64 | auth_session_t *as; | 65 | auth_session_t *as; |
65 | #endif | 66 | #endif |
@@ -157,6 +158,9 @@ int bsdauth_respond(void *, u_int, char **); | |||
157 | int skey_query(void *, char **, char **, u_int *, char ***, u_int **); | 158 | int skey_query(void *, char **, char **, u_int *, char ***, u_int **); |
158 | int skey_respond(void *, u_int, char **); | 159 | int skey_respond(void *, u_int, char **); |
159 | 160 | ||
161 | void auth2_jpake_get_pwdata(Authctxt *, BIGNUM **, char **, char **); | ||
162 | void auth2_jpake_stop(Authctxt *); | ||
163 | |||
160 | int allowed_user(struct passwd *); | 164 | int allowed_user(struct passwd *); |
161 | struct passwd * getpwnamallow(const char *user); | 165 | struct passwd * getpwnamallow(const char *user); |
162 | 166 | ||