mirror of
https://github.com/torvalds/linux.git
synced 2025-11-06 11:39:24 +02:00
13cecc526d
Consolidate the ChaCha code into a single module (excluding chacha-block-generic.c which remains always built-in for random.c), similar to various other algorithms: - Each arch now provides a header file lib/crypto/$(SRCARCH)/chacha.h, replacing lib/crypto/$(SRCARCH)/chacha*.c. The header defines chacha_crypt_arch() and hchacha_block_arch(). It is included by lib/crypto/chacha.c, and thus the code gets built into the single libchacha module, with improved inlining in some cases. - Whether arch-optimized ChaCha 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. - Any additional arch-specific translation units for the optimized ChaCha code, such as assembly files, are now compiled by lib/crypto/Makefile instead of lib/crypto/$(SRCARCH)/Makefile. This removes the last use for the Makefile and Kconfig files in the arm64, mips, powerpc, riscv, and s390 subdirectories of lib/crypto/. So also remove those files and the references to them. Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/r/20250827151131.27733-7-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@kernel.org>
70 lines
1.7 KiB
C
70 lines
1.7 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* The ChaCha stream cipher (RFC7539)
|
|
*
|
|
* Copyright (C) 2015 Martin Willi
|
|
*/
|
|
|
|
#include <crypto/algapi.h> // for crypto_xor_cpy
|
|
#include <crypto/chacha.h>
|
|
#include <linux/export.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
|
|
static void __maybe_unused
|
|
chacha_crypt_generic(struct chacha_state *state, u8 *dst, const u8 *src,
|
|
unsigned int bytes, int nrounds)
|
|
{
|
|
/* aligned to potentially speed up crypto_xor() */
|
|
u8 stream[CHACHA_BLOCK_SIZE] __aligned(sizeof(long));
|
|
|
|
while (bytes >= CHACHA_BLOCK_SIZE) {
|
|
chacha_block_generic(state, stream, nrounds);
|
|
crypto_xor_cpy(dst, src, stream, CHACHA_BLOCK_SIZE);
|
|
bytes -= CHACHA_BLOCK_SIZE;
|
|
dst += CHACHA_BLOCK_SIZE;
|
|
src += CHACHA_BLOCK_SIZE;
|
|
}
|
|
if (bytes) {
|
|
chacha_block_generic(state, stream, nrounds);
|
|
crypto_xor_cpy(dst, src, stream, bytes);
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_CRYPTO_LIB_CHACHA_ARCH
|
|
#include "chacha.h" /* $(SRCARCH)/chacha.h */
|
|
#else
|
|
#define chacha_crypt_arch chacha_crypt_generic
|
|
#define hchacha_block_arch hchacha_block_generic
|
|
#endif
|
|
|
|
void chacha_crypt(struct chacha_state *state, u8 *dst, const u8 *src,
|
|
unsigned int bytes, int nrounds)
|
|
{
|
|
chacha_crypt_arch(state, dst, src, bytes, nrounds);
|
|
}
|
|
EXPORT_SYMBOL_GPL(chacha_crypt);
|
|
|
|
void hchacha_block(const struct chacha_state *state,
|
|
u32 out[HCHACHA_OUT_WORDS], int nrounds)
|
|
{
|
|
hchacha_block_arch(state, out, nrounds);
|
|
}
|
|
EXPORT_SYMBOL_GPL(hchacha_block);
|
|
|
|
#ifdef chacha_mod_init_arch
|
|
static int __init chacha_mod_init(void)
|
|
{
|
|
chacha_mod_init_arch();
|
|
return 0;
|
|
}
|
|
subsys_initcall(chacha_mod_init);
|
|
|
|
static void __exit chacha_mod_exit(void)
|
|
{
|
|
}
|
|
module_exit(chacha_mod_exit);
|
|
#endif
|
|
|
|
MODULE_DESCRIPTION("ChaCha stream cipher (RFC7539)");
|
|
MODULE_LICENSE("GPL");
|