From nobody Fri Oct 3 00:04: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 4cd86j0K1qz6BMvx; Fri, 03 Oct 2025 00:04:45 +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 4cd86h0fJDz3skK; Fri, 03 Oct 2025 00:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449884; 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=fdydXwinIJoWeFTflhbzcioj15Yn+jFGUWKIgvkrIcQ=; b=nr9ZN+JH8m992hNC4mlqLl5xO0DcIORNzL0RLHL3VzqLlrJL3uZatXrjb6cdkIHTUiZUzC JJ68IzrS2TAaLpWaqgcdu+ZeAtpyVm3TD/21KnH2YWw0ti3Sq+CkO+MmuZJdPszQ6CEyrH VfmAQCtyt+y7kQo075daT/omaFYPhg/vSm68RInVDLUNyMHs2MMVi+D7Y5tv7r7wzjPq5B TeIGzVIDDq0xkhxjJEM9uA29P0xuDRNdSGaKKTspNCMO+3uyDH1t5DEaw/BjVo7+7ybRSF XqnQ16MK5hsID6Q5lwgmXqX7MmUus3ATDQI21pPNvrAF0q1tEMIZIYuF2x35mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449884; 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=fdydXwinIJoWeFTflhbzcioj15Yn+jFGUWKIgvkrIcQ=; b=m3Y1HSwulWuyjiNcSRNTQaZ5MQbnXMGcBzpJknYIn3KmudRkJa64le9qKthn/MsbVARWjQ /su3Dyn7f0Q5aqzD6aPUDLH4TJHqAT2wWX3ZgPYz78hZ8y28vKOZocN9I57ydfRb0rKBwO WAuBQgetHqvB9inWzAD7ZWw2O+tbl8xQD0o6byUqAnCSJvMkYIQ8KKawLF/eyiH1+VOCSY JcFnFWZVyOE7PaLUIBHX+1SQl5KWJuEQEUk95WMzE5tRS68DLKjprBTg1nSvn/Oej/nRoq Lryi3X3Nf4dSYdCf/I0qH4cnPUCysOKHleJfBpmjGmWUZ0MgZArUBYHq7mbhAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759449884; a=rsa-sha256; cv=none; b=Go3/YKBuQMqsN76AwpvZEy8nEvCXMot3AJqSR+vFnFeIFb5ipp9891nMltj+/COLLRP/if JSxNRU6i2bZ6rr214FacFiAn+ky8+ytf4VEfyCIfv5ffRhCqdQt0HxOqhZzfXCGDLnh0LN XTEtFfLZVhc77tQsoH/E4ZZ6/DGr/ydGys8wE+xRzfdr9OdAs3jf8j/0dkzdnzHjMkgQQU VldjZeVSVaOcivT9q3z8X7baeHGc6d1gmyYxcDrKe0Y+NvC8kS31TLj+KjdaOd9dW8wkH9 lL1nfWV/4wBuYCI9F8c0+sKNXwsXUXpx5xd9MqRvjeFvGpPUPZwrmnM55Bqrfw== 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 4cd86g6Rs6zVcs; Fri, 03 Oct 2025 00:04: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 59304hBP057453; Fri, 3 Oct 2025 00:04:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59304hda057450; Fri, 3 Oct 2025 00:04:43 GMT (envelope-from git) Date: Fri, 3 Oct 2025 00:04:43 GMT Message-Id: <202510030004.59304hda057450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: e35760a50bc4 - stable/15 - cxgbe: Support for TLS 1.3 in key contexts. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e35760a50bc424420fb56b64adda54343c5911ad Auto-Submitted: auto-generated The branch stable/15 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=e35760a50bc424420fb56b64adda54343c5911ad commit e35760a50bc424420fb56b64adda54343c5911ad Author: John Baldwin AuthorDate: 2025-09-29 15:02:28 +0000 Commit: Navdeep Parhar CommitDate: 2025-10-02 22:09:08 +0000 cxgbe: Support for TLS 1.3 in key contexts. For TLS 1.3 the 4 byte salt field has been extended to hold the 12 byte nonce. Sponsored by: Chelsio Communications (cherry picked from commit 6154961e2e4c7e1d998f4c9e22c5370d17edb160) --- sys/dev/cxgbe/crypto/t4_crypto.h | 1 + sys/dev/cxgbe/crypto/t4_keyctx.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/dev/cxgbe/crypto/t4_crypto.h b/sys/dev/cxgbe/crypto/t4_crypto.h index 452e48d20dfd..71c9ec3903ef 100644 --- a/sys/dev/cxgbe/crypto/t4_crypto.h +++ b/sys/dev/cxgbe/crypto/t4_crypto.h @@ -139,6 +139,7 @@ struct phys_sge_pairs { #define SCMD_PROTO_VERSION_TLS_1_2 0 #define SCMD_PROTO_VERSION_TLS_1_1 1 #define SCMD_PROTO_VERSION_GENERIC 4 +#define SCMD_PROTO_VERSION_TLS_1_3 8 #define SCMD_CIPH_MODE_NOP 0 #define SCMD_CIPH_MODE_AES_CBC 1 diff --git a/sys/dev/cxgbe/crypto/t4_keyctx.c b/sys/dev/cxgbe/crypto/t4_keyctx.c index 52a75666c3aa..b85e50fd6cb1 100644 --- a/sys/dev/cxgbe/crypto/t4_keyctx.c +++ b/sys/dev/cxgbe/crypto/t4_keyctx.c @@ -437,10 +437,16 @@ t4_tls_key_info_size(const struct ktls_session *tls) int t4_tls_proto_ver(const struct ktls_session *tls) { - if (tls->params.tls_vminor == TLS_MINOR_VER_ONE) + switch (tls->params.tls_vminor) { + case TLS_MINOR_VER_ONE: return (SCMD_PROTO_VERSION_TLS_1_1); - else + case TLS_MINOR_VER_TWO: return (SCMD_PROTO_VERSION_TLS_1_2); + case TLS_MINOR_VER_THREE: + return (SCMD_PROTO_VERSION_TLS_1_3); + default: + __assert_unreachable(); + } } int @@ -491,6 +497,17 @@ t4_tls_hmac_ctrl(const struct ktls_session *tls) } } +static int +tls_seqnum_ctrl(const struct ktls_session *tls) +{ + switch (tls->params.tls_vminor) { + case TLS_MINOR_VER_THREE: + return (0); + default: + return (3); + } +} + static int tls_cipher_key_size(const struct ktls_session *tls) { @@ -557,7 +574,7 @@ t4_tls_key_ctx(const struct ktls_session *tls, int direction, kctx->u.rxhdr.authmode_to_rxvalid = V_TLS_KEYCTX_TX_WR_AUTHMODE(t4_tls_auth_mode(tls)) | - V_TLS_KEYCTX_TX_WR_SEQNUMCTRL(3) | + V_TLS_KEYCTX_TX_WR_SEQNUMCTRL(tls_seqnum_ctrl(tls)) | V_TLS_KEYCTX_TX_WR_RXVALID(1); kctx->u.rxhdr.ivpresent_to_rxmk_size = @@ -607,7 +624,8 @@ t4_tls_key_ctx(const struct ktls_session *tls, int direction, _Static_assert(offsetof(struct tx_keyctx_hdr, txsalt) == offsetof(struct rx_keyctx_hdr, rxsalt), "salt offset mismatch"); - memcpy(kctx->u.txhdr.txsalt, tls->params.iv, SALT_SIZE); + memcpy(kctx->u.txhdr.txsalt, tls->params.iv, + tls->params.iv_len); t4_init_gmac_hash(tls->params.cipher_key, tls->params.cipher_key_len, hash); } else {