Commit 79fe0f86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v5.19-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "This fixes a potential build failure when CRYPTO=m"

* tag 'v5.19-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: memneq - move into lib/
parents f0ec9c65 abfed87e

crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ source "crypto/async_tx/Kconfig" 
#

menuconfig CRYPTO

	tristate "Cryptographic API"

	select LIB_MEMNEQ

	help

	  This option provides the core Cryptographic API.

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#



obj-$(CONFIG_CRYPTO) += crypto.o

crypto-y := api.o cipher.o compress.o memneq.o

crypto-y := api.o cipher.o compress.o



obj-$(CONFIG_CRYPTO_ENGINE) += crypto_engine.o

obj-$(CONFIG_CRYPTO_FIPS) += fips.o

lib/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ config INDIRECT_IOMEM_FALLBACK 


source "lib/crypto/Kconfig"



config LIB_MEMNEQ

	bool



config CRC_CCITT

	tristate "CRC-CCITT functions"

	help

lib/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ obj-$(CONFIG_DIMLIB) += dim/ 
obj-$(CONFIG_SIGNATURE) += digsig.o



lib-$(CONFIG_CLZ_TAB) += clz_tab.o

lib-$(CONFIG_LIB_MEMNEQ) += memneq.o



obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o

obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o

lib/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ config CRYPTO_LIB_CURVE25519 
	tristate "Curve25519 scalar multiplication library"

	depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519

	select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n

	select LIB_MEMNEQ

	help

	  Enable the Curve25519 library interface. This interface may be

	  fulfilled by either the generic implementation or an arch-specific