Commit 32b7144f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux 

Pull crypto library fixes from Eric Biggers:
 "Fix a regression where 'make clean' stopped removing some of the
  generated assembly files on arm and arm64"

* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crypto: ensure generated *.S files are removed on make clean
  lib/crypto: sha: Update Kconfig help for SHA1 and SHA256
parents eb4a0992 fd7e5de4

lib/crypto/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ config CRYPTO_LIB_CHACHA20POLY1305 
config CRYPTO_LIB_SHA1

	tristate

	help

	  The SHA-1 library functions.  Select this if your module uses any of

	  the functions from <crypto/sha1.h>.

	  The SHA-1 and HMAC-SHA1 library functions.  Select this if your module

	  uses any of the functions from <crypto/sha1.h>.



config CRYPTO_LIB_SHA1_ARCH

	bool
@@ -157,9 +157,9 @@ config CRYPTO_LIB_SHA1_ARCH 
config CRYPTO_LIB_SHA256

	tristate

	help

	  Enable the SHA-256 library interface. This interface may be fulfilled

	  by either the generic implementation or an arch-specific one, if one

	  is available and enabled.

	  The SHA-224, SHA-256, HMAC-SHA224, and HMAC-SHA256 library functions.

	  Select this if your module uses any of these functions from

	  <crypto/sha2.h>.



config CRYPTO_LIB_SHA256_ARCH

	bool

lib/crypto/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ ifeq ($(CONFIG_ARM),y) 
libsha256-y += arm/sha256-ce.o arm/sha256-core.o

$(obj)/arm/sha256-core.S: $(src)/arm/sha256-armv4.pl

	$(call cmd,perlasm)

clean-files += arm/sha256-core.S

AFLAGS_arm/sha256-core.o += $(aflags-thumb2-y)

endif
@@ -108,7 +107,6 @@ ifeq ($(CONFIG_ARM64),y) 
libsha256-y += arm64/sha256-core.o

$(obj)/arm64/sha256-core.S: $(src)/arm64/sha2-armv8.pl

	$(call cmd,perlasm_with_args)

clean-files += arm64/sha256-core.S

libsha256-$(CONFIG_KERNEL_MODE_NEON) += arm64/sha256-ce.o

endif
@@ -132,7 +130,6 @@ ifeq ($(CONFIG_ARM),y) 
libsha512-y += arm/sha512-core.o

$(obj)/arm/sha512-core.S: $(src)/arm/sha512-armv4.pl

	$(call cmd,perlasm)

clean-files += arm/sha512-core.S

AFLAGS_arm/sha512-core.o += $(aflags-thumb2-y)

endif
@@ -140,7 +137,6 @@ ifeq ($(CONFIG_ARM64),y) 
libsha512-y += arm64/sha512-core.o

$(obj)/arm64/sha512-core.S: $(src)/arm64/sha2-armv8.pl

	$(call cmd,perlasm_with_args)

clean-files += arm64/sha512-core.S

libsha512-$(CONFIG_KERNEL_MODE_NEON) += arm64/sha512-ce-core.o

endif
@@ -167,3 +163,7 @@ obj-$(CONFIG_PPC) += powerpc/ 
obj-$(CONFIG_RISCV) += riscv/

obj-$(CONFIG_S390) += s390/

obj-$(CONFIG_X86) += x86/



# clean-files must be defined unconditionally

clean-files += arm/sha256-core.S arm/sha512-core.S

clean-files += arm64/sha256-core.S arm64/sha512-core.S