Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0112cefd authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Treehugger Robot
Browse files

UPSTREAM: crypto: poly1305 - fix poly1305_core_setkey() declaration 



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: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>

(cherry picked from commit 8d195e7a8ada68928f2aedb2c18302a4518fe68e)
Change-Id: I41a75ab0b86449a77f9efc968544b93e21df90a9
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent c056f215

arch/arm/crypto/poly1305-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ void __weak poly1305_blocks_neon(void *state, const u8 *src, u32 len, u32 hibit) 


static __ro_after_init DEFINE_STATIC_KEY_FALSE(have_neon);



void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 *key)

void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 key[POLY1305_KEY_SIZE])

{

	poly1305_init_arm(&dctx->h, key);

	dctx->s[0] = get_unaligned_le32(key + 16);

arch/arm64/crypto/poly1305-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ asmlinkage void poly1305_emit(void *state, u8 *digest, const u32 *nonce); 


static __ro_after_init DEFINE_STATIC_KEY_FALSE(have_neon);



void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 *key)

void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 key[POLY1305_KEY_SIZE])

{

	poly1305_init_arm64(&dctx->h, key);

	dctx->s[0] = get_unaligned_le32(key + 16);

arch/mips/crypto/poly1305-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ asmlinkage void poly1305_init_mips(void *state, const u8 *key); 
asmlinkage void poly1305_blocks_mips(void *state, const u8 *src, u32 len, u32 hibit);

asmlinkage void poly1305_emit_mips(void *state, u8 *digest, const u32 *nonce);



void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 *key)

void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 key[POLY1305_KEY_SIZE])

{

	poly1305_init_mips(&dctx->h, key);

	dctx->s[0] = get_unaligned_le32(key + 16);

arch/x86/crypto/poly1305_glue.c

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/intel-family.h>



asmlinkage void poly1305_init_x86_64(void *ctx,

				     const u8 key[POLY1305_KEY_SIZE]);

				     const u8 key[POLY1305_BLOCK_SIZE]);

asmlinkage void poly1305_blocks_x86_64(void *ctx, const u8 *inp,

				       const size_t len, const u32 padbit);

asmlinkage void poly1305_emit_x86_64(void *ctx, u8 mac[POLY1305_DIGEST_SIZE],
@@ -80,7 +80,7 @@ static void convert_to_base2_64(void *ctx) 
	state->is_base2_26 = 0;

}



static void poly1305_simd_init(void *ctx, const u8 key[POLY1305_KEY_SIZE])

static void poly1305_simd_init(void *ctx, const u8 key[POLY1305_BLOCK_SIZE])

{

	poly1305_init_x86_64(ctx, key);

}
@@ -128,7 +128,7 @@ static void poly1305_simd_emit(void *ctx, u8 mac[POLY1305_DIGEST_SIZE], 
		poly1305_emit_avx(ctx, mac, nonce);

}



void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 *key)

void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 key[POLY1305_KEY_SIZE])

{

	poly1305_simd_init(&dctx->h, key);

	dctx->s[0] = get_unaligned_le32(&key[16]);

include/crypto/internal/poly1305.h

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
 * only the ε-almost-∆-universal hash function (not the full MAC) is computed.

 */



void poly1305_core_setkey(struct poly1305_core_key *key, const u8 *raw_key);

void poly1305_core_setkey(struct poly1305_core_key *key,

			  const u8 raw_key[POLY1305_BLOCK_SIZE]);

static inline void poly1305_core_init(struct poly1305_state *state)

{

	*state = (struct poly1305_state){};