summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2019-06-21 16:34:53 -0400
committerJeff Forcier <jeff@bitprophet.org>2019-06-21 16:34:53 -0400
commitb7af6829de1e4c4544334bca11fc777c6d350548 (patch)
treeffb8c28b51ae54e8afe1328c1b6d018341653a7d /sites
parent0db807758757170b92d882ecbc43f1bdad36cce6 (diff)
parent26ae0c9b452b4fa395aa89a010e855cbe10780e6 (diff)
Merge branch '2.3' into 2.4
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 8a1eb76b..86419aa7 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,11 @@
Changelog
=========
+- :bug:`1306` (via :issue:`1400`) Fix Ed25519 key handling so certain key
+ comment lengths don't cause ``SSHException("Invalid key")`` (this was
+ technically a bug in how padding, or lack thereof, is
+ calculated/interpreted). Thanks to ``@parke`` for the bug report & Pierce
+ Lopez for the patch.
- :support:`1378 backported` Add support for the modern (as of Python 3.3)
import location of ``MutableMapping`` (used in host key management) to avoid
the old location becoming deprecated in Python 3.8. Thanks to Josh Karpel for