From nobody Sun Dec 7 19:56:29 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 4dPbTp1k8Yz6Hhr4 for ; Sun, 07 Dec 2025 19:56:30 +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 4dPbTn5h6rz3Pnd for ; Sun, 07 Dec 2025 19:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765137389; 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=9jZ7a20cxAyITrFYJuxycLbkRhNDPmckiH/bYX6tvY8=; b=TTEre/nUhx1X1SJdl2nUZaV9s5vcIoIaeOwd2bPmd2pl3rODzfJuz38nU7Q8ZZA+jic1Tl Jgy29JWO3XpU8kW8OxUV82hp0mHGg1vFqTbi6UyGrk+tB4owdMdBnicuSUaUDpAUVUz6Zs sUUwxToR4XWd+B83/Ie6U64L6u09JkFuAEheAvM/Yj0jKhYgghBUIjTVJ88nCheT82EwhO trBKt/QP3S6pQuR/ZNMwIoDoLSHYHLrdU3UY0QS0dUvkPaEyk0MOOPKtHuqf9xlhcQkFEh P5odlAowue8g+jfCEsEbKZ7lIs5el2fZK6lSP0aVUE923syHICsALehKtP2Yxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765137389; 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=9jZ7a20cxAyITrFYJuxycLbkRhNDPmckiH/bYX6tvY8=; b=uIHS8vMCe9xKuNkEdgc4NxGsdfHQYx6nbCmhL8zbZer2SEVYPYva2w9NrhD1tVzsjaVTl8 7xhZTO9WNoD/sBdgoKCMUD/oUcFbISJ9xGpbI0kbBnjFe8VyQBwIP8J1O747dPwINVbKKP GNgNYOFw6HTO8NAe0ZP5BrLvCoBCnbL9mQjWMMTxz60f5SZ9wXMPwZaZqUlFNYbDEYtoec WNNw15+UnzHkX4EBVAiJ7gGeU4WvXaVjhFP7wxQuU+hCbCYhJ3lYVaRaBcGsUfZWxTTPat DT7CQ50uIuPOf9pcJD6NxsOgRA5b45q5e3gO2oomwmwRh0ClTnAuIQsqrlKyzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765137389; a=rsa-sha256; cv=none; b=vVJ/+OKvoJ8IlcgaaIqoRdnE0RjsF4Wxst0HBIiD6Wdit1iMpJI0I7Sxp8W3z8eVIvR2L2 mKo2Jvu9tJBtycz5S4BL16uwIFhHFw/vjBn3NSJjQwqcyfuOKZxEwfiKd8nbyXBCSN5CEg xJ8MIycButjZ63G6+jIYzlgtwekNJqs0L5VUfzADFI2omKHcNX3UNRIrxSpncGyyZdGEVB GCt8hjQNuTrsixk2A8uU52+/I9nxqK8KGXWRV12M3uiblLcJsQ/YHIfWqHYzKosafJdwYI qTvTFM/1B+fLDrCSlSmcpyQxbsHZqGzX5uYgw21TQCDKvttqIaHGcZGfOCNiMQ== 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 4dPbTn4n84zwxc for ; Sun, 07 Dec 2025 19:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27337 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Dec 2025 19:56:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a409ba2e30d5 - stable/14 - ipsec: Fix typos in references to IPsec's ESP 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a409ba2e30d517841e8d6aafafd472f59fa50b63 Auto-Submitted: auto-generated Date: Sun, 07 Dec 2025 19:56:29 +0000 Message-Id: <6935dbed.27337.5a5089c4@gitrepo.freebsd.org> The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=a409ba2e30d517841e8d6aafafd472f59fa50b63 commit a409ba2e30d517841e8d6aafafd472f59fa50b63 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-12-04 15:17:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-12-07 19:56:26 +0000 ipsec: Fix typos in references to IPsec's ESP ESP is "Encapsulating Security Payload", not "Encapsulated Security Payload". This patch fixes all the place in the tree I could find with `grep -i encapsulated security`. MFC after: 3 days Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D53769 (cherry picked from commit 15afd75e67102f81c37adbf11966e48685bd7be7) --- sbin/ipfw/ipfw.8 | 4 ++-- sbin/ipfw/ipv6.c | 2 +- sbin/ping/ping.8 | 4 ++-- sys/netipsec/esp.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index e62b8d6efc95..94ad9e0958cf 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd September 28, 2023 +.Dd December 4, 2025 .Dt IPFW 8 .Os .Sh NAME @@ -1614,7 +1614,7 @@ Destination options .Pq Cm dstopt , IPSec authentication headers .Pq Cm ah , -and IPsec encapsulated security payload headers +and IPsec encapsulating security payload headers .Pq Cm esp . .It Cm fib Ar fibnum Matches a packet that has been tagged to use diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c index e6139976e6cb..e6eb07af26dc 100644 --- a/sbin/ipfw/ipv6.c +++ b/sbin/ipfw/ipv6.c @@ -289,7 +289,7 @@ print_ext6hdr(struct buf_pr *bp, const ipfw_insn *cmd ) sep = ','; } if (cmd->arg1 & EXT_ESP) { - bprintf(bp, "%cencapsulated security payload", sep); + bprintf(bp, "%cencapsulating security payload", sep); } } diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8 index 34ffc98c3a40..145beede79fd 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ping.8 8.2 (Berkeley) 12/11/93 .\" -.Dd September 15, 2023 +.Dd December 4, 2025 .Dt PING 8 .Os .Sh NAME @@ -536,7 +536,7 @@ IPv6 address of the final destination node. .Ss Experimental options only for IPv6 target .Bl -tag -width indent .It Fl E -Enables transport-mode IPsec encapsulated security payload. +Enables transport-mode IPsec encapsulating security payload. .It Fl Z Enables transport-mode IPsec authentication header. .El diff --git a/sys/netipsec/esp.h b/sys/netipsec/esp.h index 50a79384a6b1..27f2fd1c683a 100644 --- a/sys/netipsec/esp.h +++ b/sys/netipsec/esp.h @@ -32,7 +32,7 @@ */ /* - * RFC1827/2406 Encapsulated Security Payload. + * RFC 1827 & RFC 2406: Encapsulating Security Payload. */ #ifndef _NETIPSEC_ESP_H_