From b5fd97896b59a3a46245cf438cc8b16c795d9f74 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Mon, 4 Sep 2023 00:04:02 +0000
Subject: [PATCH] upstream: avoid bogus "obfuscate_keystroke_timing: stopping
 ..."

debug messages when keystroke timing obfuscation was never started; spotted
by naddy@

OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31
---
 clientloop.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/clientloop.c b/clientloop.c
index a0c3ed8d0..f04a5aef8 100644
--- a/clientloop.c
+++ b/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
@@ -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;
 	}