summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-18 12:34:53 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-18 12:34:53 -0700
commit378fa86814f52fc83b5721bec6b81c5e0e4826c3 (patch)
tree77535e1d28f1ccb578880056b95611de23606d15
parent975bcf1e19b1efc5a84ef2eb639939e516f7f633 (diff)
parentac6aad79da050ce65f0be085a8379338c41d4386 (diff)
downloadparamiko-378fa86814f52fc83b5721bec6b81c5e0e4826c3.tar.gz
Merge branch '2.2' into 2.3
-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 bd10e6b3..2790036f 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -24,9 +24,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.
* :support:`979` Update how we use `Cryptography <https://cryptography.io>`_'s
signature/verification methods so we aren't relying on a deprecated API.
Thanks to Paul Kehrer for the patch.