Add the at_least (i.e. 'static') decoration to the fixed-size array
parameters of the chacha library functions.  This causes clang to warn
when a too-small array of known size is passed.

Signed-off-by: Eric Biggers <[email protected]>
---
 include/crypto/chacha.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h
index 38e26dff27b0..1cc301a48469 100644
--- a/include/crypto/chacha.h
+++ b/include/crypto/chacha.h
@@ -36,22 +36,22 @@
 struct chacha_state {
        u32 x[CHACHA_STATE_WORDS];
 };
 
 void chacha_block_generic(struct chacha_state *state,
-                         u8 out[CHACHA_BLOCK_SIZE], int nrounds);
+                         u8 out[at_least CHACHA_BLOCK_SIZE], int nrounds);
 static inline void chacha20_block(struct chacha_state *state,
-                                 u8 out[CHACHA_BLOCK_SIZE])
+                                 u8 out[at_least CHACHA_BLOCK_SIZE])
 {
        chacha_block_generic(state, out, 20);
 }
 
 void hchacha_block_generic(const struct chacha_state *state,
-                          u32 out[HCHACHA_OUT_WORDS], int nrounds);
+                          u32 out[at_least HCHACHA_OUT_WORDS], int nrounds);
 
 void hchacha_block(const struct chacha_state *state,
-                  u32 out[HCHACHA_OUT_WORDS], int nrounds);
+                  u32 out[at_least HCHACHA_OUT_WORDS], int nrounds);
 
 enum chacha_constants { /* expand 32-byte k */
        CHACHA_CONSTANT_EXPA = 0x61707865U,
        CHACHA_CONSTANT_ND_3 = 0x3320646eU,
        CHACHA_CONSTANT_2_BY = 0x79622d32U,
@@ -65,12 +65,12 @@ static inline void chacha_init_consts(struct chacha_state 
*state)
        state->x[2]  = CHACHA_CONSTANT_2_BY;
        state->x[3]  = CHACHA_CONSTANT_TE_K;
 }
 
 static inline void chacha_init(struct chacha_state *state,
-                              const u32 key[CHACHA_KEY_WORDS],
-                              const u8 iv[CHACHA_IV_SIZE])
+                              const u32 key[at_least CHACHA_KEY_WORDS],
+                              const u8 iv[at_least CHACHA_IV_SIZE])
 {
        chacha_init_consts(state);
        state->x[4]  = key[0];
        state->x[5]  = key[1];
        state->x[6]  = key[2];
-- 
2.51.2


Reply via email to