From nobody Fri Oct 09 00:20:39 2026 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 4j16vr2L47z6Z23h for ; Fri, 09 Oct 2026 00:20:40 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j16vq5szKz4Lgd for ; Fri, 09 Oct 2026 00:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505239; 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=Q0tF+Xg1UmBrhXmrlNNAt51JdE6uYZZJFaRNxZPrips=; b=XP6mwAS+PbN4kye0Teo6RzzsgU04EEK8Z4uShN0gy+mB6My7ZI4c0cdMF3zYqmLN2YPJPl Ivloq3u8LFh705ZhO24ZWiCIsUbJVaTT7cLnghsvz5HvUht2V+BJ43WtNvZeP2vyiSBLI5 XJjnRc3tY/To7HbpPLGxGI5D56tbGj6agibR1Mq0PoA6UPQuy7saTTCAJqvn+88kiCYZ8i S80p/wOUN8z2PMpdNC4JLbwJsp4OKnpVAr0/aSkyIGYL7rFUcgtf3WoRSOuCpn/38gS4Fp VQI3ll6+cxFeELTAFggp16szbL4XjP6vep6JLNPDHmGvwqaWIhiqMyHXzoyzyA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791505239; b=lBvMz/OwIzSvrxB2Q0BabejUAVCQHsBN4D99MQyGMkn2Hnsp0iMb/wgfX2jqXR31mm68Js kLqohnVCb1ckXunKJ6kuhLqz/YJ3GOOJoXW3G41skJ1OlNebnGJG5ltuEAaL5an+6o+PIy gUSNP56PFjBU8ksbEGBHox4kuJsPlDhiW8iKjYVF7nYVwqjutd6pYggBVfZdSd+0lMQD8B PNaSaf+4v5kMnmXap4bE9Z9R6652Tlcm/Vx3z3IB+wC6RACI3xAY32+kTcMfHC/iVXIF9+ x4p+7Jz3iV62bt6kaXWSWyKOc3tjTCmiE7mvae9D/9MCGXg4U245EJGNwkuYeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505239; 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=Q0tF+Xg1UmBrhXmrlNNAt51JdE6uYZZJFaRNxZPrips=; b=ULjMAss3RRF3DHk+1ZiJ+WLzMjkR59eHy4ap5fxuRwsKzIkXRL26jKqkhqx+wzAKiBOTKI DlX4pjWDvQ+tROS17XuUKdHyLpm3FuhyK9UFhAsWNGQpqtxGoxsdFHNaFE8XODBNMRDAA7 GhodD2Yk0Ih3tg0aJZ0b1zUkkTdqscecQ2YaXRkUBlWVD1+MXse/Isqrg5gxf/wPZl65kf 8iMcg+kuZ5JLgei294hKUCE4N00x/ZFDlZjKRsEpwj3eq4tG63DOxrjlyvP1OcasSOmHuP G78dVErOvaR6CvM/PJ1eGhJyphTrad36z9xHwFeGmSRQijEithP0MAKQ9vKAcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j16vq4q64z12br for ; Fri, 09 Oct 2026 00:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bb16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 00:20:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 75182070e41d - stable/14 - ktls: Centralize the check for CBC ciphers 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 75182070e41d28ebc1555fe9ce6165c6312f9030 Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 00:20:39 +0000 Message-Id: <6ac83357.1bb16.6124e05e@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=75182070e41d28ebc1555fe9ce6165c6312f9030 commit 75182070e41d28ebc1555fe9ce6165c6312f9030 Author: John Baldwin AuthorDate: 2026-07-01 00:52:55 +0000 Commit: John Baldwin CommitDate: 2026-10-08 18:33:36 +0000 ktls: Centralize the check for CBC ciphers Move the check out of ktls_enable_(rx|tx) and into ktls_create_session. Reviewed by: gallatin, markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57973 (cherry picked from commit 9cee48180d7a3d612110b4433f82bade288f326b) --- sys/kern/uipc_ktls.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 2efb1c4cfe0d..9a09fd15db6d 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -565,6 +565,9 @@ ktls_create_session(struct socket *so, struct tls_enable *en, } break; case CRYPTO_AES_CBC: + if (!ktls_cbc_enable) + return (EOPNOTSUPP); + switch (en->auth_algorithm) { case CRYPTO_SHA1_HMAC: break; @@ -1235,9 +1238,6 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en) if (so->so_rcv.sb_tls_info != NULL) return (EALREADY); - if (en->cipher_algorithm == CRYPTO_AES_CBC && !ktls_cbc_enable) - return (ENOTSUP); - error = ktls_create_session(so, en, &tls, KTLS_RX); if (error) return (error); @@ -1321,9 +1321,6 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en) if (so->so_snd.sb_tls_info != NULL) return (EALREADY); - if (en->cipher_algorithm == CRYPTO_AES_CBC && !ktls_cbc_enable) - return (ENOTSUP); - /* TLS requires ext pgs */ if (mb_use_ext_pgs == 0) return (ENXIO);