Commit 6b9ae8cf authored by Eric Biggers's avatar Eric Biggers
Browse files

lib/crypto: powerpc/sha1: Migrate optimized code into library 



Instead of exposing the powerpc-optimized SHA-1 code via
powerpc-specific crypto_shash algorithms, instead just implement the
sha1_blocks() library function.  This is much simpler, it makes the
SHA-1 library functions be powerpc-optimized, and it fixes the
longstanding issue where the powerpc-optimized SHA-1 code was disabled
by default.  SHA-1 still remains available through crypto_shash, but
individual architectures no longer need to handle it.

Note: to see the diff from arch/powerpc/crypto/sha1-spe-glue.c to
lib/crypto/powerpc/sha1.h, view this commit with 'git show -M10'.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250712232329.818226-11-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent b6ac1dac

arch/powerpc/configs/44x/akebono_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -128,6 +128,5 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x00010000 
CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x33f

CONFIG_CRYPTO_PCBC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_SHA1_PPC=y

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_HW is not set

arch/powerpc/configs/powernv_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MD5_PPC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA1_PPC=m

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

arch/powerpc/configs/ppc64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ CONFIG_CRYPTO_SHA256=y 
CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_MD5_PPC=m

CONFIG_CRYPTO_SHA1_PPC=m

CONFIG_CRYPTO_AES_GCM_P10=m

CONFIG_CRYPTO_DEV_NX=y

CONFIG_CRYPTO_DEV_NX_ENCRYPT=m

arch/powerpc/crypto/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -23,22 +23,6 @@ config CRYPTO_MD5_PPC 


	  Architecture: powerpc



config CRYPTO_SHA1_PPC

	tristate "Hash functions: SHA-1"

	help

	  SHA-1 secure hash algorithm (FIPS 180)



	  Architecture: powerpc



config CRYPTO_SHA1_PPC_SPE

	tristate "Hash functions: SHA-1 (SPE)"

	depends on SPE

	help

	  SHA-1 secure hash algorithm (FIPS 180)



	  Architecture: powerpc using

	  - SPE (Signal Processing Engine) extensions



config CRYPTO_AES_PPC_SPE

	tristate "Ciphers: AES, modes: ECB/CBC/CTR/XTS (SPE)"

	depends on SPE

arch/powerpc/crypto/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -7,16 +7,12 @@ 


obj-$(CONFIG_CRYPTO_AES_PPC_SPE) += aes-ppc-spe.o

obj-$(CONFIG_CRYPTO_MD5_PPC) += md5-ppc.o

obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o

obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o

obj-$(CONFIG_CRYPTO_AES_GCM_P10) += aes-gcm-p10-crypto.o

obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o

obj-$(CONFIG_CRYPTO_CURVE25519_PPC64) += curve25519-ppc64le.o



aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes-spe-glue.o

md5-ppc-y := md5-asm.o md5-glue.o

sha1-powerpc-y := sha1-powerpc-asm.o sha1.o

sha1-ppc-spe-y := sha1-spe-asm.o sha1-spe-glue.o

aes-gcm-p10-crypto-y := aes-gcm-p10-glue.o aes-gcm-p10.o ghashp10-ppc.o aesp10-ppc.o

vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o

curve25519-ppc64le-y := curve25519-ppc64le-core.o curve25519-ppc64le_asm.o