Commit f4065b2f authored by Herbert Xu's avatar Herbert Xu
Browse files

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



Move the sm3 library code into lib/crypto.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a58d1c0b

arch/arm64/crypto/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/riscv/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/x86/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -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)

crypto/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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