Commit 21ca9c56 authored by Tianjia Zhang's avatar Tianjia Zhang Committed by JiangShui
Browse files

crypto: ccree,hisilicon - Fix dependencies to correct algorithm 

mainline inclusion
from mainline-v6.2-rc1
commit 2ae6feb1
category: bugfix
bugzilla: https://gitee/com/openeuler/kernel/issues/16VW8E
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2ae6feb1a1f6678fe11864f1b6920ed10b09ad6a



-------------------------------------------------------------------

Commit d2825fa9 ("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: d2825fa9 ("crypto: sm3,sm4 - move into crypto directory")
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: stable@vger.kernel.org # v5.19+
Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJangShui <yangjiangshui@h-partners.com>
parent 57dbed85

drivers/crypto/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -870,8 +870,8 @@ config CRYPTO_DEV_CCREE 
	select CRYPTO_ECB

	select CRYPTO_CTR

	select CRYPTO_XTS

	select CRYPTO_SM4

	select CRYPTO_SM3

	select CRYPTO_SM4_GENERIC

	select CRYPTO_SM3_GENERIC

	help

	  Say 'Y' to enable a driver for the REE interface of the Arm

	  TrustZone CryptoCell family of processors. Currently the

drivers/crypto/hisilicon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ config CRYPTO_DEV_HISI_SEC2 
	select CRYPTO_SHA1

	select CRYPTO_SHA256

	select CRYPTO_SHA512

	select CRYPTO_SM4

	select CRYPTO_SM4_GENERIC

	depends on PCI && PCI_MSI

	depends on UACCE || UACCE=n

	depends on ARM64 || (COMPILE_TEST && 64BIT)