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.h | |
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.h')
-rw-r--r-- | kex.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.46 2007/06/07 19:37:34 pvalchev Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.47 2009/05/27 06:34:36 andreas Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -30,6 +30,8 @@ | |||
30 | #include <openssl/evp.h> | 30 | #include <openssl/evp.h> |
31 | #include <openssl/hmac.h> | 31 | #include <openssl/hmac.h> |
32 | 32 | ||
33 | #define KEX_COOKIE_LEN 16 | ||
34 | |||
33 | #define KEX_DH1 "diffie-hellman-group1-sha1" | 35 | #define KEX_DH1 "diffie-hellman-group1-sha1" |
34 | #define KEX_DH14 "diffie-hellman-group14-sha1" | 36 | #define KEX_DH14 "diffie-hellman-group14-sha1" |
35 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" | 37 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" |