]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
lib/crypto: poly1305: Consolidate into single module
authorEric Biggers <ebiggers@kernel.org>
Fri, 29 Aug 2025 15:25:12 +0000 (08:25 -0700)
committerEric Biggers <ebiggers@kernel.org>
Fri, 29 Aug 2025 16:49:18 +0000 (09:49 -0700)
commitb646b782e522da3509e61f971e5502fccb3a3723
tree5ee572e4bf360a193fb057d73a7a22198396854f
parentdf220cc5e689213c34a0eec7ef26d25f503c77ae
lib/crypto: poly1305: Consolidate into single module

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>
28 files changed:
crypto/Kconfig
include/crypto/internal/poly1305.h
lib/crypto/Kconfig
lib/crypto/Makefile
lib/crypto/arm/Kconfig
lib/crypto/arm/Makefile
lib/crypto/arm/poly1305-armv4.pl
lib/crypto/arm/poly1305-glue.c [deleted file]
lib/crypto/arm/poly1305.h [new file with mode: 0644]
lib/crypto/arm64/Kconfig
lib/crypto/arm64/Makefile
lib/crypto/arm64/poly1305-armv8.pl
lib/crypto/arm64/poly1305-glue.c [deleted file]
lib/crypto/arm64/poly1305.h [new file with mode: 0644]
lib/crypto/mips/Kconfig
lib/crypto/mips/Makefile
lib/crypto/mips/poly1305-glue.c [deleted file]
lib/crypto/mips/poly1305-mips.pl
lib/crypto/mips/poly1305.h [new file with mode: 0644]
lib/crypto/poly1305-generic.c [deleted file]
lib/crypto/poly1305.c
lib/crypto/powerpc/Kconfig
lib/crypto/powerpc/Makefile
lib/crypto/powerpc/poly1305.h [moved from lib/crypto/powerpc/poly1305-p10-glue.c with 66% similarity]
lib/crypto/x86/Kconfig
lib/crypto/x86/Makefile
lib/crypto/x86/poly1305-x86_64-cryptogams.pl
lib/crypto/x86/poly1305.h [moved from lib/crypto/x86/poly1305_glue.c with 85% similarity]