- markus@cvs.openbsd.org 2003/04/01 10:10:23

     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
     [readconf.h serverloop.c sshconnect2.c]
     rekeying bugfixes and automatic rekeying:
     * both client and server rekey _automatically_
           (a) after 2^31 packets, because after 2^32 packets
               the sequence number for packets wraps
           (b) after 2^(blocksize_in_bits/4) blocks
       (see: draft-ietf-secsh-newmodes-00.txt)
       (a) and (b) are _enabled_ by default, and only disabled for known
       openssh versions, that don't support rekeying properly.
     * client option 'RekeyLimit'
     * do not reply to requests during rekeying
   - markus@cvs.openbsd.org 2003/04/01 10:22:21
     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
     [readconf.h serverloop.c sshconnect2.c]
     backout rekeying changes (for 3.6.1)

diff --git a/ChangeLog b/ChangeLog
index c366eaad3dde1041b8d0526f2edd2ddb0ef13a72..fbef1ca01495e9715cc71cb8bd32149e084bb31b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,23 @@
      - new sentence new line
      - .Bk for arguments
      ok markus@
-
+   - markus@cvs.openbsd.org 2003/04/01 10:10:23
+     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
+     [readconf.h serverloop.c sshconnect2.c]
+     rekeying bugfixes and automatic rekeying:
+     * both client and server rekey _automatically_
+           (a) after 2^31 packets, because after 2^32 packets
+               the sequence number for packets wraps
+           (b) after 2^(blocksize_in_bits/4) blocks
+       (see: draft-ietf-secsh-newmodes-00.txt)
+       (a) and (b) are _enabled_ by default, and only disabled for known
+       openssh versions, that don't support rekeying properly.
+     * client option 'RekeyLimit'
+     * do not reply to requests during rekeying
+   - markus@cvs.openbsd.org 2003/04/01 10:22:21
+     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
+     [readconf.h serverloop.c sshconnect2.c]
+     backout rekeying changes (for 3.6.1)
 
 20030326
  - (djm) OpenBSD CVS Sync

diff --git a/clientloop.c b/clientloop.c
index fcd75d2d727b988822bebc30c61cfb15ca4e0e98..af207c070b37826424b42eeefb2c627345744e0c 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.105 2002/11/18 16:43:44 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.107 2003/04/01 10:22:21 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"

diff --git a/monitor.c b/monitor.c
index 3d7dcaf867d325f0c49463aa2501d143613d0905..bcd007e607bf9eb23ab53fe68221390d24a14f50 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.34 2003/03/23 19:02:00 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.36 2003/04/01 10:22:21 markus Exp $");
 
 #include <openssl/dh.h>
 

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 1395a32f4933855564582480a4aff51c8ee76637..c9714138ada711a746f0f8f0d4f2123198c6cf42 100644 (file)
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.22 2003/02/16 17:30:33 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.24 2003/04/01 10:22:21 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>

diff --git a/packet.c b/packet.c
index 3e2d1249d22b1e618c51fe91e9743bebbf91fcfd..3e21df722a376fa4ce56cdef426f8e6a08479fe3 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.102 2002/12/10 19:47:14 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"

diff --git a/packet.h b/packet.h
index 3ff75593adba7162f67b5d54b8d359bee9f6e478..46830c3df912799029618d3e07e88bb24a762811 100644 (file)
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: packet.h,v 1.35 2002/06/19 18:01:00 markus Exp $      */
+/*     $OpenBSD: packet.h,v 1.37 2003/04/01 10:22:21 markus Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>

diff --git a/readconf.c b/readconf.c
index 8b576a7adfee874ee07a377976a57059c88e724a..1df5ce2d9b9d8d2210fc43972940e45fd8fed626 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.102 2003/02/05 09:02:28 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"

diff --git a/readconf.h b/readconf.h
index bc5968843b8ac0686d2accd70590ba08945ba6ad..78e04fedf98b10729e33f44602daae5c3cc01a10 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: readconf.h,v 1.44 2002/11/07 22:08:07 markus Exp $    */
+/*     $OpenBSD: readconf.h,v 1.46 2003/04/01 10:22:21 markus Exp $    */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>

diff --git a/serverloop.c b/serverloop.c
index 58e20dfb994e5242436cbd5eb90bde8ec34d1b59..f4df9cccb01575aa6b35d172eaa2712bc441849f 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.104 2002/09/19 16:03:15 stevesk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.106 2003/04/01 10:22:21 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"

diff --git a/sshconnect2.c b/sshconnect2.c
index 1f92f02965ea1ee5f5e6349cbfe665bb6f9ddf89..642b34b9e49417563e75e119b3cfc38f625e72a2 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.112 2003/03/05 22:33:43 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.114 2003/04/01 10:22:21 markus Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"