]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
crypto: poly1305 - fix poly1305_core_setkey() declaration
authorArnd Bergmann <arnd@arndb.de>
Mon, 22 Mar 2021 17:05:15 +0000 (18:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:52:24 +0000 (10:52 +0200)
commita542f220b4b1b02a5d36dec45e5fc9072b8577cc
tree536e1405d312ae700651edd1fc2a19e9c1cbcc38
parent8b37c99d66b45e1828e6ca46d3a2f6a4265169d0
crypto: poly1305 - fix poly1305_core_setkey() declaration

[ Upstream commit 8d195e7a8ada68928f2aedb2c18302a4518fe68e ]

gcc-11 points out a mismatch between the declaration and the definition
of poly1305_core_setkey():

lib/crypto/poly1305-donna32.c:13:67: error: argument 2 of type ‘const u8[16]’ {aka ‘const unsigned char[16]’} with mismatched bound [-Werror=array-parameter=]
   13 | void poly1305_core_setkey(struct poly1305_core_key *key, const u8 raw_key[16])
      |                                                          ~~~~~~~~~^~~~~~~~~~~
In file included from lib/crypto/poly1305-donna32.c:11:
include/crypto/internal/poly1305.h:21:68: note: previously declared as ‘const u8 *’ {aka ‘const unsigned char *’}
   21 | void poly1305_core_setkey(struct poly1305_core_key *key, const u8 *raw_key);

This is harmless in principle, as the calling conventions are the same,
but the more specific prototype allows better type checking in the
caller.

Change the declaration to match the actual function definition.
The poly1305_simd_init() is a bit suspicious here, as it previously
had a 32-byte argument type, but looks like it needs to take the
16-byte POLY1305_BLOCK_SIZE array instead.

Fixes: 1c08a104360f ("crypto: poly1305 - add new 32 and 64-bit generic versions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/crypto/poly1305-glue.c
arch/arm64/crypto/poly1305-glue.c
arch/mips/crypto/poly1305-glue.c
arch/x86/crypto/poly1305_glue.c
include/crypto/internal/poly1305.h
include/crypto/poly1305.h
lib/crypto/poly1305-donna32.c
lib/crypto/poly1305-donna64.c
lib/crypto/poly1305.c