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

---
 lib/src/main/java/com/trilead/ssh2/KnownHosts.java | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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

diff --git a/lib/src/main/java/com/trilead/ssh2/KnownHosts.java b/lib/src/main/java/com/trilead/ssh2/KnownHosts.java
index e89779b..edca0a2 100644
--- a/lib/src/main/java/com/trilead/ssh2/KnownHosts.java
+++ b/lib/src/main/java/com/trilead/ssh2/KnownHosts.java
@@ -8,6 +8,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.SecureRandom;
@@ -39,7 +40,7 @@ import com.trilead.ssh2.signature.RSASHA1Verify;
  * <code>KnownHosts</code> for your whole application.
  * 
  * @author Christian Plattner, plattner@trilead.com
- * @version $Id: KnownHosts.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
+ * @version $Id: KnownHosts.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $
  */
 
 public class KnownHosts
@@ -168,8 +169,16 @@ public class KnownHosts
 
 		HMAC hmac = new HMAC(sha1, salt, salt.length);
 
-		hmac.update(hostname.getBytes());
-
+		try
+		{
+			hmac.update(hostname.getBytes("ISO-8859-1"));
+		}catch(UnsupportedEncodingException ignore)
+		{
+			/* Actually, ISO-8859-1 is supported by all correct
+			 * Java implementations. But... you never know. */
+			hmac.update(hostname.getBytes());
+		}
+		
 		byte[] dig = new byte[hmac.getDigestLength()];
 
 		hmac.digest(dig);
@@ -684,7 +693,7 @@ public class KnownHosts
 				raf.write('\n');
 		}
 		
-		raf.write(new String(entry).getBytes());
+		raf.write(new String(entry).getBytes("ISO-8859-1"));
 		raf.close();
 	}
 
-- 
cgit v1.2.3