Mercurial > 510Connectbot

changeset 323:90537ba71897 ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ecdsa key support everywhere
author Carl Byington <carl@five-ten-sg.com>
date Thu, 31 Jul 2014 09:26:19 -0700
parents a713e91c59c8
children a1a2e33b3565
files src/ch/ethz/ssh2/auth/AuthenticationManager.java src/ch/ethz/ssh2/transport/KexManager.java src/ch/ethz/ssh2/transport/TransportManager.java
diffstat 3 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/auth/AuthenticationManager.java	Thu Jul 31 09:03:50 2014 -0700
+++ b/src/ch/ethz/ssh2/auth/AuthenticationManager.java	Thu Jul 31 09:26:19 2014 -0700
@@ -69,7 +69,7 @@
 
     private byte[] deQueue() throws IOException {
         if (connectionClosed) {
-            throw tm.getReasonClosedCause();
+            throw new IOException("The connection is closed.").initCause(tm.getReasonClosedCause());
         }
 
         // Wait for packet
--- a/src/ch/ethz/ssh2/transport/KexManager.java	Thu Jul 31 09:03:50 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/KexManager.java	Thu Jul 31 09:26:19 2014 -0700
@@ -98,7 +98,7 @@
                 }
 
                 if (connectionClosed) {
-                    throw tm.getReasonClosedCause();
+                    throw new IOException("Key exchange was not finished, connection is closed.").initCause(tm.getReasonClosedCause());
                 }
 
                 try {
--- a/src/ch/ethz/ssh2/transport/TransportManager.java	Thu Jul 31 09:03:50 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/TransportManager.java	Thu Jul 31 09:26:19 2014 -0700
@@ -199,7 +199,7 @@
         }
 
         // check if we need to inform the monitors
-        List monitors = null;
+        List<ConnectionMonitor> monitors = null;
 
         synchronized (this) {
             // Short term lock to protect "connectionMonitors"
@@ -207,7 +207,7 @@
             // (they may be modified concurrently)
             if (monitorsWereInformed == false) {
                 monitorsWereInformed = true;
-                monitors = (List) connectionMonitors.clone();
+                monitors = new ArrayList<ConnectionMonitor>(connectionMonitors);
             }
         }
 
@@ -280,7 +280,7 @@
     public void sendKexMessage(byte[] msg) throws IOException {
         synchronized (connectionSemaphore) {
             if (connectionClosed) {
-                throw reasonClosedCause;
+                throw new IOException("Sorry, this connection is closed.").initCause(reasonClosedCause);
             }
 
             flagKexOngoing = true;
@@ -366,8 +366,7 @@
 
     public void setConnectionMonitors(List<ConnectionMonitor> monitors) {
         synchronized (this) {
-            connectionMonitors = new ArrayList<ConnectionMonitor>();
-            connectionMonitors.addAll(monitors);
+            connectionMonitors = new ArrayList<ConnectionMonitor>(monitors);
         }
     }
 
@@ -403,7 +402,7 @@
         synchronized (connectionSemaphore) {
             while (true) {
                 if (connectionClosed) {
-                    throw reasonClosedCause;
+                    throw new IOException("Sorry, this connection is closed.").initCause(reasonClosedCause);
                 }
 
                 if (!flagKexOngoing) {