summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2023-08-28 04:06:52 +0000
committerDamien Miller <djm@mindrot.org>2023-08-28 14:07:56 +1000
commit3867361ca691d0956ef7d5fb8181cf554a91d84a (patch)
treec7e6813e791d4010760053f74d3d4a46e059953e
parent7603ba71264e7fa938325c37eca993e2fa61272f (diff)
upstream: explicit long long type in timing calculations (doesn't
matter, since the range is pre-clamped) OpenBSD-Commit-ID: f786ed902d04a5b8ecc581d068fea1a79aa772de
-rw-r--r--clientloop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c
index 94ff2cb9..a0c3ed8d 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.393 2023/08/28 03:31:16 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.394 2023/08/28 04:06:52 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -618,9 +618,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout)
return 0;
/* Calculate number of intervals missed since the last check */
- n = (now.tv_sec - next_interval.tv_sec) * 1000 * 1000 * 1000;
+ n = (now.tv_sec - next_interval.tv_sec) * 1000LL * 1000 * 1000;
n += now.tv_nsec - next_interval.tv_nsec;
- n /= options.obscure_keystroke_timing_interval * 1000 * 1000;
+ n /= options.obscure_keystroke_timing_interval * 1000LL * 1000;
n = (n < 0) ? 1 : n + 1;
/* Advance to the next interval */