mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 08:44:41 +00:00 
			
		
		
		
	This push fixes a potential build failure when CRYPTO=m.
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEn51F/lCuNhUwmDeSxycdCkmxi6cFAmKljZkACgkQxycdCkmx i6dCdhAAiXpo4NloUI7H2l5gLOwiQQnJqdLQ8jCnI46/P+RGdLVeZ8vNjLLLRxMl Yv+lQ4g/fZ4dQNYM4BG0i2htcrzx2ifgXlRfHQqlQRil/NxbkJ44sv+Gl5tR1erP ysfdCdQ41ryTpx9w/xuL5EbtCGB5Zn1AvJLu0AhnxdVfAR98ICnIyub2ExrFsOVs JDcBTJvRTiswH5dtc0ngrm7wzKVtUwtQ8G1qDm3HxN5WSe/hl3jI7D+OzgDN1FdZ pfPKjYG5kW/CVFS+TJyEXEeHfoue5xVg1d4mm5bTeQw96yeifjOAQBTHN3NtJrXg ULGcl9Z0Dz8dL+BnYVfDZ3e6GtcqfJnDJh00WBn8QE1OB3IA4AG3F0ihAMF2rMrR DIgMmM5eBd2ZehkyMz0Wm7JDlqJKS7YzM6YC4DI+bhYAn1nPFbhSwMCof3idL7PV Kk+JdJI8aUVNhI4tNKUYnjAgiybuM2DvZ2SB5KZWERZkH+hmVwn7umFbKR3P89Pt fVun/xpsJl7d37Crozx9eI90gywwvpN+Iz/EnigSNG6Mlg73qHP2B4wtF091eLMm GKW/cuvt21HA+g56QGxlOyicV2ELfE5A1fQXIXFRM/geDkgh54jaeLF0tEveEPm9 Lh0ttMUFkYneuhz/g6yucFpBIahnB2Q+pB2dQ8LOLRgjDMenL4w= =kepS -----END PGP SIGNATURE----- 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/
This commit is contained in:
		
						commit
						79fe0f863f
					
				
					 6 changed files with 7 additions and 1 deletions
				
			
		|  | @ -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. | ||||
| 
 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -120,6 +120,9 @@ config INDIRECT_IOMEM_FALLBACK | |||
| 
 | ||||
| source "lib/crypto/Kconfig" | ||||
| 
 | ||||
| config LIB_MEMNEQ | ||||
| 	bool | ||||
| 
 | ||||
| config CRC_CCITT | ||||
| 	tristate "CRC-CCITT functions" | ||||
| 	help | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Linus Torvalds
						Linus Torvalds