mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
crypto: ccree,hisilicon - Fix dependencies to correct algorithm
commit2ae6feb1a1
upstream. Commitd2825fa936
("crypto: sm3,sm4 - move into crypto directory") moves the SM3 and SM4 stand-alone library and the algorithm implementation for the Crypto API into the same directory, and the corresponding relationship of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the algorithm implementation for the Crypto API. Therefore, it is necessary for this module to depend on the correct algorithm. Fixes:d2825fa936
("crypto: sm3,sm4 - move into crypto directory") Cc: Jason A. Donenfeld <Jason@zx2c4.com> Cc: stable@vger.kernel.org # v5.19+ Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d93b6a8a34
commit
06bc122d9b
2 changed files with 3 additions and 3 deletions
|
@ -790,8 +790,8 @@ config CRYPTO_DEV_CCREE
|
||||||
select CRYPTO_ECB
|
select CRYPTO_ECB
|
||||||
select CRYPTO_CTR
|
select CRYPTO_CTR
|
||||||
select CRYPTO_XTS
|
select CRYPTO_XTS
|
||||||
select CRYPTO_SM4
|
select CRYPTO_SM4_GENERIC
|
||||||
select CRYPTO_SM3
|
select CRYPTO_SM3_GENERIC
|
||||||
help
|
help
|
||||||
Say 'Y' to enable a driver for the REE interface of the Arm
|
Say 'Y' to enable a driver for the REE interface of the Arm
|
||||||
TrustZone CryptoCell family of processors. Currently the
|
TrustZone CryptoCell family of processors. Currently the
|
||||||
|
|
|
@ -26,7 +26,7 @@ config CRYPTO_DEV_HISI_SEC2
|
||||||
select CRYPTO_SHA1
|
select CRYPTO_SHA1
|
||||||
select CRYPTO_SHA256
|
select CRYPTO_SHA256
|
||||||
select CRYPTO_SHA512
|
select CRYPTO_SHA512
|
||||||
select CRYPTO_SM4
|
select CRYPTO_SM4_GENERIC
|
||||||
depends on PCI && PCI_MSI
|
depends on PCI && PCI_MSI
|
||||||
depends on UACCE || UACCE=n
|
depends on UACCE || UACCE=n
|
||||||
depends on ARM64 || (COMPILE_TEST && 64BIT)
|
depends on ARM64 || (COMPILE_TEST && 64BIT)
|
||||||
|
|
Loading…
Reference in a new issue