aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/transport
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-04-19 12:35:24 -0700
committerKenny Root <kenny@the-b.org>2015-04-19 12:35:24 -0700
commit5af75d5b3657409a9d46d48bafa446df9646ae0c (patch)
treea5bc0e9e3f275bb551e2bf7af993c1ed3b01e990 /app/src/main/java/org/connectbot/transport
parent6372acec6f745c9689ab1db703611f78e41bb0e0 (diff)
parenta50c421c4dc566284ba59b8ef07833f09fc2774e (diff)
downloadconnectbot-5af75d5b3657409a9d46d48bafa446df9646ae0c.tar.gz
connectbot-5af75d5b3657409a9d46d48bafa446df9646ae0c.tar.bz2
connectbot-5af75d5b3657409a9d46d48bafa446df9646ae0c.zip
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src/main/java/org/connectbot/transport')
-rw-r--r--app/src/main/java/org/connectbot/transport/SSH.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/java/org/connectbot/transport/SSH.java b/app/src/main/java/org/connectbot/transport/SSH.java
index 2a552a4..b0fe2a8 100644
--- a/app/src/main/java/org/connectbot/transport/SSH.java
+++ b/app/src/main/java/org/connectbot/transport/SSH.java
@@ -432,6 +432,8 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC
connectionInfo = connection.connect(new HostKeyVerifier());
connected = true;
+ bridge.outputLine(manager.res.getString(R.string.terminal_kex_algorithm,
+ connectionInfo.keyExchangeAlgorithm));
if (connectionInfo.clientToServerCryptoAlgorithm
.equals(connectionInfo.serverToClientCryptoAlgorithm)
&& connectionInfo.clientToServerMACAlgorithm