From nobody Wed Jul 1 00:55:02 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 4gqhPl3t1Tz6kGbB for ; Wed, 01 Jul 2026 00:55:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqhPl2PQKz3ZbG for ; Wed, 01 Jul 2026 00:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782867307; 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=NFeLoXN44pKqJ7Aj/dL/QESfj86zryqjPL8wknESZcI=; b=H6XqRRZEjUoZXtxLdaWZ/m9G7PAvTQE8wOcBNpxkRE9JygKzus5Pf6LBeBSWqs1fIyV1SM 0D/nqkNsSgjZpvEhkjN6soUuM5jFzIdJz8h80Ylg4EmEUAv2u+kjWbizW0qHorC3DQrfLK iSJ6g8oJNYbnETVL83TuQ7r4WtelbvnYyBtYDofivSq2Pe9hfwGerZPjqpC9xFP7UL607O hCfC7mp9Iamrje2/l5lehWVjz3Ry1nG0OxkGraRT6MoQfKJlZFTbMyyUlhfbqf2vf8rWlJ wKqoG1k71dD4hkwvHEoju2MVmQOKrZ9+J/bzaqUb0uwRYMZ0o6b74gNqZpb56g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782867307; a=rsa-sha256; cv=none; b=AaM1bi69roJ9YedbgtrKsyrweXguycJeoswNN0TiVTf8SLwBqRLGucVr6NVXfgTzgrViRh LaA37ztI/q0J55FXJiGeZCtIKTMKHw6Taf59WweC9sCIVtl5J1wvsssfljqapaJ4CjC++J dIOPVwsmzQ7NatSnaNMZ2eQvgUBbS0tGEBZ8qAletryrKu5HNjjXmfKguGz4pOrxwBBorY CivRE4f5xRtqUnTtCyOUoKiSeA/OdqSFCHuPVwfFYeIcXXXOqRW1IzeO2LOKqyptheMsSP SL39Y9IKS9idPc8erWaqRmVZ3fZAPenWxnBA7I+Bj3EbhMc2E8vIemBTkfcVSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782867307; 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=NFeLoXN44pKqJ7Aj/dL/QESfj86zryqjPL8wknESZcI=; b=lLy2IBKRJ1V0baznJDtl1lMDGvwviedf42/Dp4A0Zra0qwX1qfj8uPmTxSuo9Yvj/9lijv EVD+etZ4qsvAGGFrWaEyW+VWQtTZeyfJOPVvt7Lip5R8mAB/zaHgPNNwcA/bj7zrsIQb0f HGNNVl+HhIEKOIjde3cU8rpqxYXT6zs6FYF6ZwfWnaieAV3o1MCxNF9O68eQC1C1wzy4vJ Yi1Xo8RLFxQvF4JppwUpkj2ZEuG+SH+Xdn4cFZ6CspmrUb7EAYHHQKAxy+I2W3FdHfcX5y P/fUNhdnVoUq4Z64jjOFwOM0/G2Y9qle3q6B4SScbE3R90ZcV7NHj7A0Y3KtPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqhPl1Jhjz17Ck for ; Wed, 01 Jul 2026 00:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2692c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Jul 2026 00:55:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9cee48180d7a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9cee48180d7a3d612110b4433f82bade288f326b Auto-Submitted: auto-generated Date: Wed, 01 Jul 2026 00:55:02 +0000 Message-Id: <6a446566.2692c.23ccf52b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9cee48180d7a3d612110b4433f82bade288f326b commit 9cee48180d7a3d612110b4433f82bade288f326b Author: John Baldwin AuthorDate: 2026-07-01 00:52:55 +0000 Commit: John Baldwin CommitDate: 2026-07-01 00:52:55 +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 --- 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 17189514c2cb..629fe8923466 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -656,6 +656,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; @@ -1301,9 +1304,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); @@ -1387,9 +1387,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);