summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2021-09-24 11:05:00 -0400
committerJeff Forcier <jeff@bitprophet.org>2021-09-24 11:05:00 -0400
commit0b7fa07df98bcf3b5e659980b28b2631569436dc (patch)
tree8ccba5b2d5544f65a1e60d0db1503bed74a67388 /sites
parent9537cd43f7b979f7b27f367a34ec2ab9ccb9bcd6 (diff)
parentd259b1f6bd9004abab700358b79dc72c89f5a307 (diff)
Merge branch '2.6' into 2.7
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 3582b775..7c20e434 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.7.2 <2020-08-30>`
- :support:`- backported` Update our CI to catch issues with sdist generation,
installation and testing.