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 /kex.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 'kex.c')
-rw-r--r-- | kex.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
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 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -53,8 +53,6 @@ | |||
53 | #include "ssh-gss.h" | 53 | #include "ssh-gss.h" |
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | #define KEX_COOKIE_LEN 16 | ||
57 | |||
58 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L | 56 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L |
59 | # if defined(HAVE_EVP_SHA256) | 57 | # if defined(HAVE_EVP_SHA256) |
60 | # define evp_ssh_sha256 EVP_sha256 | 58 | # define evp_ssh_sha256 EVP_sha256 |