← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to auth2-jpake.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-01-26 13:07:40 UTC
  • mfrom: (1.13.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126130740-d7r70jqrqlbvz3r0
Tags: 1:5.3p1-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Add support for registering ConsoleKit sessions on login.
  - Drop openssh-blacklist and openssh-blacklist-extra to Suggests; they
    take up a lot of CD space, and I suspect that rolling them out in
    security updates has covered most affected systems now.
  - Convert to Upstart.  The init script is still here for the benefit of
    people running sshd in chroots.

Show diffs side-by-side

added added

removed removed

Lines of Context:
auth2-jpake.c
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
3
 * Copyright (c) 2008 Damien Miller.  All rights reserved.
4
4
 *
42
42
#include "ssh2.h"
43
43
#include "key.h"
44
44
#include "hostfile.h"
 
45
#include "auth.h"
45
46
#include "buffer.h"
46
 
#include "auth.h"
47
47
#include "packet.h"
48
48
#include "dispatch.h"
49
49
#include "log.h"
55
55
#endif
56
56
#include "monitor_wrap.h"
57
57
 
 
58
#include "schnorr.h"
58
59
#include "jpake.h"
59
60
 
60
61
/*
359
360
}
360
361
 
361
362
/*
362
 
 * Being authentication attempt.
 
363
 * Begin authentication attempt.
363
364
 * Note, sets authctxt->postponed while in subprotocol
364
365
 */
365
366
static int