| Message ID | 20221125121811.88031-1-tianjia.zhang@linux.alibaba.com |
|---|---|
| State | Accepted |
| Commit | 2ae6feb1a1f6678fe11864f1b6920ed10b09ad6a |
| Headers | show |
| Series | crypto: ccree,hisilicon - Fix dependencies to correct algorithm | expand |
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 <Jason@zx2c4.com> > Cc: stable@vger.kernel.org # v5.19+ > Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> > --- > 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
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 <Jason@zx2c4.com> > Cc: stable@vger.kernel.org # v5.19+ > Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> > --- > drivers/crypto/Kconfig | 4 ++-- > drivers/crypto/hisilicon/Kconfig | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Patch applied. Thanks.
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)
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 <Jason@zx2c4.com> Cc: stable@vger.kernel.org # v5.19+ Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> --- drivers/crypto/Kconfig | 4 ++-- drivers/crypto/hisilicon/Kconfig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)