The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=15afd75e67102f81c37adbf11966e48685bd7be7
commit 15afd75e67102f81c37adbf11966e48685bd7be7 Author: Mateusz Piotrowski <[email protected]> AuthorDate: 2025-12-04 15:17:11 +0000 Commit: Mateusz Piotrowski <[email protected]> CommitDate: 2025-12-04 15:17:12 +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 --- 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_
