summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2021-09-24 11:04:38 -0400
committerJeff Forcier <jeff@bitprophet.org>2021-09-24 11:04:38 -0400
commitd259b1f6bd9004abab700358b79dc72c89f5a307 (patch)
tree777f9dd47af4bfc6a1b06a2397e6f0bde089616f /sites
parent097bd18ad40c30c63d41a2dd7d46247b6fdeaf3d (diff)
parent45cfb6dd7f463b26d1c13828690c809ba6a189c2 (diff)
Merge branch '2.5' into 2.6
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index a5415ff2..02e48e92 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,11 +2,12 @@
Changelog
=========
-- :bug:`1882` Newer server-side key exchange algorithms not intended to use
- SHA1 (``diffie-hellman-group14-sha256``, ``diffie-hellman-group16-sha512``)
- were incorrectly using SHA1 after all, due to a bug causing them to ignore
- the ``hash_algo`` class attribute. This has been corrected. Big thanks to
- Benno Rice for catch & patch.
+- :bug:`1462` (via :issue:`1882`) Newer server-side key exchange algorithms not
+ intended to use SHA1 (``diffie-hellman-group14-sha256``,
+ ``diffie-hellman-group16-sha512``) were incorrectly using SHA1 after all, due
+ to a bug causing them to ignore the ``hash_algo`` class attribute. This has
+ been corrected. Big thanks to ``@miverson`` for the report and to Benno Rice
+ for the patch.
- :release:`2.6.0 <2019-06-23>`
- :feature:`1463` Add a new keyword argument to `SSHClient.connect
<paramiko.client.SSHClient.connect>` and `~paramiko.transport.Transport`,