This is an automated email from the ASF dual-hosted git repository.

twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit 21485ec01c1e094f6f0c4d62013758f165395f94
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Mon Jul 12 00:09:01 2021 +0200

    Mention chacha20-poly1305 in CHANGES and README
    
    This reverts commit 8e884ba8338eca96664468790ced3731dbf754a7.
---
 CHANGES.md | 1 +
 README.md  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d95c290..47d6b2e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@
 
 ## Behavioral changes and enhancements
 
+* [SSHD-1017](https://issues.apache.org/jira/browse/SSHD-1017) Add support for 
the chacha20-poly1...@openssh.com cipher
 * [SSHD-1161](https://issues.apache.org/jira/browse/SSHD-1161) Support OpenSSH 
client certificates for publickey authentication
 * [SSHD-1163](https://issues.apache.org/jira/browse/SSHD-1163) Wrong server 
key algorithm choose
 * [SSHD-1164](https://issues.apache.org/jira/browse/SSHD-1164) Parsing of 
~/.ssh/config Host patterns fails with extra whitespace
diff --git a/README.md b/README.md
index 6984c5e..d7b9b87 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ based applications requiring SSH support.
 ## Implemented/available support
 
 * **Ciphers**: aes128cbc, aes128ctr, aes192cbc, aes192ctr, aes256cbc, 
aes256ctr, arcfour128, arcfour256, blowfishcbc, tripledescbc,
-aes128-...@openssh.com, aes256-...@openssh.com
+aes128-...@openssh.com, aes256-...@openssh.com, chacha20-poly1...@openssh.com
 * **Digests**: md5, sha1, sha224, sha256, sha384, sha512
 * **Macs**: hmacmd5, hmacmd596, hmacsha1, hmacsha196, hmacsha256, hmacsha512, 
hmac-sha2-256-...@openssh.com
 , hmac-sha2-512-...@openssh.com, hmac-sha1-...@openssh.com

Reply via email to