Merge tag 'leds-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel...

[platform/kernel/linux-starfive.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 4106881..1919746 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -274,7 +274,7 @@ config CRYPTO_ECRDSA
 
 config CRYPTO_SM2
        tristate "SM2 algorithm"
-       select CRYPTO_LIB_SM3
+       select CRYPTO_SM3
        select CRYPTO_AKCIPHER
        select CRYPTO_MANAGER
        select MPILIB
@@ -1010,9 +1010,12 @@ config CRYPTO_SHA3
          http://keccak.noekeon.org/
 
 config CRYPTO_SM3
+       tristate
+
+config CRYPTO_SM3_GENERIC
        tristate "SM3 digest algorithm"
        select CRYPTO_HASH
-       select CRYPTO_LIB_SM3
+       select CRYPTO_SM3
        help
          SM3 secure hash function as defined by OSCCA GM/T 0004-2012 SM3).
          It is part of the Chinese Commercial Cryptography suite.
@@ -1025,7 +1028,7 @@ config CRYPTO_SM3_AVX_X86_64
        tristate "SM3 digest algorithm (x86_64/AVX)"
        depends on X86 && 64BIT
        select CRYPTO_HASH
-       select CRYPTO_LIB_SM3
+       select CRYPTO_SM3
        help
          SM3 secure hash function as defined by OSCCA GM/T 0004-2012 SM3).
          It is part of the Chinese Commercial Cryptography suite. This is
@@ -1572,9 +1575,12 @@ config CRYPTO_SERPENT_AVX2_X86_64
          <https://www.cl.cam.ac.uk/~rja14/serpent.html>
 
 config CRYPTO_SM4
+       tristate
+
+config CRYPTO_SM4_GENERIC
        tristate "SM4 cipher algorithm"
        select CRYPTO_ALGAPI
-       select CRYPTO_LIB_SM4
+       select CRYPTO_SM4
        help
          SM4 cipher algorithms (OSCCA GB/T 32907-2016).
 
@@ -1603,7 +1609,7 @@ config CRYPTO_SM4_AESNI_AVX_X86_64
        select CRYPTO_SKCIPHER
        select CRYPTO_SIMD
        select CRYPTO_ALGAPI
-       select CRYPTO_LIB_SM4
+       select CRYPTO_SM4
        help
          SM4 cipher algorithms (OSCCA GB/T 32907-2016) (x86_64/AES-NI/AVX).
 
@@ -1624,7 +1630,7 @@ config CRYPTO_SM4_AESNI_AVX2_X86_64
        select CRYPTO_SKCIPHER
        select CRYPTO_SIMD
        select CRYPTO_ALGAPI
-       select CRYPTO_LIB_SM4
+       select CRYPTO_SM4
        select CRYPTO_SM4_AESNI_AVX_X86_64
        help
          SM4 cipher algorithms (OSCCA GB/T 32907-2016) (x86_64/AES-NI/AVX2).