diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2019-06-21 16:36:47 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2019-06-21 16:36:47 -0400 |
commit | e5d052c4da3b9a966b1c6ee67c93157a3c55b871 (patch) | |
tree | 705bd1bb170960806d91add6430bd548760b5cfb /sites | |
parent | 22c20fd288c9a2e8bdaf42f2ba76e390679211b0 (diff) | |
parent | b7af6829de1e4c4544334bca11fc777c6d350548 (diff) |
Merge branch '2.4' into 2.5
Diffstat (limited to 'sites')
-rw-r--r-- | sites/www/changelog.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 41c50ce5..2a0ce7e9 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. - :release:`2.5.0 <2019-06-09>` - :feature:`1233` (also :issue:`1229`, :issue:`1332`) Add support for encrypt-then-MAC (ETM) schemes (``hmac-sha2-256-etm@openssh.com``, |