From c36f336e6f294313cdab84352b108beea4607e48 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Tue, 26 Aug 2008 05:10:04 +0000
Subject: Update Trilead SSH-2 for Java from build 211 to build 213

---
 .../trilead/ssh2/transport/ClientServerHello.java  | 34 ++++++++++++++++++----
 .../trilead/ssh2/transport/TransportManager.java   |  8 ++---
 2 files changed, 32 insertions(+), 10 deletions(-)

(limited to 'lib/src/main/java/com/trilead/ssh2/transport')

diff --git a/lib/src/main/java/com/trilead/ssh2/transport/ClientServerHello.java b/lib/src/main/java/com/trilead/ssh2/transport/ClientServerHello.java
index 6fa4a00..23726f3 100644
--- a/lib/src/main/java/com/trilead/ssh2/transport/ClientServerHello.java
+++ b/lib/src/main/java/com/trilead/ssh2/transport/ClientServerHello.java
@@ -4,15 +4,15 @@ package com.trilead.ssh2.transport;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 
 import com.trilead.ssh2.Connection;
 
-
 /**
  * ClientServerHello.
  * 
  * @author Christian Plattner, plattner@trilead.com
- * @version $Id: ClientServerHello.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $
+ * @version $Id: ClientServerHello.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $
  */
 public class ClientServerHello
 {
@@ -58,7 +58,7 @@ public class ClientServerHello
 	{
 		client_line = "SSH-2.0-" + Connection.identification;
 
-		bo.write((client_line + "\r\n").getBytes());
+		bo.write((client_line + "\r\n").getBytes("ISO-8859-1"));
 		bo.flush();
 
 		byte[] serverVersion = new byte[512];
@@ -67,7 +67,7 @@ public class ClientServerHello
 		{
 			int len = readLineRN(bi, serverVersion);
 
-			server_line = new String(serverVersion, 0, len);
+			server_line = new String(serverVersion, 0, len, "ISO-8859-1");
 
 			if (server_line.startsWith("SSH-"))
 				break;
@@ -90,7 +90,18 @@ public class ClientServerHello
 	 */
 	public byte[] getClientString()
 	{
-		return client_line.getBytes();
+		byte[] result;
+
+		try
+		{
+			result = client_line.getBytes("ISO-8859-1");
+		}
+		catch (UnsupportedEncodingException ign)
+		{
+			result = client_line.getBytes();
+		}
+
+		return result;
 	}
 
 	/**
@@ -98,6 +109,17 @@ public class ClientServerHello
 	 */
 	public byte[] getServerString()
 	{
-		return server_line.getBytes();
+		byte[] result;
+
+		try
+		{
+			result = server_line.getBytes("ISO-8859-1");
+		}
+		catch (UnsupportedEncodingException ign)
+		{
+			result = server_line.getBytes();
+		}
+
+		return result;
 	}
 }
diff --git a/lib/src/main/java/com/trilead/ssh2/transport/TransportManager.java b/lib/src/main/java/com/trilead/ssh2/transport/TransportManager.java
index f577c2b..aeb4fce 100644
--- a/lib/src/main/java/com/trilead/ssh2/transport/TransportManager.java
+++ b/lib/src/main/java/com/trilead/ssh2/transport/TransportManager.java
@@ -49,7 +49,7 @@ import com.trilead.ssh2.util.Tokenizer;
  * TransportManager.
  * 
  * @author Christian Plattner, plattner@trilead.com
- * @version $Id: TransportManager.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
+ * @version $Id: TransportManager.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $
  */
 public class TransportManager
 {
@@ -366,7 +366,7 @@ public class TransportManager
 			if ((pd.proxyUser != null) && (pd.proxyPass != null))
 			{
 				String credentials = pd.proxyUser + ":" + pd.proxyPass;
-				char[] encoded = Base64.encode(credentials.getBytes());
+				char[] encoded = Base64.encode(credentials.getBytes("ISO-8859-1"));
 				sb.append("Proxy-Authorization: Basic ");
 				sb.append(encoded);
 				sb.append("\r\n");
@@ -388,7 +388,7 @@ public class TransportManager
 
 			OutputStream out = sock.getOutputStream();
 
-			out.write(sb.toString().getBytes());
+			out.write(sb.toString().getBytes("ISO-8859-1"));
 			out.flush();
 
 			/* Now parse the HTTP response */
@@ -398,7 +398,7 @@ public class TransportManager
 
 			int len = ClientServerHello.readLineRN(in, buffer);
 
-			String httpReponse = new String(buffer, 0, len);
+			String httpReponse = new String(buffer, 0, len, "ISO-8859-1");
 
 			if (httpReponse.startsWith("HTTP/") == false)
 				throw new IOException("The proxy did not send back a valid HTTP response.");
-- 
cgit v1.2.3