tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

crypto: sm3 - Rename CRYPTO_SM3_GENERIC to CRYPTO_SM3

The kconfig options for generic crypto API modules have traditionally
*not* had a "_GENERIC" suffix. Also, the "_GENERIC" suffix will make
even less sense once the architecture-optimized SM3 code is moved into
lib/crypto/ and the "sm3" crypto_shash is reimplemented on top of that.

Thus, rename CRYPTO_SM3_GENERIC to CRYPTO_SM3.

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20260321040935.410034-4-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

Eric Biggers 6dc7fce9 77e4ca81

+21 -21
+1 -1
arch/loongarch/configs/loongson32_defconfig
··· 1080 1080 CONFIG_CRYPTO_TEA=m 1081 1081 CONFIG_CRYPTO_TWOFISH=m 1082 1082 CONFIG_CRYPTO_CHACHA20POLY1305=m 1083 - CONFIG_CRYPTO_SM3_GENERIC=m 1083 + CONFIG_CRYPTO_SM3=m 1084 1084 CONFIG_CRYPTO_WP512=m 1085 1085 CONFIG_CRYPTO_DEFLATE=m 1086 1086 CONFIG_CRYPTO_LZO=m
+1 -1
arch/loongarch/configs/loongson64_defconfig
··· 1113 1113 CONFIG_CRYPTO_TEA=m 1114 1114 CONFIG_CRYPTO_TWOFISH=m 1115 1115 CONFIG_CRYPTO_CHACHA20POLY1305=m 1116 - CONFIG_CRYPTO_SM3_GENERIC=m 1116 + CONFIG_CRYPTO_SM3=m 1117 1117 CONFIG_CRYPTO_WP512=m 1118 1118 CONFIG_CRYPTO_DEFLATE=m 1119 1119 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/amiga_defconfig
··· 581 581 CONFIG_CRYPTO_MICHAEL_MIC=m 582 582 CONFIG_CRYPTO_RMD160=m 583 583 CONFIG_CRYPTO_SHA1=m 584 - CONFIG_CRYPTO_SM3_GENERIC=m 584 + CONFIG_CRYPTO_SM3=m 585 585 CONFIG_CRYPTO_WP512=m 586 586 CONFIG_CRYPTO_XCBC=m 587 587 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/apollo_defconfig
··· 538 538 CONFIG_CRYPTO_MICHAEL_MIC=m 539 539 CONFIG_CRYPTO_RMD160=m 540 540 CONFIG_CRYPTO_SHA1=m 541 - CONFIG_CRYPTO_SM3_GENERIC=m 541 + CONFIG_CRYPTO_SM3=m 542 542 CONFIG_CRYPTO_WP512=m 543 543 CONFIG_CRYPTO_XCBC=m 544 544 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/atari_defconfig
··· 558 558 CONFIG_CRYPTO_MICHAEL_MIC=m 559 559 CONFIG_CRYPTO_RMD160=m 560 560 CONFIG_CRYPTO_SHA1=m 561 - CONFIG_CRYPTO_SM3_GENERIC=m 561 + CONFIG_CRYPTO_SM3=m 562 562 CONFIG_CRYPTO_WP512=m 563 563 CONFIG_CRYPTO_XCBC=m 564 564 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/bvme6000_defconfig
··· 530 530 CONFIG_CRYPTO_MICHAEL_MIC=m 531 531 CONFIG_CRYPTO_RMD160=m 532 532 CONFIG_CRYPTO_SHA1=m 533 - CONFIG_CRYPTO_SM3_GENERIC=m 533 + CONFIG_CRYPTO_SM3=m 534 534 CONFIG_CRYPTO_WP512=m 535 535 CONFIG_CRYPTO_XCBC=m 536 536 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/hp300_defconfig
··· 540 540 CONFIG_CRYPTO_MICHAEL_MIC=m 541 541 CONFIG_CRYPTO_RMD160=m 542 542 CONFIG_CRYPTO_SHA1=m 543 - CONFIG_CRYPTO_SM3_GENERIC=m 543 + CONFIG_CRYPTO_SM3=m 544 544 CONFIG_CRYPTO_WP512=m 545 545 CONFIG_CRYPTO_XCBC=m 546 546 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/mac_defconfig
··· 557 557 CONFIG_CRYPTO_MICHAEL_MIC=m 558 558 CONFIG_CRYPTO_RMD160=m 559 559 CONFIG_CRYPTO_SHA1=m 560 - CONFIG_CRYPTO_SM3_GENERIC=m 560 + CONFIG_CRYPTO_SM3=m 561 561 CONFIG_CRYPTO_WP512=m 562 562 CONFIG_CRYPTO_XCBC=m 563 563 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/multi_defconfig
··· 644 644 CONFIG_CRYPTO_MICHAEL_MIC=m 645 645 CONFIG_CRYPTO_RMD160=m 646 646 CONFIG_CRYPTO_SHA1=m 647 - CONFIG_CRYPTO_SM3_GENERIC=m 647 + CONFIG_CRYPTO_SM3=m 648 648 CONFIG_CRYPTO_WP512=m 649 649 CONFIG_CRYPTO_XCBC=m 650 650 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/mvme147_defconfig
··· 530 530 CONFIG_CRYPTO_MICHAEL_MIC=m 531 531 CONFIG_CRYPTO_RMD160=m 532 532 CONFIG_CRYPTO_SHA1=m 533 - CONFIG_CRYPTO_SM3_GENERIC=m 533 + CONFIG_CRYPTO_SM3=m 534 534 CONFIG_CRYPTO_WP512=m 535 535 CONFIG_CRYPTO_XCBC=m 536 536 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/mvme16x_defconfig
··· 531 531 CONFIG_CRYPTO_MICHAEL_MIC=m 532 532 CONFIG_CRYPTO_RMD160=m 533 533 CONFIG_CRYPTO_SHA1=m 534 - CONFIG_CRYPTO_SM3_GENERIC=m 534 + CONFIG_CRYPTO_SM3=m 535 535 CONFIG_CRYPTO_WP512=m 536 536 CONFIG_CRYPTO_XCBC=m 537 537 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/q40_defconfig
··· 547 547 CONFIG_CRYPTO_MICHAEL_MIC=m 548 548 CONFIG_CRYPTO_RMD160=m 549 549 CONFIG_CRYPTO_SHA1=m 550 - CONFIG_CRYPTO_SM3_GENERIC=m 550 + CONFIG_CRYPTO_SM3=m 551 551 CONFIG_CRYPTO_WP512=m 552 552 CONFIG_CRYPTO_XCBC=m 553 553 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/sun3_defconfig
··· 528 528 CONFIG_CRYPTO_MICHAEL_MIC=m 529 529 CONFIG_CRYPTO_RMD160=m 530 530 CONFIG_CRYPTO_SHA1=m 531 - CONFIG_CRYPTO_SM3_GENERIC=m 531 + CONFIG_CRYPTO_SM3=m 532 532 CONFIG_CRYPTO_WP512=m 533 533 CONFIG_CRYPTO_XCBC=m 534 534 CONFIG_CRYPTO_LZO=m
+1 -1
arch/m68k/configs/sun3x_defconfig
··· 528 528 CONFIG_CRYPTO_MICHAEL_MIC=m 529 529 CONFIG_CRYPTO_RMD160=m 530 530 CONFIG_CRYPTO_SHA1=m 531 - CONFIG_CRYPTO_SM3_GENERIC=m 531 + CONFIG_CRYPTO_SM3=m 532 532 CONFIG_CRYPTO_WP512=m 533 533 CONFIG_CRYPTO_XCBC=m 534 534 CONFIG_CRYPTO_LZO=m
+1 -1
arch/s390/configs/debug_defconfig
··· 797 797 CONFIG_CRYPTO_MICHAEL_MIC=m 798 798 CONFIG_CRYPTO_RMD160=m 799 799 CONFIG_CRYPTO_SHA3=m 800 - CONFIG_CRYPTO_SM3_GENERIC=m 800 + CONFIG_CRYPTO_SM3=m 801 801 CONFIG_CRYPTO_WP512=m 802 802 CONFIG_CRYPTO_XCBC=m 803 803 CONFIG_CRYPTO_CRC32=m
+1 -1
arch/s390/configs/defconfig
··· 781 781 CONFIG_CRYPTO_MICHAEL_MIC=m 782 782 CONFIG_CRYPTO_RMD160=m 783 783 CONFIG_CRYPTO_SHA3=m 784 - CONFIG_CRYPTO_SM3_GENERIC=m 784 + CONFIG_CRYPTO_SM3=m 785 785 CONFIG_CRYPTO_WP512=m 786 786 CONFIG_CRYPTO_XCBC=m 787 787 CONFIG_CRYPTO_CRC32=m
+1 -1
crypto/Kconfig
··· 974 974 help 975 975 SHA-3 secure hash algorithms (FIPS 202, ISO/IEC 10118-3) 976 976 977 - config CRYPTO_SM3_GENERIC 977 + config CRYPTO_SM3 978 978 tristate "SM3 (ShangMi 3)" 979 979 select CRYPTO_HASH 980 980 select CRYPTO_LIB_SM3
+1 -1
crypto/Makefile
··· 83 83 obj-$(CONFIG_CRYPTO_SHA256) += sha256.o 84 84 obj-$(CONFIG_CRYPTO_SHA512) += sha512.o 85 85 obj-$(CONFIG_CRYPTO_SHA3) += sha3.o 86 - obj-$(CONFIG_CRYPTO_SM3_GENERIC) += sm3_generic.o 86 + obj-$(CONFIG_CRYPTO_SM3) += sm3_generic.o 87 87 obj-$(CONFIG_CRYPTO_STREEBOG) += streebog_generic.o 88 88 obj-$(CONFIG_CRYPTO_WP512) += wp512.o 89 89 CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149
+1 -1
drivers/crypto/Kconfig
··· 843 843 select CRYPTO_CTR 844 844 select CRYPTO_XTS 845 845 select CRYPTO_SM4_GENERIC 846 - select CRYPTO_SM3_GENERIC 846 + select CRYPTO_SM3 847 847 help 848 848 Say 'Y' to enable a driver for the REE interface of the Arm 849 849 TrustZone CryptoCell family of processors. Currently the
+1 -1
drivers/crypto/starfive/Kconfig
··· 10 10 select CRYPTO_HMAC 11 11 select CRYPTO_SHA256 12 12 select CRYPTO_SHA512 13 - select CRYPTO_SM3_GENERIC 13 + select CRYPTO_SM3 14 14 select CRYPTO_RSA 15 15 select CRYPTO_AES 16 16 select CRYPTO_CCM
+1 -1
security/integrity/ima/Kconfig
··· 111 111 112 112 config IMA_DEFAULT_HASH_SM3 113 113 bool "SM3" 114 - depends on CRYPTO_SM3_GENERIC=y 114 + depends on CRYPTO_SM3=y 115 115 endchoice 116 116 117 117 config IMA_DEFAULT_HASH