diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 14 |
2 files changed, 14 insertions, 5 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2001/02/16 13:38:18 | 3 | - markus@cvs.openbsd.org 2001/02/16 13:38:18 |
4 | [channel.c] | 4 | [channel.c] |
5 | remove debug | 5 | remove debug |
6 | - markus@cvs.openbsd.org 2001/02/16 14:03:43 | ||
7 | [session.c] | ||
8 | proper payload-length check for x11 w/o screen-number | ||
6 | 9 | ||
7 | 20010216 | 10 | 20010216 |
8 | - (bal) added '--with-prce' to allow overriding of system regex when | 11 | - (bal) added '--with-prce' to allow overriding of system regex when |
@@ -4001,4 +4004,4 @@ | |||
4001 | - Wrote replacements for strlcpy and mkdtemp | 4004 | - Wrote replacements for strlcpy and mkdtemp |
4002 | - Released 1.0pre1 | 4005 | - Released 1.0pre1 |
4003 | 4006 | ||
4004 | $Id: ChangeLog,v 1.781 2001/02/16 15:56:31 mouring Exp $ | 4007 | $Id: ChangeLog,v 1.782 2001/02/16 16:02:14 mouring Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.55 2001/02/08 19:30:52 itojun Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.56 2001/02/16 14:03:43 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -343,12 +343,18 @@ do_authenticated(struct passwd * pw) | |||
343 | 343 | ||
344 | s->auth_proto = packet_get_string(&proto_len); | 344 | s->auth_proto = packet_get_string(&proto_len); |
345 | s->auth_data = packet_get_string(&data_len); | 345 | s->auth_data = packet_get_string(&data_len); |
346 | packet_integrity_check(plen, 4 + proto_len + 4 + data_len + 4, type); | ||
347 | 346 | ||
348 | if (packet_get_protocol_flags() & SSH_PROTOFLAG_SCREEN_NUMBER) | 347 | if (packet_get_protocol_flags() & SSH_PROTOFLAG_SCREEN_NUMBER) { |
348 | debug2("SSH_PROTOFLAG_SCREEN_NUMBER == true"); | ||
349 | packet_integrity_check(plen, | ||
350 | 4 + proto_len + 4 + data_len + 4, type); | ||
349 | s->screen = packet_get_int(); | 351 | s->screen = packet_get_int(); |
350 | else | 352 | } else { |
353 | debug2("SSH_PROTOFLAG_SCREEN_NUMBER == false"); | ||
354 | packet_integrity_check(plen, | ||
355 | 4 + proto_len + 4 + data_len, type); | ||
351 | s->screen = 0; | 356 | s->screen = 0; |
357 | } | ||
352 | s->display = x11_create_display_inet(s->screen, options.x11_display_offset); | 358 | s->display = x11_create_display_inet(s->screen, options.x11_display_offset); |
353 | 359 | ||
354 | if (s->display == NULL) | 360 | if (s->display == NULL) |