summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog20
-rw-r--r--clientloop.c2
-rw-r--r--monitor.c2
-rw-r--r--monitor_wrap.c2
-rw-r--r--packet.c2
-rw-r--r--packet.h2
-rw-r--r--readconf.c2
-rw-r--r--readconf.h2
-rw-r--r--serverloop.c2
-rw-r--r--sshconnect2.c2
10 files changed, 27 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 82053128..cf216edc 100644
--- 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
@@ -1270,4 +1286,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2643 2003/04/01 11:42:14 djm Exp $
+$Id: ChangeLog,v 1.2644 2003/04/01 11:43:39 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index fcd75d2d..af207c07 100644
--- 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 3d7dcaf8..bcd007e6 100644
--- 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 1395a32f..c9714138 100644
--- 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 3e2d1249..3e21df72 100644
--- 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 3ff75593..46830c3d 100644
--- 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 8b576a7a..1df5ce2d 100644
--- 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 bc596884..78e04fed 100644
--- 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 58e20dfb..f4df9ccc 100644
--- 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 1f92f029..642b34b9 100644
--- 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"