aboutsummaryrefslogtreecommitdiff
path: root/website/static/security/patches/SA-25:01/openssh.patch
blob: 111d0f886c5f48aa89d15c5216c388cbe19d4e95 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
--- crypto/openssh/clientloop.c.orig
+++ 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++;
 		}