From 42b64b35b97024ee0297b60b83a0648b0e71ec30 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 19 Apr 2015 12:13:48 -0700
Subject: ssh: display the key exchange algorithm used

---
 CHANGELOG.md                          | 1 +
 res/values/strings.xml                | 5 +++++
 src/org/connectbot/transport/SSH.java | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6822d91..d95f9a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - More context is given for failures to connect via SSH which should
   reveal why a host might be incompatible with ConnectBot.
+- SSH key exchange algorithm will now be printed upon connection.
 
 ## [1.8.3][1.8.3] - 2014-04-02
 ### Fixed
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5f2d78a..d8e3bb5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -437,6 +437,11 @@
 	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
 	<string name="terminal_using_algorithm">"Using algorithm: %1$s %2$s"</string>
 
+	<!-- Displayed on the terminal during a SSH connection describing the cryptographic key
+	     exchange algorithm used to establish a shared secret between this program and the
+	     server. -->
+	<string name="terminal_kex_algorithm">Key exchange algorithm: %s</string>
+
 	<string name="terminal_auth">"Trying to authenticate"</string>
 
 	<string name="terminal_auth_pass">"Attempting 'password' authentication"</string>
diff --git a/src/org/connectbot/transport/SSH.java b/src/org/connectbot/transport/SSH.java
index ab1ca4c..b6a5714 100644
--- a/src/org/connectbot/transport/SSH.java
+++ b/src/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
-- 
cgit v1.2.3