From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C6876BFC0; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079453; cv=none; b=XoilOAsbpVnmac0E8+2xG3BPwmkwCsJZQ/FyID0RPoqKMmUb4ZRykHpUiO2Pj4E2dxgMxJwCN536BLQU73zTz5prFL7qTHVW1RxSKE4ziD6byr8zp1lT8joDwEudIPAuZS27EXipt0d0cUO5zzvf7a4uK/z77Di4YhLRgiXuoqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079453; c=relaxed/simple; bh=nww4iDqCd5K43fJVUdqt607LG+PEqEZdkJi0yiS6zYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QEx/CIM4AkfRJ+Zzj1UcaUIt9qoi5SzddI/d3u8nqZBk7ZVDqTsrbqlhz1wRIVvW/LDSEL10Gng9BLQJti12/Le+IhY2z1BPwTyPH2DhF7F0LX7AhoYlTgz8BZCRC3B7GTYCTY0aRFjcemL7L1vGQrKKsRwCtYcg+swaIIcNSe8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PuQLsiP/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PuQLsiP/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9A0EC4CEEC; Sat, 19 Apr 2025 16:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079453; bh=nww4iDqCd5K43fJVUdqt607LG+PEqEZdkJi0yiS6zYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PuQLsiP/bt3je2ckVF/UE/oZgcMoakW6hvWjT4a/7hJdhufntVaxqnqxbzd5/zEbU 9HIMfr7wHJ2ZnIDpmBNsJxxJyS9l/blM1Z0BsEg7zr0wdzpTw8JEmLMLt9eSquZMzu y5swK+qP34ZQl4adgWqKg0h5ITvuUiPdcga+KpRb/MD/GXEPKky2HaxlhJPXvcXjWo NSOmp65kphCNRb0xc2q7iY6KlltIPtzbCpVFtwOuW18Yz/RaMs7ciVp7lE7iqmNq30 yf+K67KbcXVlK4C+XzVmHmilarJymoOiUGRyHS5w9yWgBt1JgquEW+OZGVsOHgxMKr tgwb+xBrek1+A== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/9] crypto: tcrypt - remove CRYPTO_TEST from defconfigs Date: Sat, 19 Apr 2025 09:15:35 -0700 Message-ID: <20250419161543.139344-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers CONFIG_CRYPTO_TEST enables a benchmarking module that is only really useful for developers working on the crypto subsystem. It is in a bunch of defconfigs. But as with most of the other crypto options that tend to be randomly set in defconfigs, it is unlikely that much thought was put into these, especially when placed in "production" defconfigs. Clear it out of the defconfigs for now. Signed-off-by: Eric Biggers --- arch/arm/configs/exynos_defconfig | 1 - arch/arm/configs/pxa_defconfig | 1 - arch/arm/configs/spitz_defconfig | 1 - arch/arm64/configs/defconfig | 1 - arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - arch/mips/configs/gpr_defconfig | 1 - arch/mips/configs/lemote2f_defconfig | 1 - arch/mips/configs/mtx1_defconfig | 1 - arch/mips/configs/rb532_defconfig | 1 - arch/parisc/configs/generic-32bit_defconfig | 1 - arch/powerpc/configs/g5_defconfig | 1 - arch/powerpc/configs/powernv_defconfig | 1 - arch/powerpc/configs/ppc64_defconfig | 1 - arch/powerpc/configs/ppc64e_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - arch/sparc/configs/sparc64_defconfig | 1 - 29 files changed, 29 deletions(-) diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_de= fconfig index 7ad48fdda1da..b8e2267f68cc 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -347,11 +347,10 @@ CONFIG_ROOT_NFS=3Dy CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_ASCII=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_NLS_UTF8=3Dy CONFIG_CRYPTO_USER=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_LRW=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_MD5=3Dm CONFIG_CRYPTO_SHA512=3Dm diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index de0ac8f521d7..821c670dd687 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -637,11 +637,10 @@ CONFIG_NLS_UTF8=3Dm CONFIG_TIMER_STATS=3Dy CONFIG_SECURITY=3Dy CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_CRYPTD=3Dm CONFIG_CRYPTO_AUTHENC=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defc= onfig index ac5b7a5aaff6..1013c58d27ee 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig @@ -213,11 +213,10 @@ CONFIG_NLS_DEFAULT=3D"cp437" CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_NLS_UTF8=3Dy CONFIG_DEBUG_KERNEL=3Dy CONFIG_CRYPTO_NULL=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_ECB=3Dm CONFIG_CRYPTO_SHA256=3Dm CONFIG_CRYPTO_AES=3Dm CONFIG_CRYPTO_ANUBIS=3Dm CONFIG_CRYPTO_ARC4=3Dm diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 5bb8f09422a2..72e6cd8b6c81 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1727,11 +1727,10 @@ CONFIG_ROOT_NFS=3Dy CONFIG_9P_FS=3Dy CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_SECURITY=3Dy CONFIG_CRYPTO_USER=3Dy -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_ECHAINIV=3Dy CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_ANSI_CPRNG=3Dy CONFIG_CRYPTO_USER_API_RNG=3Dm CONFIG_CRYPTO_CHACHA20_NEON=3Dm diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_de= fconfig index 31ecb8b7b9f1..2f9770cf6760 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -549,11 +549,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_= defconfig index 1f57514624d5..91de4c6aecb9 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -506,11 +506,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_de= fconfig index 02db7a48e57e..561613c10744 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -526,11 +526,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6= 000_defconfig index f0e673cb17eb..ed37e5aa0045 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -498,11 +498,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_de= fconfig index e8ca5a50b86d..0307583dc4a8 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -508,11 +508,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defcon= fig index b3a270441bb1..83c94360c151 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -525,11 +525,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_de= fconfig index d215dba006ce..2be267f10b92 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -612,11 +612,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme14= 7_defconfig index a888ed93ff82..9828470a9caf 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -498,11 +498,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16= x_defconfig index b481782375f6..8cc6811aad14 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -499,11 +499,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defcon= fig index 6eba743d8eb5..b1bda41516f6 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -515,11 +515,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defc= onfig index 9bdbb418ffa8..7ec14bcfd626 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -496,11 +496,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_de= fconfig index e1cf20fa5343..e6f943d68959 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -496,11 +496,10 @@ CONFIG_NLS_MAC_TURKISH=3Dm CONFIG_DLM=3Dm CONFIG_ENCRYPTED_KEYS=3Dm CONFIG_HARDENED_USERCOPY=3Dy CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_RSA=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm diff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defcon= fig index 12f3eed8a946..ec55b07e572a 100644 --- a/arch/mips/configs/gpr_defconfig +++ b/arch/mips/configs/gpr_defconfig @@ -271,11 +271,10 @@ CONFIG_NFS_V4=3Dy CONFIG_ROOT_NFS=3Dy CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_CODEPAGE_850=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_CRYPTO_AUTHENC=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_SHA512=3Dm CONFIG_CRYPTO_WP512=3Dm diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemot= e2f_defconfig index 71d6340497c9..af4e53da39f8 100644 --- a/arch/mips/configs/lemote2f_defconfig +++ b/arch/mips/configs/lemote2f_defconfig @@ -295,11 +295,10 @@ CONFIG_NLS_ISO8859_14=3Dm CONFIG_NLS_ISO8859_15=3Dm CONFIG_NLS_KOI8_R=3Dm CONFIG_NLS_KOI8_U=3Dm CONFIG_NLS_UTF8=3Dy CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAMELLIA=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm CONFIG_CRYPTO_FCRYPT=3Dm diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defc= onfig index 06b7a0b97eca..9ff468d7eba0 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig @@ -660,11 +660,10 @@ CONFIG_NLS_ISO8859_13=3Dm CONFIG_NLS_ISO8859_14=3Dm CONFIG_NLS_ISO8859_15=3Dm CONFIG_NLS_KOI8_R=3Dm CONFIG_NLS_KOI8_U=3Dm CONFIG_NLS_UTF8=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_HMAC=3Dy CONFIG_CRYPTO_MD5=3Dy CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_WP512=3Dm diff --git a/arch/mips/configs/rb532_defconfig b/arch/mips/configs/rb532_de= fconfig index 0261969a6e45..5c4befe1d873 100644 --- a/arch/mips/configs/rb532_defconfig +++ b/arch/mips/configs/rb532_defconfig @@ -151,9 +151,8 @@ CONFIG_TMPFS=3Dy CONFIG_CONFIGFS_FS=3Dy CONFIG_JFFS2_FS=3Dy CONFIG_JFFS2_SUMMARY=3Dy CONFIG_JFFS2_COMPRESSION_OPTIONS=3Dy CONFIG_SQUASHFS=3Dy -CONFIG_CRYPTO_TEST=3Dm # CONFIG_CRYPTO_HW is not set CONFIG_CRC16=3Dm CONFIG_STRIP_ASM_SYMS=3Dy diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/conf= igs/generic-32bit_defconfig index f5fffc24c3bc..0d4c4298bcc6 100644 --- a/arch/parisc/configs/generic-32bit_defconfig +++ b/arch/parisc/configs/generic-32bit_defconfig @@ -249,11 +249,10 @@ CONFIG_NFS_FS=3Dm CONFIG_NFSD=3Dm CONFIG_CIFS=3Dm CONFIG_CIFS_XATTR=3Dy CONFIG_CIFS_POSIX=3Dy # CONFIG_CIFS_DEBUG is not set -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm CONFIG_CRYPTO_DES=3Dy CONFIG_CRYPTO_SERPENT=3Dm diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_de= fconfig index 9215bed53291..6ede430de615 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig @@ -234,11 +234,10 @@ CONFIG_NLS_UTF8=3Dy CONFIG_CRC_T10DIF=3Dy CONFIG_MAGIC_SYSRQ=3Dy CONFIG_DEBUG_KERNEL=3Dy CONFIG_DEBUG_MUTEXES=3Dy CONFIG_BOOTX_TEXT=3Dy -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_HMAC=3Dy CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_SHA512=3Dm CONFIG_CRYPTO_WP512=3Dm diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/= powernv_defconfig index 6b6d7467fecf..258a1ceca006 100644 --- a/arch/powerpc/configs/powernv_defconfig +++ b/arch/powerpc/configs/powernv_defconfig @@ -315,11 +315,10 @@ CONFIG_BLK_DEV_IO_TRACE=3Dy CONFIG_PPC_EMULATED_STATS=3Dy CONFIG_CODE_PATCHING_SELFTEST=3Dy CONFIG_FTR_FIXUP_SELFTEST=3Dy CONFIG_MSI_BITMAP_SELFTEST=3Dy CONFIG_XMON=3Dy -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_HMAC=3Dy CONFIG_CRYPTO_MD5_PPC=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_SHA1_PPC=3Dm diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/pp= c64_defconfig index 5fa154185efa..0474ee4b2f43 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -375,11 +375,10 @@ CONFIG_IMA_KEXEC=3Dy CONFIG_IMA_DEFAULT_HASH_SHA256=3Dy CONFIG_IMA_WRITE_POLICY=3Dy CONFIG_IMA_APPRAISE=3Dy CONFIG_IMA_ARCH_POLICY=3Dy CONFIG_IMA_APPRAISE_MODSIG=3Dy -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAST6=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_TWOFISH=3Dm CONFIG_CRYPTO_PCBC=3Dm diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/p= pc64e_defconfig index 4c05f4e4d505..54d68d0c7bb0 100644 --- a/arch/powerpc/configs/ppc64e_defconfig +++ b/arch/powerpc/configs/ppc64e_defconfig @@ -219,11 +219,10 @@ CONFIG_SCHED_TRACER=3Dy CONFIG_BLK_DEV_IO_TRACE=3Dy CONFIG_CODE_PATCHING_SELFTEST=3Dy CONFIG_FTR_FIXUP_SELFTEST=3Dy CONFIG_MSI_BITMAP_SELFTEST=3Dy CONFIG_XMON=3Dy -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_CCM=3Dm CONFIG_CRYPTO_GCM=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_HMAC=3Dy CONFIG_CRYPTO_MICHAEL_MIC=3Dm diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/p= pc6xx_defconfig index a91a766b71a4..34e78ed557df 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -1071,11 +1071,10 @@ CONFIG_SECURITY=3Dy CONFIG_SECURITY_NETWORK=3Dy CONFIG_SECURITY_NETWORK_XFRM=3Dy CONFIG_SECURITY_SELINUX=3Dy CONFIG_SECURITY_SELINUX_BOOTPARAM=3Dy CONFIG_SECURITY_SELINUX_DISABLE=3Dy -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_CTS=3Dm CONFIG_CRYPTO_LRW=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_HMAC=3Dy diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_de= fconfig index 6f2c9ce1b154..0216a6f50801 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -744,11 +744,10 @@ CONFIG_IMA_APPRAISE=3Dy CONFIG_BUG_ON_DATA_CORRUPTION=3Dy CONFIG_CRYPTO_USER=3Dm # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_PCRYPT=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm CONFIG_CRYPTO_CURVE25519=3Dm diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index f18a7d97ac21..c0528f791ecf 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -730,11 +730,10 @@ CONFIG_BUG_ON_DATA_CORRUPTION=3Dy CONFIG_CRYPTO_FIPS=3Dy CONFIG_CRYPTO_USER=3Dm # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_PCRYPT=3Dm CONFIG_CRYPTO_CRYPTD=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm CONFIG_CRYPTO_ECRDSA=3Dm CONFIG_CRYPTO_CURVE25519=3Dm diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/spar= c64_defconfig index 01b2bdfbf9a8..f1f68e43616b 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig @@ -203,11 +203,10 @@ CONFIG_DETECT_HUNG_TASK=3Dy CONFIG_SCHEDSTATS=3Dy CONFIG_BLK_DEV_IO_TRACE=3Dy CONFIG_UPROBE_EVENTS=3Dy CONFIG_KEYS=3Dy CONFIG_CRYPTO_NULL=3Dm -CONFIG_CRYPTO_TEST=3Dm CONFIG_CRYPTO_LRW=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_XCBC=3Dy CONFIG_CRYPTO_MD4=3Dy --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3D271DED72; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079453; cv=none; b=KgyGShDYbVO57buQilTJV4m18Mk/cW8sYhb7KLEQTKSrMPMYc1h5nqVGky+UOvnRnNW5zJCSpAi3WfMYmyMkw3hznq34t3Lze5rUcYIMnQI6titYjzETfxsJplZlXh1NrD4f/0x+8m7OtWoQav+VBB2/ia/3OL4iTaFBKh5VbAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079453; c=relaxed/simple; bh=2rB0N4riKb1i0IpUawdTCB0Q6AEMznGVzsiXwou3PqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BGxmOPcv3j+ZQLMRJ2S2W60+Vs3DJbtvtZwhHF9aDAWQvsz+ywRe6tBrHOk6pclvtLdyiwdJ6g0DgBECLqgfu09SaGr9A+0VEeANecUPS88LahOZxPK40q15oW5dEftqjOdu5DN3WnysWrEN2Tsmz07ToaRNpNLcf5+Wn+re80Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uZluZb8Z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uZluZb8Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C1AAC4CEE9; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079453; bh=2rB0N4riKb1i0IpUawdTCB0Q6AEMznGVzsiXwou3PqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uZluZb8ZEpvO2lkPV8eOSK+v/yKedoUtr0ude2zzRXKbqkXcMzVQPet4fhSKrvYhW KXMS3xb2ftaKIp3Au+LseIsWOh5l4w3QwUJgitAx6znTGtL4lIt5l9+emV0qc5IH3A SyrZe2LipvjkAKiGJODw6BSVuact29t0bBLUqGNc9clA+/RGJTPO3ssrbmWvvgDSJG Tfrybsu9fO50tn3zGsGXSzttYRTcpZO8Ygm8f0gK/z62iZm967XtepXePkWeaFoqkG kQWKgrZ/7lSIxjG9zJcEvIusAsFGa6JVcmBs7MY3/20s0euZxRYnepA4agaXsXy4/L sFfXpVGIpUrcQ== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/9] crypto: tcrypt - rename CRYPTO_TEST to CRYPTO_BENCHMARK Date: Sat, 19 Apr 2025 09:15:36 -0700 Message-ID: <20250419161543.139344-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers 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 --- crypto/Kconfig | 10 +++++++--- crypto/Makefile | 2 +- crypto/tcrypt.c | 8 ++++---- crypto/tcrypt.h | 4 ++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 9322e42e562d..48283975fb2b 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -244,16 +244,20 @@ config CRYPTO_KRB5ENC help Combined hash and cipher support for Kerberos 5 RFC3961 simplified profile. This is required for Kerberos 5-style encryption, used by sunrpc/NFS and rxrpc/AFS. =20 -config CRYPTO_TEST - tristate "Testing module" +config CRYPTO_BENCHMARK + tristate "Crypto benchmarking module" depends on m || EXPERT select CRYPTO_MANAGER help - Quick & dirty crypto test module. + Quick & dirty crypto benchmarking module. + + This is mainly intended for use by people developing cryptographic + algorithms in the kernel. It should not be enabled in production + kernels. =20 config CRYPTO_SIMD tristate select CRYPTO_CRYPTD =20 diff --git a/crypto/Makefile b/crypto/Makefile index 5d2f2a28d8a0..18b057a799b0 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -171,11 +171,11 @@ obj-$(CONFIG_CRYPTO_JITTERENTROPY) +=3D jitterentropy= _rng.o CFLAGS_jitterentropy.o =3D -O0 KASAN_SANITIZE_jitterentropy.o =3D n UBSAN_SANITIZE_jitterentropy.o =3D n jitterentropy_rng-y :=3D jitterentropy.o jitterentropy-kcapi.o obj-$(CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE) +=3D jitterentropy-testin= g.o -obj-$(CONFIG_CRYPTO_TEST) +=3D tcrypt.o +obj-$(CONFIG_CRYPTO_BENCHMARK) +=3D tcrypt.o obj-$(CONFIG_CRYPTO_GHASH) +=3D ghash-generic.o obj-$(CONFIG_CRYPTO_POLYVAL) +=3D polyval-generic.o obj-$(CONFIG_CRYPTO_USER_API) +=3D af_alg.o obj-$(CONFIG_CRYPTO_USER_API_HASH) +=3D algif_hash.o obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) +=3D algif_skcipher.o diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 879fc21dcc16..d1d88debbd71 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Quick & dirty crypto testing module. + * Quick & dirty crypto benchmarking module. * - * This will only exist until we have a better testing mechanism + * This will only exist until we have a better benchmarking mechanism * (e.g. a char device). * * Copyright (c) 2002 James Morris * Copyright (c) 2002 Jean-Francois Dive * Copyright (c) 2007 Nokia Siemens Networks @@ -37,11 +37,11 @@ =20 #include "internal.h" #include "tcrypt.h" =20 /* - * Need slab memory for testing (size in number of pages). + * Need slab memory for benchmarking (size in number of pages). */ #define TVMEMSIZE 4 =20 /* * Used by test_cipher_speed() @@ -2866,7 +2866,7 @@ module_param(num_mb, uint, 0000); MODULE_PARM_DESC(num_mb, "Number of concurrent requests to be used in mb s= peed tests (defaults to 8)"); module_param(klen, uint, 0); MODULE_PARM_DESC(klen, "Key length (defaults to 0)"); =20 MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Quick & dirty crypto testing module"); +MODULE_DESCRIPTION("Quick & dirty crypto benchmarking module"); MODULE_AUTHOR("James Morris "); diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h index 96c843a24607..7f938ac93e58 100644 --- a/crypto/tcrypt.h +++ b/crypto/tcrypt.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * Quick & dirty crypto testing module. + * Quick & dirty crypto benchmarking module. * - * This will only exist until we have a better testing mechanism + * This will only exist until we have a better benchmarking mechanism * (e.g. a char device). * * Copyright (c) 2002 James Morris * Copyright (c) 2002 Jean-Francois Dive * Copyright (c) 2007 Nokia Siemens Networks --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED1721DF747; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; cv=none; b=b3XeG6boTD+hXJs3phFH/EM+A1qcEfkHyOSsXN/LstGrNZsVlrWw+glbrRmp/F57qsXPftjyCLEZLRP/89Wen8O5snZXIpUOWBrMFLQzcHTBAC+Hqn6iERkZ9Fv/fRnA4K6bcWvCvlfxeaJFdDMSjGZF4mP56lYt59E4yLCZ8/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; c=relaxed/simple; bh=I42QJF1Eu44xNBr4N3XRIXMmtD3KqHQdmwg+Z6Q8kY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XA0Mh3uzPK5uG+E7F/86fFIrkp4RZ4S+RBQfxg+Tcb9vE9KXE4mi4r2KM+7jHDJQzOaK5q265yYGeJoYWUuuOd83FvJSLZMU5qdX+HFCWe6NFT3ZqhNovUJBu2rcHACEKgbIF0U3dUpP4Ieo9GbRfz0e+Jz+A0NkYdGME9UPSA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pPxhXdVv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pPxhXdVv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52D1EC4CEEE; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079453; bh=I42QJF1Eu44xNBr4N3XRIXMmtD3KqHQdmwg+Z6Q8kY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pPxhXdVv38d/1iJc/XJ5EMmL/prKGfR/aa80QW9dKUHLV3OU8WTU4cAS0HStmYvJi 8CAn4XvP4v6I7IZcjnzZNLHoIWc33fZgVAz9FVKJ4bvA/PcIP9dM30oCH5f725SIFL jUoh3TPA8MaPEAQmhmtvevIxCuj9JfyNDw3IxaIUBhSw5sjp0mHAyz/Ao/ROOIIZlN 3gTP2la+TRVF5bgyXjMaE8ShmmW0BK0vY9KiROtagUDeFD9Fsow9i6+0rykMo/isHi nY2awpV28jtEWgq19h0Cx5rMwfRJIe48AwYRQnqxMZYOsL5qjCCWi/4wgZj5WhPTIx dOrSQmUDwnM/g== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 3/9] crypto: testmgr - remove CRYPTO_MANAGER_DISABLE_TESTS from defconfigs Date: Sat, 19 Apr 2025 09:15:37 -0700 Message-ID: <20250419161543.139344-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers Unsetting CONFIG_CRYPTO_MANAGER_DISABLE_TESTS enables the crypto self-tests, which are only really useful for developers working on the crypto subsystem. Some defconfigs did this. But as with most of the other crypto options that tend to be randomly set in defconfigs, it is unlikely that much thought was put into these, especially when placed in "production" defconfigs. Clear it out of the defconfigs for now. Signed-off-by: Eric Biggers --- arch/arm/configs/milbeaut_m10v_defconfig | 1 - arch/loongarch/configs/loongson3_defconfig | 1 - arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - 4 files changed, 4 deletions(-) diff --git a/arch/arm/configs/milbeaut_m10v_defconfig b/arch/arm/configs/mi= lbeaut_m10v_defconfig index acd16204f8d7..2741c08e93db 100644 --- a/arch/arm/configs/milbeaut_m10v_defconfig +++ b/arch/arm/configs/milbeaut_m10v_defconfig @@ -92,11 +92,10 @@ CONFIG_CONFIGFS_FS=3Dy CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_NLS_UTF8=3Dy CONFIG_KEYS=3Dy CONFIG_CRYPTO_MANAGER=3Dy -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set # CONFIG_CRYPTO_ECHAINIV is not set CONFIG_CRYPTO_AES=3Dy CONFIG_CRYPTO_SEQIV=3Dm CONFIG_CRYPTO_GHASH_ARM_CE=3Dm CONFIG_CRYPTO_SHA1_ARM_NEON=3Dm diff --git a/arch/loongarch/configs/loongson3_defconfig b/arch/loongarch/co= nfigs/loongson3_defconfig index 90f21dfe22b1..3f588ad2071e 100644 --- a/arch/loongarch/configs/loongson3_defconfig +++ b/arch/loongarch/configs/loongson3_defconfig @@ -1024,11 +1024,10 @@ CONFIG_SECURITY_SELINUX=3Dy CONFIG_SECURITY_SELINUX_BOOTPARAM=3Dy CONFIG_SECURITY_APPARMOR=3Dy CONFIG_SECURITY_YAMA=3Dy CONFIG_DEFAULT_SECURITY_DAC=3Dy CONFIG_CRYPTO_USER=3Dm -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_PCRYPT=3Dm CONFIG_CRYPTO_CRYPTD=3Dm CONFIG_CRYPTO_ANUBIS=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAST5=3Dm diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_de= fconfig index 0216a6f50801..d4781acad45f 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -741,11 +741,10 @@ CONFIG_IMA=3Dy CONFIG_IMA_DEFAULT_HASH_SHA256=3Dy CONFIG_IMA_WRITE_POLICY=3Dy CONFIG_IMA_APPRAISE=3Dy CONFIG_BUG_ON_DATA_CORRUPTION=3Dy CONFIG_CRYPTO_USER=3Dm -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_PCRYPT=3Dm CONFIG_CRYPTO_CRYPTD=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index c0528f791ecf..732452c41f44 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -727,11 +727,10 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=3Dy CONFIG_IMA_WRITE_POLICY=3Dy CONFIG_IMA_APPRAISE=3Dy CONFIG_BUG_ON_DATA_CORRUPTION=3Dy CONFIG_CRYPTO_FIPS=3Dy CONFIG_CRYPTO_USER=3Dm -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_PCRYPT=3Dm CONFIG_CRYPTO_CRYPTD=3Dm CONFIG_CRYPTO_DH=3Dm CONFIG_CRYPTO_ECDH=3Dm CONFIG_CRYPTO_ECDSA=3Dm --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1444E1DF75C; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; cv=none; b=r0goUZiFlJqoGyMV9CnDlPLtn5+DlENjBUZtdG0Q0EaQMB7nz88LPVfC7MgUNwKQWHKCKnc7OkEf7JR3p3mDBFYXErEp2BpsLVTpm0USA4aSoMqqPE2UvvM0U5vqrYDNgew8rc7kzApGiUq8edSYxHQ6NXLi1wXMPfrkjhrZ3us= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; c=relaxed/simple; bh=XtyEiCkEKuikYYRpeUpbHx3EOmA+Ieo50jo5BElj4QI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SAe/ObRXfGefP4vAPyt2mMQnJao/Fj0Ll6lvLV0BaLEiBRLuH24J1hP3j4LSLeK4dhoMXsgDaQ5bZaUbfJI7IBStFZDWmIeNO9NcjJJIClBcKPg19fkOzip9B6xAD+y883QcOzDU+e9i8UXAZ91qMmyJFd1g5FjR+x6A9yCJQvY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lg5496XI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Lg5496XI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89071C4CEE7; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079453; bh=XtyEiCkEKuikYYRpeUpbHx3EOmA+Ieo50jo5BElj4QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lg5496XIE7QMKhR+payE/ypvMqKYJE/Q5ubTeWaC7JMuArlPtfI/WQeyQ6SZ2kGmI DeKZwZqxxqd+W/HOZZJrhhVA9zFkbkzke58Y3TUFgahhk3EsX0Pgs8vh7Jbi6D3Sgx RZ33vsPZEalz2UhOqpoUyR94KC9yl2x4ur5wlueOOlcmzbTIcvEjTw0VdwF/BQSieD THGCPtw4bJCbgzVp1L3d3L5VCHTElqoXNdwowITTN4p/6GQ4UqkvEMddjKtRaLc8Ul jQjnxJQNG0Yv70paoCyjGd2e5mu7dzJaFvejQsOUoqH7sGBvaqjCEK2gUO32Txwkz5 W2bjShHEzhj4A== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 4/9] crypto: testmgr - remove panic_on_fail Date: Sat, 19 Apr 2025 09:15:38 -0700 Message-ID: <20250419161543.139344-5-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers The cryptomgr.panic_on_fail=3D1 kernel command-line parameter is not very useful now that the tests have been fixed to WARN on failure, since developers can just use panic_on_warn=3D1 instead. There's no need for a special option just for the crypto self-tests. Remove it. Signed-off-by: Eric Biggers --- crypto/testmgr.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 82977ea25db3..d075c48ff1a2 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -43,13 +43,10 @@ MODULE_IMPORT_NS("CRYPTO_INTERNAL"); =20 static bool notests; module_param(notests, bool, 0644); MODULE_PARM_DESC(notests, "disable crypto self-tests"); =20 -static bool panic_on_fail; -module_param(panic_on_fail, bool, 0444); - #ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS static bool noextratests; module_param(noextratests, bool, 0644); MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests"); =20 @@ -5858,15 +5855,14 @@ int alg_test(const char *driver, const char *alg, u= 32 type, u32 mask) rc |=3D alg_test_descs[j].test(alg_test_descs + j, driver, type, mask); =20 test_done: if (rc) { - if (fips_enabled || panic_on_fail) { + if (fips_enabled) { fips_fail_notify(); - panic("alg: self-tests for %s (%s) failed in %s mode!\n", - driver, alg, - fips_enabled ? "fips" : "panic_on_fail"); + panic("alg: self-tests for %s (%s) failed in fips mode!\n", + driver, alg); } pr_warn("alg: self-tests for %s using %s failed (rc=3D%d)", alg, driver, rc); WARN(rc !=3D -ENOENT, "alg: self-tests for %s using %s failed (rc=3D%d)", --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 472271DFE20; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; cv=none; b=GmkrRjXKcV1IPVTJ+L9+0+hSZF5B6Wq3kShnpNfaGoZlUFgDyZ6ySx48yuXVDDoGJm0SZu2GcEL9+94wByx6TO4nW8MFoQQK7N2sZULqWtjJH0FxPE/ChsMrgCdDyRr2USi/c/sFGdz2qDlZJ9LUriJqPGAq1/mKfvTDd1g2Zkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; c=relaxed/simple; bh=I3PlMZtGBwQ0VoD5S3H7Kd+Kw85TXV6dUPiiZk7OQX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WV5oOna8Arpvq/xmfnelO4YDrg6oxkHS7M9GkQFiQMw6cLqP67eI2+2/vTVNQrF63EQU7/YLWgmkbKwO2Zy0jaEt+IwdRmncyI4yVIoX9+vSqu7aMBsX4uN0xnYR9Uz+upSGq97jmbFF8sycNvXfR7RuD+ZrMdJujkf6MLAqU5A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KrPT0/Cy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KrPT0/Cy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF7EDC4CEEC; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079453; bh=I3PlMZtGBwQ0VoD5S3H7Kd+Kw85TXV6dUPiiZk7OQX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KrPT0/CyV9tNE+ezX4SRJWhwPpdDcFfZ4GPvWro0UbKDt5Xs6zN/cmpfuRe3sL1x/ xq/a9JKC8WmKYHIyPMbZ8nQpBOtbYMb7zXy1UCCwFD2WbtbIFfDMzn3HyDzqGNctrp EKsnIw0otcQbm+mbPnP+lCWfYuN7VwKNNXObaVc1VyVsnfeiEZ57+DqmsWUhpVggnI Pvh7wxAIC/aQgOLOJvHd1ZmhvpuSP7b5ZhoaDvEgxktpsDBqJGY6FzST+1mnfSJICu tG3pP6dTQqZ+xr6iuku8Uu3q8mFO3pDCmPfTFD4bYmGEjfilGQlb1zYsRoZyXiyONK 9W08EAc9tUfiA== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 5/9] crypto: testmgr - replace CRYPTO_MANAGER_DISABLE_TESTS with CRYPTO_SELFTESTS Date: Sat, 19 Apr 2025 09:15:39 -0700 Message-ID: <20250419161543.139344-6-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers The negative-sense of CRYPTO_MANAGER_DISABLE_TESTS is a longstanding mistake that regularly causes confusion. Especially bad is that you can have CRYPTO=3Dn && CRYPTO_MANAGER_DISABLE_TESTS=3Dn, which is ambiguous. Replace CRYPTO_MANAGER_DISABLE_TESTS with CRYPTO_SELFTESTS which has the expected behavior. The tests continue to be disabled by default. Signed-off-by: Eric Biggers --- crypto/Kconfig | 23 ++++++++++++++--------- crypto/algapi.c | 4 ++-- crypto/algboss.c | 2 +- crypto/api.c | 3 +-- crypto/hkdf.c | 2 +- crypto/internal.h | 5 ++--- crypto/kdf_sp800108.c | 2 +- crypto/testmgr.c | 12 ++++++------ lib/crypto/Makefile | 8 +++----- lib/crypto/aescfb.c | 2 +- lib/crypto/aesgcm.c | 2 +- lib/crypto/blake2s.c | 2 +- lib/crypto/chacha20poly1305.c | 2 +- lib/crypto/curve25519.c | 2 +- 14 files changed, 36 insertions(+), 35 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 48283975fb2b..8bac10e4c1cc 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -23,11 +23,11 @@ if CRYPTO =20 menu "Crypto core or helper" =20 config CRYPTO_FIPS bool "FIPS 200 compliance" - depends on (CRYPTO_ANSI_CPRNG || CRYPTO_DRBG) && !CRYPTO_MANAGER_DISABLE_= TESTS + depends on (CRYPTO_ANSI_CPRNG || CRYPTO_DRBG) && CRYPTO_SELFTESTS depends on (MODULE_SIG || !MODULES) help This option enables the fips boot option which is required if you want the system to operate in a FIPS 200 certification. You should say no unless you know what @@ -141,12 +141,12 @@ config CRYPTO_ACOMP select CRYPTO_ALGAPI select CRYPTO_ACOMP2 =20 config CRYPTO_HKDF tristate - select CRYPTO_SHA256 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS - select CRYPTO_SHA512 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS + select CRYPTO_SHA256 if CRYPTO_SELFTESTS + select CRYPTO_SHA512 if CRYPTO_SELFTESTS select CRYPTO_HASH2 =20 config CRYPTO_MANAGER tristate "Cryptographic algorithm manager" select CRYPTO_MANAGER2 @@ -171,20 +171,25 @@ config CRYPTO_USER select CRYPTO_MANAGER help Userspace configuration for cryptographic instantiations such as cbc(aes). =20 -config CRYPTO_MANAGER_DISABLE_TESTS - bool "Disable run-time self tests" - default y +config CRYPTO_SELFTESTS + bool "Enable crypto self-tests" help - Disable run-time self tests that normally take place at - algorithm registration. + Enable the cryptographic self-tests. + + The cryptographic self-tests run at boot time, or at algorithm + registration time if algorithms are dynamically loaded later. + + This is primarily intended for developer use. It should not be + enabled in production kernels, unless you are trying to use these + tests to fulfill a FIPS testing requirement. =20 config CRYPTO_MANAGER_EXTRA_TESTS bool "Enable extra run-time crypto self tests" - depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER + depends on DEBUG_KERNEL && CRYPTO_SELFTESTS && CRYPTO_MANAGER help Enable extra run-time self tests of registered crypto algorithms, including randomized fuzz tests. =20 This is intended for developer use only, as these tests take much diff --git a/crypto/algapi.c b/crypto/algapi.c index 532d3efc3c7d..9030a30c89e8 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -273,11 +273,11 @@ static void crypto_alg_finish_registration(struct cry= pto_alg *alg, static struct crypto_larval *crypto_alloc_test_larval(struct crypto_alg *a= lg) { struct crypto_larval *larval; =20 if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER) || - IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) || + !IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) || (alg->cra_flags & CRYPTO_ALG_INTERNAL)) return NULL; /* No self-test needed */ =20 larval =3D crypto_larval_alloc(alg->cra_name, alg->cra_flags | CRYPTO_ALG_TESTED, 0); @@ -1057,11 +1057,11 @@ EXPORT_SYMBOL_GPL(crypto_type_has_alg); static void __init crypto_start_tests(void) { if (!IS_BUILTIN(CONFIG_CRYPTO_ALGAPI)) return; =20 - if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS)) + if (!IS_ENABLED(CONFIG_CRYPTO_SELFTESTS)) return; =20 set_crypto_boot_test_finished(); =20 for (;;) { diff --git a/crypto/algboss.c b/crypto/algboss.c index a20926bfd34e..14b131c5d86a 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -187,11 +187,11 @@ static int cryptomgr_test(void *data) static int cryptomgr_schedule_test(struct crypto_alg *alg) { struct task_struct *thread; struct crypto_test_param *param; =20 - if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS)) + if (!IS_ENABLED(CONFIG_CRYPTO_SELFTESTS)) return NOTIFY_DONE; =20 if (!try_module_get(THIS_MODULE)) goto err; =20 diff --git a/crypto/api.c b/crypto/api.c index e427cc5662b5..038db19e375f 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -29,12 +29,11 @@ DECLARE_RWSEM(crypto_alg_sem); EXPORT_SYMBOL_GPL(crypto_alg_sem); =20 BLOCKING_NOTIFIER_HEAD(crypto_chain); EXPORT_SYMBOL_GPL(crypto_chain); =20 -#if IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) && \ - !IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) +#if IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) && IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) DEFINE_STATIC_KEY_FALSE(__crypto_boot_test_finished); #endif =20 static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg, u32 type, u32 mask); diff --git a/crypto/hkdf.c b/crypto/hkdf.c index 2434c5c42545..f24c2a8d4df9 100644 --- a/crypto/hkdf.c +++ b/crypto/hkdf.c @@ -541,11 +541,11 @@ static int hkdf_test(const char *shash, const struct = hkdf_testvec *tv) =20 static int __init crypto_hkdf_module_init(void) { int ret =3D 0, i; =20 - if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS)) + if (!IS_ENABLED(CONFIG_CRYPTO_SELFTESTS)) return 0; =20 for (i =3D 0; i < ARRAY_SIZE(hkdf_sha256_tv); i++) { ret =3D hkdf_test("hmac(sha256)", &hkdf_sha256_tv[i]); if (ret) diff --git a/crypto/internal.h b/crypto/internal.h index 2ed79bf208ca..b9afd68767c1 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -65,12 +65,11 @@ extern struct list_head crypto_alg_list; extern struct rw_semaphore crypto_alg_sem; extern struct blocking_notifier_head crypto_chain; =20 int alg_test(const char *driver, const char *alg, u32 type, u32 mask); =20 -#if !IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) || \ - IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) +#if !IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) || !IS_ENABLED(CONFIG_CRYPTO_SELFTES= TS) static inline bool crypto_boot_test_finished(void) { return true; } static inline void set_crypto_boot_test_finished(void) @@ -85,11 +84,11 @@ static inline bool crypto_boot_test_finished(void) static inline void set_crypto_boot_test_finished(void) { static_branch_enable(&__crypto_boot_test_finished); } #endif /* !IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) || - * IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) + * !IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) */ =20 #ifdef CONFIG_PROC_FS void __init crypto_init_proc(void); void __exit crypto_exit_proc(void); diff --git a/crypto/kdf_sp800108.c b/crypto/kdf_sp800108.c index c3f9938e1ad2..b7a6bf9da773 100644 --- a/crypto/kdf_sp800108.c +++ b/crypto/kdf_sp800108.c @@ -125,11 +125,11 @@ static const struct kdf_testvec kdf_ctr_hmac_sha256_t= v_template[] =3D { =20 static int __init crypto_kdf108_init(void) { int ret; =20 - if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS)) + if (!IS_ENABLED(CONFIG_CRYPTO_SELFTESTS)) return 0; =20 ret =3D kdf_test(&kdf_ctr_hmac_sha256_tv_template[0], "hmac(sha256)", crypto_kdf108_setkey, crypto_kdf108_ctr_generate); if (ret) { diff --git a/crypto/testmgr.c b/crypto/testmgr.c index d075c48ff1a2..1b2f7a4724d8 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -53,11 +53,11 @@ MODULE_PARM_DESC(noextratests, "disable expensive crypt= o self-tests"); static unsigned int fuzz_iterations =3D 100; module_param(fuzz_iterations, uint, 0644); MODULE_PARM_DESC(fuzz_iterations, "number of fuzz test iterations"); #endif =20 -#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS +#ifndef CONFIG_CRYPTO_SELFTESTS =20 /* a perfect nop */ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) { return 0; @@ -319,14 +319,14 @@ struct testvec_config { =20 #define TESTVEC_CONFIG_NAMELEN 192 =20 /* * The following are the lists of testvec_configs to test for each algorit= hm - * type when the basic crypto self-tests are enabled, i.e. when - * CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is unset. They aim to provide good= test - * coverage, while keeping the test time much shorter than the full fuzz t= ests - * so that the basic tests can be enabled in a wider range of circumstance= s. + * type when the basic crypto self-tests are enabled. They aim to provide= good + * test coverage, while keeping the test time much shorter than the full f= uzz + * tests so that the basic tests can be enabled in a wider range of + * circumstances. */ =20 /* Configs for skciphers and aeads */ static const struct testvec_config default_cipher_testvec_configs[] =3D { { @@ -5903,8 +5903,8 @@ int alg_test(const char *driver, const char *alg, u32= type, u32 mask) return 0; non_fips_alg: return alg_fips_disabled(driver, alg); } =20 -#endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ +#endif /* CONFIG_CRYPTO_SELFTESTS */ =20 EXPORT_SYMBOL_GPL(alg_test); diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 4dd62bc5bee3..5a41bf5bf819 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -49,15 +49,13 @@ obj-$(CONFIG_CRYPTO_LIB_SHA1) +=3D libsha1.o libsha1-y :=3D sha1.o =20 obj-$(CONFIG_CRYPTO_LIB_SHA256) +=3D libsha256.o libsha256-y :=3D sha256.o =20 -ifneq ($(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS),y) -libblake2s-y +=3D blake2s-selftest.o -libchacha20poly1305-y +=3D chacha20poly1305-selftest.o -libcurve25519-y +=3D curve25519-selftest.o -endif +libblake2s-$(CONFIG_CRYPTO_SELFTESTS) +=3D blake2s-selftest.o +libchacha20poly1305-$(CONFIG_CRYPTO_SELFTESTS) +=3D chacha20poly1305-selft= est.o +libcurve25519-$(CONFIG_CRYPTO_SELFTESTS) +=3D curve25519-selftest.o =20 obj-$(CONFIG_MPILIB) +=3D mpi/ =20 obj-$(CONFIG_CRYPTO_MANAGER_EXTRA_TESTS) +=3D simd.o =20 diff --git a/lib/crypto/aescfb.c b/lib/crypto/aescfb.c index 749dc1258a44..437613265e14 100644 --- a/lib/crypto/aescfb.c +++ b/lib/crypto/aescfb.c @@ -97,11 +97,11 @@ EXPORT_SYMBOL(aescfb_decrypt); =20 MODULE_DESCRIPTION("Generic AES-CFB library"); MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL"); =20 -#ifndef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS +#ifdef CONFIG_CRYPTO_SELFTESTS =20 /* * Test code below. Vectors taken from crypto/testmgr.h */ =20 diff --git a/lib/crypto/aesgcm.c b/lib/crypto/aesgcm.c index 902e49410aaf..277824d6b4af 100644 --- a/lib/crypto/aesgcm.c +++ b/lib/crypto/aesgcm.c @@ -197,11 +197,11 @@ EXPORT_SYMBOL(aesgcm_decrypt); =20 MODULE_DESCRIPTION("Generic AES-GCM library"); MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL"); =20 -#ifndef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS +#ifdef CONFIG_CRYPTO_SELFTESTS =20 /* * Test code below. Vectors taken from crypto/testmgr.h */ =20 diff --git a/lib/crypto/blake2s.c b/lib/crypto/blake2s.c index 71a316552cc5..b0f9a678300b 100644 --- a/lib/crypto/blake2s.c +++ b/lib/crypto/blake2s.c @@ -58,11 +58,11 @@ void blake2s_final(struct blake2s_state *state, u8 *out) } EXPORT_SYMBOL(blake2s_final); =20 static int __init blake2s_mod_init(void) { - if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) && + if (IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) && WARN_ON(!blake2s_selftest())) return -ENODEV; return 0; } =20 diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c index 9cfa886f1f89..57a84fee179e 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -353,11 +353,11 @@ bool chacha20poly1305_decrypt_sg_inplace(struct scatt= erlist *src, size_t src_len } EXPORT_SYMBOL(chacha20poly1305_decrypt_sg_inplace); =20 static int __init chacha20poly1305_init(void) { - if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) && + if (IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) && WARN_ON(!chacha20poly1305_selftest())) return -ENODEV; return 0; } =20 diff --git a/lib/crypto/curve25519.c b/lib/crypto/curve25519.c index 064b352c6907..6850b76a80c9 100644 --- a/lib/crypto/curve25519.c +++ b/lib/crypto/curve25519.c @@ -13,11 +13,11 @@ #include #include =20 static int __init curve25519_init(void) { - if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) && + if (IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) && WARN_ON(!curve25519_selftest())) return -ENODEV; return 0; } =20 --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31EBC1DF98B; Sat, 19 Apr 2025 16:17:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; cv=none; b=Rz4uHjA+G53KUkfM/vstXN3lD5inmayKH/PMqTa0XYsI+L1bEiJIQhfRGo6pkP3HCk0T1bABuZUZvs+TD+H1UtyCJHiNmltk+TGPybyEtXl8NTWWCgigcro02IfeEeRp+mgxwFFwfVNQaHf4W2cZdoNQ4mqQJfgzpZNRv5r6bgw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; c=relaxed/simple; bh=eh6O/hdgGD2DcNLDPvPzeJto8tvC5SK9NG51iJCe9i4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jzo2MJwsJ76LBHRdLl27y5RdOE1KSUW/CVDB/3hzjF2ABxEDSYu8lD9ijaAdcNBMX67RLPtjKp8x9BeFW4yrNaey5lQ1qDi3T+ofmvrvAOIVzC/h9ybOSeldlJ6GzyC2ptEbFAm7wSykpwIMWIV3ze/kPiRiZXwoGZmkQ93HcFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D60gXZz1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D60gXZz1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 017F9C4CEE9; Sat, 19 Apr 2025 16:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079454; bh=eh6O/hdgGD2DcNLDPvPzeJto8tvC5SK9NG51iJCe9i4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D60gXZz1gX0xPs5bbAP49UfmWdBgWU0jlBMR9/pgoSJ2igOZhEkVBzAwch9mJyh9W N2cDDFHvM+JWOwOtPV3F0A+L/Hn97wVaxypSLhtogck2K1JGulzS3nbHIvFRQuTzts JgmDePP8ycwbOuMvkM9MqjVrz5/4suq8tR681XJ9qFsZl/AZFOeqFcmLyIi2jBQSTo EXJCBWKkhF69F/gmWcbXLEmsR37Icn3rteIbHY7zAbvhasmhMGYFmWM24W5kNmR/Ys MeW6Ln7+3IMJoIFQYCl1A4nwI+UEqLyu7MhUOnX6gYEZqvy+p5PS+D4tPW2qgg6iph rFRdSpOUNMTOg== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 6/9] crypto: testmgr - make it easier to enable the full set of tests Date: Sat, 19 Apr 2025 09:15:40 -0700 Message-ID: <20250419161543.139344-7-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers Currently the full set of crypto self-tests requires CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=3Dy. This is problematic in two ways. First, developers regularly overlook this option. Second, the description of the tests as "extra" sometimes gives the impression that it is not required that all algorithms pass these tests. Given that the main use case for the crypto self-tests is for developers, make enabling CONFIG_CRYPTO_SELFTESTS=3Dy just enable the full set of crypto self-tests by default. The slow tests can still be disabled by adding the command-line parameter cryptomgr.noextratests=3D1, soon to be renamed to cryptomgr.noslowtests=3D1. The only known use case for doing this is for people trying to use the crypto self-tests to satisfy the FIPS 140-3 pre-operational self-testing requirements when the kernel is being validated as a FIPS 140-3 cryptographic module. Signed-off-by: Eric Biggers --- crypto/Kconfig | 10 ------ crypto/testmgr.c | 62 +++------------------------------- include/crypto/internal/simd.h | 6 ++-- lib/crypto/Makefile | 2 +- 4 files changed, 8 insertions(+), 72 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 8bac10e4c1cc..538a874262fc 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -183,20 +183,10 @@ config CRYPTO_SELFTESTS =20 This is primarily intended for developer use. It should not be enabled in production kernels, unless you are trying to use these tests to fulfill a FIPS testing requirement. =20 -config CRYPTO_MANAGER_EXTRA_TESTS - bool "Enable extra run-time crypto self tests" - depends on DEBUG_KERNEL && CRYPTO_SELFTESTS && CRYPTO_MANAGER - help - Enable extra run-time self tests of registered crypto algorithms, - including randomized fuzz tests. - - This is intended for developer use only, as these tests take much - longer to run than the normal self tests. - config CRYPTO_NULL tristate "Null algorithms" select CRYPTO_NULL2 help These are 'Null' algorithms, used by IPsec, which do nothing. diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 1b2f7a4724d8..a02cb7f82867 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -43,19 +43,17 @@ MODULE_IMPORT_NS("CRYPTO_INTERNAL"); =20 static bool notests; module_param(notests, bool, 0644); MODULE_PARM_DESC(notests, "disable crypto self-tests"); =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS static bool noextratests; module_param(noextratests, bool, 0644); MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests"); =20 static unsigned int fuzz_iterations =3D 100; module_param(fuzz_iterations, uint, 0644); MODULE_PARM_DESC(fuzz_iterations, "number of fuzz test iterations"); -#endif =20 #ifndef CONFIG_CRYPTO_SELFTESTS =20 /* a perfect nop */ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) @@ -319,14 +317,13 @@ struct testvec_config { =20 #define TESTVEC_CONFIG_NAMELEN 192 =20 /* * The following are the lists of testvec_configs to test for each algorit= hm - * type when the basic crypto self-tests are enabled. They aim to provide= good - * test coverage, while keeping the test time much shorter than the full f= uzz - * tests so that the basic tests can be enabled in a wider range of - * circumstances. + * type when the fast crypto self-tests are enabled. They aim to provide = good + * test coverage, while keeping the test time much shorter than the full t= ests + * so that the fast tests can be used to fulfill FIPS 140 testing requirem= ents. */ =20 /* Configs for skciphers and aeads */ static const struct testvec_config default_cipher_testvec_configs[] =3D { { @@ -871,12 +868,10 @@ static int prepare_keybuf(const u8 *key, unsigned int= ksize, kfree(keybuf); \ } \ err; \ }) =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS - /* * The fuzz tests use prandom instead of the normal Linux RNG since they d= on't * need cryptographically secure random numbers. This greatly improves the * performance of these tests, especially if they are run before the Linux= RNG * has been initialized or if they are run on a lockdep-enabled kernel. @@ -1237,19 +1232,10 @@ static int build_generic_driver_name(const char *al= gname, too_long: pr_err("alg: generic driver name for \"%s\" would be too long\n", algname); return -ENAMETOOLONG; } -#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ -static void crypto_disable_simd_for_test(void) -{ -} - -static void crypto_reenable_simd_for_test(void) -{ -} -#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ =20 static int build_hash_sglist(struct test_sglist *tsgl, const struct hash_testvec *vec, const struct testvec_config *cfg, unsigned int alignmask, @@ -1686,11 +1672,10 @@ static int test_hash_vec(const struct hash_testvec = *vec, unsigned int vec_num, req, desc, tsgl, hashstate); if (err) return err; } =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS if (!noextratests) { struct rnd_state rng; struct testvec_config cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; =20 @@ -1704,15 +1689,13 @@ static int test_hash_vec(const struct hash_testvec = *vec, unsigned int vec_num, if (err) return err; cond_resched(); } } -#endif return 0; } =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS /* * Generate a hash test vector from the given implementation. * Assumes the buffers in 'vec' were already allocated. */ static void generate_random_hash_testvec(struct rnd_state *rng, @@ -1874,21 +1857,10 @@ static int test_hash_vs_generic_impl(const char *ge= neric_driver, kfree(vec.digest); crypto_free_shash(generic_tfm); kfree_sensitive(generic_desc); return err; } -#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ -static int test_hash_vs_generic_impl(const char *generic_driver, - unsigned int maxkeysize, - struct ahash_request *req, - struct shash_desc *desc, - struct test_sglist *tsgl, - u8 *hashstate) -{ - return 0; -} -#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ =20 static int alloc_shash(const char *driver, u32 type, u32 mask, struct crypto_shash **tfm_ret, struct shash_desc **desc_ret) { @@ -2258,11 +2230,10 @@ static int test_aead_vec(int enc, const struct aead= _testvec *vec, req, tsgls); if (err) return err; } =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS if (!noextratests) { struct rnd_state rng; struct testvec_config cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; =20 @@ -2276,16 +2247,13 @@ static int test_aead_vec(int enc, const struct aead= _testvec *vec, if (err) return err; cond_resched(); } } -#endif return 0; } =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS - struct aead_extra_tests_ctx { struct rnd_state rng; struct aead_request *req; struct crypto_aead *tfm; const struct alg_test_desc *test_desc; @@ -2666,18 +2634,10 @@ static int test_aead_extra(const struct alg_test_de= sc *test_desc, kfree(ctx->vec.ptext); kfree(ctx->vec.ctext); kfree(ctx); return err; } -#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ -static int test_aead_extra(const struct alg_test_desc *test_desc, - struct aead_request *req, - struct cipher_test_sglists *tsgls) -{ - return 0; -} -#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ =20 static int test_aead(int enc, const struct aead_test_suite *suite, struct aead_request *req, struct cipher_test_sglists *tsgls) { @@ -3013,11 +2973,10 @@ static int test_skcipher_vec(int enc, const struct = cipher_testvec *vec, req, tsgls); if (err) return err; } =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS if (!noextratests) { struct rnd_state rng; struct testvec_config cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; =20 @@ -3031,15 +2990,13 @@ static int test_skcipher_vec(int enc, const struct = cipher_testvec *vec, if (err) return err; cond_resched(); } } -#endif return 0; } =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS /* * Generate a symmetric cipher test vector from the given implementation. * Assumes the buffers in 'vec' were already allocated. */ static void generate_random_cipher_testvec(struct rnd_state *rng, @@ -3234,18 +3191,10 @@ static int test_skcipher_vs_generic_impl(const char= *generic_driver, kfree(vec.ctext); crypto_free_skcipher(generic_tfm); skcipher_request_free(generic_req); return err; } -#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ -static int test_skcipher_vs_generic_impl(const char *generic_driver, - struct skcipher_request *req, - struct cipher_test_sglists *tsgls) -{ - return 0; -} -#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ =20 static int test_skcipher(int enc, const struct cipher_test_suite *suite, struct skcipher_request *req, struct cipher_test_sglists *tsgls) { @@ -5764,13 +5713,12 @@ static void alg_check_testvec_configs(void) static void testmgr_onetime_init(void) { alg_check_test_descs_order(); alg_check_testvec_configs(); =20 -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS - pr_warn("alg: extra crypto tests enabled. This is intended for developer= use only.\n"); -#endif + if (!noextratests) + pr_warn("alg: full crypto tests enabled. This is intended for developer= use only.\n"); } =20 static int alg_find_test(const char *alg) { int start =3D 0; diff --git a/include/crypto/internal/simd.h b/include/crypto/internal/simd.h index f56049bd1660..7e7f1ac3b7fd 100644 --- a/include/crypto/internal/simd.h +++ b/include/crypto/internal/simd.h @@ -42,15 +42,13 @@ void simd_unregister_aeads(struct aead_alg *algs, int c= ount, * crypto_simd_usable() - is it allowed at this time to use SIMD instructi= ons or * access the SIMD register file? * * This delegates to may_use_simd(), except that this also returns false i= f SIMD * in crypto code has been temporarily disabled on this CPU by the crypto - * self-tests, in order to test the no-SIMD fallback code. This override = is - * currently limited to configurations where the extra self-tests are enab= led, - * because it might be a bit too invasive to be part of the regular self-t= ests. + * self-tests, in order to test the no-SIMD fallback code. */ -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS +#ifdef CONFIG_CRYPTO_SELFTESTS DECLARE_PER_CPU(bool, crypto_simd_disabled_for_test); #define crypto_simd_usable() \ (may_use_simd() && !this_cpu_read(crypto_simd_disabled_for_test)) #else #define crypto_simd_usable() may_use_simd() diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 5a41bf5bf819..8beda506b9b7 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -55,9 +55,9 @@ libblake2s-$(CONFIG_CRYPTO_SELFTESTS) +=3D blake2s-selft= est.o libchacha20poly1305-$(CONFIG_CRYPTO_SELFTESTS) +=3D chacha20poly1305-selft= est.o libcurve25519-$(CONFIG_CRYPTO_SELFTESTS) +=3D curve25519-selftest.o =20 obj-$(CONFIG_MPILIB) +=3D mpi/ =20 -obj-$(CONFIG_CRYPTO_MANAGER_EXTRA_TESTS) +=3D simd.o +obj-$(CONFIG_CRYPTO_SELFTESTS) +=3D simd.o =20 obj-$(CONFIG_CRYPTO_LIB_SM3) +=3D libsm3.o libsm3-y :=3D sm3.o --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E91A1E0DDC; Sat, 19 Apr 2025 16:17:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; cv=none; b=VQeDM2nnWuPr6CkoDnhD2jDg0ToDM9jGBnqYh9Oyg0HAkChh7E96XU8NlJSPQMyQ2/8PQ683KBv88M9hdThsLFilgqxLSYX1lRUwRq9DNyEUpVP3S/GoQqRnxlkg+2HE0x0MWKf4KgLWCEdGdcl1AQrw7oJjWcUv1CRFq2Y/Tlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079454; c=relaxed/simple; bh=DqTLZgsKDoEKsPl/yjb0tYpwcfITj+2CSmakXqmcYf8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bVN9opXyMUUs8537H6cgqBqp8uMzpNcjaQMxLnFnlDlEDvOqrzfy42mQwfoWN+m23oM8KnEWMGeUP+dpJRFBV42EzB7RW+FmR1Q2Dv4iEuKcHjtA6qUZOSuVrotgHh6NqNO6u2+W3I7B9zDDgvvjtViXFJZ9iBuFlqqSiDz/DHU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ad9r0X92; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ad9r0X92" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 380E8C4CEF5; Sat, 19 Apr 2025 16:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079454; bh=DqTLZgsKDoEKsPl/yjb0tYpwcfITj+2CSmakXqmcYf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ad9r0X92u5d4JULQIclxEMFaNfdxNjKZaMbE8ioz/m9/0AFadZraAPm4Ug82Wm4R/ VyFQsGzw+GSVlLZCzJO3ftSIh6LvD6Ar2IHYCWqSIrQRh7mAStOGx265QCYDb8Yht+ iERdWMjBc+aYrUe0MRwqHXQfoAWfLRpEbA7s+UQcOkKO8T6pDLdR3y03ntPGfG0D5x oWOG4140wYvGqGoSa3qXKxyOkH1nxlNJLJH6+A4Ea6n6D/Uw+b9M7zXj13FoSLLf0/ 7dHHmbPVyC06+bqI7C6Zjzc7bjmjx/vYTbtRsCFlsheIgh808+2QBuo9q4PeFEuYsz EnhX/ntZzgqkg== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 7/9] crypto: testmgr - rename noextratests to noslowtests Date: Sat, 19 Apr 2025 09:15:41 -0700 Message-ID: <20250419161543.139344-8-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers Rename the noextratests module parameter to noslowtests, and replace other remaining mentions of "extra" in the code with "slow". This addresses confusion regarding the word "extra" like that seen at https://lore.kernel.org/r/6cecf2de-9aa0-f6ea-0c2d-8e974a1a820b@huawei.com/. Signed-off-by: Eric Biggers --- crypto/testmgr.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index a02cb7f82867..be3ffc47109f 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -41,15 +41,15 @@ =20 MODULE_IMPORT_NS("CRYPTO_INTERNAL"); =20 static bool notests; module_param(notests, bool, 0644); -MODULE_PARM_DESC(notests, "disable crypto self-tests"); +MODULE_PARM_DESC(notests, "disable all crypto self-tests"); =20 -static bool noextratests; -module_param(noextratests, bool, 0644); -MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests"); +static bool noslowtests; +module_param(noslowtests, bool, 0644); +MODULE_PARM_DESC(noslowtests, "disable slow crypto self-tests"); =20 static unsigned int fuzz_iterations =3D 100; module_param(fuzz_iterations, uint, 0644); MODULE_PARM_DESC(fuzz_iterations, "number of fuzz test iterations"); =20 @@ -1672,11 +1672,11 @@ static int test_hash_vec(const struct hash_testvec = *vec, unsigned int vec_num, req, desc, tsgl, hashstate); if (err) return err; } =20 - if (!noextratests) { + if (!noslowtests) { struct rnd_state rng; struct testvec_config cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; =20 init_rnd_state(&rng); @@ -1762,11 +1762,11 @@ static int test_hash_vs_generic_impl(const char *ge= neric_driver, char vec_name[64]; struct testvec_config *cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; int err; =20 - if (noextratests) + if (noslowtests) return 0; =20 init_rnd_state(&rng); =20 if (!generic_driver) { /* Use default naming convention? */ @@ -2230,11 +2230,11 @@ static int test_aead_vec(int enc, const struct aead= _testvec *vec, req, tsgls); if (err) return err; } =20 - if (!noextratests) { + if (!noslowtests) { struct rnd_state rng; struct testvec_config cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; =20 init_rnd_state(&rng); @@ -2250,11 +2250,11 @@ static int test_aead_vec(int enc, const struct aead= _testvec *vec, } } return 0; } =20 -struct aead_extra_tests_ctx { +struct aead_slow_tests_ctx { struct rnd_state rng; struct aead_request *req; struct crypto_aead *tfm; const struct alg_test_desc *test_desc; struct cipher_test_sglists *tsgls; @@ -2425,12 +2425,11 @@ static void generate_random_aead_testvec(struct rnd= _state *rng, snprintf(name, max_namelen, "\"random: alen=3D%u plen=3D%u authsize=3D%u klen=3D%u novrfy=3D%d\"", vec->alen, vec->plen, authsize, vec->klen, vec->novrfy); } =20 -static void try_to_generate_inauthentic_testvec( - struct aead_extra_tests_ctx *ctx) +static void try_to_generate_inauthentic_testvec(struct aead_slow_tests_ctx= *ctx) { int i; =20 for (i =3D 0; i < 10; i++) { generate_random_aead_testvec(&ctx->rng, ctx->req, &ctx->vec, @@ -2445,11 +2444,11 @@ static void try_to_generate_inauthentic_testvec( =20 /* * Generate inauthentic test vectors (i.e. ciphertext, AAD pairs that aren= 't the * result of an encryption with the key) and verify that decryption fails. */ -static int test_aead_inauthentic_inputs(struct aead_extra_tests_ctx *ctx) +static int test_aead_inauthentic_inputs(struct aead_slow_tests_ctx *ctx) { unsigned int i; int err; =20 for (i =3D 0; i < fuzz_iterations * 8; i++) { @@ -2480,11 +2479,11 @@ static int test_aead_inauthentic_inputs(struct aead= _extra_tests_ctx *ctx) =20 /* * Test the AEAD algorithm against the corresponding generic implementatio= n, if * one is available. */ -static int test_aead_vs_generic_impl(struct aead_extra_tests_ctx *ctx) +static int test_aead_vs_generic_impl(struct aead_slow_tests_ctx *ctx) { struct crypto_aead *tfm =3D ctx->tfm; const char *algname =3D crypto_aead_alg(tfm)->base.cra_name; const char *driver =3D crypto_aead_driver_name(tfm); const char *generic_driver =3D ctx->test_desc->generic_driver; @@ -2584,19 +2583,19 @@ static int test_aead_vs_generic_impl(struct aead_ex= tra_tests_ctx *ctx) crypto_free_aead(generic_tfm); aead_request_free(generic_req); return err; } =20 -static int test_aead_extra(const struct alg_test_desc *test_desc, - struct aead_request *req, - struct cipher_test_sglists *tsgls) +static int test_aead_slow(const struct alg_test_desc *test_desc, + struct aead_request *req, + struct cipher_test_sglists *tsgls) { - struct aead_extra_tests_ctx *ctx; + struct aead_slow_tests_ctx *ctx; unsigned int i; int err; =20 - if (noextratests) + if (noslowtests) return 0; =20 ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; @@ -2699,11 +2698,11 @@ static int alg_test_aead(const struct alg_test_desc= *desc, const char *driver, =20 err =3D test_aead(DECRYPT, suite, req, tsgls); if (err) goto out; =20 - err =3D test_aead_extra(desc, req, tsgls); + err =3D test_aead_slow(desc, req, tsgls); out: free_cipher_test_sglists(tsgls); aead_request_free(req); crypto_free_aead(tfm); return err; @@ -2973,11 +2972,11 @@ static int test_skcipher_vec(int enc, const struct = cipher_testvec *vec, req, tsgls); if (err) return err; } =20 - if (!noextratests) { + if (!noslowtests) { struct rnd_state rng; struct testvec_config cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; =20 init_rnd_state(&rng); @@ -3075,11 +3074,11 @@ static int test_skcipher_vs_generic_impl(const char= *generic_driver, char vec_name[64]; struct testvec_config *cfg; char cfgname[TESTVEC_CONFIG_NAMELEN]; int err; =20 - if (noextratests) + if (noslowtests) return 0; =20 init_rnd_state(&rng); =20 if (!generic_driver) { /* Use default naming convention? */ @@ -5713,11 +5712,11 @@ static void alg_check_testvec_configs(void) static void testmgr_onetime_init(void) { alg_check_test_descs_order(); alg_check_testvec_configs(); =20 - if (!noextratests) + if (!noslowtests) pr_warn("alg: full crypto tests enabled. This is intended for developer= use only.\n"); } =20 static int alg_find_test(const char *alg) { --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16CEA1E1E12; Sat, 19 Apr 2025 16:17:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079455; cv=none; b=s5Y00kjcHUtrs4k2ySMyqzetLX2TdZZWNCG43bNlcB5A9xtyDMX1D5Sxbx6PzHuIa91iOkOYCuwToFD16Oh2/B2w1C3VXxuhJJjzT2WC0UdM9GDqLh8R1qeP8TiytXd9h+LKKvLWHq5sFugGwwP2uEAi5JDHCSWMYZNgGfeNdo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079455; c=relaxed/simple; bh=+zx2Cjb+gLCq+K8saN7p6/cUJdOWOHiUYKHSH4y/2CU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZoqJwN3IAyfzVavzcYpavlqvJzihauOzwp172H7t5DsIY7QK6iahRYo909IAEs8A+IjLYv1Qn6g5rBI0maxA0KXPk5oX3xWSRrv04HVt9cygXyHiQE5IJ0VHptBqccLf0KdRSzbib/7aFcqsy76TnEuI+GOXGtki3p2fIe4EIwg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LDL9cFSX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LDL9cFSX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E806C4CEF7; Sat, 19 Apr 2025 16:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079454; bh=+zx2Cjb+gLCq+K8saN7p6/cUJdOWOHiUYKHSH4y/2CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LDL9cFSXzeuwGtWtALjOITo5j5uPVBuNiycudpQ/vBSOE7xWzuFCDsZnnV+kkTVk+ P08Imqo6lwR8bObni47+vR0GF1m0eBQ+Ys/I8f+EqRwhYYc9BOUAlAw/Iky2JN8tUz cUJzA4CYxWXr81lrQrntgSrRBX9DgL9NpAojkvuy8hRcD2YzKKaDidWaT/J2Jqy5a6 PXXxwPYdFk/wGOrLmiy9tKxXpgXkLy4xewZBzPcGyt9eS9ZvSGChFOpSSOxAZjL4CS fRHqUzgrUdOyl2cl0iLXwcQZLMmqLDzhqM4+YYqxIiOh3RcYAmSw4tfnZL0jAcvA8i Rw6dwNhRfmCnw== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 8/9] crypto: Kconfig - make CRYPTO_MANAGER a hidden symbol Date: Sat, 19 Apr 2025 09:15:42 -0700 Message-ID: <20250419161543.139344-9-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers There is no reason for people configuring the kernel to be asked about CRYPTO_MANAGER, so make it a hidden symbol. Signed-off-by: Eric Biggers --- arch/arm/configs/milbeaut_m10v_defconfig | 1 - arch/arm/configs/pxa_defconfig | 1 - arch/mips/configs/decstation_64_defconfig | 1 - arch/mips/configs/decstation_defconfig | 1 - arch/mips/configs/decstation_r4k_defconfig | 1 - arch/mips/configs/ip28_defconfig | 1 - arch/parisc/configs/generic-64bit_defconfig | 1 - arch/sh/configs/migor_defconfig | 1 - crypto/Kconfig | 2 +- 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/configs/milbeaut_m10v_defconfig b/arch/arm/configs/mi= lbeaut_m10v_defconfig index 2741c08e93db..263e966fad82 100644 --- a/arch/arm/configs/milbeaut_m10v_defconfig +++ b/arch/arm/configs/milbeaut_m10v_defconfig @@ -91,11 +91,10 @@ CONFIG_CONFIGFS_FS=3Dy # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_NLS_UTF8=3Dy CONFIG_KEYS=3Dy -CONFIG_CRYPTO_MANAGER=3Dy # CONFIG_CRYPTO_ECHAINIV is not set CONFIG_CRYPTO_AES=3Dy CONFIG_CRYPTO_SEQIV=3Dm CONFIG_CRYPTO_GHASH_ARM_CE=3Dm CONFIG_CRYPTO_SHA1_ARM_NEON=3Dm diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 821c670dd687..7bd7eff7f612 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -634,11 +634,10 @@ CONFIG_NLS_ASCII=3Dm CONFIG_NLS_ISO8859_1=3Dm CONFIG_NLS_ISO8859_15=3Dm CONFIG_NLS_UTF8=3Dm CONFIG_TIMER_STATS=3Dy CONFIG_SECURITY=3Dy -CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_CRYPTD=3Dm CONFIG_CRYPTO_AUTHENC=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm diff --git a/arch/mips/configs/decstation_64_defconfig b/arch/mips/configs/= decstation_64_defconfig index 9655567614aa..85a4472cb058 100644 --- a/arch/mips/configs/decstation_64_defconfig +++ b/arch/mips/configs/decstation_64_defconfig @@ -166,11 +166,10 @@ CONFIG_NLS_ISO8859_9=3Dm CONFIG_NLS_ISO8859_13=3Dm CONFIG_NLS_ISO8859_14=3Dm CONFIG_NLS_ISO8859_15=3Dm CONFIG_NLS_UTF8=3Dm CONFIG_CRYPTO_RSA=3Dm -CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_CCM=3Dm CONFIG_CRYPTO_GCM=3Dm CONFIG_CRYPTO_CHACHA20POLY1305=3Dm CONFIG_CRYPTO_CTS=3Dm CONFIG_CRYPTO_LRW=3Dm diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/dec= station_defconfig index 1539fe8eb34d..a3b2c8da2dde 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig @@ -161,11 +161,10 @@ CONFIG_NLS_ISO8859_9=3Dm CONFIG_NLS_ISO8859_13=3Dm CONFIG_NLS_ISO8859_14=3Dm CONFIG_NLS_ISO8859_15=3Dm CONFIG_NLS_UTF8=3Dm CONFIG_CRYPTO_RSA=3Dm -CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_CCM=3Dm CONFIG_CRYPTO_GCM=3Dm CONFIG_CRYPTO_CHACHA20POLY1305=3Dm CONFIG_CRYPTO_CTS=3Dm CONFIG_CRYPTO_LRW=3Dm diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs= /decstation_r4k_defconfig index 58c36720c94a..a476717b8a6a 100644 --- a/arch/mips/configs/decstation_r4k_defconfig +++ b/arch/mips/configs/decstation_r4k_defconfig @@ -161,11 +161,10 @@ CONFIG_NLS_ISO8859_9=3Dm CONFIG_NLS_ISO8859_13=3Dm CONFIG_NLS_ISO8859_14=3Dm CONFIG_NLS_ISO8859_15=3Dm CONFIG_NLS_UTF8=3Dm CONFIG_CRYPTO_RSA=3Dm -CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_CCM=3Dm CONFIG_CRYPTO_GCM=3Dm CONFIG_CRYPTO_CHACHA20POLY1305=3Dm CONFIG_CRYPTO_CTS=3Dm CONFIG_CRYPTO_LRW=3Dm diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defc= onfig index e0040110a3ee..6db21e498faa 100644 --- a/arch/mips/configs/ip28_defconfig +++ b/arch/mips/configs/ip28_defconfig @@ -58,8 +58,7 @@ CONFIG_PROC_KCORE=3Dy CONFIG_TMPFS=3Dy CONFIG_TMPFS_POSIX_ACL=3Dy CONFIG_NFS_FS=3Dy CONFIG_NFS_V3_ACL=3Dy CONFIG_ROOT_NFS=3Dy -CONFIG_CRYPTO_MANAGER=3Dy # CONFIG_CRYPTO_HW is not set CONFIG_MAGIC_SYSRQ=3Dy diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/conf= igs/generic-64bit_defconfig index 2487765b7be3..d9778c9bef4a 100644 --- a/arch/parisc/configs/generic-64bit_defconfig +++ b/arch/parisc/configs/generic-64bit_defconfig @@ -281,11 +281,10 @@ CONFIG_NLS_CODEPAGE_1250=3Dm CONFIG_NLS_CODEPAGE_1251=3Dm CONFIG_NLS_ASCII=3Dm CONFIG_NLS_ISO8859_1=3Dm CONFIG_NLS_ISO8859_2=3Dm CONFIG_NLS_UTF8=3Dm -CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_ECB=3Dm CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MD5=3Dy diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defcon= fig index 2d1e65cad239..4d06a4d844dd 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig @@ -85,9 +85,8 @@ CONFIG_UIO_PDRV_GENIRQ=3Dy CONFIG_PROC_KCORE=3Dy CONFIG_TMPFS=3Dy CONFIG_NFS_FS=3Dy CONFIG_ROOT_NFS=3Dy CONFIG_DEBUG_FS=3Dy -CONFIG_CRYPTO_MANAGER=3Dy # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set CONFIG_CRC_T10DIF=3Dy diff --git a/crypto/Kconfig b/crypto/Kconfig index 538a874262fc..fa354b54d09b 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -146,11 +146,11 @@ config CRYPTO_HKDF select CRYPTO_SHA256 if CRYPTO_SELFTESTS select CRYPTO_SHA512 if CRYPTO_SELFTESTS select CRYPTO_HASH2 =20 config CRYPTO_MANAGER - tristate "Cryptographic algorithm manager" + tristate select CRYPTO_MANAGER2 help Create default cryptographic template instantiations such as cbc(aes). =20 --=20 2.49.0 From nobody Mon Dec 15 21:27:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EF651E22E9; Sat, 19 Apr 2025 16:17:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079455; cv=none; b=A1rpjI5YcynYeD61JmhDEPTfRaC5uAnMsj5RqtH9y8suHEFX/SzJZRwbpDQjGJ0ybMZIgQFzx5ot4ltanYO4wdHMdiGTjLDL8HxuyHV316kVfw15sbstEXl4XIHTktld6fQs3kKXEKpEDtRvmNcyRKWOtWeUDYUTdRzLofBQdLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745079455; c=relaxed/simple; bh=c+ZfnCHBB/xdo4pLdvwg/vGfuPMyzIrC+/q3vpZ/CcQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=shvZ2k6w9vUl9QjzxhxzFSFxd2aUGbRQ+4ReMkoR1AtSMhqEXB6YEARNc/D/gDJ+UJ6pvCziONtPoypftCbUcx8tA+TNJGNSOOeuABpbDrl0CsMhrGbkNCHcT7TE0gy3yOZ5wl4VIIgZIhxV/i6nvs469eAej1XmbSmhf+prwVQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d+BsHPso; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d+BsHPso" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4C84C4CEE9; Sat, 19 Apr 2025 16:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745079454; bh=c+ZfnCHBB/xdo4pLdvwg/vGfuPMyzIrC+/q3vpZ/CcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d+BsHPsoKBsk8hG1z0zw325wTAUJ285D8C1ZKOlLEXaDmTQOnDsUL17CChv1G/Er9 1S7mJkj5m/ktTQSRU0de2q+F68N8i1MruFtMxw0+jVnMxf2SPMdUR6jZI5WqvkydXR LVMyYqbVgmtpCNt8Mu6fw+JoUjFXiGgLRTac0xRNT1dkqU1d6StbYe4xA8cy6lrDtR aK+FIAF4yY4obfGKc+aBD2Lyx3djuQGP00qzAkgHxAomqYEZsUgomJBEDYb6jAt2eT TdHYIOMkaaThVbodeSo7yHIo9SQ2w+cr3jV2fh8uK1pLyGWF1Qhs8BgNHY/xE73bSM UUzAI4NjGOR6A== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 9/9] crypto: testmgr - enable CRYPTO_MANAGER when CRYPTO_SELFTESTS Date: Sat, 19 Apr 2025 09:15:43 -0700 Message-ID: <20250419161543.139344-10-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250419161543.139344-1-ebiggers@kernel.org> References: <20250419161543.139344-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Biggers crypto/testmgr.c is compiled only CRYPTO_MANAGER is enabled. To make CRYPTO_SELFTESTS work as expected when CRYPTO_MANAGER doesn't get enabled for another reason, automatically set CRYPTO_MANAGER to the value of CRYPTO_ALGAPI when CRYPTO_SELFTESTS is enabled. Signed-off-by: Eric Biggers --- crypto/Kconfig | 5 +++-- crypto/algapi.c | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index fa354b54d09b..0577cfb942fb 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -147,14 +147,15 @@ config CRYPTO_HKDF select CRYPTO_SHA512 if CRYPTO_SELFTESTS select CRYPTO_HASH2 =20 config CRYPTO_MANAGER tristate + default CRYPTO_ALGAPI if CRYPTO_SELFTESTS select CRYPTO_MANAGER2 help - Create default cryptographic template instantiations such as - cbc(aes). + This provides the support for instantiating templates such as + cbc(aes), and the support for the crypto self-tests. =20 config CRYPTO_MANAGER2 def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=3Dn && CRYPTO_ALGAPI=3Dy) select CRYPTO_ACOMP2 select CRYPTO_AEAD2 diff --git a/crypto/algapi.c b/crypto/algapi.c index 9030a30c89e8..25b5519e3b71 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -272,12 +272,11 @@ static void crypto_alg_finish_registration(struct cry= pto_alg *alg, =20 static struct crypto_larval *crypto_alloc_test_larval(struct crypto_alg *a= lg) { struct crypto_larval *larval; =20 - if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER) || - !IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) || + if (!IS_ENABLED(CONFIG_CRYPTO_SELFTESTS) || (alg->cra_flags & CRYPTO_ALG_INTERNAL)) return NULL; /* No self-test needed */ =20 larval =3D crypto_larval_alloc(alg->cra_name, alg->cra_flags | CRYPTO_ALG_TESTED, 0); --=20 2.49.0