diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | kex.c | 4 | ||||
-rw-r--r-- | kex.h | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -71,6 +71,10 @@ | |||
71 | [kex.c kex.h] | 71 | [kex.c kex.h] |
72 | Move the KEX_COOKIE_LEN define to kex.h | 72 | Move the KEX_COOKIE_LEN define to kex.h |
73 | ok markus@ | 73 | ok markus@ |
74 | - andreas@cvs.openbsd.org 2009/05/27 06:36:07 | ||
75 | [packet.h packet.c] | ||
76 | Add packet_put_int64() and packet_get_int64(), part of a larger change | ||
77 | from Martin Forssen. | ||
74 | 78 | ||
75 | 20090616 | 79 | 20090616 |
76 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t | 80 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t |
@@ -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 | * |
@@ -49,8 +49,6 @@ | |||
49 | #include "dispatch.h" | 49 | #include "dispatch.h" |
50 | #include "monitor.h" | 50 | #include "monitor.h" |
51 | 51 | ||
52 | #define KEX_COOKIE_LEN 16 | ||
53 | |||
54 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L | 52 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L |
55 | # if defined(HAVE_EVP_SHA256) | 53 | # if defined(HAVE_EVP_SHA256) |
56 | # define evp_ssh_sha256 EVP_sha256 | 54 | # define evp_ssh_sha256 EVP_sha256 |
@@ -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" |