mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-17 12:00:35 +00:00
b646b782e5
Consolidate the Poly1305 code into a single module, similar to various other algorithms (SHA-1, SHA-256, SHA-512, etc.): - Each arch now provides a header file lib/crypto/$(SRCARCH)/poly1305.h, replacing lib/crypto/$(SRCARCH)/poly1305*.c. The header defines poly1305_block_init(), poly1305_blocks(), poly1305_emit(), and optionally poly1305_mod_init_arch(). It is included by lib/crypto/poly1305.c, and thus the code gets built into the single libpoly1305 module, with improved inlining in some cases. - Whether arch-optimized Poly1305 is buildable is now controlled centrally by lib/crypto/Kconfig instead of by lib/crypto/$(SRCARCH)/Kconfig. The conditions for enabling it remain the same as before, and it remains enabled by default. (The PPC64 one remains unconditionally disabled due to 'depends on BROKEN'.) - Any additional arch-specific translation units for the optimized Poly1305 code, such as assembly files, are now compiled by lib/crypto/Makefile instead of lib/crypto/$(SRCARCH)/Makefile. A special consideration is needed because the Adiantum code uses the poly1305_core_*() functions directly. For now, just carry forward that approach. This means retaining the CRYPTO_LIB_POLY1305_GENERIC kconfig symbol, and keeping the poly1305_core_*() functions in separate translation units. So it's not quite as streamlined I've done with the other hash functions, but we still get a single libpoly1305 module. Note: to see the diff from the arm, arm64, and x86 .c files to the new .h files, view this commit with 'git show -M10'. Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/r/20250829152513.92459-3-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@kernel.org>
57 lines
1.7 KiB
C
57 lines
1.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Common values for the Poly1305 algorithm
|
|
*/
|
|
|
|
#ifndef _CRYPTO_INTERNAL_POLY1305_H
|
|
#define _CRYPTO_INTERNAL_POLY1305_H
|
|
|
|
#include <crypto/poly1305.h>
|
|
#include <linux/types.h>
|
|
|
|
/*
|
|
* Poly1305 core functions. These only accept whole blocks; the caller must
|
|
* handle any needed block buffering and padding. 'hibit' must be 1 for any
|
|
* full blocks, or 0 for the final block if it had to be padded. If 'nonce' is
|
|
* non-NULL, then it's added at the end to compute the Poly1305 MAC. Otherwise,
|
|
* 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[POLY1305_BLOCK_SIZE]);
|
|
static inline void poly1305_core_init(struct poly1305_state *state)
|
|
{
|
|
*state = (struct poly1305_state){};
|
|
}
|
|
|
|
void poly1305_core_blocks(struct poly1305_state *state,
|
|
const struct poly1305_core_key *key, const void *src,
|
|
unsigned int nblocks, u32 hibit);
|
|
void poly1305_core_emit(const struct poly1305_state *state, const u32 nonce[4],
|
|
void *dst);
|
|
|
|
static inline void
|
|
poly1305_block_init_generic(struct poly1305_block_state *desc,
|
|
const u8 raw_key[POLY1305_BLOCK_SIZE])
|
|
{
|
|
poly1305_core_init(&desc->h);
|
|
poly1305_core_setkey(&desc->core_r, raw_key);
|
|
}
|
|
|
|
static inline void poly1305_blocks_generic(struct poly1305_block_state *state,
|
|
const u8 *src, unsigned int len,
|
|
u32 padbit)
|
|
{
|
|
poly1305_core_blocks(&state->h, &state->core_r, src,
|
|
len / POLY1305_BLOCK_SIZE, padbit);
|
|
}
|
|
|
|
static inline void poly1305_emit_generic(const struct poly1305_state *state,
|
|
u8 digest[POLY1305_DIGEST_SIZE],
|
|
const u32 nonce[4])
|
|
{
|
|
poly1305_core_emit(state, nonce, digest);
|
|
}
|
|
|
|
#endif
|