Commit 33c148a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "Fix a number of autobuild failures due to missing Kconfig
  dependencies"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - add CRYPTO_AES to Kconfig dependencies
  crypto: keembay - Add dependency on HAS_IOMEM
  crypto: keembay - CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 should depend on ARCH_KEEMBAY
parents cce622ab c0e583ab

drivers/crypto/keembay/Kconfig

+3 −2
Original line number Diff line number Diff line 
config CRYPTO_DEV_KEEMBAY_OCS_AES_SM4

	tristate "Support for Intel Keem Bay OCS AES/SM4 HW acceleration"

	depends on OF || COMPILE_TEST

	depends on HAS_IOMEM

	depends on ARCH_KEEMBAY || COMPILE_TEST

	select CRYPTO_SKCIPHER

	select CRYPTO_AEAD

	select CRYPTO_ENGINE

	help

	  Support for Intel Keem Bay Offload and Crypto Subsystem (OCS) AES and

	  SM4 cihper hardware acceleration for use with Crypto API.

	  SM4 cipher hardware acceleration for use with Crypto API.



	  Provides HW acceleration for the following transformations:

	  cbc(aes), ctr(aes), ccm(aes), gcm(aes), cbc(sm4), ctr(sm4), ccm(sm4)

drivers/crypto/qat/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config CRYPTO_DEV_QAT 
	select CRYPTO_SHA1

	select CRYPTO_SHA256

	select CRYPTO_SHA512

	select CRYPTO_AES

	select FW_LOADER



config CRYPTO_DEV_QAT_DH895xCC