summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-06-21 18:15:25 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-06-21 18:15:25 +1000
commit5b48cdd882579f60217b9aa9a0c09e61e739a917 (patch)
tree75f711e7696f3ec09a404d2c77c5e391e8114227
parent12b4a6504b3f7bad3c144761714fb429669f56d0 (diff)
- andreas@cvs.openbsd.org 2009/05/27 06:36:07
[packet.h packet.c] Add packet_put_int64() and packet_get_int64(), part of a larger change from Martin Forssen.
-rw-r--r--ChangeLog4
-rw-r--r--kex.c4
-rw-r--r--kex.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ba0cfd79..d10b327a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,10 @@
[kex.c kex.h]
Move the KEX_COOKIE_LEN define to kex.h
ok markus@
+ - andreas@cvs.openbsd.org 2009/05/27 06:36:07
+ [packet.h packet.c]
+ Add packet_put_int64() and packet_get_int64(), part of a larger change
+ from Martin Forssen.
20090616
- (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
diff --git a/kex.c b/kex.c
index 48b54f5f..f4f44f09 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.80 2008/09/06 12:24:13 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.81 2009/05/27 06:34:36 andreas Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -49,8 +49,6 @@
#include "dispatch.h"
#include "monitor.h"
-#define KEX_COOKIE_LEN 16
-
#if OPENSSL_VERSION_NUMBER >= 0x00907000L
# if defined(HAVE_EVP_SHA256)
# define evp_ssh_sha256 EVP_sha256
diff --git a/kex.h b/kex.h
index 8e29c90e..68c80c5a 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.46 2007/06/07 19:37:34 pvalchev Exp $ */
+/* $OpenBSD: kex.h,v 1.47 2009/05/27 06:34:36 andreas Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -30,6 +30,8 @@
#include <openssl/evp.h>
#include <openssl/hmac.h>
+#define KEX_COOKIE_LEN 16
+
#define KEX_DH1 "diffie-hellman-group1-sha1"
#define KEX_DH14 "diffie-hellman-group14-sha1"
#define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1"