1ff35ded67
These two C implementations from Zinc -- a 32x32 one and a 64x64 one, depending on the platform -- come from Andrew Moon's public domain poly1305-donna portable code, modified for usage in the kernel. The precomputation in the 32-bit version and the use of 64x64 multiplies in the 64-bit version make these perform better than the code it replaces. Moon's code is also very widespread and has received many eyeballs of scrutiny. There's a bit of interference between the x86 implementation, which relies on internal details of the old scalar implementation. In the next commit, the x86 implementation will be replaced with a faster one that doesn't rely on this, so none of this matters much. But for now, to keep this passing the tests, we inline the bits of the old implementation that the x86 implementation relied on. Also, since we now support a slightly larger key space, via the union, some offsets had to be fixed up. Nonce calculation was folded in with the emit function, to take advantage of 64x64 arithmetic. However, Adiantum appeared to rely on no nonce handling in emit, so this path was conditionalized. We also introduced a new struct, poly1305_core_key, to represent the precise amount of space that particular implementation uses. Testing with kbench9000, depending on the CPU, the update function for the 32x32 version has been improved by 4%-7%, and for the 64x64 by 19%-30%. The 32x32 gains are small, but I think there's great value in having a parallel implementation to the 64x64 one so that the two can be compared side-by-side as nice stand-alone units. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit 1c08a104360f3e18f4ee6346c21cc3923efb952e) Bug: 152722841 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ie53f7e47335863df3d82dbc268c6d8323ae5f559
77 lines
2 KiB
C
77 lines
2 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_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>");
|