diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /monitor_wrap.h | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 1e6f8b30e..432953fbf 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.21 2008/11/04 08:22:13 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.22 2009/03/05 07:18:19 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -104,17 +104,17 @@ int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); | |||
104 | int mm_skey_respond(void *, u_int, char **); | 104 | int mm_skey_respond(void *, u_int, char **); |
105 | 105 | ||
106 | /* jpake */ | 106 | /* jpake */ |
107 | struct jpake_group; | 107 | struct modp_group; |
108 | void mm_auth2_jpake_get_pwdata(struct Authctxt *, BIGNUM **, char **, char **); | 108 | void mm_auth2_jpake_get_pwdata(struct Authctxt *, BIGNUM **, char **, char **); |
109 | void mm_jpake_step1(struct jpake_group *, u_char **, u_int *, | 109 | void mm_jpake_step1(struct modp_group *, u_char **, u_int *, |
110 | BIGNUM **, BIGNUM **, BIGNUM **, BIGNUM **, | 110 | BIGNUM **, BIGNUM **, BIGNUM **, BIGNUM **, |
111 | u_char **, u_int *, u_char **, u_int *); | 111 | u_char **, u_int *, u_char **, u_int *); |
112 | void mm_jpake_step2(struct jpake_group *, BIGNUM *, | 112 | void mm_jpake_step2(struct modp_group *, BIGNUM *, |
113 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, | 113 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, |
114 | const u_char *, u_int, const u_char *, u_int, | 114 | const u_char *, u_int, const u_char *, u_int, |
115 | 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 *); | 116 | BIGNUM **, u_char **, u_int *); |
117 | void mm_jpake_key_confirm(struct jpake_group *, BIGNUM *, BIGNUM *, | 117 | void mm_jpake_key_confirm(struct modp_group *, BIGNUM *, BIGNUM *, |
118 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, | 118 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, |
119 | const u_char *, u_int, const u_char *, u_int, | 119 | const u_char *, u_int, const u_char *, u_int, |
120 | const u_char *, u_int, const u_char *, u_int, | 120 | const u_char *, u_int, const u_char *, u_int, |