2022-11-25 12:25:01

by Tianjia Zhang

Subject: [PATCH] crypto: ccree,hisilicon - Fix dependencies to correct algorithm

Commit d2825fa9365d ("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: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
Cc: Jason A. Donenfeld <[email protected]>
Cc: [email protected] # v5.19+
Signed-off-by: Tianjia Zhang <[email protected]>
---
drivers/crypto/Kconfig | 4 ++--
drivers/crypto/hisilicon/Kconfig | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 2947888d3b82..dfb103f81a64 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -800,8 +800,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
diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
index 27e1fa912063..743ce4fc3158 100644
--- a/drivers/crypto/hisilicon/Kconfig
+++ b/drivers/crypto/hisilicon/Kconfig
@@ -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)
--
2.24.3 (Apple Git-128)

2022-12-02 06:26:14

by yekai (A)

Subject: Re: [PATCH] crypto: ccree,hisilicon - Fix dependencies to correct algorithm

On 2022/11/25 20:18, Tianjia Zhang wrote:
> Commit d2825fa9365d ("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: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> Cc: Jason A. Donenfeld <[email protected]>
> Cc: [email protected] # v5.19+
> Signed-off-by: Tianjia Zhang <[email protected]>
> ---
> drivers/crypto/Kconfig | 4 ++--
> drivers/crypto/hisilicon/Kconfig | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
> index 2947888d3b82..dfb103f81a64 100644
> --- a/drivers/crypto/Kconfig
> +++ b/drivers/crypto/Kconfig
> @@ -800,8 +800,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
> diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
> index 27e1fa912063..743ce4fc3158 100644
> --- a/drivers/crypto/hisilicon/Kconfig
> +++ b/drivers/crypto/hisilicon/Kconfig
> @@ -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)
Hisilicon sec2 module is ok.

Thanks
Kai

2022-12-02 10:23:41

by Herbert Xu

Subject: Re: [PATCH] crypto: ccree,hisilicon - Fix dependencies to correct algorithm

On Fri, Nov 25, 2022 at 08:18:11PM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("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: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> Cc: Jason A. Donenfeld <[email protected]>
> Cc: [email protected] # v5.19+
> Signed-off-by: Tianjia Zhang <[email protected]>
> ---
> drivers/crypto/Kconfig | 4 ++--
> drivers/crypto/hisilicon/Kconfig | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt