← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kex.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:
kex.c
1
 
/* $OpenBSD: kex.c,v 1.80 2008/09/06 12:24:13 djm Exp $ */
 
1
/* $OpenBSD: kex.c,v 1.81 2009/05/27 06:34:36 andreas Exp $ */
2
2
/*
3
3
 * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
4
4
 *
53
53
#include "ssh-gss.h"
54
54
#endif
55
55
 
56
 
#define KEX_COOKIE_LEN  16
57
 
 
58
56
#if OPENSSL_VERSION_NUMBER >= 0x00907000L
59
57
# if defined(HAVE_EVP_SHA256)
60
58
# define evp_ssh_sha256 EVP_sha256