| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Valdis=20Kl=C4=93tnieks?= <valdis.kletnieks@vt.edu> |
| 3 | Date: Thu, 5 Dec 2019 20:58:36 -0500 |
| 4 | Subject: [PATCH] crypto: chacha - fix warning message in header file |
| 5 | |
| 6 | commit 579d705cd64e44f3fcda1a6cfd5f37468a5ddf63 upstream. |
| 7 | |
| 8 | Building with W=1 causes a warning: |
| 9 | |
| 10 | CC [M] arch/x86/crypto/chacha_glue.o |
| 11 | In file included from arch/x86/crypto/chacha_glue.c:10: |
| 12 | ./include/crypto/internal/chacha.h:37:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] |
| 13 | 37 | static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key, |
| 14 | | ^~~~~~ |
| 15 | |
| 16 | Straighten out the order to match the rest of the header file. |
| 17 | |
| 18 | Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> |
| 19 | Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| 20 | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> |
| 21 | --- |
| 22 | include/crypto/internal/chacha.h | 2 +- |
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 24 | |
| 25 | --- a/include/crypto/internal/chacha.h |
| 26 | +++ b/include/crypto/internal/chacha.h |
| 27 | @@ -34,7 +34,7 @@ static inline int chacha20_setkey(struct |
| 28 | return chacha_setkey(tfm, key, keysize, 20); |
| 29 | } |
| 30 | |
| 31 | -static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key, |
| 32 | +static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key, |
| 33 | unsigned int keysize) |
| 34 | { |
| 35 | return chacha_setkey(tfm, key, keysize, 12); |