Ganymed library patch

SSH client patch of Ganymed library to accept
to accept precreated socket.

Change-Id: Icbccba360e9a86be41cc65a04f1e7aca8c4bffca
Signed-off-by: Robert Gallas <rgallas@cisco.com>

diff --git a/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java b/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java
index bf742c5f5f4f5d33f4f7879d3d103e621dee9c44..786f81ce06caf392bfdd264035c2bace7fb07d6e 100644 (file)
--- a/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java
+++ b/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java
@@ -60,6 +60,14 @@ public class Connection
 
     private SecureRandom generator;
 
 
     private SecureRandom generator;
 

+    private Socket precreatedSocket;
+
+    public Connection(Socket socket) {
+        this.precreatedSocket = socket;
+        this.hostname = socket.getInetAddress().getHostName();
+        this.port = socket.getPort();
+    }
+

     /**
      * Unless you know what you are doing, you will never need this.
      *
     /**
      * Unless you know what you are doing, you will never need this.
      *


@@ -745,8 +753,14 @@ public class Connection
 
             try
             {
 
             try
             {

-                tm.clientInit(hostname, port, softwareversion, cryptoWishList, verifier, dhgexpara, connectTimeout,
-                        getOrCreateSecureRND(), proxyData);
+
+                if (precreatedSocket != null) {
+                    tm.clientInit(precreatedSocket, softwareversion, cryptoWishList, verifier, dhgexpara,
+                            getOrCreateSecureRND());
+                } else {
+                    tm.clientInit(hostname, port, softwareversion, cryptoWishList, verifier, dhgexpara, connectTimeout,
+                            getOrCreateSecureRND(), proxyData);
+                }

             }
             catch (SocketTimeoutException se)
             {
             }
             catch (SocketTimeoutException se)
             {

diff --git a/third-party/ganymed/src/main/java/ch/ethz/ssh2/transport/TransportManager.java b/third-party/ganymed/src/main/java/ch/ethz/ssh2/transport/TransportManager.java
index 50e9b287ea077195dbd0edd6e77d56ebb1fd91da..963267082b6a27fa37ea02fff635ad85c9c99dfd 100644 (file)
--- a/third-party/ganymed/src/main/java/ch/ethz/ssh2/transport/TransportManager.java
+++ b/third-party/ganymed/src/main/java/ch/ethz/ssh2/transport/TransportManager.java
@@ -551,6 +551,31 @@ public class TransportManager
         receiveThread.start();
     }
 
         receiveThread.start();
     }
 

+    public void clientInit(Socket socket, String softwareversion, CryptoWishList cwl,
+                           ServerHostKeyVerifier verifier, DHGexParameters dhgex, SecureRandom rnd) throws IOException
+    {
+               /* First, establish the TCP connection to the SSH-2 server */
+
+        sock = socket;
+
+               /* Parse the server line and say hello - important: this information is later needed for the
+                * key exchange (to stop man-in-the-middle attacks) - that is why we wrap it into an object
+                * for later use.
+                */
+
+        ClientServerHello csh = ClientServerHello.clientHello(softwareversion, sock.getInputStream(),
+                sock.getOutputStream());
+
+        tc = new TransportConnection(sock.getInputStream(), sock.getOutputStream(), rnd);
+        String hostname = sock.getInetAddress().getHostName();
+        int port = sock.getPort();
+
+        km = new ClientKexManager(this, csh, cwl, hostname, port, verifier, rnd);
+        km.initiateKEX(cwl, dhgex, null, null);
+
+        startReceiver();
+    }
+

     public void clientInit(String hostname, int port, String softwareversion, CryptoWishList cwl,
                            ServerHostKeyVerifier verifier, DHGexParameters dhgex, int connectTimeout, SecureRandom rnd,
                            ProxyData proxyData) throws IOException
     public void clientInit(String hostname, int port, String softwareversion, CryptoWishList cwl,
                            ServerHostKeyVerifier verifier, DHGexParameters dhgex, int connectTimeout, SecureRandom rnd,
                            ProxyData proxyData) throws IOException