From nobody Mon Sep 29 15:22:32 2025 X-Original-To: dev-commits-src-main@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 4cb4gY1KGkz68NqP; Mon, 29 Sep 2025 15:22:33 +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 4cb4gX677Dz46RW; Mon, 29 Sep 2025 15:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759159352; 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=Cg6Rrofr2yjY5G1IuUSYMNGPVq803um23HpcM61ADp0=; b=ofkl0wG10OoeWJEYKg4jQg6uGOGvyhSNzTblN4wl7E/tfRHUtucG9/heZMcwPrp5YeyK1f toVnHKuKTe7qAL39lBvsHf/8fpLqZcHtgn+KgZxLW4Wy8XgZuOo4sX/dobXKSV1h2xujEy FUMqoRJs6HmieNUwrxzK7mal8auTe4s5DQpEjcBicvDWJqEDBWsi1ChqXVpCVUCyAmsglI 7sEGqVq82l4uS5hgz0ZbQP8Uz+8DC4Eflp4pAxG1xjx8NJhNn1CUy40BRkKYRlGIB9a7lo 9yoEA3oQ/Qda3O9FOocbG/1E83VTgnP165MscHXv6AGXE1M0lgfT3Di3xqimVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759159352; 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=Cg6Rrofr2yjY5G1IuUSYMNGPVq803um23HpcM61ADp0=; b=o7xpnzWHwJW7Tnp5ez3liqjXYWXY12u9sIkZ/mYDTuGb0P4uzw87Xa8ojJK3Dzt7BZAKd8 D+eJJ+N2jZRNhHFGSHCAMoJihbbFWZEOL14VwmfqdxlqXB8iIvFuWBES01/gPnNGvwXkV5 PBKdmq969QtkEBuxngNT3jWoP6LeiR/gnJC5nQcBlZKtkKy8jYvnraTqVoN/WcYakZC7h6 DokFRAbqSGr3AafLAWCJTXJwLSkah+D6bsHnKoB53rrLYImo7Bi7f3ofLGX/wAAkKYT/ei I05yTid+5G1UUt84wlx+LNnCOTMkTJLvQIEFsTn+WJzyPdNAyE+g16toEEGruQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759159352; a=rsa-sha256; cv=none; b=PLQCJRx9zJeRlqhkP+Bne0i3OfQhLM9gwkBLsuv6N2xwIG5f4O/FUMmgVCn1OJ5qr5jNmF WRctrOClPR2kSAg//Gvqtmf7Wd+icr3kwQ6Fdgbf7SZgbUbjaR9oFmzNP+/62RieJ7QUWY 1K+PHjt+ZYkoDyX2WTRNK65AxmiBwnG9rUkerl92ozdXXgJq1kPw3Rk5Lfyf/Q/7hV5k5f YWkDwoZZnqp46Fl3vnAI8rtOn+qbgloBy6zpDCrkNBFtZwlu7S/A70SMTm4Ah8HJv68mf8 itV30hoSt+7Zq3qO9CEB1BMDWUBn/IGKNMjBOS2LMNrHc9IHhJAV51sHSOnvYQ== 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 4cb4gX5P5tz19gj; Mon, 29 Sep 2025 15:22:32 +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 58TFMWvc011949; Mon, 29 Sep 2025 15:22:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TFMWWR011945; Mon, 29 Sep 2025 15:22:32 GMT (envelope-from git) Date: Mon, 29 Sep 2025 15:22:32 GMT Message-Id: <202509291522.58TFMWWR011945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 6154961e2e4c - main - cxgbe: Support for TLS 1.3 in key contexts. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6154961e2e4c7e1d998f4c9e22c5370d17edb160 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=6154961e2e4c7e1d998f4c9e22c5370d17edb160 commit 6154961e2e4c7e1d998f4c9e22c5370d17edb160 Author: John Baldwin AuthorDate: 2025-09-29 15:02:28 +0000 Commit: Navdeep Parhar CommitDate: 2025-09-29 15:19:12 +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. MFC after: 3 days Sponsored by: Chelsio Communications --- 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 {