mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
8d195e7a8a
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: 1c08a10436 ("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>
79 lines
2.1 KiB
C
79 lines
2.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Poly1305 authenticator algorithm, RFC7539
|
|
*
|
|
* Copyright (C) 2015 Martin Willi
|
|
*
|
|
* Based on public domain code by Andrew Moon and Daniel J. Bernstein.
|
|
*/
|
|
|
|
#include <crypto/internal/poly1305.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <asm/unaligned.h>
|
|
|
|
void poly1305_init_generic(struct poly1305_desc_ctx *desc,
|
|
const u8 key[POLY1305_KEY_SIZE])
|
|
{
|
|
poly1305_core_setkey(&desc->core_r, key);
|
|
desc->s[0] = get_unaligned_le32(key + 16);
|
|
desc->s[1] = get_unaligned_le32(key + 20);
|
|
desc->s[2] = get_unaligned_le32(key + 24);
|
|
desc->s[3] = get_unaligned_le32(key + 28);
|
|
poly1305_core_init(&desc->h);
|
|
desc->buflen = 0;
|
|
desc->sset = true;
|
|
desc->rset = 2;
|
|
}
|
|
EXPORT_SYMBOL_GPL(poly1305_init_generic);
|
|
|
|
void poly1305_update_generic(struct poly1305_desc_ctx *desc, const u8 *src,
|
|
unsigned int nbytes)
|
|
{
|
|
unsigned int bytes;
|
|
|
|
if (unlikely(desc->buflen)) {
|
|
bytes = min(nbytes, POLY1305_BLOCK_SIZE - desc->buflen);
|
|
memcpy(desc->buf + desc->buflen, src, bytes);
|
|
src += bytes;
|
|
nbytes -= bytes;
|
|
desc->buflen += bytes;
|
|
|
|
if (desc->buflen == POLY1305_BLOCK_SIZE) {
|
|
poly1305_core_blocks(&desc->h, &desc->core_r, desc->buf,
|
|
1, 1);
|
|
desc->buflen = 0;
|
|
}
|
|
}
|
|
|
|
if (likely(nbytes >= POLY1305_BLOCK_SIZE)) {
|
|
poly1305_core_blocks(&desc->h, &desc->core_r, src,
|
|
nbytes / POLY1305_BLOCK_SIZE, 1);
|
|
src += nbytes - (nbytes % POLY1305_BLOCK_SIZE);
|
|
nbytes %= POLY1305_BLOCK_SIZE;
|
|
}
|
|
|
|
if (unlikely(nbytes)) {
|
|
desc->buflen = nbytes;
|
|
memcpy(desc->buf, src, nbytes);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(poly1305_update_generic);
|
|
|
|
void poly1305_final_generic(struct poly1305_desc_ctx *desc, u8 *dst)
|
|
{
|
|
if (unlikely(desc->buflen)) {
|
|
desc->buf[desc->buflen++] = 1;
|
|
memset(desc->buf + desc->buflen, 0,
|
|
POLY1305_BLOCK_SIZE - desc->buflen);
|
|
poly1305_core_blocks(&desc->h, &desc->core_r, desc->buf, 1, 0);
|
|
}
|
|
|
|
poly1305_core_emit(&desc->h, desc->s, dst);
|
|
*desc = (struct poly1305_desc_ctx){};
|
|
}
|
|
EXPORT_SYMBOL_GPL(poly1305_final_generic);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Martin Willi <martin@strongswan.org>");
|