summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-18 12:33:47 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-18 12:33:47 -0700
commit85adfc8ef34b30231258a32a1d0151124b5427d6 (patch)
tree2d1a56b6d4cf94fe0dff336e5a08fb8735fac7e4 /sites/www
parentccad634e8ce8b2f765ea63ac3b93148452e2ab2a (diff)
parent04f62f765a03d045f4abaf69f61f835f2af81125 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst12
1 files changed, 9 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9d14314f..63793ea2 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -13,9 +13,15 @@ Changelog
* :bug:`1060` Fix key exchange (kex) algorithm list for GSSAPI authentication;
previously, the list used solely out-of-date algorithms, and now contains
newer ones listed preferentially before the old. Credit: Anselm Kruis.
-* :bug:`1055` (also :issue:`1056`, :issue:`1057`, :issue:`1058`, :issue:`1059`)
- Fix up host-key checking in our GSSAPI support, which was previously using an
- incorrect API call. Thanks to Anselm Kruis for the patches.
+* :bug:`1055 (1.17+)` (also :issue:`1056`, :issue:`1057`, :issue:`1058`,
+ :issue:`1059`) Fix up host-key checking in our GSSAPI support, which was
+ previously using an incorrect API call. Thanks to Anselm Kruis for the
+ patches.
+* :bug:`945 (1.18+)` (backport of :issue:`910` and re: :issue:`865`) SSHClient
+ now requests the type of host key it has (e.g. from known_hosts) and does not
+ consider a different type to be a "Missing" host key. This fixes a common
+ case where an ECDSA key is in known_hosts and the server also has an RSA host
+ key. Thanks to Pierce Lopez.
* :release:`2.1.3 <2017-06-09>`
* :release:`2.0.6 <2017-06-09>`
* :release:`1.18.3 <2017-06-09>`