aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Werner-Krippendorf <mail@hb9fxq.ch>2020-06-09 17:21:00 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2020-06-21 21:41:34 -0600
commitc5e19b2939d490e23b0d0ab19cdef14442910ab7 (patch)
tree835bb1034dade402df0f4dcd2441786811c9b6bc
parent178cdfffb99f2fd6fb4a5bfd2f9319461d93f53b (diff)
downloadwireguard-linux-compat-c5e19b2939d490e23b0d0ab19cdef14442910ab7.tar.gz
noise: do not assign initiation time in if condition
Fixes an error condition reported by checkpatch.pl which caused by assigning a variable in an if condition in wg_noise_handshake_consume_ initiation(). Signed-off-by: Frank Werner-Krippendorf <mail@hb9fxq.ch> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--src/noise.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/noise.c b/src/noise.c
index d0987cd..5fbe063 100644
--- a/src/noise.c
+++ b/src/noise.c
@@ -619,8 +619,8 @@ wg_noise_handshake_consume_initiation(struct message_handshake_initiation *src,
memcpy(handshake->hash, hash, NOISE_HASH_LEN);
memcpy(handshake->chaining_key, chaining_key, NOISE_HASH_LEN);
handshake->remote_index = src->sender_index;
- if ((s64)(handshake->last_initiation_consumption -
- (initiation_consumption = ktime_get_coarse_boottime_ns())) < 0)
+ initiation_consumption = ktime_get_coarse_boottime_ns();
+ if ((s64)(handshake->last_initiation_consumption - initiation_consumption) < 0)
handshake->last_initiation_consumption = initiation_consumption;
handshake->state = HANDSHAKE_CONSUMED_INITIATION;
up_write(&handshake->lock);