RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-27 12:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2012/01/25 19:26:43

Browse Source 
[packet.c]
     do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during rekeying;
     ok dtucker@, djm@
This commit is contained in:
Damien Miller 2012-02-11 08:18:43 +11:00
parent 8d60be5487
commit 1de2cfe9a9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -20,6 +20,10 @@
Ensure that $DISPLAY contains only valid characters before using it to Ensure that $DISPLAY contains only valid characters before using it to
extract xauth data so that it can't be used to play local shell extract xauth data so that it can't be used to play local shell
metacharacter games. Report from r00t_ati at ihteam.net, ok markus. metacharacter games. Report from r00t_ati at ihteam.net, ok markus.
- markus@cvs.openbsd.org 2012/01/25 19:26:43
[packet.c]
do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during rekeying;
ok dtucker@, djm@
20120206 20120206
- (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms

8
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.174 2011/12/07 05:44:38 djm Exp $ */ /* $OpenBSD: packet.c,v 1.175 2012/01/25 19:26:43 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -972,8 +972,10 @@ packet_send2(void)
/* during rekeying we can only send key exchange messages */ /* during rekeying we can only send key exchange messages */
if (active_state->rekeying) { if (active_state->rekeying) {
if (!((type >= SSH2_MSG_TRANSPORT_MIN) && if ((type < SSH2_MSG_TRANSPORT_MIN) ||
(type <= SSH2_MSG_TRANSPORT_MAX))) { (type > SSH2_MSG_TRANSPORT_MAX) ||
(type == SSH2_MSG_SERVICE_REQUEST) ||
(type == SSH2_MSG_SERVICE_ACCEPT)) {
debug("enqueue packet: %u", type); debug("enqueue packet: %u", type);
p = xmalloc(sizeof(*p)); p = xmalloc(sizeof(*p));
p->type = type; p->type = type;