From nobody Mon Aug 3 11:28:35 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 4hDDvS014Gz6nB4R for ; Mon, 03 Aug 2026 11:28:36 +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 4hDDvR5XBdz3Nnl for ; Mon, 03 Aug 2026 11:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785756515; 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=KuMpPvIzeOT7UfRAQC5RaDIfq8LMEq4yBRdA9bVLyRo=; b=gGsJIkU91t9VTIGU/7KHgSDHZFI4ev6/lPmz20HPF8h11pl5YD8vDUTliE2/PU23G3g4bb uo4Mv+SLwAWYhMQl8fMs/wTBHeJioB4TXOrM8Bw4xoVKJDxZfdUlmZ4+OYG8sOeHTVvdbY pu4aOMHKS6+i8JjgKcqogobi/ObszNxwiJDwUPqvHOpsD+YxjJcHJH4GfhAUy6dtdOIqys 60BVdZHHCt/GLNcVBqReiFexfcQI+7C8D8VlKDzbKruyvzFGH4bl519mFFTaQwj4nK1C1A W8ENhCvEVv/efFxZOg0V01JEl8ZhTJlo1ko6c3ILSgp4W+Vaw7V9Qoxq+WiloA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785756515; a=rsa-sha256; cv=none; b=sWURuNzVF/SoegR64+TMDawkS4bHcCNAphT5rBqI8QCw2DJiLjDlFJlYFN6t4mxn6J+lUZ 35fnDY1wSZJ/zr10/qh7b+Pz6Etvgx05n095bnjfRX3iOY+QXtWaTzNv47Gf2jmfsOyAXG ervRrE7ch2IvU/dCGQKVMrGhVICX1y9jfMVBKQvBz7S2WbgyRlSeJiJ5wMfAiU6JRQhVwO zswuX/BhVZpb8okKyVip85YDKTutbWuNIv3T36PW5Fuhj3u2Smd600Sd2DeLZEAPKm07WB Z0UY0QcaOUC52hH0wv6h48NNJdxKQG98Beit/rCHsxG8ZHhaYFVgbPSYl3W8wQ== 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=1785756515; 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=KuMpPvIzeOT7UfRAQC5RaDIfq8LMEq4yBRdA9bVLyRo=; b=kCEtJ4+TeiWaDj8lSXgS3tVoe8Uxq1pYUlyqD2zlCQLYbmg0DHm1wLw7GNDN2rjebdP1Jb Uz8L5zVIlGQsn2aN1/ElbO5bQx7RIfmlRwGh2EiWKJf3Q9BWwZ2hBJS+GXXIaUq3R9Yo9N w33tUlr87KZ+xNwy9ZIZVh8R9qC+z3ndg4l26Je3GYtmEgvIB5LyLYQysTqm1N2rrcG2k6 +KUcShthv5z9JRkDFDtHy+aSbG0+vJKzLQ/zVCtkptjvj8lYyLaU+URRXPnUQ8KYel3yyJ RxU9C6Jn/fGk7+RkCPmt44Nih/27YYI3RCK5PLIMK2PE+LFsSIkKZYE/ZiLenw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDDvR49sGzyR4 for ; Mon, 03 Aug 2026 11:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19c13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 11:28:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bruce M Simpson Subject: git: b451bdb7894d - main - netipsec: Refactor TCP-MD5 shim to use ip6_hdr_pseudo{} for brevity. 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: bms X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b451bdb7894dea69f74dd641861f800ac2268f5c Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 11:28:35 +0000 Message-Id: <6a707b63.19c13.13469419@gitrepo.freebsd.org> The branch main has been updated by bms: URL: https://cgit.FreeBSD.org/src/commit/?id=b451bdb7894dea69f74dd641861f800ac2268f5c commit b451bdb7894dea69f74dd641861f800ac2268f5c Author: Bruce M Simpson AuthorDate: 2026-07-30 16:08:34 +0000 Commit: Bruce M Simpson CommitDate: 2026-08-03 11:27:45 +0000 netipsec: Refactor TCP-MD5 shim to use ip6_hdr_pseudo{} for brevity. This brings xform_tcp.c into line with possible future OCF related imports. --- sys/netipsec/xform_tcp.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/netipsec/xform_tcp.c b/sys/netipsec/xform_tcp.c index a87b27048dd7..f2e8f4975e35 100644 --- a/sys/netipsec/xform_tcp.c +++ b/sys/netipsec/xform_tcp.c @@ -63,6 +63,7 @@ #ifdef INET6 #include +#include #include #endif @@ -154,25 +155,23 @@ ip_pseudo_compute(struct mbuf *m, MD5_CTX *ctx) static int ip6_pseudo_compute(struct mbuf *m, MD5_CTX *ctx) { - struct ip6_pseudo { - struct in6_addr src, dst; - uint32_t len; - uint32_t nxt; - } ip6p __aligned(4); + struct ip6_hdr_pseudo ip6ph = { + .ip6ph_zero = {} + }; struct ip6_hdr *ip6; int hdr_len; ip6 = mtod(m, struct ip6_hdr *); - ip6p.src = ip6->ip6_src; - ip6p.dst = ip6->ip6_dst; + ip6ph.ip6ph_src = ip6->ip6_src; + ip6ph.ip6ph_dst = ip6->ip6_dst; hdr_len = sizeof(struct ip6_hdr); if (ip6->ip6_nxt == IPPROTO_UDP) /* TCP over UDP */ hdr_len += sizeof(struct udphdr); - /* XXX: ext headers */ - ip6p.len = htonl(m->m_pkthdr.len - hdr_len); - ip6p.nxt = htonl(IPPROTO_TCP); - MD5Update(ctx, (char *)&ip6p, sizeof(ip6p)); + /* Append TCP segment and fixup length. */ + ip6ph.ip6ph_len = htonl(m->m_pkthdr.len - hdr_len); + ip6ph.ip6ph_nxt = IPPROTO_TCP; + MD5Update(ctx, &ip6ph, sizeof(ip6ph)); return (hdr_len); } #endif