From nobody Sun Dec 7 19:55:59 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 4dPbTC4xNxz6Hhsx for ; Sun, 07 Dec 2025 19:55:59 +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 4dPbTC2nLlz3PdM for ; Sun, 07 Dec 2025 19:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765137359; 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=ajXrG2Is4XG5vXBk+tERBBWUSt1i480hCKbPyGUDbRo=; b=Y2/46a0l0sESFf5cD5zLTpv+59TWXAf0L77WMsM9B4s6Mc0QjEAe/Y8Cw1SPWtOJ8dZfNK SDMyJTpzdhn0vHqGPSqaJ52Yd0DOOa/s9j4P3+6D6SqfPzE2RKwNX7B9orjBtBYfJZenwd 2s2NORSJsrrWuiILsJPP4H8zPOkAGfYpFr1PhrqJzl+bKrlpCgjP2zExNx/MkW4ffXWJQb cbmARwr/7HvgBaFOdf/gzWgNj9SWp8//HClgTTFA4blXWGNc7TTKt8H+19dcpYkr660CHz pLNs33CC68b7arTmnpXdSF0+lk7Z/1/cLb2Y8t24Uyk2dZf+VqnnTbcYI9DPmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765137359; 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=ajXrG2Is4XG5vXBk+tERBBWUSt1i480hCKbPyGUDbRo=; b=rKJ/3RMKQa0fd0aianmQpLK21s1UhVyVXULUgGtTUJ1/KYeSC46UUZj9x51h+yLv8LTmXF 3KRq/yO5s9mWqkRA2XETHhROMj7oaj8Qbo35ntZFrFzG577hL3ujN/oBJ9JD7MYDdSy9mv 1s6wCDab1JLJTG+gSIvxarOgtpcyc8ZQ6cbSplWTuP6LXyL2JbcgGqmH3WJbs2QHesRZKu fBfGqDAclng2USIvUA2K3D3/wZrcgIw6t8OqsCup5jMz7ScenGcmOqFa+2GqMP4Oa8FIPb LXT6P9P4+9Xbxys4ESlF0//dbcc+2ShR82y83M4xdlDqqwr8zV4PMQOHHvH/iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765137359; a=rsa-sha256; cv=none; b=Nh5G1uM5iK+0YuwmcKITtRh3dm8LzgUj8/rqbllr5LE5y4jXODWK0IHwTcJSUiINlB0ucl BQJdUX1pJq6fAekvxhFYiMk3ZN+LacGRHDwiHufDfQPmq6Yq7tDAnwk1Q1jHcRlx68N8pm x0EGikbPFpOoe+fCtUgclfjxRwAspdZqwuqIP4iGANPxy+uz4AJTom9w7F0oNqI5S1Jed4 U2k4pUSLTiqV4ch3yMLdJxAN11hpWn3okyY08PL2KVtkULw648kbmCZmOPgkxHlXcLWAAc s/IkNEsaDP6WYjYf06h7bGIC7ETSIaj9Sd4Sd3m/hjTDl0ogHBwFI6Yfd2by7w== 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 4dPbTC1gwZzwvP for ; Sun, 07 Dec 2025 19:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27511 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Dec 2025 19:55:59 +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: 2f4d348d9504 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 2f4d348d950464990fac15958fae317a60b0aef3 Auto-Submitted: auto-generated Date: Sun, 07 Dec 2025 19:55:59 +0000 Message-Id: <6935dbcf.27511.5391de15@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=2f4d348d950464990fac15958fae317a60b0aef3 commit 2f4d348d950464990fac15958fae317a60b0aef3 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:55:50 +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 ddfdc35ce651..249bd195b4de 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd April 18, 2025 +.Dd December 4, 2025 .Dt IPFW 8 .Os .Sh NAME @@ -1669,7 +1669,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 43dca1148e16..9aeb19c1a879 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 15, 2023 +.Dd December 4, 2025 .Dt PING 8 .Os .Sh NAME @@ -534,7 +534,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_