diff options
author | Damien Miller <djm@mindrot.org> | 2003-03-24 09:12:50 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-03-24 09:12:50 +1100 |
commit | a62e554c2495d5845a2add7f1f35aed31c385e0c (patch) | |
tree | 2c198b22cb9dabe4faddf1a473f1118d22255be8 | |
parent | 934a3a298344ff011d77e9978cfb9b5622ff2db3 (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-- | ChangeLog | 9 | ||||
-rw-r--r-- | monitor.c | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -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 @@ -1240,4 +1247,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2633.2.5 2003/03/21 04:52:55 tim Exp $ +$Id: ChangeLog,v 1.2633.2.6 2003/03/23 22:12:50 djm Exp $ @@ -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); |