diff options
| author | Kenny Root <kenny@the-b.org> | 2015-04-19 12:13:48 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-04-19 12:30:32 -0700 |
| commit | 42b64b35b97024ee0297b60b83a0648b0e71ec30 (patch) | |
| tree | 872e7d9f121ec873510a9843819c6b926159150c | |
| parent | 422b0131dbf0b7fbb37a3a1e0403389ad3b0808c (diff) | |
| download | connectbot-42b64b35b97024ee0297b60b83a0648b0e71ec30.tar.gz connectbot-42b64b35b97024ee0297b60b83a0648b0e71ec30.tar.bz2 connectbot-42b64b35b97024ee0297b60b83a0648b0e71ec30.zip | |
ssh: display the key exchange algorithm used
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | src/org/connectbot/transport/SSH.java | 2 |
3 files changed, 8 insertions, 0 deletions
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 |