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 82053128b..cf216edcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,23 @@
7 - new sentence new line 7 - new sentence new line
8 - .Bk for arguments 8 - .Bk for arguments
9 ok markus@ 9 ok markus@
10 10 - markus@cvs.openbsd.org 2003/04/01 10:10:23
11 [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
12 [readconf.h serverloop.c sshconnect2.c]
13 rekeying bugfixes and automatic rekeying:
14 * both client and server rekey _automatically_
15 (a) after 2^31 packets, because after 2^32 packets
16 the sequence number for packets wraps
17 (b) after 2^(blocksize_in_bits/4) blocks
18 (see: draft-ietf-secsh-newmodes-00.txt)
19 (a) and (b) are _enabled_ by default, and only disabled for known
20 openssh versions, that don't support rekeying properly.
21 * client option 'RekeyLimit'
22 * do not reply to requests during rekeying
23 - markus@cvs.openbsd.org 2003/04/01 10:22:21
24 [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
25 [readconf.h serverloop.c sshconnect2.c]
26 backout rekeying changes (for 3.6.1)
11 27
1220030326 2820030326
13 - (djm) OpenBSD CVS Sync 29 - (djm) OpenBSD CVS Sync
@@ -1270,4 +1286,4 @@
1270 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1286 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1271 ok provos@ 1287 ok provos@
1272 1288
1273$Id: ChangeLog,v 1.2643 2003/04/01 11:42:14 djm Exp $ 1289$Id: ChangeLog,v 1.2644 2003/04/01 11:43:39 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index fcd75d2d7..af207c070 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.105 2002/11/18 16:43:44 markus Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.107 2003/04/01 10:22:21 markus Exp $");
63 63
64#include "ssh.h" 64#include "ssh.h"
65#include "ssh1.h" 65#include "ssh1.h"
diff --git a/monitor.c b/monitor.c
index 3d7dcaf86..bcd007e60 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.34 2003/03/23 19:02:00 markus Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.36 2003/04/01 10:22:21 markus Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 1395a32f4..c9714138a 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor_wrap.c,v 1.22 2003/02/16 17:30:33 markus Exp $"); 28RCSID("$OpenBSD: monitor_wrap.c,v 1.24 2003/04/01 10:22:21 markus Exp $");
29 29
30#include <openssl/bn.h> 30#include <openssl/bn.h>
31#include <openssl/dh.h> 31#include <openssl/dh.h>
diff --git a/packet.c b/packet.c
index 3e2d1249d..3e21df722 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
37 */ 37 */
38 38
39#include "includes.h" 39#include "includes.h"
40RCSID("$OpenBSD: packet.c,v 1.102 2002/12/10 19:47:14 markus Exp $"); 40RCSID("$OpenBSD: packet.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
41 41
42#include "xmalloc.h" 42#include "xmalloc.h"
43#include "buffer.h" 43#include "buffer.h"
diff --git a/packet.h b/packet.h
index 3ff75593a..46830c3df 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.h,v 1.35 2002/06/19 18:01:00 markus Exp $ */ 1/* $OpenBSD: packet.h,v 1.37 2003/04/01 10:22:21 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/readconf.c b/readconf.c
index 8b576a7ad..1df5ce2d9 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.102 2003/02/05 09:02:28 markus Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
diff --git a/readconf.h b/readconf.h
index bc5968843..78e04fedf 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.44 2002/11/07 22:08:07 markus Exp $ */ 1/* $OpenBSD: readconf.h,v 1.46 2003/04/01 10:22:21 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/serverloop.c b/serverloop.c
index 58e20dfb9..f4df9cccb 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.104 2002/09/19 16:03:15 stevesk Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.106 2003/04/01 10:22:21 markus Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
diff --git a/sshconnect2.c b/sshconnect2.c
index 1f92f0296..642b34b9e 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.112 2003/03/05 22:33:43 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.114 2003/04/01 10:22:21 markus Exp $");
27 27
28#include "ssh.h" 28#include "ssh.h"
29#include "ssh2.h" 29#include "ssh2.h"