crypto: lib/sm3 - Move sm3 library into lib/crypto

Move the sm3 library code into lib/crypto.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index ce655da0fbeea7a4426d36b3aa6ac405a6a9249b..9dd1ae7a68a4bf62893807ff0f8639c4db66a6d0 100644 (file)
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -101,7 +101,7 @@ config CRYPTO_SM3_NEON
        tristate "Hash functions: SM3 (NEON)"
        depends on KERNEL_MODE_NEON
        select CRYPTO_HASH
-       select CRYPTO_SM3
+       select CRYPTO_LIB_SM3
        help
          SM3 (ShangMi 3) secure hash function (OSCCA GM/T 0004-2012)
 
@@ -112,7 +112,7 @@ config CRYPTO_SM3_ARM64_CE
        tristate "Hash functions: SM3 (ARMv8.2 Crypto Extensions)"
        depends on KERNEL_MODE_NEON
        select CRYPTO_HASH
-       select CRYPTO_SM3
+       select CRYPTO_LIB_SM3
        help
          SM3 (ShangMi 3) secure hash function (OSCCA GM/T 0004-2012)
 

diff --git a/arch/riscv/crypto/Kconfig b/arch/riscv/crypto/Kconfig
index 6392e1e11bc9626dfdef12caa4e9a32919bf1aa8..27a1f26d41bdeaabcebac31e16a3486a9080ec2d 100644 (file)
--- a/arch/riscv/crypto/Kconfig
+++ b/arch/riscv/crypto/Kconfig
@@ -61,7 +61,7 @@ config CRYPTO_SM3_RISCV64
        tristate "Hash functions: SM3 (ShangMi 3)"
        depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO
        select CRYPTO_HASH
-       select CRYPTO_SM3
+       select CRYPTO_LIB_SM3
        help
          SM3 (ShangMi 3) secure hash function (OSCCA GM/T 0004-2012)
 

diff --git a/arch/x86/crypto/Kconfig b/arch/x86/crypto/Kconfig
index 0cec75926380e5723f77851f513d3dc1bba60d47..4e0bd1258751dead644ebaf6570de3b877232686 100644 (file)
--- a/arch/x86/crypto/Kconfig
+++ b/arch/x86/crypto/Kconfig
@@ -455,7 +455,7 @@ config CRYPTO_SM3_AVX_X86_64
        tristate "Hash functions: SM3 (AVX)"
        depends on X86 && 64BIT
        select CRYPTO_HASH
-       select CRYPTO_SM3
+       select CRYPTO_LIB_SM3
        help
          SM3 secure hash function as defined by OSCCA GM/T 0004-2012 SM3
 

diff --git a/crypto/Kconfig b/crypto/Kconfig
index dbf97c4e7c594633e49d5fc351f95ca7f5bee1e1..9322e42e562de8ff3cde4a55aee227e8103fefe9 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1012,13 +1012,10 @@ config CRYPTO_SHA3
        help
          SHA-3 secure hash algorithms (FIPS 202, ISO/IEC 10118-3)
 
-config CRYPTO_SM3
-       tristate
-
 config CRYPTO_SM3_GENERIC
        tristate "SM3 (ShangMi 3)"
        select CRYPTO_HASH
-       select CRYPTO_SM3
+       select CRYPTO_LIB_SM3
        help
          SM3 (ShangMi 3) secure hash function (OSCCA GM/T 0004-2012, ISO/IEC 10118-3)
 

diff --git a/crypto/Makefile b/crypto/Makefile
index 98510a2aa0b1ec107c644ccb1259e6de6ee89cc2..baf5040ca66138f6965bcd2ee6ba4ccde8c02446 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -79,7 +79,6 @@ obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o
 obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o
 obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o
 obj-$(CONFIG_CRYPTO_SHA3) += sha3_generic.o
-obj-$(CONFIG_CRYPTO_SM3) += sm3.o
 obj-$(CONFIG_CRYPTO_SM3_GENERIC) += sm3_generic.o
 obj-$(CONFIG_CRYPTO_STREEBOG) += streebog_generic.o
 obj-$(CONFIG_CRYPTO_WP512) += wp512.o

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index 798972b29b68bce9491625f4c6dea81995e47a59..2c6ab80e0cdc4e22b0c11bd27240393377211f16 100644 (file)
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -152,4 +152,7 @@ config CRYPTO_LIB_SHA1
 config CRYPTO_LIB_SHA256
        tristate
 
+config CRYPTO_LIB_SM3
+       tristate
+
 endmenu

diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 01fac1cd05a19352b43e0d021d7669379e8da9af..4dd62bc5bee3d9844390870cba1690c55f208dc2 100644 (file)
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -60,3 +60,6 @@ endif
 obj-$(CONFIG_MPILIB) += mpi/
 
 obj-$(CONFIG_CRYPTO_MANAGER_EXTRA_TESTS)       += simd.o
+
+obj-$(CONFIG_CRYPTO_LIB_SM3)                   += libsm3.o
+libsm3-y                                       := sm3.o

diff --git a/crypto/sm3.c b/lib/crypto/sm3.c
similarity index 100%
rename from crypto/sm3.c
rename to lib/crypto/sm3.c