aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/trilead/ssh2/packets/TypesWriter.java
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2008-08-26 05:10:04 +0000
committerKenny Root <kenny@the-b.org>2008-08-26 05:10:04 +0000
commitc1e41c03ad352b00e88a926db600937f2ab06e50 (patch)
tree7397de044710bdab7947c0e02730dd48f2eb312a /src/com/trilead/ssh2/packets/TypesWriter.java
parenta92df389bc091f288116a292fd265e1986814865 (diff)
downloadconnectbot-c1e41c03ad352b00e88a926db600937f2ab06e50.tar.gz
connectbot-c1e41c03ad352b00e88a926db600937f2ab06e50.tar.bz2
connectbot-c1e41c03ad352b00e88a926db600937f2ab06e50.zip
Update Trilead SSH-2 for Java from build 211 to build 213
Diffstat (limited to 'src/com/trilead/ssh2/packets/TypesWriter.java')
-rw-r--r--src/com/trilead/ssh2/packets/TypesWriter.java22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/com/trilead/ssh2/packets/TypesWriter.java b/src/com/trilead/ssh2/packets/TypesWriter.java
index 41fe7b5..f2e5ef3 100644
--- a/src/com/trilead/ssh2/packets/TypesWriter.java
+++ b/src/com/trilead/ssh2/packets/TypesWriter.java
@@ -8,7 +8,7 @@ import java.math.BigInteger;
* TypesWriter.
*
* @author Christian Plattner, plattner@trilead.com
- * @version $Id: TypesWriter.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $
+ * @version $Id: TypesWriter.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $
*/
public class TypesWriter
{
@@ -39,7 +39,7 @@ public class TypesWriter
System.arraycopy(arr, 0, dst, 0, pos);
return dst;
}
-
+
public void getBytes(byte dst[])
{
System.arraycopy(arr, 0, dst, 0, pos);
@@ -113,7 +113,7 @@ public class TypesWriter
{
writeBytes(buff, 0, buff.length);
}
-
+
public void writeBytes(byte[] buff, int off, int len)
{
if ((pos + len) > arr.length)
@@ -131,16 +131,26 @@ public class TypesWriter
public void writeString(String v)
{
- byte[] b = v.getBytes();
+ byte[] b;
+
+ try
+ {
+ /* All Java JVMs must support ISO-8859-1 */
+ b = v.getBytes("ISO-8859-1");
+ }
+ catch (UnsupportedEncodingException ignore)
+ {
+ b = v.getBytes();
+ }
writeUINT32(b.length);
writeBytes(b, 0, b.length);
}
-
+
public void writeString(String v, String charsetName) throws UnsupportedEncodingException
{
byte[] b = (charsetName == null) ? v.getBytes() : v.getBytes(charsetName);
-
+
writeUINT32(b.length);
writeBytes(b, 0, b.length);
}