diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-11-15 23:51:49 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-11-15 23:53:42 +0100 |
| commit | 050c335c8da43741ed0df2570ebfbd5d1dfd0a31 (patch) | |
| tree | 825e2a081e5716f56398ceaf8c5c30a1d3840426 /clientloop.c | |
| parent | upstream: Make sure sftp_get_limits() only returns 0 if 'limits' (diff) | |
| download | openssh-050c335c8da43741ed0df2570ebfbd5d1dfd0a31.tar.xz openssh-050c335c8da43741ed0df2570ebfbd5d1dfd0a31.zip | |
upstream: when deciding whether to enable keystroke timing
obfuscation, only consider enabling it when a channel with a tty is open.
Avoids turning on the obfucation when X11 forwarding only is in use,
which slows it right down. Reported by Roger Marsh
OpenBSD-Commit-ID: c292f738db410f729190f92de100c39ec931a4f1
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index 8e323a600..c5a924092 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.400 2023/10/12 02:12:53 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.401 2023/11/15 22:51:49 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -589,7 +589,7 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, if (options.obscure_keystroke_timing_interval <= 0) return 1; /* disabled in config */ - if (!channel_still_open(ssh) || quit_pending) { + if (!channel_tty_open(ssh) || quit_pending) { /* Stop if no channels left of we're waiting for one to close */ stop_reason = "no active channels"; } else if (ssh_packet_is_rekeying(ssh)) { |