D45823.diff
No OneTemporary
Actions

Size

626 B

Referenced Files

None

Subscribers

None

D45823.diff
View Options

	diff --git a/crypto/openssh/clientloop.c b/crypto/openssh/clientloop.c
	--- a/crypto/openssh/clientloop.c
	+++ b/crypto/openssh/clientloop.c
	@@ -608,8 +608,9 @@
	if (timespeccmp(&now, &chaff_until, >=)) {
	/* Stop if there have been no keystrokes for a while */
	stop_reason = "chaff time expired";
	- } else if (timespeccmp(&now, &next_interval, >=)) {
	- /* Otherwise if we were due to send, then send chaff */
	+ } else if (timespeccmp(&now, &next_interval, >=) &&
	+ !ssh_packet_have_data_to_write(ssh)) {
	+ /* If due to send but have no data, then send chaff */
	if (send_chaff(ssh))
	nchaff++;
	}