mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Valdis=20Kl=C4=93tnieks?= <valdis.kletnieks@vt.edu>
|
||
|
|
Date: Thu, 5 Dec 2019 20:58:36 -0500
|
||
|
|
Subject: [PATCH] crypto: chacha - fix warning message in header file
|
||
|
|
|
||
|
|
commit 579d705cd64e44f3fcda1a6cfd5f37468a5ddf63 upstream.
|
||
|
|
|
||
|
|
Building with W=1 causes a warning:
|
||
|
|
|
||
|
|
CC [M] arch/x86/crypto/chacha_glue.o
|
||
|
|
In file included from arch/x86/crypto/chacha_glue.c:10:
|
||
|
|
./include/crypto/internal/chacha.h:37:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
|
||
|
|
37 | static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
|
||
|
|
| ^~~~~~
|
||
|
|
|
||
|
|
Straighten out the order to match the rest of the header file.
|
||
|
|
|
||
|
|
Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
|
||
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||
|
|
---
|
||
|
|
include/crypto/internal/chacha.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/include/crypto/internal/chacha.h
|
||
|
|
+++ b/include/crypto/internal/chacha.h
|
||
|
|
@@ -34,7 +34,7 @@ static inline int chacha20_setkey(struct
|
||
|
|
return chacha_setkey(tfm, key, keysize, 20);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
|
||
|
|
+static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
|
||
|
|
unsigned int keysize)
|
||
|
|
{
|
||
|
|
return chacha_setkey(tfm, key, keysize, 12);
|