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: tcrypt - rename CRYPTO_TEST to CRYPTO_BENCHMARK

tcrypt is actually a benchmarking module and not the actual tests. This
regularly causes confusion. Update the kconfig option name and help
text accordingly.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # m68k
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Eric Biggers and committed by
Herbert Xu 3357b6c9 aeaad5bf

+43 -39
+1 -1
arch/arm/configs/exynos_defconfig
··· 349 349 CONFIG_NLS_ISO8859_1=y 350 350 CONFIG_NLS_UTF8=y 351 351 CONFIG_CRYPTO_USER=m 352 - CONFIG_CRYPTO_TEST=m 352 + CONFIG_CRYPTO_BENCHMARK=m 353 353 CONFIG_CRYPTO_DH=m 354 354 CONFIG_CRYPTO_LRW=m 355 355 CONFIG_CRYPTO_XTS=m
+1 -1
arch/arm/configs/pxa_defconfig
··· 639 639 CONFIG_CRYPTO_MANAGER=y 640 640 CONFIG_CRYPTO_CRYPTD=m 641 641 CONFIG_CRYPTO_AUTHENC=m 642 - CONFIG_CRYPTO_TEST=m 642 + CONFIG_CRYPTO_BENCHMARK=m 643 643 CONFIG_CRYPTO_BLOWFISH=m 644 644 CONFIG_CRYPTO_CAST5=m 645 645 CONFIG_CRYPTO_CAST6=m
+1 -1
arch/arm/configs/spitz_defconfig
··· 215 215 CONFIG_NLS_UTF8=y 216 216 CONFIG_DEBUG_KERNEL=y 217 217 CONFIG_CRYPTO_NULL=m 218 - CONFIG_CRYPTO_TEST=m 218 + CONFIG_CRYPTO_BENCHMARK=m 219 219 CONFIG_CRYPTO_ECB=m 220 220 CONFIG_CRYPTO_SHA256=m 221 221 CONFIG_CRYPTO_AES=m
+1 -1
arch/arm64/configs/defconfig
··· 1729 1729 CONFIG_NLS_ISO8859_1=y 1730 1730 CONFIG_SECURITY=y 1731 1731 CONFIG_CRYPTO_USER=y 1732 - CONFIG_CRYPTO_TEST=m 1732 + CONFIG_CRYPTO_BENCHMARK=m 1733 1733 CONFIG_CRYPTO_ECHAINIV=y 1734 1734 CONFIG_CRYPTO_MICHAEL_MIC=m 1735 1735 CONFIG_CRYPTO_ANSI_CPRNG=y
+1 -1
arch/m68k/configs/amiga_defconfig
··· 551 551 CONFIG_HARDENED_USERCOPY=y 552 552 CONFIG_CRYPTO_USER=m 553 553 CONFIG_CRYPTO_CRYPTD=m 554 - CONFIG_CRYPTO_TEST=m 554 + CONFIG_CRYPTO_BENCHMARK=m 555 555 CONFIG_CRYPTO_RSA=m 556 556 CONFIG_CRYPTO_DH=m 557 557 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/apollo_defconfig
··· 508 508 CONFIG_HARDENED_USERCOPY=y 509 509 CONFIG_CRYPTO_USER=m 510 510 CONFIG_CRYPTO_CRYPTD=m 511 - CONFIG_CRYPTO_TEST=m 511 + CONFIG_CRYPTO_BENCHMARK=m 512 512 CONFIG_CRYPTO_RSA=m 513 513 CONFIG_CRYPTO_DH=m 514 514 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/atari_defconfig
··· 528 528 CONFIG_HARDENED_USERCOPY=y 529 529 CONFIG_CRYPTO_USER=m 530 530 CONFIG_CRYPTO_CRYPTD=m 531 - CONFIG_CRYPTO_TEST=m 531 + CONFIG_CRYPTO_BENCHMARK=m 532 532 CONFIG_CRYPTO_RSA=m 533 533 CONFIG_CRYPTO_DH=m 534 534 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/bvme6000_defconfig
··· 500 500 CONFIG_HARDENED_USERCOPY=y 501 501 CONFIG_CRYPTO_USER=m 502 502 CONFIG_CRYPTO_CRYPTD=m 503 - CONFIG_CRYPTO_TEST=m 503 + CONFIG_CRYPTO_BENCHMARK=m 504 504 CONFIG_CRYPTO_RSA=m 505 505 CONFIG_CRYPTO_DH=m 506 506 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/hp300_defconfig
··· 510 510 CONFIG_HARDENED_USERCOPY=y 511 511 CONFIG_CRYPTO_USER=m 512 512 CONFIG_CRYPTO_CRYPTD=m 513 - CONFIG_CRYPTO_TEST=m 513 + CONFIG_CRYPTO_BENCHMARK=m 514 514 CONFIG_CRYPTO_RSA=m 515 515 CONFIG_CRYPTO_DH=m 516 516 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/mac_defconfig
··· 527 527 CONFIG_HARDENED_USERCOPY=y 528 528 CONFIG_CRYPTO_USER=m 529 529 CONFIG_CRYPTO_CRYPTD=m 530 - CONFIG_CRYPTO_TEST=m 530 + CONFIG_CRYPTO_BENCHMARK=m 531 531 CONFIG_CRYPTO_RSA=m 532 532 CONFIG_CRYPTO_DH=m 533 533 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/multi_defconfig
··· 614 614 CONFIG_HARDENED_USERCOPY=y 615 615 CONFIG_CRYPTO_USER=m 616 616 CONFIG_CRYPTO_CRYPTD=m 617 - CONFIG_CRYPTO_TEST=m 617 + CONFIG_CRYPTO_BENCHMARK=m 618 618 CONFIG_CRYPTO_RSA=m 619 619 CONFIG_CRYPTO_DH=m 620 620 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/mvme147_defconfig
··· 500 500 CONFIG_HARDENED_USERCOPY=y 501 501 CONFIG_CRYPTO_USER=m 502 502 CONFIG_CRYPTO_CRYPTD=m 503 - CONFIG_CRYPTO_TEST=m 503 + CONFIG_CRYPTO_BENCHMARK=m 504 504 CONFIG_CRYPTO_RSA=m 505 505 CONFIG_CRYPTO_DH=m 506 506 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/mvme16x_defconfig
··· 501 501 CONFIG_HARDENED_USERCOPY=y 502 502 CONFIG_CRYPTO_USER=m 503 503 CONFIG_CRYPTO_CRYPTD=m 504 - CONFIG_CRYPTO_TEST=m 504 + CONFIG_CRYPTO_BENCHMARK=m 505 505 CONFIG_CRYPTO_RSA=m 506 506 CONFIG_CRYPTO_DH=m 507 507 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/q40_defconfig
··· 517 517 CONFIG_HARDENED_USERCOPY=y 518 518 CONFIG_CRYPTO_USER=m 519 519 CONFIG_CRYPTO_CRYPTD=m 520 - CONFIG_CRYPTO_TEST=m 520 + CONFIG_CRYPTO_BENCHMARK=m 521 521 CONFIG_CRYPTO_RSA=m 522 522 CONFIG_CRYPTO_DH=m 523 523 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/sun3_defconfig
··· 498 498 CONFIG_HARDENED_USERCOPY=y 499 499 CONFIG_CRYPTO_USER=m 500 500 CONFIG_CRYPTO_CRYPTD=m 501 - CONFIG_CRYPTO_TEST=m 501 + CONFIG_CRYPTO_BENCHMARK=m 502 502 CONFIG_CRYPTO_RSA=m 503 503 CONFIG_CRYPTO_DH=m 504 504 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/m68k/configs/sun3x_defconfig
··· 498 498 CONFIG_HARDENED_USERCOPY=y 499 499 CONFIG_CRYPTO_USER=m 500 500 CONFIG_CRYPTO_CRYPTD=m 501 - CONFIG_CRYPTO_TEST=m 501 + CONFIG_CRYPTO_BENCHMARK=m 502 502 CONFIG_CRYPTO_RSA=m 503 503 CONFIG_CRYPTO_DH=m 504 504 CONFIG_CRYPTO_ECDH=m
+1 -1
arch/mips/configs/gpr_defconfig
··· 273 273 CONFIG_NLS_CODEPAGE_850=y 274 274 CONFIG_NLS_ISO8859_1=y 275 275 CONFIG_CRYPTO_AUTHENC=m 276 - CONFIG_CRYPTO_TEST=m 276 + CONFIG_CRYPTO_BENCHMARK=m 277 277 CONFIG_CRYPTO_PCBC=m 278 278 CONFIG_CRYPTO_MD4=m 279 279 CONFIG_CRYPTO_MICHAEL_MIC=m
+1 -1
arch/mips/configs/lemote2f_defconfig
··· 297 297 CONFIG_NLS_KOI8_U=m 298 298 CONFIG_NLS_UTF8=y 299 299 CONFIG_CRYPTO_CRYPTD=m 300 - CONFIG_CRYPTO_TEST=m 300 + CONFIG_CRYPTO_BENCHMARK=m 301 301 CONFIG_CRYPTO_BLOWFISH=m 302 302 CONFIG_CRYPTO_CAMELLIA=m 303 303 CONFIG_CRYPTO_CAST5=m
+1 -1
arch/mips/configs/mtx1_defconfig
··· 662 662 CONFIG_NLS_KOI8_R=m 663 663 CONFIG_NLS_KOI8_U=m 664 664 CONFIG_NLS_UTF8=m 665 - CONFIG_CRYPTO_TEST=m 665 + CONFIG_CRYPTO_BENCHMARK=m 666 666 CONFIG_CRYPTO_PCBC=m 667 667 CONFIG_CRYPTO_HMAC=y 668 668 CONFIG_CRYPTO_MD5=y
+1 -1
arch/mips/configs/rb532_defconfig
··· 153 153 CONFIG_JFFS2_SUMMARY=y 154 154 CONFIG_JFFS2_COMPRESSION_OPTIONS=y 155 155 CONFIG_SQUASHFS=y 156 - CONFIG_CRYPTO_TEST=m 156 + CONFIG_CRYPTO_BENCHMARK=m 157 157 # CONFIG_CRYPTO_HW is not set 158 158 CONFIG_STRIP_ASM_SYMS=y
+1 -1
arch/parisc/configs/generic-32bit_defconfig
··· 251 251 CONFIG_CIFS_XATTR=y 252 252 CONFIG_CIFS_POSIX=y 253 253 # CONFIG_CIFS_DEBUG is not set 254 - CONFIG_CRYPTO_TEST=m 254 + CONFIG_CRYPTO_BENCHMARK=m 255 255 CONFIG_CRYPTO_BLOWFISH=m 256 256 CONFIG_CRYPTO_CAST5=m 257 257 CONFIG_CRYPTO_CAST6=m
+1 -1
arch/powerpc/configs/g5_defconfig
··· 235 235 CONFIG_DEBUG_KERNEL=y 236 236 CONFIG_DEBUG_MUTEXES=y 237 237 CONFIG_BOOTX_TEXT=y 238 - CONFIG_CRYPTO_TEST=m 238 + CONFIG_CRYPTO_BENCHMARK=m 239 239 CONFIG_CRYPTO_PCBC=m 240 240 CONFIG_CRYPTO_HMAC=y 241 241 CONFIG_CRYPTO_MICHAEL_MIC=m
+1 -1
arch/powerpc/configs/powernv_defconfig
··· 317 317 CONFIG_FTR_FIXUP_SELFTEST=y 318 318 CONFIG_MSI_BITMAP_SELFTEST=y 319 319 CONFIG_XMON=y 320 - CONFIG_CRYPTO_TEST=m 320 + CONFIG_CRYPTO_BENCHMARK=m 321 321 CONFIG_CRYPTO_PCBC=m 322 322 CONFIG_CRYPTO_HMAC=y 323 323 CONFIG_CRYPTO_MD5_PPC=m
+1 -1
arch/powerpc/configs/ppc64_defconfig
··· 377 377 CONFIG_IMA_APPRAISE=y 378 378 CONFIG_IMA_ARCH_POLICY=y 379 379 CONFIG_IMA_APPRAISE_MODSIG=y 380 - CONFIG_CRYPTO_TEST=m 380 + CONFIG_CRYPTO_BENCHMARK=m 381 381 CONFIG_CRYPTO_BLOWFISH=m 382 382 CONFIG_CRYPTO_CAST6=m 383 383 CONFIG_CRYPTO_SERPENT=m
+1 -1
arch/powerpc/configs/ppc64e_defconfig
··· 220 220 CONFIG_FTR_FIXUP_SELFTEST=y 221 221 CONFIG_MSI_BITMAP_SELFTEST=y 222 222 CONFIG_XMON=y 223 - CONFIG_CRYPTO_TEST=m 223 + CONFIG_CRYPTO_BENCHMARK=m 224 224 CONFIG_CRYPTO_CCM=m 225 225 CONFIG_CRYPTO_GCM=m 226 226 CONFIG_CRYPTO_PCBC=m
+1 -1
arch/powerpc/configs/ppc6xx_defconfig
··· 1073 1073 CONFIG_SECURITY_SELINUX=y 1074 1074 CONFIG_SECURITY_SELINUX_BOOTPARAM=y 1075 1075 CONFIG_SECURITY_SELINUX_DISABLE=y 1076 - CONFIG_CRYPTO_TEST=m 1076 + CONFIG_CRYPTO_BENCHMARK=m 1077 1077 CONFIG_CRYPTO_CTS=m 1078 1078 CONFIG_CRYPTO_LRW=m 1079 1079 CONFIG_CRYPTO_PCBC=m
+1 -1
arch/s390/configs/debug_defconfig
··· 746 746 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 747 747 CONFIG_CRYPTO_PCRYPT=m 748 748 CONFIG_CRYPTO_CRYPTD=m 749 - CONFIG_CRYPTO_TEST=m 749 + CONFIG_CRYPTO_BENCHMARK=m 750 750 CONFIG_CRYPTO_DH=m 751 751 CONFIG_CRYPTO_ECDH=m 752 752 CONFIG_CRYPTO_ECDSA=m
+1 -1
arch/s390/configs/defconfig
··· 732 732 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 733 733 CONFIG_CRYPTO_PCRYPT=m 734 734 CONFIG_CRYPTO_CRYPTD=m 735 - CONFIG_CRYPTO_TEST=m 735 + CONFIG_CRYPTO_BENCHMARK=m 736 736 CONFIG_CRYPTO_DH=m 737 737 CONFIG_CRYPTO_ECDH=m 738 738 CONFIG_CRYPTO_ECDSA=m
+1 -1
arch/sparc/configs/sparc64_defconfig
··· 205 205 CONFIG_UPROBE_EVENTS=y 206 206 CONFIG_KEYS=y 207 207 CONFIG_CRYPTO_NULL=m 208 - CONFIG_CRYPTO_TEST=m 208 + CONFIG_CRYPTO_BENCHMARK=m 209 209 CONFIG_CRYPTO_LRW=m 210 210 CONFIG_CRYPTO_PCBC=m 211 211 CONFIG_CRYPTO_XTS=m
+7 -3
crypto/Kconfig
··· 240 240 profile. This is required for Kerberos 5-style encryption, used by 241 241 sunrpc/NFS and rxrpc/AFS. 242 242 243 - config CRYPTO_TEST 244 - tristate "Testing module" 243 + config CRYPTO_BENCHMARK 244 + tristate "Crypto benchmarking module" 245 245 depends on m || EXPERT 246 246 select CRYPTO_MANAGER 247 247 help 248 - Quick & dirty crypto test module. 248 + Quick & dirty crypto benchmarking module. 249 + 250 + This is mainly intended for use by people developing cryptographic 251 + algorithms in the kernel. It should not be enabled in production 252 + kernels. 249 253 250 254 config CRYPTO_SIMD 251 255 tristate
+1 -1
crypto/Makefile
··· 172 172 UBSAN_SANITIZE_jitterentropy.o = n 173 173 jitterentropy_rng-y := jitterentropy.o jitterentropy-kcapi.o 174 174 obj-$(CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE) += jitterentropy-testing.o 175 - obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o 175 + obj-$(CONFIG_CRYPTO_BENCHMARK) += tcrypt.o 176 176 obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o 177 177 obj-$(CONFIG_CRYPTO_POLYVAL) += polyval-generic.o 178 178 obj-$(CONFIG_CRYPTO_USER_API) += af_alg.o
+4 -4
crypto/tcrypt.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-or-later 2 2 /* 3 - * Quick & dirty crypto testing module. 3 + * Quick & dirty crypto benchmarking module. 4 4 * 5 - * This will only exist until we have a better testing mechanism 5 + * This will only exist until we have a better benchmarking mechanism 6 6 * (e.g. a char device). 7 7 * 8 8 * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> ··· 39 39 #include "tcrypt.h" 40 40 41 41 /* 42 - * Need slab memory for testing (size in number of pages). 42 + * Need slab memory for benchmarking (size in number of pages). 43 43 */ 44 44 #define TVMEMSIZE 4 45 45 ··· 2868 2868 MODULE_PARM_DESC(klen, "Key length (defaults to 0)"); 2869 2869 2870 2870 MODULE_LICENSE("GPL"); 2871 - MODULE_DESCRIPTION("Quick & dirty crypto testing module"); 2871 + MODULE_DESCRIPTION("Quick & dirty crypto benchmarking module"); 2872 2872 MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
+2 -2
crypto/tcrypt.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0-or-later */ 2 2 /* 3 - * Quick & dirty crypto testing module. 3 + * Quick & dirty crypto benchmarking module. 4 4 * 5 - * This will only exist until we have a better testing mechanism 5 + * This will only exist until we have a better benchmarking mechanism 6 6 * (e.g. a char device). 7 7 * 8 8 * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>