From nobody Thu Oct 08 20:43:52 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 4j125h73zLz6wCmv for ; Thu, 08 Oct 2026 20:43:52 +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 4j125h3K48z4bhf for ; Thu, 08 Oct 2026 20:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492232; 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=iROcjdkDATgWPnr5FmU6HHivPa5gbn8Ad9rvJMv1QSc=; b=k4lFEMaFUKNmnEWsUR8FvO6KQZia6WeZWeNPW/5pjo77FL4CmOy68pu1qdFyCr8/lgny9W hkDaw2SEwoqetNE4YLUL02xxlEy9+nVvxYEwE7mzIUsWekdmSq8J09XmOk1YqQqtQ1Gw5D Y1tk2dDI8pWvinG8sSjijH2jCY8qLrMXMZmtkBTKQP2iWj9ERkWc0aWCYjO0llg0sMneQ4 FGG2nEWU/Gi4haJsGE+WF2RRu1GmQpKcgCyo+izKs45TnWUWDdIsptuu02HaCd48J7u9k3 w39dTcnWa0kzmqA9n2X9G9P0zwQgHh2msrpanhAt8V1Fb7HYFXqS7SHT7wQimQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492232; b=biq3X4IGYyvQXZjeoI6EpdccqHuwWtqppziWwzcWNXdb/ikBqwB8yxKRN6yoJ1Iz0VJVLx NL45DLLu35swg75w95aQwh+iiVOaZLGB52v34EwC42CRffCTe+qO1j0wWUvNLm3MZ9O/ho rr5r9HE/+rBoRVvyoXPEP+eCwrt1OKQWg/bRMpUJEhsu+GpZ+Jr8plPntqQtC4Y8vmcAMJ aAeagd67E2ThfcsOOaubSl3b6EjNFMy7PflHovRg7Wi7eDV0uN5QuLWSi4bvXtQFUHGoJB 2wz65Cs/4Vzw+rhMlieH/OPlAHDhtGD61WnMAnEZHwTLEFQUBcrCOoec+ggfVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492232; 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=iROcjdkDATgWPnr5FmU6HHivPa5gbn8Ad9rvJMv1QSc=; b=DrKBogZB8feMimjBnYQnywaxKrw5y7vknxMjrRMT5QuVSE7IwvdlP2iTMGB5YMO2E+VCR0 vtQhR5BvkkCLmbL8VPQ2toHjdTvVYY5VBsNZVw5nGWqxw5YoTGzLWYZB+qCzwgy7Qu1p8O dZzUleK7yh0h42XLL2Yfgc1eKhGTUzIKzzWjyKfXd4suPms5oiMCpiysgyeqfTeA8noWN9 0so/bxuUg4UlJ76pdndHq+b2Emu3pog6B+R5w/YaLP02KL+3659yk7SXbg7R0ntz3TIFWw APxDYdaIR4kNtRJb4NMu4KGtBMb0hjFZwrq+Lx79go+X15bt2/iKCoWdJrtsIg== 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 4j125h2PPqzwmP for ; Thu, 08 Oct 2026 20:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3311a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:43:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1cdfb542cae5 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 1cdfb542cae5abc29ee168f2c97adc13d873a6bf Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:43:52 +0000 Message-Id: <6ac80088.3311a.626c992a@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1cdfb542cae5abc29ee168f2c97adc13d873a6bf commit 1cdfb542cae5abc29ee168f2c97adc13d873a6bf Author: John Baldwin AuthorDate: 2026-07-01 00:52:55 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:31 +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 6fc37ec2a829..4ba4bf44dcd2 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -661,6 +661,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; @@ -1321,9 +1324,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); @@ -1407,9 +1407,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);