aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-04-05 17:27:57 -0700
committerKenny Root <kenny@the-b.org>2015-04-05 17:27:57 -0700
commit9c16dc9ecd1e2d23a63ceb696ed7efc48c983e38 (patch)
treee1874a596acc045dbd1c4d53e82cd7fe1f7cb6ec
parent9689224a9e0c26b64fdbf7515a4dc9ae20454f3b (diff)
parent149080bc7dcbdbe310e39891e6a9dff0ceec8e8b (diff)
downloadconnectbot-9c16dc9ecd1e2d23a63ceb696ed7efc48c983e38.tar.gz
connectbot-9c16dc9ecd1e2d23a63ceb696ed7efc48c983e38.tar.bz2
connectbot-9c16dc9ecd1e2d23a63ceb696ed7efc48c983e38.zip
Merge branch 'master' into gradle-conversion
-rw-r--r--CHANGELOG.md12
-rw-r--r--app/src/main/java/com/trilead/ssh2/transport/KexManager.java2
2 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddfccf0..3c857f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- Key exchange and host key algorithm preference order was not being
respected.
+- DSA host key support was broken from the beginning of the v1.8 series.
### Added
- More context is given for failures to connect via SSH which should
reveal why a host might be incompatible with ConnectBot.
+
+## [1.8.3][1.8.3] - 2014-04-02
+### Fixed
+- Only enable EC support when the device supports it.
+- Default font size scales with the device display density.
+- Color picker scales correctly depending on device density.
+- Color picker color numbers are now localized
+
+
+[unreleased]: https://github.com/connectbot/connectbot/compare/v1.8.3...HEAD
+[1.8.3]: https://github.com/connectbot/connectbot/compare/v1.8.2...v1.8.3
diff --git a/app/src/main/java/com/trilead/ssh2/transport/KexManager.java b/app/src/main/java/com/trilead/ssh2/transport/KexManager.java
index acf2812..ee0784a 100644
--- a/app/src/main/java/com/trilead/ssh2/transport/KexManager.java
+++ b/app/src/main/java/com/trilead/ssh2/transport/KexManager.java
@@ -70,7 +70,7 @@ public class KexManager
HOSTKEY_ALGS.add("ecdsa-sha2-nistp521");
}
HOSTKEY_ALGS.add("ssh-rsa");
- HOSTKEY_ALGS.add("ssh-dsa");
+ HOSTKEY_ALGS.add("ssh-dss");
}
private static final Set<String> KEX_ALGS = new LinkedHashSet<String>();