diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
commit | 59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch) | |
tree | 5910d4a840352aafbf67e8a39fa63936e5529b26 /auth2-jpake.c | |
parent | 07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff) | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) |
* New upstream release.
* Update to GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
Diffstat (limited to 'auth2-jpake.c')
-rw-r--r-- | auth2-jpake.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/auth2-jpake.c b/auth2-jpake.c index efe7ff2a3..5de5506a6 100644 --- a/auth2-jpake.c +++ b/auth2-jpake.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ | 1 | /* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 3 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
4 | * | 4 | * |
@@ -42,8 +42,8 @@ | |||
42 | #include "ssh2.h" | 42 | #include "ssh2.h" |
43 | #include "key.h" | 43 | #include "key.h" |
44 | #include "hostfile.h" | 44 | #include "hostfile.h" |
45 | #include "buffer.h" | ||
46 | #include "auth.h" | 45 | #include "auth.h" |
46 | #include "buffer.h" | ||
47 | #include "packet.h" | 47 | #include "packet.h" |
48 | #include "dispatch.h" | 48 | #include "dispatch.h" |
49 | #include "log.h" | 49 | #include "log.h" |
@@ -55,6 +55,7 @@ | |||
55 | #endif | 55 | #endif |
56 | #include "monitor_wrap.h" | 56 | #include "monitor_wrap.h" |
57 | 57 | ||
58 | #include "schnorr.h" | ||
58 | #include "jpake.h" | 59 | #include "jpake.h" |
59 | 60 | ||
60 | /* | 61 | /* |
@@ -359,7 +360,7 @@ auth2_jpake_get_pwdata(Authctxt *authctxt, BIGNUM **s, | |||
359 | } | 360 | } |
360 | 361 | ||
361 | /* | 362 | /* |
362 | * Being authentication attempt. | 363 | * Begin authentication attempt. |
363 | * Note, sets authctxt->postponed while in subprotocol | 364 | * Note, sets authctxt->postponed while in subprotocol |
364 | */ | 365 | */ |
365 | static int | 366 | static int |