From: djm <djm@openbsd.org>
Date: Mon, 4 Sep 2023 00:04:02 +0000 (+0000)
Subject: avoid bogus "obfuscate_keystroke_timing: stopping ..." debug
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3353d14d40236d27dafd66194e0cdfa8ef6547d1;p=openbsd

avoid bogus "obfuscate_keystroke_timing: stopping ..." debug
messages when keystroke timing obfuscation was never started;
spotted by naddy@
---

diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index 035643f9e09..9a1df648cd6 100644
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/clientloop.c
@@ -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
@@ -564,9 +564,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;
 	}