From 9d5c520d2229fbaef72fbfa31faa02be27266898 Mon Sep 17 00:00:00 2001
From: Graham Percival <gperciva@tarsnap.com>
Date: Mon, 10 Jun 2024 09:32:15 -0700
Subject: [PATCH] comments: fix API arg descriptions

SHA256_arm: W and S should have been removed in:
    2021-02-19 sha256: don't pass W and S to SHA256_Transform_arm
    05ebafdd870e30e49e5715331414ebcd9e3a1233

SHA256_sse2: W and S should have been included in:
    2021-02-06 sha256_sse2: add
    192d05beba9502601496102ee89258afc534387d

tests/fork_func: wrong API comment in:
    2024-01-13 tests: add fork_func
    19efda2fc3a303d1888468722ad526ba88e69ca4

util/entropy.h: ${er} should not have been included in:
    2020-09-22 entropy: expose _init(), _fill(), _done()
    ceaae6784dbc836ca2a789765510ed60c25cd555
---
 alg/sha256_arm.c                 | 5 ++---
 alg/sha256_arm.h                 | 5 ++---
 alg/sha256_sse2.c                | 2 +-
 alg/sha256_sse2.h                | 2 +-
 tests/fork_func/check.h          | 4 ++--
 tests/fork_func/check_perftest.c | 2 +-
 util/entropy.h                   | 2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/alg/sha256_arm.c b/alg/sha256_arm.c
index e3e5f6b1..96223f4d 100644
--- a/alg/sha256_arm.c
+++ b/alg/sha256_arm.c
@@ -49,12 +49,11 @@ static const uint32_t Krnd[64] = {
 	X0 = vsha256su1q_u32(vsha256su0q_u32(X0, X1), X2, X3)
 
 /**
- * SHA256_Transform_arm(state, block, W, S):
+ * SHA256_Transform_arm(state, block):
  * Compute the SHA256 block compression function, transforming ${state} using
  * the data in ${block}.  This implementation uses ARM SHA256 instructions,
  * and should only be used if _SHA256 is defined and cpusupport_arm_sha256()
- * returns nonzero.  The arrays W and S may be filled with sensitive data, and
- * should be cleared by the callee.
+ * returns nonzero.
  */
 #ifdef POSIXFAIL_ABSTRACT_DECLARATOR
 void
diff --git a/alg/sha256_arm.h b/alg/sha256_arm.h
index 4c39b6cf..d9ed3fab 100644
--- a/alg/sha256_arm.h
+++ b/alg/sha256_arm.h
@@ -4,12 +4,11 @@
 #include <stdint.h>
 
 /**
- * SHA256_Transform_arm(state, block, W, S):
+ * SHA256_Transform_arm(state, block):
  * Compute the SHA256 block compression function, transforming ${state} using
  * the data in ${block}.  This implementation uses ARM SHA256 instructions,
  * and should only be used if _SHA256 is defined and cpusupport_arm_sha256()
- * returns nonzero.  The arrays W and S may be filled with sensitive data, and
- * should be cleared by the callee.
+ * returns nonzero.
  */
 #ifdef POSIXFAIL_ABSTRACT_DECLARATOR
 void SHA256_Transform_arm(uint32_t state[8], const uint8_t block[64]);
diff --git a/alg/sha256_sse2.c b/alg/sha256_sse2.c
index 35b58d2f..d2575534 100644
--- a/alg/sha256_sse2.c
+++ b/alg/sha256_sse2.c
@@ -167,7 +167,7 @@ MSG4(__m128i X0, __m128i X1, __m128i X2, __m128i X3)
 }
 
 /**
- * SHA256_Transform_sse2(state, block):
+ * SHA256_Transform_sse2(state, block, W, S):
  * Compute the SHA256 block compression function, transforming ${state} using
  * the data in ${block}.  This implementation uses x86 SSE2 instructions, and
  * should only be used if _SSE2 is defined and cpusupport_x86_sse2() returns
diff --git a/alg/sha256_sse2.h b/alg/sha256_sse2.h
index 4035d388..16704cec 100644
--- a/alg/sha256_sse2.h
+++ b/alg/sha256_sse2.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 /**
- * SHA256_Transform_sse2(state, block):
+ * SHA256_Transform_sse2(state, block, W, S):
  * Compute the SHA256 block compression function, transforming ${state} using
  * the data in ${block}.  This implementation uses x86 SSE2 instructions, and
  * should only be used if _SSE2 is defined and cpusupport_x86_sse2() returns
diff --git a/tests/fork_func/check.h b/tests/fork_func/check.h
index ac8df5d3..848d1f6d 100644
--- a/tests/fork_func/check.h
+++ b/tests/fork_func/check.h
@@ -20,9 +20,9 @@ int check_exec(void);
 int check_order(void);
 
 /**
- * check_perftest(void):
+ * check_perftest(child_ms, num_reps):
  * Check the amount of delay added by func_fork() and func_fork_wait().
  */
-int check_perftest(int child_ms, int num_reps);
+int check_perftest(int, int);
 
 #endif /* !CHECK_H_ */
diff --git a/tests/fork_func/check_perftest.c b/tests/fork_func/check_perftest.c
index fa5ffb05..712de8f8 100644
--- a/tests/fork_func/check_perftest.c
+++ b/tests/fork_func/check_perftest.c
@@ -146,7 +146,7 @@ benchmark_fork_func_millisleep(int ms)
 }
 
 /**
- * check_perftest(void):
+ * check_perftest(child_ms, num_reps):
  * Check the amount of delay added by func_fork() and func_fork_wait().
  */
 int
diff --git a/util/entropy.h b/util/entropy.h
index ffe67cfe..abadfa94 100644
--- a/util/entropy.h
+++ b/util/entropy.h
@@ -25,7 +25,7 @@ int entropy_read_fill(struct entropy_read_cookie *, uint8_t *, size_t);
  * entropy_read_done(er):
  * Release any resources used by ${er}.
  */
-int entropy_read_done(struct entropy_read_cookie * er);
+int entropy_read_done(struct entropy_read_cookie *);
 
 /**
  * entropy_read(buf, buflen):