tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: when sending ObscureKeystrokeTiming chaff packets, we 

can't rely on channel_did_enqueue to tell that there is data to send. This
flag indicates that the channels code enqueued a packet on _this_ ppoll()
iteration, not that data was enqueued in _any_ ppoll() iteration in the
timeslice. ok markus@

OpenBSD-Commit-ID: 009b74fd2769b36b5284a0188ade182f00564136
This commit is contained in:
djm@openbsd.org 2024-07-01 04:31:17 +00:00 committed by Damien Miller
parent 637e4dfea4
commit 146c420d29
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.407 2024/05/17 06:42:04 jsg Exp $ */ /* $OpenBSD: clientloop.c,v 1.408 2024/07/01 04:31:17 djm 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
@ -607,8 +607,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout,
if (timespeccmp(&now, &chaff_until, >=)) { if (timespeccmp(&now, &chaff_until, >=)) {
/* Stop if there have been no keystrokes for a while */ /* Stop if there have been no keystrokes for a while */
stop_reason = "chaff time expired"; stop_reason = "chaff time expired";
} else if (timespeccmp(&now, &next_interval, >=)) { } else if (timespeccmp(&now, &next_interval, >=) &&
/* Otherwise if we were due to send, then send chaff */ !ssh_packet_have_data_to_write(ssh)) {
/* If due to send but have no data, then send chaff */
if (send_chaff(ssh)) if (send_chaff(ssh))
nchaff++; nchaff++;
} }