better exit condition

arun-babu · May 9, 2022 · 5204643 · 5204643
1 parent 9dab5d7
commit 5204643
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/freestyle.c b/freestyle.c
@@ -458,13 +458,11 @@ static bool freestyle_randomsetup_decrypt (freestyle_ctx* const x)
 
 		++running_pepper;
 
-		if (
-			(running_pepper == start_pepper)
-					||
-			(running_pepper == max_pepper)
-		) {
+		if (running_pepper > max_pepper)
+			running_pepper = 0;
+
+		if (running_pepper == start_pepper)
 			return false;
-		}
 	}
 
 	if (! found_pepper)

diff --git a/optimized/8-32/freestyle.c b/optimized/8-32/freestyle.c
@@ -453,13 +453,11 @@ static bool freestyle_randomsetup_decrypt (freestyle_ctx* const x)
 
 		++running_pepper;
 
-		if (
-			(running_pepper == start_pepper)
-					||
-			(running_pepper == max_pepper)
-		) {
+		if (running_pepper > max_pepper)
+			running_pepper = 0;
+
+		if (running_pepper == start_pepper)
 			return false;
-		}
 	}
 
 	if (! found_pepper)

diff --git a/optimized/merged/freestyle.c b/optimized/merged/freestyle.c
@@ -453,13 +453,11 @@ static bool freestyle_randomsetup_decrypt (freestyle_ctx* const x)
 
 		++running_pepper;
 
-		if (
-			(running_pepper == start_pepper)
-					||
-			(running_pepper == max_pepper)
-		) {
+		if (running_pepper > max_pepper)
+			running_pepper = 0;
+
+		if (running_pepper == start_pepper)
 			return false;
-		}
 	}
 
 	if (! found_pepper)

diff --git a/side-channel-attack-resistance/freestyle.c b/side-channel-attack-resistance/freestyle.c
@@ -496,13 +496,11 @@ static bool freestyle_randomsetup_decrypt (freestyle_ctx* const x)
 
 		++running_pepper;
 
-		if (
-			(running_pepper == start_pepper)
-					||
-			(running_pepper == max_pepper)
-		) {
+		if (running_pepper > max_pepper)
+			running_pepper = 0;
+
+		if (running_pepper == start_pepper)
 			return false;
-		}
 	}
 
 	if (! found_pepper)