- 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.

diff --git a/ChangeLog b/ChangeLog
index ba0cfd796bd998a0e3a589a6ba1a1a393a84a07c..d10b327a09f3d85d7f511999cb1ff8a3d9a4f42d 100644 (file)
--- 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 48b54f5f7341aaa7bfe62c825a06656863b806bc..f4f44f095d6c33a0dd4dac10e6fa126052f61cd3 100644 (file)
--- 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 8e29c90e9025d168978c12504590801e6329d4d7..68c80c5a90d2e58bec2376b095be8cd7899344fd 100644 (file)
--- 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"