From nobody Wed Oct 15 13:26:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cmsLX1Kwcz6CNtF; Wed, 15 Oct 2025 13:26:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cmsLW6CqJz3Ksx; Wed, 15 Oct 2025 13:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760534803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YQYWTw/cAqEp36BH3ptySD/m7Du2GDOn/rAkOm69XA8=; b=CTRLMdvSN7E7utaF7ilhSeZXfo0Lxmwtya1xLM8TyczyvObnQAmzQ5udMY+yWGph41v1Zx PE2b1L+MpDgf0sP6oGl72say4/zFySqNfbkofK2LKugzuop4UA5Bj6kvASPd3i0pHEIlnN uoWHvCFEWqxlzNvRqku4/TgZTsMUgduJaPhPIeTYRAafuUxLGGwiK1phuYGESTytyKXlFG hd+pM6hz848VIz7cME2kIYK6TLTR5PSkiOT4W6jqCescx9pIYSzp8bocHuWAUh21Bg/t1K I3WTVKt+n/D6JZ6dbB0Jp6dVpIRROqKYvAigY2ZaihA09tQNyqmV3EBnXdCOSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760534803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YQYWTw/cAqEp36BH3ptySD/m7Du2GDOn/rAkOm69XA8=; b=FypPltp/ZT5yj+cCqr70orPG8TcJ3ZK3tsHmrUS/ESExsq6xA/HRhmRhqWKN6jUV/L6Y8K LGl9GpWcNbR/ZKIB6Dn5PS8vePxpAEZInO3iEsziEYI00ZSRDcXaxP94mH3juMDq6TZ8aS iQBC8prSnTywTdDC9TcXmvVdPT6phZVpAj/ZPjeR6JZWvl2/d1t12sXV/Y0Cg8WxcjPxaf BRSiiB3vhQQAvkB0kZCivpFbmqaKORb/94oPuvAgBSs4bKujW2EAhD4iSoBI8bvbJALA2X i0MAVYVVrOoVHr/h6q2BXybnJPtaqnBwWnoWrLv/6kyE4yEqZKXrYTyILpI4aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760534803; a=rsa-sha256; cv=none; b=XnfOGxwNLs72VP/dVAzgrLGVXy9aAQ4TsvfJGEJjThSmZalSWk3uU2a6YICW7zlXH0vCI6 gfaNWIqooD8IoqIAvxR5/YNBup2MIWeTMR2408WFCdRJJIuJtrDI+nIYOf9g4AeiqtsRI4 KfpZCGJ/gQPLSfpOHJOCr1fA1HwekjOg9qapenuFro8V/BaBJjnFYbV1rbpUkT7BrXO7X+ dbCfvqpqeDAHVf2KCdjJZAk2HyZD9/FuCqqyIWcee5GQwdxRaTRrNPo3xfLyKSQsiarbKa Ixv47at6Te6QftlxXArUXf19NX7f13B8vgHhrYB5AWA23j5ux2tAY/apLdnf/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cmsLW5qNrzgm6; Wed, 15 Oct 2025 13:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59FDQhsL051230; Wed, 15 Oct 2025 13:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FDQhk1051227; Wed, 15 Oct 2025 13:26:43 GMT (envelope-from git) Date: Wed, 15 Oct 2025 13:26:43 GMT Message-Id: <202510151326.59FDQhk1051227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3a382afe367a - stable/15 - cryptocheck: Be friendlier when testing software crypto backends List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3a382afe367a5ecd849ca0e3ba92781f24ce1be4 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3a382afe367a5ecd849ca0e3ba92781f24ce1be4 commit 3a382afe367a5ecd849ca0e3ba92781f24ce1be4 Author: Mark Johnston AuthorDate: 2025-10-08 15:24:12 +0000 Commit: Mark Johnston CommitDate: 2025-10-15 13:23:24 +0000 cryptocheck: Be friendlier when testing software crypto backends - Fail loudly if we can't change the kern.crypto.allow_soft sysctl. - Add more drivers to the list. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52490 (cherry picked from commit e63bf6aa523eb9a865b7ce34d01e75a13818b367) --- tools/tools/crypto/cryptocheck.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/tools/crypto/cryptocheck.c b/tools/tools/crypto/cryptocheck.c index 6506671455ac..46a364b0453c 100644 --- a/tools/tools/crypto/cryptocheck.c +++ b/tools/tools/crypto/cryptocheck.c @@ -362,9 +362,11 @@ enable_user_soft(void) size_t cursize = sizeof(curstate); if (sysctlbyname(CRYPT_SOFT_ALLOW, &curstate, &cursize, - &on, sizeof(on)) == 0) { + &on, sizeof(on)) == 0) { if (curstate == 0) atexit(reset_user_soft); + } else { + err(1, "sysctl(%s)", CRYPT_SOFT_ALLOW); } } @@ -373,7 +375,10 @@ crlookup(const char *devname) { struct crypt_find_op find; - if (strncmp(devname, "soft", 4) == 0) { + if (strncmp(devname, "soft", 4) == 0 || + strncmp(devname, "ossl", 4) == 0 || + strncmp(devname, "aesni", 5) == 0 || + strncmp(devname, "armv8crypto", 11) == 0) { enable_user_soft(); return CRYPTO_FLAG_SOFTWARE; }