2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e89d22d85..e81691f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20030324
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2003/03/23 19:02:00
+     [monitor.c]
+     unbreak rekeying for privsep; ok millert@
+ - Release 3.6p1
+
 20030320
  - (djm) OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2003/03/17 10:38:38
@@ -1239,4 +1246,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2638 2003/03/21 04:50:41 tim Exp $
+$Id: ChangeLog,v 1.2639 2003/03/23 22:12:09 djm Exp $
diff --git a/monitor.c b/monitor.c
index 2b4168831..3d7dcaf86 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.33 2003/03/05 22:33:43 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.34 2003/03/23 19:02:00 markus Exp $");
 
 #include <openssl/dh.h>
 
@@ -1466,6 +1466,8 @@ mm_get_kex(Buffer *m)
             (memcmp(kex->session_id, session_id2, session_id2_len) != 0))
                 fatal("mm_get_get: internal error: bad session id");
         kex->we_need = buffer_get_int(m);
+        kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
+        kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
         kex->server = 1;
         kex->hostkey_type = buffer_get_int(m);
         kex->kex_type = buffer_get_int(m);