summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-03-24 09:12:50 +1100
committerDamien Miller <djm@mindrot.org>2003-03-24 09:12:50 +1100
commita62e554c2495d5845a2add7f1f35aed31c385e0c (patch)
tree2c198b22cb9dabe4faddf1a473f1118d22255be8
parent934a3a298344ff011d77e9978cfb9b5622ff2db3 (diff)
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/03/23 19:02:00 [monitor.c] unbreak rekeying for privsep; ok millert@
-rw-r--r--ChangeLog9
-rw-r--r--monitor.c4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 825d60448..0eb5fec0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120030324
2 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2003/03/23 19:02:00
4 [monitor.c]
5 unbreak rekeying for privsep; ok millert@
6 - Release 3.6p1
7
120030320 820030320
2 - (djm) OpenBSD CVS Sync 9 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2003/03/17 10:38:38 10 - markus@cvs.openbsd.org 2003/03/17 10:38:38
@@ -1240,4 +1247,4 @@
1240 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1247 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1241 ok provos@ 1248 ok provos@
1242 1249
1243$Id: ChangeLog,v 1.2633.2.5 2003/03/21 04:52:55 tim Exp $ 1250$Id: ChangeLog,v 1.2633.2.6 2003/03/23 22:12:50 djm Exp $
diff --git a/monitor.c b/monitor.c
index 2b4168831..3d7dcaf86 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.33 2003/03/05 22:33:43 markus Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.34 2003/03/23 19:02:00 markus Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -1466,6 +1466,8 @@ mm_get_kex(Buffer *m)
1466 (memcmp(kex->session_id, session_id2, session_id2_len) != 0)) 1466 (memcmp(kex->session_id, session_id2, session_id2_len) != 0))
1467 fatal("mm_get_get: internal error: bad session id"); 1467 fatal("mm_get_get: internal error: bad session id");
1468 kex->we_need = buffer_get_int(m); 1468 kex->we_need = buffer_get_int(m);
1469 kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
1470 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
1469 kex->server = 1; 1471 kex->server = 1;
1470 kex->hostkey_type = buffer_get_int(m); 1472 kex->hostkey_type = buffer_get_int(m);
1471 kex->kex_type = buffer_get_int(m); 1473 kex->kex_type = buffer_get_int(m);