gentoo-ebuilds/net-misc/openssh-contrib/files/openssh-9.6_p1-chaff-logic.patch
Patrick McLean 615ab9d0a7
net-misc/openssh-contrib: Revbump, add fix for CVE-2024-6387
Bug: https://bugs.gentoo.org/935271
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
2024-07-02 10:07:07 -07:00

16 lines
696 B
Diff

"Minor logic error in ObscureKeystrokeTiming"
https://marc.info/?l=oss-security&m=171982317624594&w=2
--- a/clientloop.c
+++ b/clientloop.c
@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout,
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++;
}