]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: avoid bogus "obfuscate_keystroke_timing: stopping ..."
authordjm@openbsd.org <djm@openbsd.org>
Mon, 4 Sep 2023 00:04:02 +0000 (00:04 +0000)
committerDamien Miller <djm@mindrot.org>
Mon, 4 Sep 2023 00:09:53 +0000 (10:09 +1000)
debug messages when keystroke timing obfuscation was never started; spotted
by naddy@

OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31

clientloop.c

index a0c3ed8d0942341e6ecc3b596ee96ee3147cb429..f04a5aef837bb2abf86a42703d77f1358f34bc5a 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.394 2023/08/28 04:06:52 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.395 2023/09/04 00:04:02 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -573,9 +573,11 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout)
        }
 
        if (stop_reason != NULL) {
-               active = 0;
-               debug3_f("stopping: %s (%llu chaff packets sent)",
-                   stop_reason, nchaff);
+               if (active) {
+                       debug3_f("stopping: %s (%llu chaff packets sent)",
+                           stop_reason, nchaff);
+                       active = 0;
+               }
                return 1;
        }