From nobody Thu Oct 21 17:07:02 2021
X-Original-To: dev-commits-src-branches@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 BF5151806E42;
Thu, 21 Oct 2021 17:07:06 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4HZv6J5hnrz4h4F;
Thu, 21 Oct 2021 17:07:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
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 9987A1F020;
Thu, 21 Oct 2021 17:07:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19LH72Qa080327;
Thu, 21 Oct 2021 17:07:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19LH72Z2080326;
Thu, 21 Oct 2021 17:07:02 GMT
(envelope-from git)
Date: Thu, 21 Oct 2021 17:07:02 GMT
Message-Id: <202110211707.19LH72Z2080326@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 06e1e115a9ae - stable/13 - Add Chacha20+Poly1035 to the list of AEAD algorithms.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 06e1e115a9ae872ff54a479f8082ada843a48c6e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=06e1e115a9ae872ff54a479f8082ada843a48c6e
commit 06e1e115a9ae872ff54a479f8082ada843a48c6e
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2021-03-18 20:31:39 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2021-10-21 15:51:24 +0000
Add Chacha20+Poly1035 to the list of AEAD algorithms.
Sponsored by: Netflix
(cherry picked from commit c853c53d024a3cc950854dfaade7f50303c5a022)
---
share/man/man9/crypto.9 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index 0ea24356e975..69fe3339a757 100644
--- a/share/man/man9/crypto.9
+++ b/share/man/man9/crypto.9
@@ -17,7 +17,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 11, 2020
+.Dd March 18, 2021
.Dt CRYPTO 9
.Os
.Sh NAME
@@ -136,9 +136,10 @@ The following encryption algorithms are supported:
The following authenticated encryption with additional data (AEAD)
algorithms are supported:
.Pp
-.Bl -tag -offset indent -width CRYPTO_AES_NIST_GCM_16 -compact
+.Bl -tag -offset indent -width CRYPTO_CHACHA20_POLY1305 -compact
.It Dv CRYPTO_AES_CCM_16
.It Dv CRYPTO_AES_NIST_GCM_16
+.It Dv CRYPTO_CHACHA20_POLY1305
.El
.Pp
The following compression algorithms are supported: