Merge lp:~veger/ubuntu/quantal/jsch/fix-for-803492-v2 into lp:ubuntu/quantal/jsch

[Maarten Bezemer]

Changes from 0.1.42 to 0.1.48 can be found at: http://www.jcraft.com/jsch/ChangeLog

[lp:~veger/ubuntu/quantal/jsch/fix-for-803492-v2]

11. By Maarten Bezemer on 2012-05-04

Reverted removal (and refreshed) jsch-build-xml.patch as it still is required

[James Page (james-page)]

Hi Maarten

Thanks for preparing this update; I have two bits of feedback

1) The Merge proposal looks a little odd (removal of files in the .pc directory) because you have not applied all patched and added the .pc directory. This is a little counter intuitive but makes it easier to review

2) d/manifest.mf needed an update as well for the new version.

I've fixed both of these issues and uploaded - thanks for your contribution!

Cheers

James

review: Approve

[James Page (james-page)]

Oh - I missed this last point as well - you should really reference the bug report in the changelog entry with a (LP: #xxxxx) reference - that way the bug report gets closed as well.

I obviously still need more coffee...

=== removed directory '.pc'
=== removed file '.pc/.version'
--- .pc/.version	2010-06-27 23:17:34 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2010-06-27 23:17:34 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-jsch-build-xml.patch
 
=== removed directory '.pc/jsch-build-xml.patch'
=== removed file '.pc/jsch-build-xml.patch/build.xml'
--- .pc/jsch-build-xml.patch/build.xml	2010-06-27 23:17:34 +0000
+++ .pc/jsch-build-xml.patch/build.xml	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-<project name="Jsch" default="dist" basedir=".">
-    <description>
-JSch is a pure Java implementation of SSH2. JSch allows you to connect to an
-sshd server and use port forwarding, X11 forwarding, file transfer, etc., and
-you can integrate its functionality into your own Java programs
-    </description>
-  <!-- set global properties for this build -->
-  <property name="version" location="0.1.40"/>
-  <property name="src" location="src"/>
-  <property name="exasrc" location="examples"/>
-  <property name="build" location="build"/>
-  <property name="exabuild" location="examples"/>
-  <property name="dist"  location="dist"/>
-  <property name="javadoc" location="javadoc"/>
-  <property name="javac.debug" value="true"/>
-  <path id="project.cp">
-    <pathelement location="${build}"/>
-  </path>
-  <target name="init">
-    <!-- Create the time stamp -->
-    <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${build}"/>
-  </target>
-
-  <target name="compile" depends="init"
-        description="compile the source " >
-    <!-- Compile the java code from ${src} into ${build} -->
-    <available property="jzlib.available"
-               classname="com.jcraft.jzlib.ZStream"/>
-    <javac srcdir="${src}" destdir="${build}" debug="${javac.debug}">
-      <exclude name="com/jcraft/jsch/jcraft/Compression.java"
-               unless="jzlib.available"/>
-    </javac>
-  </target>
-  <target name="run" depends="compile">
-    <java classname="Login" classpathref="project.cp"/>
-  </target>
-  <target name="dist" depends="compile"
-        description="generate the distribution" >
-    <!-- Create the distribution directory -->
-    <mkdir dir="${dist}/lib"/>
-
-    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-    <jar jarfile="${dist}/lib/jsch-${DSTAMP}.jar" basedir="${build}"/>
-  </target>
-
-  <target name="examples"
-  	description="compiles the examples"
-	depends="compile">
-	
-    <path id="compile.classpath">
-      <pathelement location="${build}" /> 
-    </path>
-
-    <javac srcdir="${exasrc}" destdir="${exabuild}">
-          <classpath refid="compile.classpath"/>
-    </javac>
-    
-  </target>
-	
-  <target name="clean"
-        description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-    <delete dir="${javadoc}"/>
-  </target>
-
-  <target name="javadoc">
-  	<javadoc sourcepath="${src}"
-		destdir="${javadoc}"
-	>
-		<packageset dir="${src}"/>
-	</javadoc>
-  </target>
-</project>
 
=== modified file 'ChangeLog'
--- ChangeLog	2010-06-27 23:17:34 +0000
+++ ChangeLog	2012-05-04 10:23:17 +0000
@@ -1,6 +1,99 @@
 ChangeLog of JSch
 ====================================================================
-Last modified: Tue Jul 14 02:29:29 UTC 2009
+Last modified: Fri Apr 20 06:44:50 UTC 2012
+
+
+Changes since version 0.1.47:
+- change: the file transfer speed with ChannelSftp#get(String src) has been
+          improved; sending multiple requests at any one time.
+- change: by the default, at most, 16 requests will be sent at any one time
+          in ChannelSftp.
+- feature: added Session#{setIdentityRepository(),getIdentityRepository()}
+
+
+Changes since version 0.1.46:
+- bugfix: failed to initialize channels for the stream forwarding.     FIXED
+- change: Session#getHostKey() will return the given hostkey
+	  even if session is not established.
+- change: Logger will record additional messages about algorithm negotiations.
+- feature: added ChannelSftp#ls(String path, LsEntrySelector selector) method.
+- feature: added IdentityRepository#{getName(),getStatus()} methods.
+
+
+Changes since version 0.1.45:
+- bugfix: in the agent forwarding mode, "ssh-add -l" on the remote
+          will freeze.                                                 FIXED
+- bugfix: requests should not be sent to the closed channel.           FIXED
+- bugfix: ChannelShell#setAgentForwarding(true) will cause
+          resource leaks.                                              FIXED
+- change: for the efficiency, channel opening will be delayed
+          in local port forwarding.
+- change: added examples/Sudo.java to demonstrate sudo on exec channel.
+- change: authentication trials will be failed at 6 failures by the default.
+- change: updating copyright messages; 2011 -> 2012
+- feature: added JSch#setIdentityRepository(IdentityRepository irepo) to
+	   integrate with jsch-agent-proxy.
+
+	
+Changes since version 0.1.44:
+- bugfix: fields referred by multiple threads simultaneously should be
+	  volatile.                                                    FIXED 
+- bugfix: use local window size offered by the remote in sftp put.
+                                                                       FIXED 
+- bugfix: SftpProgressMonitor#init was not invoked in sftp-put
+	  for input-stream.                                            FIXED 
+- bugfix: sftp protocol version 3, 4 and 5 should allow only 
+	  UTF-8 encoding.                                              FIXED 
+- bugfix: Channel Subsystem had failed to set X forwarding flag.
+                                                                       FIXED 
+- bugfix: Channel X11 had leaked some resources.
+                                                                       FIXED 
+- bugfix: packet compression may break sessions
+	  in some case(transferring deflated data).                    FIXED 
+- bugfix: failed to set dev-null for logger
+                                                                       FIXED 
+- bugfix: even in sftp protocol version 3 session, some sftpd sends data
+	  packets defined in sftp protocol 6 ;-( working around it.    FIXED 
+- bugfix: ChannelSftp file globbing logic had missed 
+	  the string "foo\\\*bar" as a pattern.                        FIXED 
+- bugfix: sequential accesses to ChannelSftp by multiple threads may
+	  break its I/O channel.
+	  https://bugs.eclipse.org/bugs/show_bug.cgi?id=359184         FIXED 
+- bugfix: KeyPair.load can not handle private keys cyphered with AES.  FIXED
+- change: to improve sftp-put performance, send multiple packet at one time.
+- change: wait/notify will be used instead of sleep loop 
+          in establishing channel connections.
+- change: increasing local window size for sftp get.
+- change: updating copyright messages; 2010 -> 2011
+- change: src/com -> src/main/java/com
+- feature: key-exchange method "diffie-hellman-group14-sha1"
+	  (RFC4253#section-8.2)
+- feature: KeyPair#getPlulicKeyCommment() is added.
+
+	
+Changes since version 0.1.43:
+- bugfix: hmac-md5-96 and hmac-sha1-96 are broken. FIXED.
+- bugfix: working around OOME in parsing broken data from the remote. FIXED.
+- bugfix: failed to send very long command for exec channels. FIXED.
+- bugfix: in some case, failed to get the response 
+	  for remote port-forwarding request.  FIXED.
+- feature: support for private keys ciphered with aes192-cbc and aes128-cbc.
+
+	
+Changes since version 0.1.42:
+- bugfix: the remote window size must be in unsigned int.  FIXED.
+- bugfix: support for EBCDIC environment.  FIXED.
+- bugfix: data may be written to the closed channel.  FIXED.
+- bugfix: NPE in closing channels.  FIXED.
+- bugfix: the private key file may include garbage data before its header.  FIXED.
+- bugfix: the session down may not be detected during the re-keying process.  FIXED.
+- change: try keyboard-interactive auth with the given password if UserInfo is not given.
+- change: working around the wrong auth method list sent by some SSHD 
+          in the partial auth success.
+- change: working around the CPNI-957037 Plain-text Recovery Attack.
+- change: in searching for [host]:non-default port in known_hosts, 
+          host:22 should be also checked.
+- change: updating copyright messages; 2009 -> 2010
 
 	
 Changes since version 0.1.41:
 
=== modified file 'LICENSE.txt'
--- LICENSE.txt	2010-06-27 23:17:34 +0000
+++ LICENSE.txt	2012-05-04 10:23:17 +0000
@@ -2,7 +2,7 @@
 over to a BSD-style license. 
 
 ------------------------------------------------------------------------------
-Copyright (c) 2002,2003,2004,2005,2006,2007,2008,2009 Atsuhiko Yamanaka, JCraft,Inc. 
+Copyright (c) 2002-2012 Atsuhiko Yamanaka, JCraft,Inc. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 
=== modified file 'build.xml'
--- build.xml	2010-06-27 23:17:34 +0000
+++ build.xml	2012-05-04 10:23:17 +0000
@@ -5,14 +5,17 @@
 you can integrate its functionality into your own Java programs
     </description>
   <!-- set global properties for this build -->
-  <property name="version" location="0.1.40"/>
-  <property name="src" location="src"/>
+  <property name="version" value="0.1.48"/>
+  <property name="src" location="src/main/java/"/>
   <property name="exasrc" location="examples"/>
   <property name="build" location="build"/>
   <property name="exabuild" location="examples"/>
   <property name="dist"  location="dist"/>
   <property name="javadoc" location="javadoc"/>
   <property name="javac.debug" value="true"/>
+  <path id="lib.path.ref">
+    <fileset dir="lib" includes="*.jar"/>
+  </path>
   <path id="project.cp">
     <pathelement location="${build}"/>
   </path>
@@ -27,22 +30,39 @@
         description="compile the source " >
     <!-- Compile the java code from ${src} into ${build} -->
     <available property="jzlib.available"
-               classname="com.jcraft.jzlib.ZStream"/>
-    <javac srcdir="${src}" destdir="${build}" debug="${javac.debug}">
+               classname="com.jcraft.jzlib.ZStream">
+      <classpath refid="lib.path.ref"/>
+    </available>
+    <javac srcdir="${src}"
+           destdir="${build}"
+           target="1.4"
+           source="1.4"
+           debug="${javac.debug}">
+      <classpath refid="lib.path.ref"/>
       <exclude name="com/jcraft/jsch/jcraft/Compression.java"
                unless="jzlib.available"/>
     </javac>
   </target>
-  <target name="run" depends="compile">
-    <java classname="Login" classpathref="project.cp"/>
-  </target>
   <target name="dist" depends="compile"
         description="generate the distribution" >
     <!-- Create the distribution directory -->
     <mkdir dir="${dist}/lib"/>
 
-    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-    <jar jarfile="${dist}/lib/jsch.jar" basedir="${build}" manifest="debian/manifest.mf" />
+    <!-- Put everything in ${build} into the MyProject-${version}.jar file -->
+    <jar jarfile="${dist}/lib/jsch-${version}.jar" basedir="${build}">
+      <!--
+      <manifest>
+        <attribute name="Bundle-ClassPath" value="."/>
+        <attribute name="Bundle-Vendor" value="JCraft, Inc."/>
+        <attribute name="Bundle-Name" value="com.jcraft.jsch"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-SymbolicName" value="com.jcraft.jsch"/>
+        <attribute name="Bundle-Version" value="${version}"/>
+        <attribute name="Export-Package" value='com.jcraft.jsch;version="${version}",com.jcraft.jsch.jce;version="${version}";x-internal:=true,com.jcraft.jsch.jcraft;version="${version}";x-internal:=true,com.jcraft.jsch.jgss;version="${version}";x-internal:=true'/>
+        <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss,com.jcraft.jzlib"/>
+      </manifest>
+      -->
+    </jar>
   </target>
 
   <target name="examples"
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-06-27 23:17:34 +0000
+++ debian/changelog	2012-05-04 10:23:17 +0000
@@ -1,3 +1,12 @@
+jsch (0.1.48-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Updated debian/pom.xml
+    - Refreshed jsch-build-xml.patch
+  * Bumped Standards-Version to 3.9.3 - no changes required.
+
+ -- Maarten Bezemer <[e-mail]>  Fri, 04 May 2012 10:39:23 +0200
+
 jsch (0.1.42-2fakesync1) maverick; urgency=low
 
   * Fake sync due to mismatching orig tarball.
 
=== modified file 'debian/control'
--- debian/control	2010-06-27 23:17:34 +0000
+++ debian/control	2012-05-04 10:23:17 +0000
@@ -8,7 +8,7 @@
  Niels Thykier <[e-mail]>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsch
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jsch
 Homepage: http://www.jcraft.com/jsch/
 
=== modified file 'debian/patches/jsch-build-xml.patch'
--- debian/patches/jsch-build-xml.patch	2010-06-27 23:17:34 +0000
+++ debian/patches/jsch-build-xml.patch	2012-05-04 10:23:17 +0000
@@ -7,9 +7,9 @@
 @@ -42,7 +42,7 @@
      <mkdir dir="${dist}/lib"/>
  
-     <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
--    <jar jarfile="${dist}/lib/jsch-${DSTAMP}.jar" basedir="${build}"/>
-+    <jar jarfile="${dist}/lib/jsch.jar" basedir="${build}" manifest="debian/manifest.mf" />
-   </target>
- 
-   <target name="examples"
+     <!-- Put everything in ${build} into the MyProject-${version}.jar file -->
+-    <jar jarfile="${dist}/lib/jsch-${version}.jar" basedir="${build}">
++    <jar jarfile="${dist}/lib/jsch.jar" basedir="${build}" manifest="debian/manifest.mf">
+       <!--
+       <manifest>
+         <attribute name="Bundle-ClassPath" value="."/>
 
=== modified file 'debian/pom.xml'
--- debian/pom.xml	2009-09-22 20:01:52 +0000
+++ debian/pom.xml	2012-05-04 10:23:17 +0000
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jcraft</groupId>
   <artifactId>jsch</artifactId>
-  <version>0.1.42</version>
+  <version>0.1.48</version>
   <name>JSch</name>
 
   <description>JSch is a pure Java implementation of SSH2</description>
 
=== removed directory 'dist'
=== removed directory 'dist/lib'
=== modified file 'examples/AES.java'
--- examples/AES.java	2008-02-06 23:23:19 +0000
+++ examples/AES.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,8 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate how to use "aes128-cbc".
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/ChangePassphrase.java'
--- examples/ChangePassphrase.java	2007-09-09 20:32:32 +0000
+++ examples/ChangePassphrase.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,15 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate to change the passphrase for a
+ * private key file instead of creating a new private key.
+ *   $ CLASSPATH=.:../build javac ChangePassphrase.java
+ *   $ CLASSPATH=.:../build java ChangePassphrase private-key
+ * A passphrase will be prompted if the given private-key has been
+ * encrypted.  After successfully loading the content of the
+ * private-key, the new passphrase will be prompted and the given
+ * private-key will be re-encrypted with that new passphrase.
+ *
+ */
 import com.jcraft.jsch.*;
 import javax.swing.*;
 
 
=== modified file 'examples/Compression.java'
--- examples/Compression.java	2008-02-06 23:23:19 +0000
+++ examples/Compression.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,13 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the packet compression.
+ *   $ CLASSPATH=.:../build javac Compression.java
+ *   $ CLASSPATH=.:../build java Compression
+ * You will be asked username, hostname and passwd. 
+ * If everything works fine, you will get the shell prompt. 
+ * In this program, all data from sshd server to jsch will be compressed.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/Daemon.java'
--- examples/Daemon.java	2008-02-06 23:23:19 +0000
+++ examples/Daemon.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,9 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate how to provide a network service like
+ * inetd by using remote port-forwarding functionality.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.io.*;
 import java.awt.*;
@@ -58,10 +63,10 @@
     }
     public void setArg(Object[] arg){this.arg=arg;}
     public void run(){
-      System.out.println("remote port: "+channel.getRemotePort());
-      System.out.println("remote host: "+channel.getSession().getHost());
       try{
         byte[] buf=new byte[1024];
+        System.out.println("remote port: "+channel.getRemotePort());
+        System.out.println("remote host: "+channel.getSession().getHost());
         while(true){
           int i=in.read(buf, 0, buf.length);
           if(i<=0)break;
@@ -70,6 +75,9 @@
           if(buf[0]=='.')break;
         }
       }
+      catch(JSchException e){
+        System.out.println("session is down.");
+      }
       catch(IOException e){
       }
     }
 
=== modified file 'examples/Exec.java'
--- examples/Exec.java	2008-02-06 23:23:19 +0000
+++ examples/Exec.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,13 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate remote exec.
+ *   $ CLASSPATH=.:../build javac Exec.java 
+ *   $ CLASSPATH=.:../build java Exec
+ * You will be asked username, hostname, displayname, passwd and command.
+ * If everything works fine, given command will be invoked 
+ * on the remote side and outputs will be printed out.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/KeyGen.java'
--- examples/KeyGen.java	2007-09-09 20:32:32 +0000
+++ examples/KeyGen.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,16 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This progam will demonstrate the DSA keypair generation. 
+ *   $ CLASSPATH=.:../build javac KeyGen.java
+ *   $ CLASSPATH=.:../build java KeyGen rsa output_keyfile comment
+ * or
+ *   $ CLASSPATH=.:../build java KeyGen dsa output_keyfile comment
+ * You will be asked a passphrase for output_keyfile.
+ * If everything works fine, you will get the DSA or RSA keypair, 
+ * output_keyfile and output_keyfile+".pub".
+ * The private key and public key are in the OpenSSH format.
+ *
+ */
 import com.jcraft.jsch.*;
 import javax.swing.*;
 
 
=== modified file 'examples/KnownHosts.java'
--- examples/KnownHosts.java	2008-02-06 23:23:19 +0000
+++ examples/KnownHosts.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,14 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the 'known_hosts' file handling.
+ *   $ CLASSPATH=.:../build javac KnownHosts.java
+ *   $ CLASSPATH=.:../build java KnownHosts
+ * You will be asked username, hostname, a path for 'known_hosts' and passwd. 
+ * If everything works fine, you will get the shell prompt.
+ * In current implementation, jsch only reads 'known_hosts' for checking
+ * and does not modify it.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/Logger.java'
--- examples/Logger.java	2008-02-06 23:23:19 +0000
+++ examples/Logger.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,8 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate how to enable logging mechanism and
+ * get logging messages.
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/PortForwardingL.java'
--- examples/PortForwardingL.java	2008-02-06 23:23:19 +0000
+++ examples/PortForwardingL.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,15 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the port forwarding like option -L of
+ * ssh command; the given port on the local host will be forwarded to
+ * the given remote host and port on the remote side.
+ *   $ CLASSPATH=.:../build javac PortForwardingL.java
+ *   $ CLASSPATH=.:../build java PortForwardingL
+ * You will be asked username, hostname, port:host:hostport and passwd. 
+ * If everything works fine, you will get the shell prompt.
+ * Try the port on localhost.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/PortForwardingR.java'
--- examples/PortForwardingR.java	2008-02-06 23:23:19 +0000
+++ examples/PortForwardingR.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,15 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the port forwarding like option -R of
+ * ssh command; the given port on the remote host will be forwarded to
+ * the given host and port  on the local side.
+ *   $ CLASSPATH=.:../build javac PortForwardingR.java
+ *   $ CLASSPATH=.:../build java PortForwardingR
+ * You will be asked username, hostname, port:host:hostport and passwd. 
+ * If everything works fine, you will get the shell prompt.
+ * Try the port on remote host.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/README'
--- examples/README	2007-09-09 20:32:32 +0000
+++ examples/README	2012-05-04 10:23:17 +0000
@@ -38,6 +38,13 @@
   You will be asked username, hostname, proxy-server and passwd. 
   If everything works fine, you will get the shell prompt.
 
+- ViaSOCKS.java
+  This program will demonstrate the ssh session via SOCKS proxy.
+  $ CLASSPATH=.:../build javac ViaSOCKS.java 
+  $ CLASSPATH=.:../build java ViaSOCKS
+  You will be asked username, hostname, proxy-server and passwd. 
+  If everything works fine, you will get the shell prompt.
+
 - PortForwardingR.java
   This program will demonstrate the port forwarding like option -R of
   ssh command; the given port on the remote host will be forwarded to
@@ -158,3 +165,12 @@
 - Logger.java
   This program will demonstrate how to enable logging mechanism and
   get logging messages.
+
+- Subsystem.java
+  This program will demonstrate how to use the Subsystem channel.
+
+- Sudo.java
+  This program will demonstrate how to exec 'sudo' on the remote.
+
+- ScpToNoneCipher.java
+  This program will demonstrate how to enable none cipher.
 
=== modified file 'examples/ScpFrom.java'
--- examples/ScpFrom.java	2007-09-09 20:32:32 +0000
+++ examples/ScpFrom.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,13 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the file transfer from remote to local
+ *   $ CLASSPATH=.:../build javac ScpFrom.java
+ *   $ CLASSPATH=.:../build java ScpFrom user@remotehost:file1 file2
+ * You will be asked passwd. 
+ * If everything works fine, a file 'file1' on 'remotehost' will copied to
+ * local 'file1'.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/ScpTo.java'
--- examples/ScpTo.java	2007-09-09 20:32:32 +0000
+++ examples/ScpTo.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,13 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the file transfer from local to remote.
+ *   $ CLASSPATH=.:../build javac ScpTo.java
+ *   $ CLASSPATH=.:../build java ScpTo file1 user@remotehost:file2
+ * You will be asked passwd. 
+ * If everything works fine, a local file 'file1' will copied to
+ * 'file2' on 'remotehost'.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
@@ -28,9 +37,10 @@
       session.setUserInfo(ui);
       session.connect();
 
+      boolean ptimestamp = true;
 
       // exec 'scp -t rfile' remotely
-      String command="scp -p -t "+rfile;
+      String command="scp " + (ptimestamp ? "-p" :"") +" -t "+rfile;
       Channel channel=session.openChannel("exec");
       ((ChannelExec)channel).setCommand(command);
 
@@ -44,8 +54,21 @@
 	System.exit(0);
       }
 
+      File _lfile = new File(lfile);
+
+      if(ptimestamp){
+        command="T "+(_lfile.lastModified()/1000)+" 0";
+        // The access time should be sent here,
+        // but it is not accessible with JavaAPI ;-<
+        command+=(" "+(_lfile.lastModified()/1000)+" 0\n"); 
+        out.write(command.getBytes()); out.flush();
+        if(checkAck(in)!=0){
+  	  System.exit(0);
+        }
+      }
+
       // send "C0644 filesize filename", where filename should not include '/'
-      long filesize=(new File(lfile)).length();
+      long filesize=_lfile.length();
       command="C0644 "+filesize+" ";
       if(lfile.lastIndexOf('/')>0){
         command+=lfile.substring(lfile.lastIndexOf('/')+1);
 
=== modified file 'examples/ScpToNoneCipher.java'
--- examples/ScpToNoneCipher.java	2007-09-09 20:32:32 +0000
+++ examples/ScpToNoneCipher.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,8 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate how to enable none cipher.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/Sftp.java'
--- examples/Sftp.java	2009-10-19 15:08:16 +0000
+++ examples/Sftp.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,15 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the sftp protocol support.
+ *   $ CLASSPATH=.:../build javac Sftp.java
+ *   $ CLASSPATH=.:../build java Sftp
+ * You will be asked username, host and passwd. 
+ * If everything works fine, you will get a prompt 'sftp>'. 
+ * 'help' command will show available command.
+ * In current implementation, the destination path for 'get' and 'put'
+ * commands must be a file, not a directory.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/Shell.java'
--- examples/Shell.java	2009-10-19 15:08:16 +0000
+++ examples/Shell.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,13 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program enables you to connect to sshd server and get the shell prompt.
+ *   $ CLASSPATH=.:../build javac Shell.java 
+ *   $ CLASSPATH=.:../build java Shell
+ * You will be asked username, hostname and passwd. 
+ * If everything works fine, you will get the shell prompt. Output will
+ * be ugly because of lacks of terminal-emulation, but you can issue commands.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
@@ -25,12 +34,36 @@
 
       Session session=jsch.getSession(user, host, 22);
 
-      //session.setPassword("your password");
-
-      // username and password will be given via UserInfo interface.
-      UserInfo ui=new MyUserInfo();
+      String passwd = JOptionPane.showInputDialog("Enter password");
+      session.setPassword(passwd);
+
+      UserInfo ui = new MyUserInfo(){
+        public void showMessage(String message){
+          JOptionPane.showMessageDialog(null, message);
+        }
+        public boolean promptYesNo(String message){
+          Object[] options={ "yes", "no" };
+          int foo=JOptionPane.showOptionDialog(null, 
+                                               message,
+                                               "Warning", 
+                                               JOptionPane.DEFAULT_OPTION, 
+                                               JOptionPane.WARNING_MESSAGE,
+                                               null, options, options[0]);
+          return foo==0;
+        }
+
+        // If password is not given before the invocation of Session#connect(),
+        // implement also following methods,
+        //   * UserInfo#getPassword(),
+        //   * UserInfo#promptPassword(String message) and
+        //   * UIKeyboardInteractive#promptKeyboardInteractive()
+
+      };
+
       session.setUserInfo(ui);
 
+      // It must not be recommended, but if you want to skip host-key check,
+      // invoke following,
       // session.setConfig("StrictHostKeyChecking", "no");
 
       //session.connect();
@@ -71,97 +104,20 @@
     }
   }
 
-  public static class MyUserInfo implements UserInfo, UIKeyboardInteractive{
-    public String getPassword(){ return passwd; }
-    public boolean promptYesNo(String str){
-      Object[] options={ "yes", "no" };
-      int foo=JOptionPane.showOptionDialog(null, 
-             str,
-             "Warning", 
-             JOptionPane.DEFAULT_OPTION, 
-             JOptionPane.WARNING_MESSAGE,
-             null, options, options[0]);
-       return foo==0;
-    }
-
-    String passwd;
-    JTextField passwordField=(JTextField)new JPasswordField(20);
-
+  public static abstract class MyUserInfo
+                          implements UserInfo, UIKeyboardInteractive{
+    public String getPassword(){ return null; }
+    public boolean promptYesNo(String str){ return false; }
     public String getPassphrase(){ return null; }
-    public boolean promptPassphrase(String message){ return true; }
-    public boolean promptPassword(String message){
-      Object[] ob={passwordField}; 
-      int result=JOptionPane.showConfirmDialog(null, ob, message,
-                                               JOptionPane.OK_CANCEL_OPTION);
-      if(result==JOptionPane.OK_OPTION){
-        passwd=passwordField.getText();
-        return true;
-      }
-      else{ 
-        return false; 
-      }
-    }
-    public void showMessage(String message){
-      JOptionPane.showMessageDialog(null, message);
-    }
-    final GridBagConstraints gbc = 
-      new GridBagConstraints(0,0,1,1,1,1,
-                             GridBagConstraints.NORTHWEST,
-                             GridBagConstraints.NONE,
-                             new Insets(0,0,0,0),0,0);
-    private Container panel;
+    public boolean promptPassphrase(String message){ return false; }
+    public boolean promptPassword(String message){ return false; }
+    public void showMessage(String message){ }
     public String[] promptKeyboardInteractive(String destination,
                                               String name,
                                               String instruction,
                                               String[] prompt,
                                               boolean[] echo){
-      panel = new JPanel();
-      panel.setLayout(new GridBagLayout());
-
-      gbc.weightx = 1.0;
-      gbc.gridwidth = GridBagConstraints.REMAINDER;
-      gbc.gridx = 0;
-      panel.add(new JLabel(instruction), gbc);
-      gbc.gridy++;
-
-      gbc.gridwidth = GridBagConstraints.RELATIVE;
-
-      JTextField[] texts=new JTextField[prompt.length];
-      for(int i=0; i<prompt.length; i++){
-        gbc.fill = GridBagConstraints.NONE;
-        gbc.gridx = 0;
-        gbc.weightx = 1;
-        panel.add(new JLabel(prompt[i]),gbc);
-
-        gbc.gridx = 1;
-        gbc.fill = GridBagConstraints.HORIZONTAL;
-        gbc.weighty = 1;
-        if(echo[i]){
-          texts[i]=new JTextField(20);
-        }
-        else{
-          texts[i]=new JPasswordField(20);
-        }
-        panel.add(texts[i], gbc);
-        gbc.gridy++;
-      }
-
-      if(JOptionPane.showConfirmDialog(null, panel, 
-                                       destination+": "+name,
-                                       JOptionPane.OK_CANCEL_OPTION,
-                                       JOptionPane.QUESTION_MESSAGE)
-         ==JOptionPane.OK_OPTION){
-        String[] response=new String[prompt.length];
-        for(int i=0; i<prompt.length; i++){
-          response[i]=texts[i].getText();
-        }
-	return response;
-      }
-      else{
-        return null;  // cancel
-      }
+      return null;
     }
   }
 }
-
-
 
=== modified file 'examples/StreamForwarding.java'
--- examples/StreamForwarding.java	2008-02-06 23:23:19 +0000
+++ examples/StreamForwarding.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,16 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the stream forwarding. The given Java
+ * I/O streams will be forwared to the given remote host and port on
+ * the remote side.  It is simmilar to the -L option of ssh command,
+ * but you don't have to assign and open a local tcp port.
+ *   $ CLASSPATH=.:../build javac StreamForwarding.java
+ *   $ CLASSPATH=.:../build java StreamForwarding
+ * You will be asked username, hostname, host:hostport and passwd. 
+ * If everything works fine, System.in and System.out streams will be
+ * forwared to remote port and you can send messages from command line.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/Subsystem.java'
--- examples/Subsystem.java	2008-02-06 23:23:19 +0000
+++ examples/Subsystem.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,8 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate how to use the Subsystem channel.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== added file 'examples/Sudo.java'
--- examples/Sudo.java	1970-01-01 00:00:00 +0000
+++ examples/Sudo.java	2012-05-04 10:23:17 +0000
@@ -0,0 +1,184 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate how to exec 'sudo' on the remote.
+ *
+ */
+import com.jcraft.jsch.*;
+import java.awt.*;
+import javax.swing.*;
+import java.io.*;
+
+public class Sudo{
+  public static void main(String[] arg){
+    try{
+      JSch jsch=new JSch();  
+
+      String host=null;
+      if(arg.length>0){
+        host=arg[0];
+      }
+      else{
+        host=JOptionPane.showInputDialog("Enter username@hostname",
+                                         System.getProperty("user.name")+
+                                         "@localhost"); 
+      }
+      String user=host.substring(0, host.indexOf('@'));
+      host=host.substring(host.indexOf('@')+1);
+
+      Session session=jsch.getSession(user, host, 22);
+      
+      UserInfo ui=new MyUserInfo();
+      session.setUserInfo(ui);
+      session.connect();
+
+      String command=JOptionPane.showInputDialog("Enter command, execed with sudo", 
+                                                 "printenv SUDO_USER");
+
+      String sudo_pass=null;
+      {
+        JTextField passwordField=(JTextField)new JPasswordField(8);
+        Object[] ob={passwordField}; 
+        int result=
+          JOptionPane.showConfirmDialog(null, 
+                                        ob,
+                                        "Enter password for sudo",
+                                        JOptionPane.OK_CANCEL_OPTION);
+        if(result!=JOptionPane.OK_OPTION){
+          System.exit(-1);
+        }  
+        sudo_pass=passwordField.getText();
+      }
+
+      Channel channel=session.openChannel("exec");
+   
+      // man sudo
+      //   -S  The -S (stdin) option causes sudo to read the password from the
+      //       standard input instead of the terminal device.
+      //   -p  The -p (prompt) option allows you to override the default
+      //       password prompt and use a custom one.
+      ((ChannelExec)channel).setCommand("sudo -S -p '' "+command);
+
+
+      InputStream in=channel.getInputStream();
+      OutputStream out=channel.getOutputStream();
+      ((ChannelExec)channel).setErrStream(System.err);
+
+      channel.connect();
+
+      out.write((sudo_pass+"\n").getBytes());
+      out.flush();
+
+      byte[] tmp=new byte[1024];
+      while(true){
+        while(in.available()>0){
+          int i=in.read(tmp, 0, 1024);
+          if(i<0)break;
+          System.out.print(new String(tmp, 0, i));
+        }
+        if(channel.isClosed()){
+          System.out.println("exit-status: "+channel.getExitStatus());
+          break;
+        }
+        try{Thread.sleep(1000);}catch(Exception ee){}
+      }
+      channel.disconnect();
+      session.disconnect();
+    }
+    catch(Exception e){
+      System.out.println(e);
+    }
+  }
+
+  public static class MyUserInfo implements UserInfo, UIKeyboardInteractive{
+    public String getPassword(){ return passwd; }
+    public boolean promptYesNo(String str){
+      Object[] options={ "yes", "no" };
+      int foo=JOptionPane.showOptionDialog(null, 
+             str,
+             "Warning", 
+             JOptionPane.DEFAULT_OPTION, 
+             JOptionPane.WARNING_MESSAGE,
+             null, options, options[0]);
+       return foo==0;
+    }
+  
+    String passwd;
+    JTextField passwordField=(JTextField)new JPasswordField(20);
+
+    public String getPassphrase(){ return null; }
+    public boolean promptPassphrase(String message){ return true; }
+    public boolean promptPassword(String message){
+      Object[] ob={passwordField}; 
+      int result=
+        JOptionPane.showConfirmDialog(null, ob, message,
+                                      JOptionPane.OK_CANCEL_OPTION);
+      if(result==JOptionPane.OK_OPTION){
+        passwd=passwordField.getText();
+        return true;
+      }
+      else{ 
+        return false; 
+      }
+    }
+    public void showMessage(String message){
+      JOptionPane.showMessageDialog(null, message);
+    }
+    final GridBagConstraints gbc = 
+      new GridBagConstraints(0,0,1,1,1,1,
+                             GridBagConstraints.NORTHWEST,
+                             GridBagConstraints.NONE,
+                             new Insets(0,0,0,0),0,0);
+    private Container panel;
+    public String[] promptKeyboardInteractive(String destination,
+                                              String name,
+                                              String instruction,
+                                              String[] prompt,
+                                              boolean[] echo){
+      panel = new JPanel();
+      panel.setLayout(new GridBagLayout());
+
+      gbc.weightx = 1.0;
+      gbc.gridwidth = GridBagConstraints.REMAINDER;
+      gbc.gridx = 0;
+      panel.add(new JLabel(instruction), gbc);
+      gbc.gridy++;
+
+      gbc.gridwidth = GridBagConstraints.RELATIVE;
+
+      JTextField[] texts=new JTextField[prompt.length];
+      for(int i=0; i<prompt.length; i++){
+        gbc.fill = GridBagConstraints.NONE;
+        gbc.gridx = 0;
+        gbc.weightx = 1;
+        panel.add(new JLabel(prompt[i]),gbc);
+
+        gbc.gridx = 1;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        gbc.weighty = 1;
+        if(echo[i]){
+          texts[i]=new JTextField(20);
+        }
+        else{
+          texts[i]=new JPasswordField(20);
+        }
+        panel.add(texts[i], gbc);
+        gbc.gridy++;
+      }
+
+      if(JOptionPane.showConfirmDialog(null, panel, 
+                                       destination+": "+name,
+                                       JOptionPane.OK_CANCEL_OPTION,
+                                       JOptionPane.QUESTION_MESSAGE)
+         ==JOptionPane.OK_OPTION){
+        String[] response=new String[prompt.length];
+        for(int i=0; i<prompt.length; i++){
+          response[i]=texts[i].getText();
+        }
+	return response;
+      }
+      else{
+        return null;  // cancel
+      }
+    }
+  }
+}
 
=== modified file 'examples/UserAuthKI.java'
--- examples/UserAuthKI.java	2008-02-06 23:23:19 +0000
+++ examples/UserAuthKI.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,12 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the keyboard-interactive authentication.
+ *   $ CLASSPATH=.:../build javac UserAuthKI.java
+ *   $ CLASSPATH=.:../build java UserAuthKI
+ * If the remote sshd supports keyboard-interactive authentication,
+ * you will be prompted.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/UserAuthPubKey.java'
--- examples/UserAuthPubKey.java	2008-02-06 23:23:19 +0000
+++ examples/UserAuthPubKey.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,12 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the user authentification by public key.
+ *   $ CLASSPATH=.:../build javac UserAuthPubKey.java
+ *   $ CLASSPATH=.:../build java UserAuthPubKey
+ * You will be asked username, hostname, privatekey(id_dsa) and passphrase. 
+ * If everything works fine, you will get the shell prompt
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/ViaHTTP.java'
--- examples/ViaHTTP.java	2008-02-06 23:23:19 +0000
+++ examples/ViaHTTP.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,12 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the ssh session via HTTP proxy.
+ *   $ CLASSPATH=.:../build javac ViaHTTP.java 
+ *   $ CLASSPATH=.:../build java ViaHTTP
+ * You will be asked username, hostname, proxy-server and passwd. 
+ * If everything works fine, you will get the shell prompt.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/ViaSOCKS5.java'
--- examples/ViaSOCKS5.java	2008-02-06 23:23:19 +0000
+++ examples/ViaSOCKS5.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,12 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate the ssh session via SOCKS proxy.
+ *   $ CLASSPATH=.:../build javac ViaSOCKS.java 
+ *   $ CLASSPATH=.:../build java ViaSOCKS
+ * You will be asked username, hostname, proxy-server and passwd. 
+ * If everything works fine, you will get the shell prompt.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== modified file 'examples/X11Forwarding.java'
--- examples/X11Forwarding.java	2008-02-06 23:23:19 +0000
+++ examples/X11Forwarding.java	2012-05-04 10:23:17 +0000
@@ -1,4 +1,14 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/**
+ * This program will demonstrate X11 forwarding.
+ *   $ CLASSPATH=.:../build javac X11Forwarding.java 
+ *   $ CLASSPATH=.:../build java X11Forwarding
+ * You will be asked username, hostname, displayname and passwd. 
+ * If your X server does not run at 127.0.0.1, please enter correct
+ * displayname. If everything works fine, you will get the shell prompt.
+ * Try X applications; for example, xlogo.
+ *
+ */
 import com.jcraft.jsch.*;
 import java.awt.*;
 import javax.swing.*;
 
=== added directory 'lib'
=== added directory 'src/main'
=== added directory 'src/main/java'
=== renamed directory 'src/com' => 'src/main/java/com'
=== modified file 'src/main/java/com/jcraft/jsch/Buffer.java'
--- src/com/jcraft/jsch/Buffer.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/Buffer.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -123,6 +123,16 @@
     foo = ((foo<<16)&0xffff0000) | (getShort()&0xffff);
     return foo;
   }
+  public long getUInt(){
+    long foo = 0L;
+    long bar = 0L;
+    foo = getByte();
+    foo = ((foo<<8)&0xff00)|(getByte()&0xff);
+    bar = getByte();
+    bar = ((bar<<8)&0xff00)|(getByte()&0xff);
+    foo = ((foo<<16)&0xffff0000) | (bar&0xffff);
+    return foo;
+  }
   int getShort() {
     int foo = getByte();
     foo = ((foo<<8)&0xff00)|(getByte()&0xff);
@@ -144,7 +154,12 @@
     return foo;
   }
   public byte[] getMPInt() {
-    int i=getInt();
+    int i=getInt();  // uint32
+    if(i<0 ||  // bigger than 0x7fffffff
+       i>8*1024){
+      // TODO: an exception should be thrown.
+      i = 8*1024; // the session will be broken, but working around OOME.
+    }
     byte[] foo=new byte[i];
     getByte(foo, 0, i);
     return foo;
@@ -163,7 +178,12 @@
     return foo;
   }
   public byte[] getString() {
-    int i=getInt();
+    int i = getInt();  // uint32
+    if(i<0 ||  // bigger than 0x7fffffff
+       i>256*1024){
+      // TODO: an exception should be thrown.
+      i = 256*1024; // the session will be broken, but working around OOME.
+    }
     byte[] foo=new byte[i];
     getByte(foo, 0, i);
     return foo;
@@ -192,6 +212,14 @@
     return buffer[5];
   }
 
+  void checkFreeSize(int n){
+    if(buffer.length<index+n){
+      byte[] tmp = new byte[buffer.length*2];
+      System.arraycopy(buffer, 0, tmp, 0, index);
+      buffer = tmp;
+    }
+  }
+
 /*
   static String[] chars={
     "0","1","2","3","4","5","6","7","8","9", "a","b","c","d","e","f"
 
=== modified file 'src/main/java/com/jcraft/jsch/Channel.java'
--- src/com/jcraft/jsch/Channel.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/Channel.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -95,30 +95,29 @@
   }
 
   int id;
-  int recipient=-1;
-  byte[] type="foo".getBytes();
-  int lwsize_max=0x100000;
-//int lwsize_max=0x20000;  // 32*1024*4
-  int lwsize=lwsize_max;  // local initial window size
-  int lmpsize=0x4000;     // local maximum packet size
-//int lmpsize=0x8000;     // local maximum packet size
+  volatile int recipient=-1;
+  protected byte[] type=Util.str2byte("foo");
+  volatile int lwsize_max=0x100000;
+  volatile int lwsize=lwsize_max;     // local initial window size
+  volatile int lmpsize=0x4000;     // local maximum packet size
 
-  int rwsize=0;         // remote initial window size
-  int rmpsize=0;        // remote maximum packet size
+  volatile long rwsize=0;         // remote initial window size
+  volatile int rmpsize=0;        // remote maximum packet size
 
   IO io=null;    
   Thread thread=null;
 
-  boolean eof_local=false;
-  boolean eof_remote=false;
-
-  boolean close=false;
-  boolean connected=false;
-
-  int exitstatus=-1;
-
-  int reply=0; 
-  int connectTimeout=0;
+  volatile boolean eof_local=false;
+  volatile boolean eof_remote=false;
+
+  volatile boolean close=false;
+  volatile boolean connected=false;
+  volatile boolean open_confirmation=false;
+
+  volatile int exitstatus=-1;
+
+  volatile int reply=0; 
+  volatile int connectTimeout=0;
 
   private Session session;
 
@@ -130,8 +129,10 @@
       pool.addElement(this);
     }
   }
-  void setRecipient(int foo){
+  synchronized void setRecipient(int foo){
     this.recipient=foo;
+    if(notifyme>0)
+      notifyAll();
   }
   int getRecipient(){
     return recipient;
@@ -145,62 +146,14 @@
   }
 
   public void connect(int connectTimeout) throws JSchException{
-    Session _session=getSession();
-    if(!_session.isConnected()){
-      throw new JSchException("session is down");
-    }
     this.connectTimeout=connectTimeout;
     try{
-      Buffer buf=new Buffer(100);
-      Packet packet=new Packet(buf);
-      // send
-      // byte   SSH_MSG_CHANNEL_OPEN(90)
-      // string channel type         //
-      // uint32 sender channel       // 0
-      // uint32 initial window size  // 0x100000(65536)
-      // uint32 maxmum packet size   // 0x4000(16384)
-      packet.reset();
-      buf.putByte((byte)90);
-      buf.putString(this.type);
-      buf.putInt(this.id);
-      buf.putInt(this.lwsize);
-      buf.putInt(this.lmpsize);
-      _session.write(packet);
-      int retry=1000;
-      long start=System.currentTimeMillis();
-      long timeout=connectTimeout;
-      while(this.getRecipient()==-1 &&
-	    _session.isConnected() &&
-	    retry>0){
-        if(timeout>0L){
-          if((System.currentTimeMillis()-start)>timeout){
-            retry=0;
-            continue;
-          }
-        }
-	try{Thread.sleep(50);}catch(Exception ee){}
-	retry--;
-      }
-      if(!_session.isConnected()){
-	throw new JSchException("session is down");
-      }
-      if(retry==0){
-        throw new JSchException("channel is not opened.");
-      }
-
-      /*
-       * At the failure in opening the channel on the sshd, 
-       * 'SSH_MSG_CHANNEL_OPEN_FAILURE' will be sent from sshd and it will
-       * be processed in Session#run().
-       */
-      if(this.isClosed()){
-        throw new JSchException("channel is not opened.");
-      }
-      connected=true;
+      sendChannelOpen();
       start();
     }
     catch(Exception e){
       connected=false;
+      disconnect();
       if(e instanceof JSchException) 
         throw (JSchException)e;
       throw new JSchException(e.toString(), e);
@@ -216,7 +169,7 @@
 
   void getData(Buffer buf){
     setRecipient(buf.getInt());
-    setRemoteWindowSize(buf.getInt());
+    setRemoteWindowSize(buf.getUInt());
     setRemotePacketSize(buf.getInt());
   }
 
@@ -274,7 +227,7 @@
           packet=new Packet(buffer);
 
           byte[] _buf=buffer.buffer;
-          if(_buf.length-(14+0)-32-20<=0){
+          if(_buf.length-(14+0)-Session.buffer_margin<=0){
             buffer=null;
             packet=null;
             throw new IOException("failed to initialize the channel.");
@@ -299,8 +252,8 @@
           int _bufl=_buf.length;
           while(l>0){
             int _l=l;
-            if(l>_bufl-(14+dataLen)-32-20){
-              _l=_bufl-(14+dataLen)-32-20;
+            if(l>_bufl-(14+dataLen)-Session.buffer_margin){
+              _l=_bufl-(14+dataLen)-Session.buffer_margin;
             }
 
             if(_l<=0){
@@ -329,7 +282,10 @@
           try{
             int foo=dataLen;
             dataLen=0;
-            getSession().write(packet, channel, foo);
+            synchronized(channel){
+              if(!channel.close)
+                getSession().write(packet, channel, foo);
+            }
           }
           catch(Exception e){
             close();
@@ -371,11 +327,27 @@
       super(out);
       buffer=new byte[size];
     }
+
+    /*
+     * TODO: We should have our own Piped[I/O]Stream implementation.
+     * Before accepting data, JDK's PipedInputStream will check the existence of
+     * reader thread, and if it is not alive, the stream will be closed.
+     * That behavior may cause the problem if multiple threads make access to it.
+     */
+    public synchronized void updateReadSide() throws IOException {
+      if(available() != 0){ // not empty
+        return;
+      }
+      in = 0;
+      out = 0;
+      buffer[in++] = 0;
+      read();
+    }
   }
   void setLocalWindowSizeMax(int foo){ this.lwsize_max=foo; }
   void setLocalWindowSize(int foo){ this.lwsize=foo; }
   void setLocalPacketSize(int foo){ this.lmpsize=foo; }
-  synchronized void setRemoteWindowSize(int foo){ this.rwsize=foo; }
+  synchronized void setRemoteWindowSize(long foo){ this.rwsize=foo; }
   synchronized void addRemoteWindowSize(int foo){ 
     this.rwsize+=foo; 
     if(notifyme>0)
@@ -409,18 +381,19 @@
   }
 
   void eof(){
-    //System.err.println("EOF!!!! "+this);
-    if(close)return;
     if(eof_local)return;
     eof_local=true;
-    //close=eof;
+
     try{
       Buffer buf=new Buffer(100);
       Packet packet=new Packet(buf);
       packet.reset();
       buf.putByte((byte)Session.SSH_MSG_CHANNEL_EOF);
       buf.putInt(getRecipient());
-      getSession().write(packet);
+      synchronized(this){
+        if(!close)
+          getSession().write(packet);
+      }
     }
     catch(Exception e){
       //System.err.println("Channel.eof");
@@ -468,10 +441,8 @@
   */
 
   void close(){
-    //System.err.println("close!!!!");
     if(close)return;
     close=true;
-
     eof_local=eof_remote=true;
 
     try{
@@ -480,7 +451,9 @@
       packet.reset();
       buf.putByte((byte)Session.SSH_MSG_CHANNEL_CLOSE);
       buf.putInt(getRecipient());
-      getSession().write(packet);
+      synchronized(this){
+        getSession().write(packet);
+      }
     }
     catch(Exception e){
       //e.printStackTrace();
@@ -514,14 +487,15 @@
     //System.err.println(this+":disconnect "+io+" "+connected);
     //Thread.dumpStack();
 
-    synchronized(this){
-      if(!connected){
-        return;
+    try{
+
+      synchronized(this){
+        if(!connected){
+          return;
+        }
+        connected=false;
       }
-      connected=false;
-    }
 
-    try{
       close();
 
       eof_remote=eof_local=true;
@@ -628,11 +602,76 @@
       buf.putByte((byte)SSH_MSG_CHANNEL_OPEN_FAILURE);
       buf.putInt(getRecipient());
       buf.putInt(reasoncode);
-      buf.putString("open failed".getBytes());
-      buf.putString("".getBytes());
+      buf.putString(Util.str2byte("open failed"));
+      buf.putString(Util.empty);
       getSession().write(packet);
     }
     catch(Exception e){
     }
   }
+
+  protected Packet genChannelOpenPacket(){
+    Buffer buf=new Buffer(100);
+    Packet packet=new Packet(buf);
+    // byte   SSH_MSG_CHANNEL_OPEN(90)
+    // string channel type         //
+    // uint32 sender channel       // 0
+    // uint32 initial window size  // 0x100000(65536)
+    // uint32 maxmum packet size   // 0x4000(16384)
+    packet.reset();
+    buf.putByte((byte)90);
+    buf.putString(this.type);
+    buf.putInt(this.id);
+    buf.putInt(this.lwsize);
+    buf.putInt(this.lmpsize);
+    return packet;
+  }
+
+  protected void sendChannelOpen() throws Exception {
+    Session _session=getSession();
+    if(!_session.isConnected()){
+      throw new JSchException("session is down");
+    }
+
+    Packet packet = genChannelOpenPacket();
+    _session.write(packet);
+
+    int retry=10;
+    long start=System.currentTimeMillis();
+    long timeout=connectTimeout;
+    if(timeout!=0L) retry = 1;
+    synchronized(this){
+      while(this.getRecipient()==-1 &&
+            _session.isConnected() &&
+             retry>0){
+        if(timeout>0L){
+          if((System.currentTimeMillis()-start)>timeout){
+            retry=0;
+            continue;
+          }
+        }
+        try{
+          long t = timeout==0L ? 5000L : timeout;
+          this.notifyme=1;
+          wait(t);
+        }
+        catch(java.lang.InterruptedException e){
+        }
+        finally{
+          this.notifyme=0;
+        }
+        retry--;
+      }
+    }
+    if(!_session.isConnected()){
+      throw new JSchException("session is down");
+    }
+    if(this.getRecipient()==-1){  // timeout
+      throw new JSchException("channel is not opened.");
+    }
+    if(this.open_confirmation==false){  // SSH_MSG_CHANNEL_OPEN_FAILURE
+      throw new JSchException("channel is not opened.");
+    }
+    connected=true;
+  }
 }
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java'
--- src/com/jcraft/jsch/ChannelAgentForwarding.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2006-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2006-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -37,14 +37,24 @@
   static private final int LOCAL_WINDOW_SIZE_MAX=0x20000;
   static private final int LOCAL_MAXIMUM_PACKET_SIZE=0x4000;
 
-  private final int SSH2_AGENTC_REQUEST_IDENTITIES=11;
-  private final int SSH2_AGENT_IDENTITIES_ANSWER=12;
-  private final int SSH2_AGENTC_SIGN_REQUEST=13;
-  private final int SSH2_AGENT_SIGN_RESPONSE=14;
-  private final int SSH2_AGENTC_ADD_IDENTITY=17;
-  private final int SSH2_AGENTC_REMOVE_IDENTITY=18;
-  private final int SSH2_AGENTC_REMOVE_ALL_IDENTITIES=19;
-  private final int SSH2_AGENT_FAILURE=30;
+  private final byte SSH_AGENTC_REQUEST_RSA_IDENTITIES = 1;
+  private final byte SSH_AGENT_RSA_IDENTITIES_ANSWER = 2;
+  private final byte SSH_AGENTC_RSA_CHALLENGE = 3;
+  private final byte SSH_AGENT_RSA_RESPONSE = 4;
+  private final byte SSH_AGENT_FAILURE = 5;
+  private final byte SSH_AGENT_SUCCESS = 6;
+  private final byte SSH_AGENTC_ADD_RSA_IDENTITY	= 7;
+  private final byte SSH_AGENTC_REMOVE_RSA_IDENTITY = 8;
+  private final byte SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES = 9;
+
+  private final byte SSH2_AGENTC_REQUEST_IDENTITIES=11;
+  private final byte SSH2_AGENT_IDENTITIES_ANSWER=12;
+  private final byte SSH2_AGENTC_SIGN_REQUEST=13;
+  private final byte SSH2_AGENT_SIGN_RESPONSE=14;
+  private final byte SSH2_AGENTC_ADD_IDENTITY=17;
+  private final byte SSH2_AGENTC_REMOVE_IDENTITY=18;
+  private final byte SSH2_AGENTC_REMOVE_ALL_IDENTITIES=19;
+  private final byte SSH2_AGENT_FAILURE=30;
 
   boolean init=true;
 
@@ -60,7 +70,7 @@
     setLocalWindowSize(LOCAL_WINDOW_SIZE_MAX);
     setLocalPacketSize(LOCAL_MAXIMUM_PACKET_SIZE);
 
-    type="[e-mail]".getBytes();
+    type=Util.str2byte("[e-mail]");
     rbuf=new Buffer();
     rbuf.reset();
     //wbuf=new Buffer(rmpsize);
@@ -111,12 +121,14 @@
       throw new java.io.IOException(e.toString());
     }
 
-    Vector identities=_session.jsch.identities;
+    IdentityRepository irepo = _session.getIdentityRepository();
     UserInfo userinfo=_session.getUserInfo();
 
+    mbuf.reset();
+
     if(typ==SSH2_AGENTC_REQUEST_IDENTITIES){ 
-      mbuf.reset();
-      mbuf.putByte((byte)SSH2_AGENT_IDENTITIES_ANSWER);
+      mbuf.putByte(SSH2_AGENT_IDENTITIES_ANSWER);
+      Vector identities = irepo.getIdentities();
       synchronized(identities){
         int count=0;
         for(int i=0; i<identities.size(); i++){
@@ -131,13 +143,13 @@
           if(pubkeyblob==null)
             continue;
           mbuf.putString(pubkeyblob);
-          mbuf.putString("".getBytes());
+          mbuf.putString(Util.empty);
         }
       }
-      byte[] bar=new byte[mbuf.getLength()];
-      mbuf.getByte(bar);
-
-      send(bar);
+    }
+    else if(typ==SSH_AGENTC_REQUEST_RSA_IDENTITIES) {
+      mbuf.putByte(SSH_AGENT_RSA_IDENTITIES_ANSWER);
+      mbuf.putInt(0);
     }
     else if(typ==SSH2_AGENTC_SIGN_REQUEST){
       byte[] blob=rbuf.getString();
@@ -148,7 +160,8 @@
 //        datafellows = SSH_BUG_SIGBLOB;
 //      }
 
-      Identity identity=null;
+      Vector identities = irepo.getIdentities();
+      Identity identity = null;
       synchronized(identities){
         for(int i=0; i<identities.size(); i++){
           Identity _identity=(Identity)(identities.elementAt(i));
@@ -195,20 +208,41 @@
         signature=identity.getSignature(data);
       }
 
-      mbuf.reset();
       if(signature==null){
-        mbuf.putByte((byte)SSH2_AGENT_FAILURE);
+        mbuf.putByte(SSH2_AGENT_FAILURE);
       }
       else{
-        mbuf.putByte((byte)SSH2_AGENT_SIGN_RESPONSE);
+        mbuf.putByte(SSH2_AGENT_SIGN_RESPONSE);
         mbuf.putString(signature);
       }
-
-      byte[] bar=new byte[mbuf.getLength()];
-      mbuf.getByte(bar);
-
-      send(bar);
-    }
+    }
+    else if(typ==SSH2_AGENTC_REMOVE_IDENTITY){
+      byte[] blob=rbuf.getString();
+      irepo.remove(blob);
+      mbuf.putByte(SSH_AGENT_SUCCESS);
+    }
+    else if(typ==SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES){
+      mbuf.putByte(SSH_AGENT_SUCCESS);
+    }
+    else if(typ==SSH2_AGENTC_REMOVE_ALL_IDENTITIES){
+      irepo.removeAll();
+      mbuf.putByte(SSH_AGENT_SUCCESS);
+    }
+    else if(typ==SSH2_AGENTC_ADD_IDENTITY){
+      int fooo = rbuf.getLength();
+      byte[] tmp = new byte[fooo];
+      rbuf.getByte(tmp);
+      boolean result = irepo.add(tmp);
+      mbuf.putByte(result ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
+    }
+    else {
+      rbuf.skip(rbuf.getLength()-1);
+      mbuf.putByte(SSH_AGENT_FAILURE);
+    }
+
+    byte[] response = new byte[mbuf.getLength()];
+    mbuf.getByte(response);
+    send(response);
   }
 
   private void send(byte[] message){
@@ -224,4 +258,9 @@
     catch(Exception e){
     }
   }
+
+  void eof_remote(){
+    super.eof_remote();
+    eof();
+  }
 }
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java'
--- src/com/jcraft/jsch/ChannelDirectTCPIP.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -35,7 +35,7 @@
 
   static private final int LOCAL_WINDOW_SIZE_MAX=0x20000;
   static private final int LOCAL_MAXIMUM_PACKET_SIZE=0x4000;
-
+  static private final byte[] _type = Util.str2byte("direct-tcpip");
   String host;
   int port;
 
@@ -44,18 +44,14 @@
 
   ChannelDirectTCPIP(){
     super();
+    type = _type;
     setLocalWindowSizeMax(LOCAL_WINDOW_SIZE_MAX);
     setLocalWindowSize(LOCAL_WINDOW_SIZE_MAX);
     setLocalPacketSize(LOCAL_MAXIMUM_PACKET_SIZE);
   }
 
   void init (){
-    try{ 
-      io=new IO();
-    }
-    catch(Exception e){
-      System.err.println(e);
-    }
+    io=new IO();
   }
 
   public void connect() throws JSchException{
@@ -64,54 +60,6 @@
       if(!_session.isConnected()){
         throw new JSchException("session is down");
       }
-      Buffer buf=new Buffer(150);
-      Packet packet=new Packet(buf);
-      // send
-      // byte   SSH_MSG_CHANNEL_OPEN(90)
-      // string channel type         //
-      // uint32 sender channel       // 0
-      // uint32 initial window size  // 0x100000(65536)
-      // uint32 maxmum packet size   // 0x4000(16384)
-
-      packet.reset();
-      buf.putByte((byte)90);
-      buf.putString("direct-tcpip".getBytes());
-      buf.putInt(id);
-      buf.putInt(lwsize);
-      buf.putInt(lmpsize);
-      buf.putString(host.getBytes());
-      buf.putInt(port);
-      buf.putString(originator_IP_address.getBytes());
-      buf.putInt(originator_port);
-      _session.write(packet);
-
-      int retry=1000;
-      try{
-        while(this.getRecipient()==-1 && 
-              _session.isConnected() &&
-              retry>0 &&
-              !eof_remote){
-          //Thread.sleep(500);
-          Thread.sleep(50);
-          retry--;
-        }
-      }
-      catch(Exception ee){
-      }
-      if(!_session.isConnected()){
-	throw new JSchException("session is down");
-      }
-      if(retry==0 || this.eof_remote){
-        throw new JSchException("channel is not opened.");
-      }
-      /*
-      if(this.eof_remote){      // failed to open
-        disconnect();
-        return;
-      }
-      */
-
-      connected=true;
 
       if(io.in!=null){
         thread=new Thread(this);
@@ -121,6 +69,9 @@
         }
         thread.start();
       }
+      else {
+        sendChannelOpen();
+      }
     }
     catch(Exception e){
       io.close();
@@ -134,12 +85,14 @@
 
   public void run(){
 
-    Buffer buf=new Buffer(rmpsize);
-    Packet packet=new Packet(buf);
-    int i=0;
-
     try{
+      sendChannelOpen();
+
+      Buffer buf=new Buffer(rmpsize);
+      Packet packet=new Packet(buf);
       Session _session=getSession();
+      int i=0;
+
       while(isConnected() &&
             thread!=null && 
             io!=null && 
@@ -147,26 +100,27 @@
         i=io.in.read(buf.buffer, 
                      14, 
                      buf.buffer.length-14
-                     -32 -20 // padding and mac
+                     -Session.buffer_margin
                      );
-
         if(i<=0){
           eof();
           break;
         }
-        if(close)break;
         packet.reset();
         buf.putByte((byte)Session.SSH_MSG_CHANNEL_DATA);
         buf.putInt(recipient);
         buf.putInt(i);
         buf.skip(i);
-        _session.write(packet, this, i);
+        synchronized(this){
+          if(close)
+            break;
+          _session.write(packet, this, i);
+        }
       }
     }
     catch(Exception e){
     }
     disconnect();
-    //System.err.println("connect end");
   }
 
   public void setInputStream(InputStream in){
@@ -180,4 +134,25 @@
   public void setPort(int port){this.port=port;}
   public void setOrgIPAddress(String foo){this.originator_IP_address=foo;}
   public void setOrgPort(int foo){this.originator_port=foo;}
+
+  protected Packet genChannelOpenPacket(){
+    Buffer buf = new Buffer(150);
+    Packet packet = new Packet(buf);
+    // byte   SSH_MSG_CHANNEL_OPEN(90)
+    // string channel type         //
+    // uint32 sender channel       // 0
+    // uint32 initial window size  // 0x100000(65536)
+    // uint32 maxmum packet size   // 0x4000(16384)
+    packet.reset();
+    buf.putByte((byte)90);
+    buf.putString(this.type);
+    buf.putInt(id);
+    buf.putInt(lwsize);
+    buf.putInt(lmpsize);
+    buf.putString(Util.str2byte(host));
+    buf.putInt(port);
+    buf.putString(Util.str2byte(originator_IP_address));
+    buf.putInt(originator_port);
+    return packet;
+  }
 }
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelExec.java'
--- src/com/jcraft/jsch/ChannelExec.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelExec.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -60,7 +60,7 @@
   }
 
   public void setCommand(String command){ 
-    this.command=command.getBytes();
+    this.command=Util.str2byte(command);
   }
   public void setCommand(byte[] command){ 
     this.command=command;
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java'
--- src/com/jcraft/jsch/ChannelForwardedTCPIP.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -97,25 +97,29 @@
     Packet packet=new Packet(buf);
     int i=0;
     try{
+      Session _session = getSession();
       while(thread!=null && 
             io!=null && 
             io.in!=null){
         i=io.in.read(buf.buffer, 
                      14, 
                      buf.buffer.length-14
-                     -32 -20 // padding and mac
+                     -Session.buffer_margin
                      );
         if(i<=0){
           eof();
           break;
         }
         packet.reset();
-        if(close)break;
         buf.putByte((byte)Session.SSH_MSG_CHANNEL_DATA);
         buf.putInt(recipient);
         buf.putInt(i);
         buf.skip(i);
-        getSession().write(packet, this, i);
+        synchronized(this){
+          if(close)
+            break;
+          _session.write(packet, this, i);
+        }
       }
     }
     catch(Exception e){
@@ -128,7 +132,7 @@
 
   void getData(Buffer buf){
     setRecipient(buf.getInt());
-    setRemoteWindowSize(buf.getInt());
+    setRemoteWindowSize(buf.getUInt());
     setRemotePacketSize(buf.getInt());
     byte[] addr=buf.getString();
     int port=buf.getInt();
@@ -136,9 +140,9 @@
     int orgport=buf.getInt();
 
     /*
-    System.err.println("addr: "+new String(addr));
+    System.err.println("addr: "+Util.byte2str(addr));
     System.err.println("port: "+port);
-    System.err.println("orgaddr: "+new String(orgaddr));
+    System.err.println("orgaddr: "+Util.byte2str(orgaddr));
     System.err.println("orgport: "+orgport);
     */
 
@@ -277,9 +281,9 @@
       // uint32  port number to bind
       packet.reset();
       buf.putByte((byte) 80/*SSH_MSG_GLOBAL_REQUEST*/);
-      buf.putString("cancel-tcpip-forward".getBytes());
+      buf.putString(Util.str2byte("cancel-tcpip-forward"));
       buf.putByte((byte)0);
-      buf.putString(address_to_bind.getBytes());
+      buf.putString(Util.str2byte(address_to_bind));
       buf.putInt(rport);
       session.write(packet);
     }
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelSession.java'
--- src/com/jcraft/jsch/ChannelSession.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelSession.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -32,7 +32,7 @@
 import java.util.*;
 
 class ChannelSession extends Channel{
-  private static byte[] _session="session".getBytes();
+  private static byte[] _session=Util.str2byte("session");
 
   protected boolean agent_forwarding=false;
   protected boolean xforwading=false;
@@ -94,7 +94,7 @@
    * @see RFC4254 6.4 Environment Variable Passing
    */
   public void setEnv(String name, String value){
-    setEnv(name.getBytes(), value.getBytes());
+    setEnv(Util.str2byte(name), Util.str2byte(value));
   }
 
   /**
@@ -226,7 +226,7 @@
 
   private byte[] toByteArray(Object o){
     if(o instanceof String){
-      return ((String)o).getBytes();
+      return Util.str2byte((String)o);
     }
     return (byte[])o;
   }
@@ -245,7 +245,7 @@
         i=io.in.read(buf.buffer, 
                      14,    
                      buf.buffer.length-14
-                     -32 -20 // padding and mac
+                     -Session.buffer_margin
 		     );
 	if(i==0)continue;
 	if(i==-1){
@@ -266,8 +266,9 @@
       //System.err.println("# ChannelExec.run");
       //e.printStackTrace();
     }
-    if(thread!=null){
-      synchronized(thread){ thread.notifyAll(); }
+    Thread _thread=thread; 
+    if(_thread!=null){
+      synchronized(_thread){ _thread.notifyAll(); }
     }
     thread=null;
     //System.err.println(this+":run <");
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelSftp.java'
--- src/com/jcraft/jsch/ChannelSftp.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelSftp.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -35,6 +35,9 @@
 
 public class ChannelSftp extends ChannelSession{
 
+  static private final int LOCAL_MAXIMUM_PACKET_SIZE=32*1024;
+  static private final int LOCAL_WINDOW_SIZE_MAX=(64*LOCAL_MAXIMUM_PACKET_SIZE);
+
   private static final byte SSH_FXP_INIT=               1;
   private static final byte SSH_FXP_VERSION=            2;
   private static final byte SSH_FXP_OPEN=               3;
@@ -131,8 +134,13 @@
   private boolean interactive=false;
   private int seq=1;
   private int[] ackid=new int[1];
+
   private Buffer buf;
-  private Packet packet=new Packet(buf);
+  private Packet packet;
+
+  // The followings will be used in file uploading.
+  private Buffer obuf;
+  private Packet opacket;
 
   private int client_version=3;
   private int server_version=3;
@@ -169,6 +177,40 @@
   private String fEncoding=UTF8;
   private boolean fEncoding_is_utf8=true;
 
+  private RequestQueue rq = new RequestQueue(16);
+
+  /**
+   * Specify how many requests may be sent at any one time.
+   * Increasing this value may slightly improve file transfer speed but will
+   * increase memory usage.  The default is 16 requests.
+   *
+   * @param bulk_requests how many requests may be outstanding at any one time.
+   */
+  public void setBulkRequests(int bulk_requests) throws JSchException {
+    if(bulk_requests>0) 
+      rq = new RequestQueue(bulk_requests);
+    else 
+      throw new JSchException("setBulkRequests: "+ 
+                              bulk_requests+" must be greater than 0.");
+  }
+
+  /**
+   * This method will return the value how many requests may be
+   * sent at any one time.
+   *
+   * @return how many requests may be sent at any one time.
+   */
+  public int getBulkRequests(){
+    return rq.size();
+  }
+
+  ChannelSftp(){
+    super();
+    setLocalWindowSizeMax(LOCAL_WINDOW_SIZE_MAX);
+    setLocalWindowSize(LOCAL_WINDOW_SIZE_MAX);
+    setLocalPacketSize(LOCAL_MAXIMUM_PACKET_SIZE);
+  }
+
   void init(){
   }
 
@@ -177,7 +219,7 @@
 
       PipedOutputStream pos=new PipedOutputStream();
       io.setOutputStream(pos);
-      PipedInputStream pis=new MyPipedInputStream(pos, 32*1024);
+      PipedInputStream pis=new MyPipedInputStream(pos, rmpsize);
       io.setInputStream(pis);
 
       io_in=io.in;
@@ -189,15 +231,19 @@
       Request request=new RequestSftp();
       request.request(getSession(), this);
 
-/*
+      /*
       System.err.println("lmpsize: "+lmpsize);
       System.err.println("lwsize: "+lwsize);
       System.err.println("rmpsize: "+rmpsize);
       System.err.println("rwsize: "+rwsize);
-*/
+      */
 
-      buf=new Buffer(rmpsize);
+      buf=new Buffer(lmpsize);
       packet=new Packet(buf);
+
+      obuf=new Buffer(rmpsize);
+      opacket=new Packet(obuf);
+
       int i=0;
       int length;
       int type;
@@ -228,8 +274,8 @@
           length-=(4+extension_name.length);
           extension_data=buf.getString();
           length-=(4+extension_data.length);
-          extensions.put(new String(extension_name),
-                         new String(extension_data));
+          extensions.put(Util.byte2str(extension_name),
+                         Util.byte2str(extension_data));
         }
       }
 
@@ -261,8 +307,9 @@
 
   public void cd(String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
-
       path=isUnique(path);
 
       byte[] str=_realpath(path);
@@ -299,11 +346,12 @@
   }
   public void put(String src, String dst, 
 		  SftpProgressMonitor monitor, int mode) throws SftpException{
-    src=localAbsolutePath(src);
-    dst=remoteAbsolutePath(dst);
 
-    //System.err.println("src: "+src+", "+dst);
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
+      src=localAbsolutePath(src);
+      dst=remoteAbsolutePath(dst);
 
       Vector v=glob_remote(dst);
       int vsize=v.size();
@@ -415,6 +463,8 @@
   public void put(InputStream src, String dst, 
 		  SftpProgressMonitor monitor, int mode) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       dst=remoteAbsolutePath(dst);
 
       Vector v=glob_remote(dst);
@@ -436,6 +486,12 @@
         throw new SftpException(SSH_FX_FAILURE, dst+" is a directory");
       }
 
+      if(monitor!=null){
+        monitor.init(SftpProgressMonitor.PUT, 
+                     "-", dst,
+                     SftpProgressMonitor.UNKNOWN_SIZE);
+      }
+
       _put(src, dst, monitor, mode);
     }
     catch(Exception e){
@@ -447,8 +503,10 @@
   }
 
   public void _put(InputStream src, String dst, 
-		  SftpProgressMonitor monitor, int mode) throws SftpException{
+                   SftpProgressMonitor monitor, int mode) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       byte[] dstb=Util.str2byte(dst, fEncoding);
       long skip=0;
       if(mode==RESUME || mode==APPEND){
@@ -489,10 +547,9 @@
 
       boolean dontcopy=true;
 
-      if(!dontcopy){
-        data=new byte[buf.buffer.length
-                      -(5+13+21+handle.length
-                        +32 +20 // padding and mac
+      if(!dontcopy){  // This case will not work anymore.
+        data=new byte[obuf.buffer.length
+                      -(5+13+21+handle.length+Session.buffer_margin
                         )
         ];
       }
@@ -503,23 +560,26 @@
       }
 
       int startid=seq;
-      int _ackid=seq;
       int ackcount=0;
+      int _s=0;
+      int _datalen=0;
+
+      if(!dontcopy){  // This case will not work anymore.
+        _datalen=data.length;
+      }
+      else{
+        data=obuf.buffer;
+        _s=5+13+21+handle.length;
+        _datalen=obuf.buffer.length-_s-Session.buffer_margin;
+      }
+
+      int bulk_requests = rq.size();
+
       while(true){
         int nread=0;
-        int s=0;
-        int datalen=0;
         int count=0;
-
-        if(!dontcopy){
-          datalen=data.length-s;
-        }
-        else{
-          data=buf.buffer;
-          s=5+13+21+handle.length;
-          datalen=buf.buffer.length -s
-            -32 -20; // padding and mac
-        }
+        int s=_s;
+        int datalen=_datalen;
 
         do{
           nread=src.read(data, s, datalen);
@@ -532,20 +592,19 @@
         while(datalen>0 && nread>0); 
         if(count<=0)break;
 
-        int _i=count;
-        while(_i>0){
-          _i-=sendWRITE(handle, offset, data, 0, _i);
+        int foo=count;
+        while(foo>0){
           if((seq-1)==startid ||
-             io_in.available()>=1024){
-            while(io_in.available()>0){
+             ((seq-startid)-ackcount)>=bulk_requests){
+            while(((seq-startid)-ackcount)>=bulk_requests){
+              if(this.rwsize>=foo) break;
               if(checkStatus(ackid, header)){
-                _ackid=ackid[0];
+                int _ackid = ackid[0];
                 if(startid>_ackid || _ackid>seq-1){
                   if(_ackid==seq){
                     System.err.println("ack error: startid="+startid+" seq="+seq+" _ackid="+_ackid);
                   } 
                   else{
-                    //throw new SftpException(SSH_FX_FAILURE, "ack error:");
                     throw new SftpException(SSH_FX_FAILURE, "ack error: startid="+startid+" seq="+seq+" _ackid="+_ackid);
                   }
                 }
@@ -556,6 +615,7 @@
               }
             }
           }
+          foo-=sendWRITE(handle, offset, data, 0, foo);
         }
         offset+=count;
 	if(monitor!=null && !monitor.count(count)){
@@ -590,9 +650,10 @@
     return put(dst, monitor, mode, 0);
   }
   public OutputStream put(String dst, final SftpProgressMonitor monitor, final int mode, long offset) throws SftpException{
-    dst=remoteAbsolutePath(dst);
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
 
+      dst=remoteAbsolutePath(dst);
       dst=isUnique(dst);
 
       if(isRemoteDir(dst)){
@@ -757,10 +818,14 @@
 		  SftpProgressMonitor monitor, int mode) throws SftpException{
     // System.out.println("get: "+src+" "+dst);
 
-    src=remoteAbsolutePath(src);
-    dst=localAbsolutePath(dst);
-
+    boolean _dstExist = false;
+    String _dst=null;
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
+      src=remoteAbsolutePath(src);
+      dst=localAbsolutePath(dst);
+
       Vector v=glob_remote(src);
       int vsize=v.size();
       if(vsize==0){
@@ -789,7 +854,7 @@
                                   "not supported to get directory "+_src);
         } 
 
-	String _dst=null;
+	_dst=null;
 	if(isDstDir){
 	  int i=_src.lastIndexOf('/');
 	  if(i==-1) dstsb.append(_src);
@@ -801,9 +866,10 @@
           _dst=dst;
         }
 
+        File _dstFile=new File(_dst);
 	if(mode==RESUME){
 	  long size_of_src=attr.getSize();
-	  long size_of_dst=new File(_dst).length();
+	  long size_of_dst=_dstFile.length();
 	  if(size_of_dst>size_of_src){
 	    throw new SftpException(SSH_FX_FAILURE, 
                                     "failed to resume for "+_dst);
@@ -816,11 +882,12 @@
 	if(monitor!=null){
 	  monitor.init(SftpProgressMonitor.GET, _src, _dst, attr.getSize());
 	  if(mode==RESUME){
-	    monitor.count(new File(_dst).length());
+	    monitor.count(_dstFile.length());
 	  }
 	}
 
-	FileOutputStream fos=null;
+        FileOutputStream fos=null;
+        _dstExist = _dstFile.exists();
         try{
           if(mode==OVERWRITE){
             fos=new FileOutputStream(_dst);
@@ -839,6 +906,12 @@
       }
     }
     catch(Exception e){
+      if(!_dstExist && _dst!=null){
+        File _dstFile = new File(_dst);
+        if(_dstFile.exists() && _dstFile.length()==0){
+          _dstFile.delete();
+        }
+      }
       if(e instanceof SftpException) throw (SftpException)e;
       if(e instanceof Throwable)
         throw new SftpException(SSH_FX_FAILURE, "", (Throwable)e);
@@ -856,8 +929,9 @@
 		   SftpProgressMonitor monitor, int mode, long skip) throws SftpException{
 //System.err.println("get: "+src+", "+dst);
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       src=remoteAbsolutePath(src);
-
       src=isUnique(src);
 
       if(monitor!=null){
@@ -908,18 +982,27 @@
 	offset+=skip;
       }
 
-      int request_len=0;
+      int request_max=1;
+      rq.init();
+      long request_offset=offset;
+
+      int request_len = buf.buffer.length-13;
+      if(server_version==0){ request_len=1024; }
+
       loop:
       while(true){
 
-        request_len=buf.buffer.length-13;
-        if(server_version==0){ request_len=1024; }
-        sendREAD(handle, offset, request_len);
+        while(rq.count() < request_max){
+          sendREAD(handle, request_offset, request_len, rq);
+          request_offset += request_len;
+        }
 
         header=header(buf, header);
         length=header.length;
         type=header.type;
 
+        RequestQueue.Request rr = rq.get(header.rid);
+
         if(type==SSH_FXP_STATUS){
           fill(buf, length);
           int i=buf.getInt();    
@@ -935,19 +1018,31 @@
 
         buf.rewind();
         fill(buf.buffer, 0, 4); length-=4;
-        int i=buf.getInt();   // length of data 
-        int foo=i;
-
+        int length_of_data = buf.getInt();   // length of data 
+
+        /**
+         Since sftp protocol version 6, "end-of-file" has been defined,
+
+           byte   SSH_FXP_DATA
+           uint32 request-id
+           string data
+           bool   end-of-file [optional]
+
+         but some sftpd server will send such a field in the sftp protocol 3 ;-(
+         */
+        int optional_data = length - length_of_data;
+
+        int foo = length_of_data;
         while(foo>0){
           int bar=foo;
           if(bar>buf.buffer.length){
             bar=buf.buffer.length;
           }
-          i=io_in.read(buf.buffer, 0, bar);
-          if(i<0){
+          int data_len = io_in.read(buf.buffer, 0, bar);
+          if(data_len<0){
             break loop;
 	  }
-          int data_len=i;
+          
           dst.write(buf.buffer, 0, data_len);
 
           offset+=data_len;
@@ -955,12 +1050,9 @@
 
           if(monitor!=null){
             if(!monitor.count(data_len)){
-              while(foo>0){
-                i=io_in.read(buf.buffer, 
-                             0, 
-                             (buf.buffer.length<foo?buf.buffer.length:foo));
-                if(i<=0) break;
-                foo-=i;
+              skip(foo); 
+              if(optional_data>0){
+                skip(optional_data);
               }
               break loop;
             }
@@ -968,10 +1060,27 @@
 
         }
 	//System.err.println("length: "+length);  // length should be 0
+
+        if(optional_data>0){
+          skip(optional_data);
+        }
+
+        if(length_of_data<rr.length){  //
+          rq.cancel(header, buf);
+          sendREAD(handle, rr.offset+length_of_data, (int)(rr.length-length_of_data), rq);
+          request_offset=rr.offset+rr.length;
+        }
+
+        if(request_max < rq.size()){
+          request_max++;
+        }
       }
       dst.flush();
 
       if(monitor!=null)monitor.end();
+
+      rq.cancel(header, buf);
+
       _sendCLOSE(handle, header);
     }
     catch(Exception e){
@@ -982,6 +1091,69 @@
     }
   }
 
+
+  private class RequestQueue {
+    class Request {
+      int id;
+      long offset;
+      long length;
+    }
+
+    Request[] rrq=null;
+    int head, count;
+    RequestQueue(int size){
+      rrq = new Request[size];
+      for(int i=0; i<rrq.length; i++){
+        rrq[i]=new Request();
+      }
+      init();
+    }
+
+    void init(){
+      head=count=0;
+    }
+
+    void add(int id, long offset, int length){
+      if(count == 0) head = 0;
+      int tail = head + count;
+      if(tail>=rrq.length) tail -= rrq.length;
+      rrq[tail].id=id;
+      rrq[tail].offset=offset;
+      rrq[tail].length=length;
+      count++;
+    }
+
+    Request get(int id){
+      count -= 1;
+      int i=head;
+      head++; 
+      if(head==rrq.length) head=0;
+      if(rrq[i].id!=id){
+        System.err.println("The request is not in order.");
+      }
+      rrq[i].id=0;
+      return rrq[i];
+    }
+
+    int count() {
+      return count;
+    }
+
+    int size() {
+      return rrq.length;
+    } 
+
+    void cancel(Header header, Buffer buf) throws IOException {
+      int _count = count;
+      for(int i=0; i<_count; i++){
+        header=header(buf, header);
+        int length=header.length;
+        get(header.rid);
+        skip(length); 
+      }
+    }
+  }
+
   public InputStream get(String src) throws SftpException{
     return get(src, null, 0L);
   }
@@ -1002,8 +1174,11 @@
     return get(src, monitor, 0L);
   }
   public InputStream get(String src, final SftpProgressMonitor monitor, final long skip) throws SftpException{
-    src=remoteAbsolutePath(src);
+
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
+      src=remoteAbsolutePath(src);
       src=isUnique(src);
 
       byte[] srcb=Util.str2byte(src, fEncoding);
@@ -1032,6 +1207,8 @@
 
       final byte[] handle=buf.getString();         // handle
 
+      rq.init();
+
       java.io.InputStream in=new java.io.InputStream(){
            long offset=skip;
            boolean closed=false;
@@ -1039,6 +1216,8 @@
            byte[] _data=new byte[1];
            byte[] rest_byte=new byte[1024];
            Header header=new Header();
+           int request_max=1;
+           long request_offset=offset;
 
            public int read() throws java.io.IOException{
              if(closed)return -1;
@@ -1087,14 +1266,26 @@
                len=1024; 
              }
 
-             try{sendREAD(handle, offset, len);}
-             catch(Exception e){ throw new IOException("error"); }
+             if(rq.count()==0) {
+               int request_len = buf.buffer.length-13;
+               if(server_version==0){ request_len=1024; }
+
+               while(rq.count() < request_max){
+                 try{
+                   sendREAD(handle, request_offset, request_len, rq);
+                 }
+                 catch(Exception e){ throw new IOException("error"); }
+                 request_offset += request_len;
+               }
+             }
 
              header=header(buf, header);
              rest_length=header.length;
              int type=header.type;
              int id=header.rid;
 
+             RequestQueue.Request rr = rq.get(header.rid);
+
              if(type!=SSH_FXP_STATUS && type!=SSH_FXP_DATA){ 
                throw new IOException("error");
              }
@@ -1109,29 +1300,43 @@
                //throwStatusError(buf, i);
                throw new IOException("error");
              }
+
              buf.rewind();
              fill(buf.buffer, 0, 4);
-             int i=buf.getInt(); rest_length-=4;
-
-             offset+=rest_length;
-             int foo=i;
+             int length_of_data = buf.getInt(); rest_length-=4;
+
+             /**
+              Since sftp protocol version 6, "end-of-file" has been defined,
+     
+                byte   SSH_FXP_DATA
+                uint32 request-id
+                string data
+                bool   end-of-file [optional]
+     
+              but some sftpd server will send such a field in the sftp protocol 3 ;-(
+              */
+             int optional_data = rest_length - length_of_data;
+
+             offset += length_of_data;
+             int foo = length_of_data;
              if(foo>0){
-               int bar=rest_length;
+               int bar=foo;
                if(bar>len){
                  bar=len;
                }
-               i=io_in.read(d, s, bar);
+               int i=io_in.read(d, s, bar);
                if(i<0){
                  return -1;
                }
-               rest_length-=i;
+               foo-=i;
+               rest_length=foo;
 
-               if(rest_length>0){
-                 if(rest_byte.length<rest_length){
-                   rest_byte=new byte[rest_length];
+               if(foo>0){
+                 if(rest_byte.length<foo){
+                   rest_byte=new byte[foo];
                  }
                  int _s=0;
-                 int _len=rest_length;
+                 int _len=foo;
                  int j;
                  while(_len>0){
                    j=io_in.read(rest_byte, _s, _len);
@@ -1141,6 +1346,25 @@
                  }
                }
 
+               if(optional_data>0){
+                 io_in.skip(optional_data);
+               }
+
+               if(length_of_data<rr.length){  //
+                 rq.cancel(header, buf);
+                 try {
+                   sendREAD(handle,
+                            rr.offset+length_of_data,
+                            (int)(rr.length-length_of_data), rq);
+                 }
+                 catch(Exception e){ throw new IOException("error"); }
+                 request_offset=rr.offset+rr.length;
+               }
+
+               if(request_max < rq.size()){
+                 request_max++;
+               }
+
                if(monitor!=null){
                  if(!monitor.count(i)){
                    close();
@@ -1156,6 +1380,7 @@
              if(closed)return;
              closed=true;
              if(monitor!=null)monitor.end();
+             rq.cancel(header, buf);
              try{_sendCLOSE(handle, header);}
              catch(Exception e){throw new IOException("error");}
            }
@@ -1171,8 +1396,32 @@
    }
 
    public java.util.Vector ls(String path) throws SftpException{
+     final java.util.Vector v = new Vector();
+     LsEntrySelector selector = new LsEntrySelector(){
+       public int select(LsEntry entry){
+         v.addElement(entry);
+         return CONTINUE;
+       }
+     };
+     ls(path, selector);
+     return v;
+   }
+
+  /**
+   * List files specified by the remote <code>path</code>.
+   * Each files and directories will be passed to
+   * <code>LsEntrySelector#select(LsEntry)</code> method, and if that method
+   * returns <code>LsEntrySelector#BREAK</code>, the operation will be
+   * canceled immediately.
+   *
+   * @see #LsEntrySelector
+   * @since 0.1.47
+   */
+   public void ls(String path, LsEntrySelector selector) throws SftpException{
      //System.out.println("ls: "+path);
      try{
+       ((MyPipedInputStream)io_in).updateReadSide();
+
        path=remoteAbsolutePath(path);
        byte[] pattern=null;
        java.util.Vector v=new java.util.Vector();
@@ -1237,9 +1486,11 @@
          throwStatusError(buf, i);
        }
 
+       int cancel = LsEntrySelector.CONTINUE;
        byte[] handle=buf.getString();         // handle
 
-       while(true){
+       while(cancel==LsEntrySelector.CONTINUE){
+
          sendREADDIR(handle);
 
          header=header(buf, header);
@@ -1281,6 +1532,11 @@
            }
            SftpATTRS attrs=SftpATTRS.getATTR(buf);
 
+           if(cancel==LsEntrySelector.BREAK){
+             count--; 
+             continue;
+           }
+
            boolean find=false;
            String f=null;
            if(pattern==null){
@@ -1311,7 +1567,8 @@
              else{
                l=Util.byte2str(longname, fEncoding);
              }
-             v.addElement(new LsEntry(f, l, attrs));
+
+             cancel = selector.select(new LsEntry(f, l, attrs));
            }
 
            count--; 
@@ -1336,7 +1593,6 @@
        }
        */
 
-       return v;
      }
      catch(Exception e){
        if(e instanceof SftpException) throw (SftpException)e;
@@ -1345,14 +1601,16 @@
        throw new SftpException(SSH_FX_FAILURE, "");
      }
    }
+
    public String readlink(String path) throws SftpException{
      try{
-
        if(server_version<3){
          throw new SftpException(SSH_FX_OP_UNSUPPORTED, 
                                  "The remote sshd is too old to support symlink operation.");
        }
 
+       ((MyPipedInputStream)io_in).updateReadSide();
+
        path=remoteAbsolutePath(path);
 
        path=isUnique(path);
@@ -1400,6 +1658,8 @@
      }
 
      try{
+       ((MyPipedInputStream)io_in).updateReadSide();
+
        oldpath=remoteAbsolutePath(oldpath);
        newpath=remoteAbsolutePath(newpath);
 
@@ -1443,6 +1703,8 @@
      }
 
      try{
+       ((MyPipedInputStream)io_in).updateReadSide();
+
        oldpath=remoteAbsolutePath(oldpath);
        newpath=remoteAbsolutePath(newpath);
 
@@ -1489,6 +1751,8 @@
   }
   public void rm(String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       Vector v=glob_remote(path);
@@ -1546,6 +1810,8 @@
 
   public void chgrp(int gid, String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       Vector v=glob_remote(path);
@@ -1570,6 +1836,8 @@
 
   public void chown(int uid, String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       Vector v=glob_remote(path);
@@ -1594,6 +1862,8 @@
 
   public void chmod(int permissions, String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       Vector v=glob_remote(path);
@@ -1618,6 +1888,8 @@
 
   public void setMtime(String path, int mtime) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       Vector v=glob_remote(path);
@@ -1642,6 +1914,8 @@
 
   public void rmdir(String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       Vector v=glob_remote(path);
@@ -1679,6 +1953,8 @@
 
   public void mkdir(String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       sendMKDIR(Util.str2byte(path, fEncoding), null);
@@ -1708,8 +1984,9 @@
 
   public SftpATTRS stat(String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
-
       path=isUnique(path);
 
       return _stat(path);
@@ -1760,8 +2037,9 @@
 
   public SftpATTRS lstat(String path) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
-
       path=isUnique(path);
 
       return _lstat(path);
@@ -1836,6 +2114,8 @@
 
   public void setStat(String path, SftpATTRS attr) throws SftpException{
     try{
+      ((MyPipedInputStream)io_in).updateReadSide();
+
       path=remoteAbsolutePath(path);
 
       Vector v=glob_remote(path);
@@ -1885,6 +2165,8 @@
   public String getHome() throws SftpException {
     if(home==null){
       try{
+        ((MyPipedInputStream)io_in).updateReadSide();
+
         byte[] _home=_realpath("");
         home=Util.byte2str(_home, fEncoding);
       }
@@ -2040,32 +2322,31 @@
   private int sendWRITE(byte[] handle, long offset, 
                         byte[] data, int start, int length) throws Exception{
     int _length=length;
-    packet.reset();
-    if(buf.buffer.length<buf.index+13+21+handle.length+length
-       +32 +20  // padding and mac
-){
-      _length=buf.buffer.length-(buf.index+13+21+handle.length
-                                 +32 +20  // padding and mac
-);
-      //System.err.println("_length="+_length+" length="+length);
+    opacket.reset();
+    if(obuf.buffer.length<obuf.index+13+21+handle.length+length+Session.buffer_margin){
+      _length=obuf.buffer.length-(obuf.index+13+21+handle.length+Session.buffer_margin);
+      // System.err.println("_length="+_length+" length="+length);
     }
 
-    putHEAD(SSH_FXP_WRITE, 21+handle.length+_length);       // 14
-    buf.putInt(seq++);                                      //  4
-    buf.putString(handle);                                  //  4+handle.length
-    buf.putLong(offset);                                    //  8
-    if(buf.buffer!=data){
-    buf.putString(data, start, _length);                    //  4+_length
+    putHEAD(obuf, SSH_FXP_WRITE, 21+handle.length+_length);       // 14
+    obuf.putInt(seq++);                                      //  4
+    obuf.putString(handle);                                  //  4+handle.length
+    obuf.putLong(offset);                                    //  8
+    if(obuf.buffer!=data){
+      obuf.putString(data, start, _length);                    //  4+_length
     }
     else{
-      buf.putInt(_length);
-      buf.skip(_length);
+      obuf.putInt(_length);
+      obuf.skip(_length);
     }
-    getSession().write(packet, this, 21+handle.length+_length+4);
+    getSession().write(opacket, this, 21+handle.length+_length+4);
     return _length;
   }
-
   private void sendREAD(byte[] handle, long offset, int length) throws Exception{
+    sendREAD(handle, offset, length, null);
+  }
+  private void sendREAD(byte[] handle, long offset, int length,
+                        RequestQueue rrq) throws Exception{
     packet.reset();
     putHEAD(SSH_FXP_READ, 21+handle.length);
     buf.putInt(seq++);
@@ -2073,9 +2354,12 @@
     buf.putLong(offset);
     buf.putInt(length);
     getSession().write(packet, this, 21+handle.length+4);
+    if(rrq!=null){
+      rrq.add(seq-1, offset, length);
+    }
   }
 
-  private void putHEAD(byte type, int length) throws Exception{
+  private void putHEAD(Buffer buf, byte type, int length) throws Exception{
     buf.putByte((byte)Session.SSH_MSG_CHANNEL_DATA);
     buf.putInt(recipient);
     buf.putInt(length+4);
@@ -2083,8 +2367,11 @@
     buf.putByte(type);
   }
 
+  private void putHEAD(byte type, int length) throws Exception{
+    putHEAD(buf, type, length);
+  }
+
   private Vector glob_remote(String _path) throws Exception{
-
     Vector v=new Vector();
     int i=0;
 
@@ -2104,7 +2391,7 @@
     boolean pattern_has_wildcard=isPattern(_pattern, _pattern_utf8);
 
     if(!pattern_has_wildcard){
-      if(dir.length()!=1) // not equal to "/"
+      if(!dir.equals("/"))
         dir+="/";
       v.addElement(dir+Util.unquote(_pattern));
       return v;
@@ -2202,23 +2489,16 @@
   }
 
   private boolean isPattern(byte[] path){
-    int i=path.length-1;
-    while(i>=0){
-      if(path[i]=='*' || path[i]=='?'){
-        if(i>0 && path[i-1]=='\\'){
-          i--;
-          if(i>0 && path[i-1]=='\\'){    // \\* or \\?
-            break;
-          }
-        }
-        else{
-          break;
-        }
-      }
-      i--;
+    int length=path.length;
+    int i=0;
+    while(i<length){
+      if(path[i]=='*' || path[i]=='?')
+        return true;
+      if(path[i]=='\\' && (i+1)<length)
+        i++;
+      i++;
     }
-    // System.err.println("isPattern: ["+(new String(path))+"] "+(!(i<0)));
-    return !(i<0);
+    return false;
   }
 
   private Vector glob_local(String _path) throws Exception{
@@ -2358,6 +2638,7 @@
   private String remoteAbsolutePath(String path) throws SftpException{
     if(path.charAt(0)=='/') return path;
     String cwd=getCwd();
+//    if(cwd.equals(getHome())) return path;
     if(cwd.endsWith("/")) return cwd+path;
     return cwd+"/"+path;
   }
@@ -2391,9 +2672,9 @@
 
   public void setFilenameEncoding(String encoding) throws SftpException{
     int sversion=getServerVersion();
-    if(sversion > 3 && 
+    if(3 <= sversion && sversion <= 5 &&
        !encoding.equals(UTF8)){
-      throw new SftpException(SSH_FX_FAILURE, 
+      throw new SftpException(SSH_FX_FAILURE,
                               "The encoding can not be changed for this sftp server.");
     }
     if(encoding.equals(UTF8)){
@@ -2445,4 +2726,26 @@
       throw new ClassCastException("a decendent of LsEntry must be given.");
     }
   }
+
+  /**
+   * This interface will be passed as an arugment for <code>ls</code> method.
+   *
+   * @see #LsEntry
+   * @see #ls(String, LsEntrySelector)
+   * @since 0.1.47
+   */
+  public interface LsEntrySelector {
+    public final int CONTINUE = 0;
+    public final int BREAK = 1;
+
+    /**
+     * <p> The <code>select</code> method will be invoked in <code>ls</code>
+     * method for each file entry. If this method returns BREAK,
+     * <code>ls</code> will be canceled.
+     * 
+     * @param entry one of entry from ls
+     * @return if BREAK is returned, the 'ls' operation will be canceled.
+     */
+    public int select(LsEntry entry);
+  }
 }
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelShell.java'
--- src/com/jcraft/jsch/ChannelShell.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelShell.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelSubsystem.java'
--- src/com/jcraft/jsch/ChannelSubsystem.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelSubsystem.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2005-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2005-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -34,7 +34,7 @@
   boolean pty=false;
   boolean want_reply=true;
   String subsystem="";
-  public void setXForwarding(boolean foo){ xforwading=true; }
+  public void setXForwarding(boolean foo){ xforwading=foo; }
   public void setPty(boolean foo){ pty=foo; }
   public void setWantReply(boolean foo){ want_reply=foo; }
   public void setSubsystem(String foo){ subsystem=foo; }
 
=== modified file 'src/main/java/com/jcraft/jsch/ChannelX11.java'
--- src/com/jcraft/jsch/ChannelX11.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ChannelX11.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -61,7 +61,7 @@
     return 0;
   }
   static void setCookie(String foo){
-    cookie_hex=foo.getBytes(); 
+    cookie_hex=Util.str2byte(foo); 
     cookie=new byte[16];
     for(int i=0; i<16; i++){
 	cookie[i]=(byte)(((revtable(cookie_hex[i*2])<<4)&0xf0) |
@@ -99,6 +99,13 @@
     }
   }
 
+  static void removeFakedCookie(Session session){
+    synchronized(faked_cookie_hex_pool){
+      faked_cookie_hex_pool.remove(session);
+      faked_cookie_pool.remove(session);
+    }
+  }
+
   ChannelX11(){
     super();
 
@@ -106,7 +113,7 @@
     setLocalWindowSize(LOCAL_WINDOW_SIZE_MAX);
     setLocalPacketSize(LOCAL_MAXIMUM_PACKET_SIZE);
 
-    type="x11".getBytes();
+    type=Util.str2byte("x11");
 
     connected=true;
     /*
@@ -150,9 +157,7 @@
             io.in!=null){
         i=io.in.read(buf.buffer, 
 		     14, 
-		     buf.buffer.length-14
-		     -32 -20 // padding and mac
-		     );
+		     buf.buffer.length-14-Session.buffer_margin);
 	if(i<=0){
 	  eof();
           break;
 
=== modified file 'src/main/java/com/jcraft/jsch/Cipher.java'
--- src/com/jcraft/jsch/Cipher.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/Cipher.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -36,4 +36,5 @@
   int getBlockSize(); 
   void init(int mode, byte[] key, byte[] iv) throws Exception; 
   void update(byte[] foo, int s1, int len, byte[] bar, int s2) throws Exception;
+  boolean isCBC();
 }
 
=== modified file 'src/main/java/com/jcraft/jsch/CipherNone.java'
--- src/com/jcraft/jsch/CipherNone.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/CipherNone.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -38,4 +38,5 @@
   }
   public void update(byte[] foo, int s1, int len, byte[] bar, int s2) throws Exception{
   }
+  public boolean isCBC(){return false; }
 }
 
=== modified file 'src/main/java/com/jcraft/jsch/Compression.java'
--- src/com/jcraft/jsch/Compression.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/Compression.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -33,6 +33,6 @@
   static public final int INFLATER=0;
   static public final int DEFLATER=1;
   void init(int type, int level);
-  int compress(byte[] buf, int start, int len);
+  byte[] compress(byte[] buf, int start, int[] len);
   byte[] uncompress(byte[] buf, int start, int[] len);
 }
 
=== modified file 'src/main/java/com/jcraft/jsch/DH.java'
--- src/com/jcraft/jsch/DH.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/DH.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/DHG1.java'
--- src/com/jcraft/jsch/DHG1.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/DHG1.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -203,7 +203,7 @@
       j=0;
       j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
 	((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
-      String alg=new String(K_S, i, j);
+      String alg=Util.byte2str(K_S, i, j);
       i+=j;
 
       boolean result=false;
 
=== added file 'src/main/java/com/jcraft/jsch/DHG14.java'
--- src/main/java/com/jcraft/jsch/DHG14.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/jcraft/jsch/DHG14.java	2012-05-04 10:23:17 +0000
@@ -0,0 +1,310 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/*
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.jcraft.jsch;
+
+public class DHG14 extends KeyExchange{
+
+  static final byte[] g={ 2 };
+  static final byte[] p={
+(byte)0x00,
+(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,
+(byte)0xC9,(byte)0x0F,(byte)0xDA,(byte)0xA2,(byte)0x21,(byte)0x68,(byte)0xC2,(byte)0x34,
+(byte)0xC4,(byte)0xC6,(byte)0x62,(byte)0x8B,(byte)0x80,(byte)0xDC,(byte)0x1C,(byte)0xD1,
+(byte)0x29,(byte)0x02,(byte)0x4E,(byte)0x08,(byte)0x8A,(byte)0x67,(byte)0xCC,(byte)0x74,
+(byte)0x02,(byte)0x0B,(byte)0xBE,(byte)0xA6,(byte)0x3B,(byte)0x13,(byte)0x9B,(byte)0x22,
+(byte)0x51,(byte)0x4A,(byte)0x08,(byte)0x79,(byte)0x8E,(byte)0x34,(byte)0x04,(byte)0xDD,
+(byte)0xEF,(byte)0x95,(byte)0x19,(byte)0xB3,(byte)0xCD,(byte)0x3A,(byte)0x43,(byte)0x1B,
+(byte)0x30,(byte)0x2B,(byte)0x0A,(byte)0x6D,(byte)0xF2,(byte)0x5F,(byte)0x14,(byte)0x37,
+(byte)0x4F,(byte)0xE1,(byte)0x35,(byte)0x6D,(byte)0x6D,(byte)0x51,(byte)0xC2,(byte)0x45,
+(byte)0xE4,(byte)0x85,(byte)0xB5,(byte)0x76,(byte)0x62,(byte)0x5E,(byte)0x7E,(byte)0xC6,
+(byte)0xF4,(byte)0x4C,(byte)0x42,(byte)0xE9,(byte)0xA6,(byte)0x37,(byte)0xED,(byte)0x6B,
+(byte)0x0B,(byte)0xFF,(byte)0x5C,(byte)0xB6,(byte)0xF4,(byte)0x06,(byte)0xB7,(byte)0xED,
+(byte)0xEE,(byte)0x38,(byte)0x6B,(byte)0xFB,(byte)0x5A,(byte)0x89,(byte)0x9F,(byte)0xA5,
+(byte)0xAE,(byte)0x9F,(byte)0x24,(byte)0x11,(byte)0x7C,(byte)0x4B,(byte)0x1F,(byte)0xE6,
+(byte)0x49,(byte)0x28,(byte)0x66,(byte)0x51,(byte)0xEC,(byte)0xE4,(byte)0x5B,(byte)0x3D,
+(byte)0xC2,(byte)0x00,(byte)0x7C,(byte)0xB8,(byte)0xA1,(byte)0x63,(byte)0xBF,(byte)0x05,
+(byte)0x98,(byte)0xDA,(byte)0x48,(byte)0x36,(byte)0x1C,(byte)0x55,(byte)0xD3,(byte)0x9A,
+(byte)0x69,(byte)0x16,(byte)0x3F,(byte)0xA8,(byte)0xFD,(byte)0x24,(byte)0xCF,(byte)0x5F,
+(byte)0x83,(byte)0x65,(byte)0x5D,(byte)0x23,(byte)0xDC,(byte)0xA3,(byte)0xAD,(byte)0x96,
+(byte)0x1C,(byte)0x62,(byte)0xF3,(byte)0x56,(byte)0x20,(byte)0x85,(byte)0x52,(byte)0xBB,
+(byte)0x9E,(byte)0xD5,(byte)0x29,(byte)0x07,(byte)0x70,(byte)0x96,(byte)0x96,(byte)0x6D,
+(byte)0x67,(byte)0x0C,(byte)0x35,(byte)0x4E,(byte)0x4A,(byte)0xBC,(byte)0x98,(byte)0x04,
+(byte)0xF1,(byte)0x74,(byte)0x6C,(byte)0x08,(byte)0xCA,(byte)0x18,(byte)0x21,(byte)0x7C,
+(byte)0x32,(byte)0x90,(byte)0x5E,(byte)0x46,(byte)0x2E,(byte)0x36,(byte)0xCE,(byte)0x3B,
+(byte)0xE3,(byte)0x9E,(byte)0x77,(byte)0x2C,(byte)0x18,(byte)0x0E,(byte)0x86,(byte)0x03,
+(byte)0x9B,(byte)0x27,(byte)0x83,(byte)0xA2,(byte)0xEC,(byte)0x07,(byte)0xA2,(byte)0x8F,
+(byte)0xB5,(byte)0xC5,(byte)0x5D,(byte)0xF0,(byte)0x6F,(byte)0x4C,(byte)0x52,(byte)0xC9,
+(byte)0xDE,(byte)0x2B,(byte)0xCB,(byte)0xF6,(byte)0x95,(byte)0x58,(byte)0x17,(byte)0x18,
+(byte)0x39,(byte)0x95,(byte)0x49,(byte)0x7C,(byte)0xEA,(byte)0x95,(byte)0x6A,(byte)0xE5,
+(byte)0x15,(byte)0xD2,(byte)0x26,(byte)0x18,(byte)0x98,(byte)0xFA,(byte)0x05,(byte)0x10,
+(byte)0x15,(byte)0x72,(byte)0x8E,(byte)0x5A,(byte)0x8A,(byte)0xAC,(byte)0xAA,(byte)0x68,
+(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF
+};
+
+  private static final int SSH_MSG_KEXDH_INIT=                     30;
+  private static final int SSH_MSG_KEXDH_REPLY=                    31;
+
+  static final int RSA=0;
+  static final int DSS=1;
+  private int type=0;
+
+  private int state;
+
+  DH dh;
+
+  byte[] V_S;
+  byte[] V_C;
+  byte[] I_S;
+  byte[] I_C;
+
+  byte[] e;
+
+  private Buffer buf;
+  private Packet packet;
+
+  public void init(Session session,
+		   byte[] V_S, byte[] V_C, byte[] I_S, byte[] I_C) throws Exception{
+    this.session=session;
+    this.V_S=V_S;      
+    this.V_C=V_C;      
+    this.I_S=I_S;      
+    this.I_C=I_C;      
+
+    try{
+      Class c=Class.forName(session.getConfig("sha-1"));
+      sha=(HASH)(c.newInstance());
+      sha.init();
+    }
+    catch(Exception e){
+      System.err.println(e);
+    }
+
+    buf=new Buffer();
+    packet=new Packet(buf);
+
+    try{
+      Class c=Class.forName(session.getConfig("dh"));
+      dh=(DH)(c.newInstance());
+      dh.init();
+    }
+    catch(Exception e){
+      //System.err.println(e);
+      throw e;
+    }
+
+    dh.setP(p);
+    dh.setG(g);
+    // The client responds with:
+    // byte  SSH_MSG_KEXDH_INIT(30)
+    // mpint e <- g^x mod p
+    //         x is a random number (1 < x < (p-1)/2)
+
+    e=dh.getE();
+    packet.reset();
+    buf.putByte((byte)SSH_MSG_KEXDH_INIT);
+    buf.putMPInt(e);
+
+    if(V_S==null){  // This is a really ugly hack for Session.checkKexes ;-(
+      return;
+    }
+
+    session.write(packet);
+
+    if(JSch.getLogger().isEnabled(Logger.INFO)){
+      JSch.getLogger().log(Logger.INFO, 
+                           "SSH_MSG_KEXDH_INIT sent");
+      JSch.getLogger().log(Logger.INFO, 
+                           "expecting SSH_MSG_KEXDH_REPLY");
+    }
+
+    state=SSH_MSG_KEXDH_REPLY;
+  }
+
+  public boolean next(Buffer _buf) throws Exception{
+    int i,j;
+
+    switch(state){
+    case SSH_MSG_KEXDH_REPLY:
+      // The server responds with:
+      // byte      SSH_MSG_KEXDH_REPLY(31)
+      // string    server public host key and certificates (K_S)
+      // mpint     f
+      // string    signature of H
+      j=_buf.getInt();
+      j=_buf.getByte();
+      j=_buf.getByte();
+      if(j!=31){
+	System.err.println("type: must be 31 "+j);
+	return false;
+      }
+
+      K_S=_buf.getString();
+      // K_S is server_key_blob, which includes ....
+      // string ssh-dss
+      // impint p of dsa
+      // impint q of dsa
+      // impint g of dsa
+      // impint pub_key of dsa
+      //System.err.print("K_S: "); //dump(K_S, 0, K_S.length);
+      byte[] f=_buf.getMPInt();
+      byte[] sig_of_H=_buf.getString();
+
+      dh.setF(f);
+      K=dh.getK();
+
+      //The hash H is computed as the HASH hash of the concatenation of the
+      //following:
+      // string    V_C, the client's version string (CR and NL excluded)
+      // string    V_S, the server's version string (CR and NL excluded)
+      // string    I_C, the payload of the client's SSH_MSG_KEXINIT
+      // string    I_S, the payload of the server's SSH_MSG_KEXINIT
+      // string    K_S, the host key
+      // mpint     e, exchange value sent by the client
+      // mpint     f, exchange value sent by the server
+      // mpint     K, the shared secret
+      // This value is called the exchange hash, and it is used to authenti-
+      // cate the key exchange.
+      buf.reset();
+      buf.putString(V_C); buf.putString(V_S);
+      buf.putString(I_C); buf.putString(I_S);
+      buf.putString(K_S);
+      buf.putMPInt(e); buf.putMPInt(f);
+      buf.putMPInt(K);
+      byte[] foo=new byte[buf.getLength()];
+      buf.getByte(foo);
+      sha.update(foo, 0, foo.length);
+      H=sha.digest();
+      //System.err.print("H -> "); //dump(H, 0, H.length);
+
+      i=0;
+      j=0;
+      j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
+	((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
+      String alg=Util.byte2str(K_S, i, j);
+      i+=j;
+
+      boolean result=false;
+
+      if(alg.equals("ssh-rsa")){
+	byte[] tmp;
+	byte[] ee;
+	byte[] n;
+
+	type=RSA;
+
+	j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
+	  ((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
+	tmp=new byte[j]; System.arraycopy(K_S, i, tmp, 0, j); i+=j;
+	ee=tmp;
+	j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
+	  ((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
+	tmp=new byte[j]; System.arraycopy(K_S, i, tmp, 0, j); i+=j;
+	n=tmp;
+	
+	SignatureRSA sig=null;
+	try{
+	  Class c=Class.forName(session.getConfig("signature.rsa"));
+	  sig=(SignatureRSA)(c.newInstance());
+	  sig.init();
+	}
+	catch(Exception e){
+	  System.err.println(e);
+	}
+
+	sig.setPubKey(ee, n);   
+	sig.update(H);
+	result=sig.verify(sig_of_H);
+
+        if(JSch.getLogger().isEnabled(Logger.INFO)){
+          JSch.getLogger().log(Logger.INFO, 
+                               "ssh_rsa_verify: signature "+result);
+        }
+
+      }
+      else if(alg.equals("ssh-dss")){
+	byte[] q=null;
+	byte[] tmp;
+	byte[] p;
+	byte[] g;
+      
+	type=DSS;
+
+	j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
+	  ((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
+	tmp=new byte[j]; System.arraycopy(K_S, i, tmp, 0, j); i+=j;
+	p=tmp;
+	j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
+	  ((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
+	tmp=new byte[j]; System.arraycopy(K_S, i, tmp, 0, j); i+=j;
+	q=tmp;
+	j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
+	  ((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
+	tmp=new byte[j]; System.arraycopy(K_S, i, tmp, 0, j); i+=j;
+	g=tmp;
+	j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
+	  ((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
+	tmp=new byte[j]; System.arraycopy(K_S, i, tmp, 0, j); i+=j;
+	f=tmp;
+
+	SignatureDSA sig=null;
+	try{
+	  Class c=Class.forName(session.getConfig("signature.dss"));
+	  sig=(SignatureDSA)(c.newInstance());
+	  sig.init();
+	}
+	catch(Exception e){
+	  System.err.println(e);
+	}
+	sig.setPubKey(f, p, q, g);   
+	sig.update(H);
+	result=sig.verify(sig_of_H);
+
+        if(JSch.getLogger().isEnabled(Logger.INFO)){
+          JSch.getLogger().log(Logger.INFO, 
+                               "ssh_dss_verify: signature "+result);
+        }
+
+      }
+      else{
+	System.err.println("unknown alg");
+      }	    
+      state=STATE_END;
+      return result;
+    }
+    return false;
+  }
+
+  public String getKeyType(){
+    if(type==DSS) return "DSA";
+    return "RSA";
+  }
+
+  public int getState(){return state; }
+}
 
=== modified file 'src/main/java/com/jcraft/jsch/DHGEX.java'
--- src/com/jcraft/jsch/DHGEX.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/DHGEX.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -233,7 +233,7 @@
       j=0;
       j=((K_S[i++]<<24)&0xff000000)|((K_S[i++]<<16)&0x00ff0000)|
 	((K_S[i++]<<8)&0x0000ff00)|((K_S[i++])&0x000000ff);
-      String alg=new String(K_S, i, j);
+      String alg=Util.byte2str(K_S, i, j);
       i+=j;
 
       boolean result=false;
 
=== modified file 'src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java'
--- src/com/jcraft/jsch/ForwardedTCPIPDaemon.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/GSSContext.java'
--- src/com/jcraft/jsch/GSSContext.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/GSSContext.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2004-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2004-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/HASH.java'
--- src/com/jcraft/jsch/HASH.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/HASH.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/HostKey.java'
--- src/com/jcraft/jsch/HostKey.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/HostKey.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -30,8 +30,8 @@
 package com.jcraft.jsch;
 
 public class HostKey{
-  private static final byte[] sshdss="ssh-dss".getBytes();
-  private static final byte[] sshrsa="ssh-rsa".getBytes();
+  private static final byte[] sshdss=Util.str2byte("ssh-dss");
+  private static final byte[] sshrsa=Util.str2byte("ssh-rsa");
 
   protected static final int GUESS=0;
   public static final int SSHDSS=1;
@@ -61,12 +61,12 @@
 
   public String getHost(){ return host; }
   public String getType(){
-    if(type==SSHDSS){ return new String(sshdss); }
-    if(type==SSHRSA){ return new String(sshrsa);}
+    if(type==SSHDSS){ return Util.byte2str(sshdss); }
+    if(type==SSHRSA){ return Util.byte2str(sshrsa);}
     return "UNKNOWN";
   }
   public String getKey(){
-    return new String(Util.toBase64(key, 0, key.length));
+    return Util.byte2str(Util.toBase64(key, 0, key.length));
   }
   public String getFingerPrint(JSch jsch){
     HASH hash=null;
 
=== modified file 'src/main/java/com/jcraft/jsch/HostKeyRepository.java'
--- src/com/jcraft/jsch/HostKeyRepository.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/HostKeyRepository.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2004-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2004-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/IO.java'
--- src/com/jcraft/jsch/IO.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/IO.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/Identity.java'
--- src/com/jcraft/jsch/Identity.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/Identity.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/IdentityFile.java'
--- src/com/jcraft/jsch/IdentityFile.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/IdentityFile.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -142,6 +142,47 @@
   private IdentityFile(String name, byte[] prvkey, byte[] pubkey, JSch jsch) throws JSchException{
     this.identity=name;
     this.jsch=jsch;
+
+    // prvkey from "ssh-add" command on the remote.
+    if(pubkey==null &&
+       prvkey!=null && 
+       (prvkey.length>11 &&
+        prvkey[0]==0 && prvkey[1]==0 && prvkey[2]==0 && prvkey[3]==7)){
+
+      Buffer buf=new Buffer(prvkey);
+      String _type = new String(buf.getString()); // ssh-rsa
+
+      if(_type.equals("ssh-rsa")){
+        type=RSA;
+        n_array=buf.getString();
+        e_array=buf.getString();
+        d_array=buf.getString();
+        buf.getString();
+        buf.getString();
+        buf.getString();
+        this.identity += new String(buf.getString());
+      }
+      else if(_type.equals("ssh-dss")){
+        type=DSS;
+        P_array=buf.getString();
+        Q_array=buf.getString();
+        G_array=buf.getString();
+        pub_array=buf.getString();
+        prv_array=buf.getString();
+        this.identity += new String(buf.getString());
+      }
+      else{
+        throw new JSchException("privatekey: invalid key "+new String(prvkey, 4, 7));
+      }
+      encoded_data=prvkey;
+      encrypted=false;
+      keytype=OPENSSH;
+      return;
+    }
+
+    /* TODO: IdentityFile should use KeyPair.
+     * The following logic exists also in KeyPair. It is redundant.
+     */
     try{
       Class c;
       c=Class.forName((String)jsch.getConfig("3des-cbc"));
@@ -156,8 +197,18 @@
       int len=buf.length;
 
       int i=0;
-      while(i<len){
-        if(buf[i]=='B'&& buf[i+1]=='E'&& buf[i+2]=='G'&& buf[i+3]=='I'){
+
+      while(i<len){
+        if(buf[i] == '-' && i+4<len && 
+           buf[i+1] == '-' && buf[i+2] == '-' && 
+           buf[i+3] == '-' && buf[i+4] == '-'){
+          break;
+        }
+        i++;
+      }
+
+      while(i<len){
+        if(buf[i]=='B'&& i+3<len && buf[i+1]=='E'&& buf[i+2]=='G'&& buf[i+3]=='I'){
           i+=6;	    
           if(buf[i]=='D'&& buf[i+1]=='S'&& buf[i+2]=='A'){ type=DSS; }
 	  else if(buf[i]=='R'&& buf[i+1]=='S'&& buf[i+2]=='A'){ type=RSA; }
@@ -172,7 +223,7 @@
           i+=3;
 	  continue;
 	}
-        if(buf[i]=='A'&& buf[i+1]=='E'&& buf[i+2]=='S'&& buf[i+3]=='-' && 
+        if(buf[i]=='A'&& i+7<len && buf[i+1]=='E'&& buf[i+2]=='S'&& buf[i+3]=='-' && 
            buf[i+4]=='2'&& buf[i+5]=='5'&& buf[i+6]=='6'&& buf[i+7]=='-'){
           i+=8;
           if(Session.checkCipher((String)jsch.getConfig("aes256-cbc"))){
@@ -186,7 +237,35 @@
           }
           continue;
         }
-        if(buf[i]=='C'&& buf[i+1]=='B'&& buf[i+2]=='C'&& buf[i+3]==','){
+        if(buf[i]=='A'&& i+7<len && buf[i+1]=='E'&& buf[i+2]=='S'&& buf[i+3]=='-' && 
+           buf[i+4]=='1'&& buf[i+5]=='9'&& buf[i+6]=='2'&& buf[i+7]=='-'){
+          i+=8;
+          if(Session.checkCipher((String)jsch.getConfig("aes192-cbc"))){
+            c=Class.forName((String)jsch.getConfig("aes192-cbc"));
+            cipher=(Cipher)(c.newInstance());
+            key=new byte[cipher.getBlockSize()];
+            iv=new byte[cipher.getIVSize()];
+          }
+          else{
+            throw new JSchException("privatekey: aes192-cbc is not available "+identity);
+          }
+          continue;
+        }
+        if(buf[i]=='A'&& i+7<len && buf[i+1]=='E'&& buf[i+2]=='S'&& buf[i+3]=='-' && 
+           buf[i+4]=='1'&& buf[i+5]=='2'&& buf[i+6]=='8'&& buf[i+7]=='-'){
+          i+=8;
+          if(Session.checkCipher((String)jsch.getConfig("aes128-cbc"))){
+            c=Class.forName((String)jsch.getConfig("aes128-cbc"));
+            cipher=(Cipher)(c.newInstance());
+            key=new byte[cipher.getBlockSize()];
+            iv=new byte[cipher.getIVSize()];
+          }
+          else{
+            throw new JSchException("privatekey: aes128-cbc is not available "+identity);
+          }
+          continue;
+        }
+        if(buf[i]=='C'&& i+3<len && buf[i+1]=='B'&& buf[i+2]=='C'&& buf[i+3]==','){
           i+=4;
 	  for(int ii=0; ii<iv.length; ii++){
             iv[ii]=(byte)(((a2b(buf[i++])<<4)&0xf0)+
@@ -194,19 +273,18 @@
   	  }
 	  continue;
 	}
-	if(buf[i]==0x0d &&
-	   i+1<buf.length && buf[i+1]==0x0a){
+	if(buf[i]==0x0d && i+1<len && buf[i+1]==0x0a){
 	  i++;
 	  continue;
 	}
-	if(buf[i]==0x0a && i+1<buf.length){
+	if(buf[i]==0x0a && i+1<len){
 	  if(buf[i+1]==0x0a){ i+=2; break; }
 	  if(buf[i+1]==0x0d &&
-	     i+2<buf.length && buf[i+2]==0x0a){
+	     i+2<len && buf[i+2]==0x0a){
 	     i+=3; break;
 	  }
 	  boolean inheader=false;
-	  for(int j=i+1; j<buf.length; j++){
+	  for(int j=i+1; j<len; j++){
 	    if(buf[j]==0x0a) break;
 	    //if(buf[j]==0x0d) break;
 	    if(buf[j]==':'){inheader=true; break;}
@@ -254,7 +332,7 @@
 	byte[]_type=_buf.getString();
 	//System.err.println("type: "+new String(_type)); 
 	byte[] _cipher=_buf.getString();
-	String cipher=new String(_cipher);
+	String cipher=Util.byte2str(_cipher);
 	//System.err.println("cipher: "+cipher); 
 	if(cipher.equals("3des-cbc")){
   	   _buf.getInt();
@@ -421,7 +499,7 @@
     Buffer buf=new Buffer("ssh-rsa".length()+4+
 			   e_array.length+4+ 
  			   n_array.length+4);
-    buf.putString("ssh-rsa".getBytes());
+    buf.putString(Util.str2byte("ssh-rsa"));
     buf.putString(e_array);
     buf.putString(n_array);
     return buf.buffer;
@@ -434,7 +512,7 @@
 			   Q_array.length+4+ 
 			   G_array.length+4+ 
 			   pub_array.length+4);
-    buf.putString("ssh-dss".getBytes());
+    buf.putString(Util.str2byte("ssh-dss"));
     buf.putString(P_array);
     buf.putString(Q_array);
     buf.putString(G_array);
@@ -459,7 +537,7 @@
       byte[] sig = rsa.sign();
       Buffer buf=new Buffer("ssh-rsa".length()+4+
 			    sig.length+4);
-      buf.putString("ssh-rsa".getBytes());
+      buf.putString(Util.str2byte("ssh-rsa"));
       buf.putString(sig);
       return buf.buffer;
     }
@@ -502,7 +580,7 @@
       byte[] sig = dsa.sign();
       Buffer buf=new Buffer("ssh-dss".length()+4+
 			    sig.length+4);
-      buf.putString("ssh-dss".getBytes());
+      buf.putString(Util.str2byte("ssh-dss"));
       buf.putString(sig);
       return buf.buffer;
     }
 
=== added file 'src/main/java/com/jcraft/jsch/IdentityRepository.java'
--- src/main/java/com/jcraft/jsch/IdentityRepository.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/jcraft/jsch/IdentityRepository.java	2012-05-04 10:23:17 +0000
@@ -0,0 +1,44 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/*
+Copyright (c) 2012 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.jcraft.jsch;
+
+import java.util.Vector;
+
+public interface IdentityRepository {
+  public static final int UNAVAILABLE=0;
+  public static final int NOTRUNNING=1;
+  public static final int RUNNING=2;
+  public String getName();
+  public int getStatus();
+  public Vector getIdentities();
+  public boolean add(byte[] identity);
+  public boolean remove(byte[] blob);
+  public void removeAll();
+}
 
=== modified file 'src/main/java/com/jcraft/jsch/JSch.java'
--- src/com/jcraft/jsch/JSch.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/JSch.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -33,12 +33,15 @@
 import java.util.Vector;
 
 public class JSch{
+  /**
+   * The version number.
+   */
+  public static final String VERSION  = "0.1.48";
+
   static java.util.Hashtable config=new java.util.Hashtable();
   static{
-//  config.put("kex", "diffie-hellman-group-exchange-sha1");
-    config.put("kex", "diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1");
+    config.put("kex", "diffie-hellman-group1-sha1,diffie-hellman-group14-sha1,diffie-hellman-group-exchange-sha1");
     config.put("server_host_key", "ssh-rsa,ssh-dss");
-//    config.put("server_host_key", "ssh-dss,ssh-rsa");
 
     config.put("cipher.s2c", 
                "aes128-ctr,aes128-cbc,3des-ctr,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc");
@@ -48,9 +51,7 @@
     config.put("mac.s2c", "hmac-md5,hmac-sha1,hmac-sha1-96,hmac-md5-96");
     config.put("mac.c2s", "hmac-md5,hmac-sha1,hmac-sha1-96,hmac-md5-96");
     config.put("compression.s2c", "none");
-    // config.put("compression.s2c", "[e-mail],zlib,none");
     config.put("compression.c2s", "none");
-    // config.put("compression.c2s", "[e-mail],zlib,none");
 
     config.put("lang.s2c", "");
     config.put("lang.c2s", "");
@@ -61,6 +62,8 @@
                                 "com.jcraft.jsch.DHGEX");
     config.put("diffie-hellman-group1-sha1", 
 	                        "com.jcraft.jsch.DHG1");
+    config.put("diffie-hellman-group14-sha1", 
+	                        "com.jcraft.jsch.DHG14");
 
     config.put("dh",            "com.jcraft.jsch.jce.DH");
     config.put("3des-cbc",      "com.jcraft.jsch.jce.TripleDESCBC");
@@ -103,13 +106,44 @@
 
     config.put("StrictHostKeyChecking",  "ask");
     config.put("HashKnownHosts",  "no");
-    //config.put("HashKnownHosts",  "yes");
+
     config.put("PreferredAuthentications", "gssapi-with-mic,publickey,keyboard-interactive,password");
 
     config.put("CheckCiphers", "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,3des-ctr,arcfour,arcfour128,arcfour256");
-  }
-  java.util.Vector pool=new java.util.Vector();
-  java.util.Vector identities=new java.util.Vector();
+    config.put("CheckKexes", "diffie-hellman-group14-sha1");
+
+    config.put("MaxAuthTries", "6");
+  }
+
+  private java.util.Vector sessionPool = new java.util.Vector();
+
+  private IdentityRepository defaultIdentityRepository =
+    new LocalIdentityRepository(this);
+
+  private IdentityRepository identityRepository = defaultIdentityRepository;
+
+  /**
+   * Sets the <code>identityRepository</code>, which will be referred
+   * in the public key authentication.
+   *
+   * @param identityRepository if <code>null</code> is given,
+   * the default repository, which usually refers to ~/.ssh/, will be used.
+   *
+   * @see #getIdentityRepository()
+   */
+  public synchronized void setIdentityRepository(IdentityRepository identityRepository){
+    if(identityRepository == null){
+      this.identityRepository = defaultIdentityRepository;
+    }
+    else{
+      this.identityRepository = identityRepository;
+    }
+  }
+
+  synchronized IdentityRepository getIdentityRepository(){
+    return this.identityRepository;
+  }
+
   private HostKeyRepository known_hosts=null;
 
   private static final Logger DEVNULL=new Logger(){
@@ -134,7 +168,47 @@
 
   }
 
-  public Session getSession(String username, String host) throws JSchException { return getSession(username, host, 22); }
+  /**
+   * Instantiates the <code>Session</code> object with
+   * <code>username</code> and <code>host</code>.
+   * The TCP port 22 will be used in making the connection.
+   * Note that the TCP connection must not be established
+   * until Session#connect().
+   *
+   * @param username user name
+   * @param host hostname
+   *
+   * @throws JSchException
+   *         if <code>username</code> or <code>host</code> are invalid.
+   *
+   * @return the instance of <code>Session</code> class.
+   *
+   * @see #getSession(String username, String host, int port)
+   * @see com.jcraft.jsch.Session
+   */
+  public Session getSession(String username, String host)
+     throws JSchException {
+    return getSession(username, host, 22);
+  }
+
+  /**
+   * Instantiates the <code>Session</code> object with given
+   * <code>username</code>, <code>host</code> and <code>port</code>.
+   * Note that the TCP connection must not be established
+   * until Session#connect().
+   *
+   * @param username user name
+   * @param host hostname
+   * @param post port number
+   *
+   * @throws JSchException
+   *         if <code>username</code> or <code>host</code> are invalid.
+   *
+   * @return the instance of <code>Session</code> class.
+   *
+   * @see #getSession(String username, String host, int port)
+   * @see com.jcraft.jsch.Session
+   */
   public Session getSession(String username, String host, int port) throws JSchException {
     if(username==null){
       throw new JSchException("username must not be null.");
@@ -146,25 +220,44 @@
     s.setUserName(username);
     s.setHost(host);
     s.setPort(port);
-    //pool.addElement(s);
     return s;
   }
 
   protected void addSession(Session session){
-    synchronized(pool){
-      pool.addElement(session);
+    synchronized(sessionPool){
+      sessionPool.addElement(session);
     }
   }
 
   protected boolean removeSession(Session session){
-    synchronized(pool){
-      return pool.remove(session);
+    synchronized(sessionPool){
+      return sessionPool.remove(session);
     }
   }
+
+  /**
+   * Sets the hostkey repository.
+   *
+   * @param hkrepo
+   *
+   * @see com.jcraft.jsch.HostKeyRepository
+   * @see com.jcraft.jsch.KnownHosts
+   */
   public void setHostKeyRepository(HostKeyRepository hkrepo){
     known_hosts=hkrepo;
   }
 
+  /**
+   * Sets the instance of <code>KnownHosts</code>, which refers
+   * to <code>filename</code>.
+   *
+   * @param filename filename of known_hosts file.
+   *
+   * @throws JSchException
+   *         if the given filename is invalid.
+   *
+   * @see com.jcraft.jsch.KnownHosts
+   */
   public void setKnownHosts(String filename) throws JSchException{
     if(known_hosts==null) known_hosts=new KnownHosts(this);
     if(known_hosts instanceof KnownHosts){
@@ -174,6 +267,17 @@
     }
   }
 
+  /**
+   * Sets the instance of <code>KnownHosts</code> generated with
+   * <code>stream</code>.
+   *
+   * @param stream the instance of InputStream from known_hosts file.
+   *
+   * @throws JSchException
+   *         if an I/O error occurs.
+   *
+   * @see com.jcraft.jsch.KnownHosts
+   */
   public void setKnownHosts(InputStream stream) throws JSchException{ 
     if(known_hosts==null) known_hosts=new KnownHosts(this);
     if(known_hosts instanceof KnownHosts){
@@ -183,15 +287,47 @@
     }
   }
 
+  /**
+   * Returns the current hostkey repository.
+   * By the default, this method will the instance of <code>KnownHosts</code>.
+   *
+   * @return current hostkey repository.
+   *
+   * @see com.jcraft.jsch.HostKeyRepository
+   * @see com.jcraft.jsch.KnownHosts
+   */
   public HostKeyRepository getHostKeyRepository(){ 
     if(known_hosts==null) known_hosts=new KnownHosts(this);
     return known_hosts; 
   }
 
+  /**
+   * Sets the private key, which will be referred in
+   * the public key authentication.
+   *
+   * @param prvkey filename of the private key.
+   *
+   * @throws JSchException if <code>prvkey</code> is invalid.
+   *
+   * @see #addIdentity(String prvkey, String passphrase)
+   */
   public void addIdentity(String prvkey) throws JSchException{
     addIdentity(prvkey, (byte[])null);
   }
 
+  /**
+   * Sets the private key, which will be referred in
+   * the public key authentication.
+   * Before registering it into identityRepository,
+   * it will be deciphered with <code>passphrase</code>.
+   *
+   * @param prvkey filename of the private key.
+   * @param passphrase passphrase for <code>prvkey</code>.
+   *
+   * @throws JSchException if <code>passphrase</code> is not right.
+   *
+   * @see #addIdentity(String prvkey, byte[] passphrase)
+   */
   public void addIdentity(String prvkey, String passphrase) throws JSchException{
     byte[] _passphrase=null;
     if(passphrase!=null){
@@ -202,20 +338,70 @@
       Util.bzero(_passphrase);
   }
 
+  /**
+   * Sets the private key, which will be referred in
+   * the public key authentication.
+   * Before registering it into identityRepository,
+   * it will be deciphered with <code>passphrase</code>.
+   *
+   * @param prvkey filename of the private key.
+   * @param passphrase passphrase for <code>prvkey</code>.
+   *
+   * @throws JSchException if <code>passphrase</code> is not right.
+   *
+   * @see #addIdentity(String prvkey, String pubkey, byte[] passphrase)
+   */
   public void addIdentity(String prvkey, byte[] passphrase) throws JSchException{
     Identity identity=IdentityFile.newInstance(prvkey, null, this);
     addIdentity(identity, passphrase);
   }
+
+  /**
+   * Sets the private key, which will be referred in
+   * the public key authentication.
+   * Before registering it into identityRepository,
+   * it will be deciphered with <code>passphrase</code>.
+   *
+   * @param prvkey filename of the private key.
+   * @param pubkey filename of the public key.
+   * @param passphrase passphrase for <code>prvkey</code>.
+   *
+   * @throws JSchException if <code>passphrase</code> is not right.
+   */
   public void addIdentity(String prvkey, String pubkey, byte[] passphrase) throws JSchException{
     Identity identity=IdentityFile.newInstance(prvkey, pubkey, this);
     addIdentity(identity, passphrase);
   }
 
+  /**
+   * Sets the private key, which will be referred in
+   * the public key authentication.
+   * Before registering it into identityRepository,
+   * it will be deciphered with <code>passphrase</code>.
+   *
+   * @param name name of the identity to be used to
+                 retrieve it in the identityRepository.
+   * @param prvkey private key in byte array.
+   * @param pubkey public key in byte array.
+   * @param passphrase passphrase for <code>prvkey</code>.
+   *
+   */
   public void addIdentity(String name, byte[]prvkey, byte[]pubkey, byte[] passphrase) throws JSchException{
     Identity identity=IdentityFile.newInstance(name, prvkey, pubkey, this);
     addIdentity(identity, passphrase);
   }
 
+  /**
+   * Sets the private key, which will be referred in
+   * the public key authentication.
+   * Before registering it into identityRepository,
+   * it will be deciphered with <code>passphrase</code>.
+   *
+   * @param identity private key.
+   * @param passphrase passphrase for <code>identity</code>.
+   *
+   * @throws JSchException if <code>passphrase</code> is not right.
+   */
   public void addIdentity(Identity identity, byte[] passphrase) throws JSchException{
     if(passphrase!=null){
       try{ 
@@ -228,53 +414,83 @@
         Util.bzero(passphrase);
       }
     }
-    synchronized(identities){
-      if(!identities.contains(identity)){
-	identities.addElement(identity);
-      }
+
+    if(identityRepository instanceof LocalIdentityRepository){
+      ((LocalIdentityRepository)identityRepository).add(identity);
+    }
+    else {
+      // TODO
     }
   }
 
+  /**
+   * @deprecated use #removeIdentity(Identity identity)
+   */
   public void removeIdentity(String name) throws JSchException{
-    synchronized(identities){
-      for(int i=0; i<identities.size(); i++){
-        Identity identity=(Identity)(identities.elementAt(i));
-	if(!identity.getName().equals(name))
-          continue;
-        identities.removeElement(identity);
-        identity.clear();
-        break;
-      }
+    Vector identities = identityRepository.getIdentities();
+    for(int i=0; i<identities.size(); i++){
+      Identity identity=(Identity)(identities.elementAt(i));
+      if(!identity.getName().equals(name))
+        continue;
+      identityRepository.remove(identity.getPublicKeyBlob());
+      break;
     }
   }
 
+  /**
+   * Removes the identity from identityRepository.
+   *
+   * @param identity the indentity to be removed.
+   *
+   * @throws JSchException if <code>identity</code> is invalid.
+   */
+  public void removeIdentity(Identity identity) throws JSchException{
+    identityRepository.remove(identity.getPublicKeyBlob());
+  }
+
+  /**
+   * Lists names of identities included in the identityRepository.
+   *
+   * @return names of identities
+   *
+   * @throws JSchException if identityReposory has problems.
+   */
   public Vector getIdentityNames() throws JSchException{
     Vector foo=new Vector();
-    synchronized(identities){
-      for(int i=0; i<identities.size(); i++){
-        Identity identity=(Identity)(identities.elementAt(i));
-        foo.addElement(identity.getName());
-      }
+    Vector identities = identityRepository.getIdentities();
+    for(int i=0; i<identities.size(); i++){
+      Identity identity=(Identity)(identities.elementAt(i));
+      foo.addElement(identity.getName());
     }
     return foo;
   }
 
+  /**
+   * Removes all identities from identityRepository.
+   *
+   * @throws JSchException if identityReposory has problems.
+   */
   public void removeAllIdentity() throws JSchException{
-    synchronized(identities){
-      Vector foo=getIdentityNames();
-      for(int i=0; i<foo.size(); i++){
-        String name=((String)foo.elementAt(i));
-        removeIdentity(name);
-      }
-    }
+    identityRepository.removeAll();
   }
 
+  /**
+   * Returns the config value for the specified key.
+   *
+   * @param key key for the configuration.
+   * @return config value
+   */
   public static String getConfig(String key){ 
     synchronized(config){
       return (String)(config.get(key));
     } 
   }
 
+  /**
+   * Sets or Overrides the configuration.
+   *
+   * @param newconf configurations
+   */
   public static void setConfig(java.util.Hashtable newconf){
     synchronized(config){
       for(java.util.Enumeration e=newconf.keys() ; e.hasMoreElements() ;) {
@@ -284,14 +500,28 @@
     }
   }
 
+  /**
+   * Sets or Overrides the configuration.
+   *
+   * @param key key for the configuration
+   * @param value value for the configuration
+   */
   public static void setConfig(String key, String value){
     config.put(key, value);
   }
 
+  /**
+   * Sets the logger
+   *
+   * @param logger logger
+   *
+   * @see com.jcraft.jsch.Logger
+   */
   public static void setLogger(Logger logger){
-    if(logger==null) JSch.logger=DEVNULL;
+    if(logger==null) logger=DEVNULL;
     JSch.logger=logger;
   }
+
   static Logger getLogger(){
     return logger;
   }
 
=== modified file 'src/main/java/com/jcraft/jsch/JSchAuthCancelException.java'
--- src/com/jcraft/jsch/JSchAuthCancelException.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/JSchAuthCancelException.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/JSchException.java'
--- src/com/jcraft/jsch/JSchException.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/JSchException.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/JSchPartialAuthException.java'
--- src/com/jcraft/jsch/JSchPartialAuthException.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/JSchPartialAuthException.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/KeyExchange.java'
--- src/com/jcraft/jsch/KeyExchange.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/KeyExchange.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -85,36 +85,41 @@
   */
 
   protected static String[] guess(byte[]I_S, byte[]I_C){
-//System.err.println("guess: ");
     String[] guess=new String[PROPOSAL_MAX];
     Buffer sb=new Buffer(I_S); sb.setOffSet(17);
     Buffer cb=new Buffer(I_C); cb.setOffSet(17);
 
+    if(JSch.getLogger().isEnabled(Logger.INFO)){
+      for(int i=0; i<PROPOSAL_MAX; i++){
+        JSch.getLogger().log(Logger.INFO,
+                             "kex: server: "+Util.byte2str(sb.getString()));
+      }
+      for(int i=0; i<PROPOSAL_MAX; i++){
+        JSch.getLogger().log(Logger.INFO,
+                             "kex: client: "+Util.byte2str(cb.getString()));
+      }
+      sb.setOffSet(17);
+      cb.setOffSet(17);
+    }
+
     for(int i=0; i<PROPOSAL_MAX; i++){
       byte[] sp=sb.getString();  // server proposal
       byte[] cp=cb.getString();  // client proposal
-
-//System.err.println("server-proposal: |"+new String(sp)+"|");
-//System.err.println("client-proposal: |"+new String(cp)+"|");
-
       int j=0;
       int k=0;
-//System.err.println(new String(cp));
+
       loop:
       while(j<cp.length){
 	while(j<cp.length && cp[j]!=',')j++; 
 	if(k==j) return null;
-	String algorithm=new String(cp, k, j-k);
-//System.err.println("algorithm: "+algorithm);
+	String algorithm=Util.byte2str(cp, k, j-k);
 	int l=0;
 	int m=0;
 	while(l<sp.length){
 	  while(l<sp.length && sp[l]!=',')l++; 
 	  if(m==l) return null;
-//System.err.println("  "+new String(sp, m, l-m));
-	  if(algorithm.equals(new String(sp, m, l-m))){
+	  if(algorithm.equals(Util.byte2str(sp, m, l-m))){
 	    guess[i]=algorithm;
-//System.err.println("  "+algorithm);
 	    break loop;
 	  }
 	  l++;
@@ -127,7 +132,6 @@
 	guess[i]="";
       }
       else if(guess[i]==null){
-//System.err.println("  fail");
 	return null;
       }
     }
@@ -145,10 +149,6 @@
                            " "+guess[PROPOSAL_COMP_ALGS_CTOS]);
     }
 
-//    for(int i=0; i<PROPOSAL_MAX; i++){
-//      System.err.println("guess: ["+guess[i]+"]");
-//    }
-
     return guess;
   }
 
 
=== modified file 'src/main/java/com/jcraft/jsch/KeyPair.java'
--- src/com/jcraft/jsch/KeyPair.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/KeyPair.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -43,7 +43,7 @@
   static final int VENDOR_FSECURE=1;
   int vendor=VENDOR_OPENSSH;
 
-  private static final byte[] cr="\n".getBytes();
+  private static final byte[] cr=Util.str2byte("\n");
 
   public static KeyPair genKeyPair(JSch jsch, int type) throws JSchException{
     return genKeyPair(jsch, type, 1024);
@@ -64,6 +64,11 @@
   abstract byte[] getEnd();
   abstract int getKeySize();
 
+  public String getPublicKeyComment(){
+    return publicKeyComment;
+  }
+  private String publicKeyComment = "";
+
   JSch jsch=null;
   private Cipher cipher;
   private HASH hash;
@@ -75,8 +80,8 @@
     this.jsch=jsch;
   }
 
-  static byte[][] header={"Proc-Type: 4,ENCRYPTED".getBytes(),
-			  "DEK-Info: DES-EDE3-CBC,".getBytes()};
+  static byte[][] header={Util.str2byte("Proc-Type: 4,ENCRYPTED"),
+                          Util.str2byte("DEK-Info: DES-EDE3-CBC,")};
 
   abstract byte[] getPrivateKey();
 
@@ -120,7 +125,7 @@
     }
   }
 
-  private static byte[] space=" ".getBytes();
+  private static byte[] space=Util.str2byte(" ");
 
   abstract byte[] getKeyTypeName();
   public abstract int getKeyType();
@@ -133,7 +138,7 @@
     try{
       out.write(getKeyTypeName()); out.write(space);
       out.write(pub, 0, pub.length); out.write(space);
-      out.write(comment.getBytes());
+      out.write(Util.str2byte(comment));
       out.write(cr);
     }
     catch(Exception e){
@@ -150,8 +155,8 @@
     byte[] pubblob=getPublicKeyBlob();
     byte[] pub=Util.toBase64(pubblob, 0, pubblob.length);
     try{
-      out.write("---- BEGIN SSH2 PUBLIC KEY ----".getBytes()); out.write(cr);
-      out.write(("Comment: \""+comment+"\"").getBytes()); out.write(cr);
+      out.write(Util.str2byte("---- BEGIN SSH2 PUBLIC KEY ----")); out.write(cr);
+      out.write(Util.str2byte("Comment: \""+comment+"\"")); out.write(cr);
       int index=0;
       while(index<pub.length){
 	int len=70;
@@ -159,7 +164,7 @@
 	out.write(pub, index, len); out.write(cr);
 	index+=len;
       }
-      out.write("---- END SSH2 PUBLIC KEY ----".getBytes()); out.write(cr);
+      out.write(Util.str2byte("---- END SSH2 PUBLIC KEY ----")); out.write(cr);
     }
     catch(Exception e){
     }
@@ -335,7 +340,7 @@
 	for(int index=0; index+hsize<=hn.length;){
 	  if(tmp!=null){ hash.update(tmp, 0, tmp.length); }
 	  hash.update(passphrase, 0, passphrase.length);
-	  hash.update(iv, 0, iv.length);
+          hash.update(iv, 0, iv.length > 8 ? 8: iv.length);
 	  tmp=hash.digest();
 	  System.arraycopy(tmp, 0, hn, index, tmp.length);
 	  index+=tmp.length;
@@ -420,6 +425,8 @@
 
     int type=ERROR;
     int vendor=VENDOR_OPENSSH;
+    String publicKeyComment = "";
+    Cipher cipher=null;
 
     try{
       File file=new File(prvkey);
@@ -437,7 +444,16 @@
       int i=0;
 
       while(i<len){
-        if(buf[i]=='B'&& buf[i+1]=='E'&& buf[i+2]=='G'&& buf[i+3]=='I'){
+        if(buf[i] == '-' && i+4<len && 
+           buf[i+1] == '-' && buf[i+2] == '-' && 
+           buf[i+3] == '-' && buf[i+4] == '-'){
+          break;
+        }
+        i++;
+      }
+
+      while(i<len){
+        if(buf[i]=='B'&& i+3<len && buf[i+1]=='E'&& buf[i+2]=='G'&& buf[i+3]=='I'){
           i+=6;	    
           if(buf[i]=='D'&& buf[i+1]=='S'&& buf[i+2]=='A'){ type=DSA; }
 	  else if(buf[i]=='R'&& buf[i+1]=='S'&& buf[i+2]=='A'){ type=RSA; }
@@ -446,21 +462,61 @@
 	    vendor=VENDOR_FSECURE;
 	  }
 	  else{
-            //System.err.println("invalid format: "+identity);
 	    throw new JSchException("invalid privatekey: "+prvkey);
 	  }
           i+=3;
 	  continue;
 	}
-        if(buf[i]=='C'&& buf[i+1]=='B'&& buf[i+2]=='C'&& buf[i+3]==','){
+        if(buf[i]=='A'&& i+7<len && buf[i+1]=='E'&& buf[i+2]=='S'&& buf[i+3]=='-' && 
+           buf[i+4]=='2'&& buf[i+5]=='5'&& buf[i+6]=='6'&& buf[i+7]=='-'){
+          i+=8;
+          if(Session.checkCipher((String)jsch.getConfig("aes256-cbc"))){
+            Class c=Class.forName((String)jsch.getConfig("aes256-cbc"));
+            cipher=(Cipher)(c.newInstance());
+            // key=new byte[cipher.getBlockSize()];
+            iv=new byte[cipher.getIVSize()];
+          }
+          else{
+            throw new JSchException("privatekey: aes256-cbc is not available "+prvkey);
+          }
+          continue;
+        }
+        if(buf[i]=='A'&& i+7<len && buf[i+1]=='E'&& buf[i+2]=='S'&& buf[i+3]=='-' && 
+           buf[i+4]=='1'&& buf[i+5]=='9'&& buf[i+6]=='2'&& buf[i+7]=='-'){
+          i+=8;
+          if(Session.checkCipher((String)jsch.getConfig("aes192-cbc"))){
+            Class c=Class.forName((String)jsch.getConfig("aes192-cbc"));
+            cipher=(Cipher)(c.newInstance());
+            // key=new byte[cipher.getBlockSize()];
+            iv=new byte[cipher.getIVSize()];
+          }
+          else{
+            throw new JSchException("privatekey: aes192-cbc is not available "+prvkey);
+          }
+          continue;
+        }
+        if(buf[i]=='A'&& i+7<len && buf[i+1]=='E'&& buf[i+2]=='S'&& buf[i+3]=='-' && 
+           buf[i+4]=='1'&& buf[i+5]=='2'&& buf[i+6]=='8'&& buf[i+7]=='-'){
+          i+=8;
+          if(Session.checkCipher((String)jsch.getConfig("aes128-cbc"))){
+            Class c=Class.forName((String)jsch.getConfig("aes128-cbc"));
+            cipher=(Cipher)(c.newInstance());
+            // key=new byte[cipher.getBlockSize()];
+            iv=new byte[cipher.getIVSize()];
+          }
+          else{
+            throw new JSchException("privatekey: aes128-cbc is not available "+prvkey);
+          }
+          continue;
+        }
+        if(buf[i]=='C'&& i+3<len && buf[i+1]=='B'&& buf[i+2]=='C'&& buf[i+3]==','){
           i+=4;
 	  for(int ii=0; ii<iv.length; ii++){
             iv[ii]=(byte)(((a2b(buf[i++])<<4)&0xf0)+(a2b(buf[i++])&0xf));
   	  }
 	  continue;
 	}
-	if(buf[i]==0x0d &&
-	   i+1<buf.length && buf[i+1]==0x0a){
+	if(buf[i]==0x0d && i+1<buf.length && buf[i+1]==0x0a){
 	  i++;
 	  continue;
 	}
@@ -518,10 +574,9 @@
 	_buf.getInt();
 	byte[]_type=_buf.getString();
 	//System.err.println("type: "+new String(_type)); 
-	byte[] _cipher=_buf.getString();
-	String cipher=new String(_cipher);
-	//System.err.println("cipher: "+cipher); 
-	if(cipher.equals("3des-cbc")){
+	String _cipher=Util.byte2str(_buf.getString());
+	//System.err.println("cipher: "+_cipher); 
+	if(_cipher.equals("3des-cbc")){
   	   _buf.getInt();
 	   byte[] foo=new byte[data.length-_buf.getOffSet()];
 	   _buf.getByte(foo);
@@ -529,7 +584,7 @@
 	   encrypted=true;
 	   throw new JSchException("unknown privatekey format: "+prvkey);
 	}
-	else if(cipher.equals("none")){
+	else if(_cipher.equals("none")){
   	   _buf.getInt();
   	   _buf.getInt();
 
@@ -606,6 +661,13 @@
 		while(i<len){ if(buf[i]==' ')break; i++;}
 		publickeyblob=Util.fromBase64(buf, start, i-start);
 	      }
+              if(i++<len){
+                int s=i;
+                while(i<len){ if(buf[i]=='\n')break; i++;}
+                if(i<len){
+                  publicKeyComment = new String(buf, s, i-s);
+                }
+              } 
 	    }
 	  }
 	}
@@ -628,6 +690,8 @@
       kpair.encrypted=encrypted;
       kpair.publickeyblob=publickeyblob;
       kpair.vendor=vendor;
+      kpair.publicKeyComment=publicKeyComment;
+      kpair.cipher=cipher;
 
       if(encrypted){
 	kpair.iv=iv;
 
=== modified file 'src/main/java/com/jcraft/jsch/KeyPairDSA.java'
--- src/com/jcraft/jsch/KeyPairDSA.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/KeyPairDSA.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -65,8 +65,8 @@
     }
   }
 
-  private static final byte[] begin="-----BEGIN DSA PRIVATE KEY-----".getBytes();
-  private static final byte[] end="-----END DSA PRIVATE KEY-----".getBytes();
+  private static final byte[] begin=Util.str2byte("-----BEGIN DSA PRIVATE KEY-----");
+  private static final byte[] end=Util.str2byte("-----END DSA PRIVATE KEY-----");
 
   byte[] getBegin(){ return begin; }
   byte[] getEnd(){ return end; }
@@ -209,7 +209,7 @@
     return buf.buffer;
   }
 
-  private static final byte[] sshdss="ssh-dss".getBytes();
+  private static final byte[] sshdss=Util.str2byte("ssh-dss");
   byte[] getKeyTypeName(){return sshdss;}
   public int getKeyType(){return DSA;}
 
 
=== modified file 'src/main/java/com/jcraft/jsch/KeyPairGenDSA.java'
--- src/com/jcraft/jsch/KeyPairGenDSA.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/KeyPairGenDSA.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/KeyPairGenRSA.java'
--- src/com/jcraft/jsch/KeyPairGenRSA.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/KeyPairGenRSA.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
=== modified file 'src/main/java/com/jcraft/jsch/KeyPairRSA.java'
--- src/com/jcraft/jsch/KeyPairRSA.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/KeyPairRSA.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -73,8 +73,8 @@
     }
   }
 
-  private static final byte[] begin="-----BEGIN RSA PRIVATE KEY-----".getBytes();
-  private static final byte[] end="-----END RSA PRIVATE KEY-----".getBytes();
+  private static final byte[] begin=Util.str2byte("-----BEGIN RSA PRIVATE KEY-----");
+  private static final byte[] end=Util.str2byte("-----END RSA PRIVATE KEY-----");
 
   byte[] getBegin(){ return begin; }
   byte[] getEnd(){ return end; }
@@ -308,7 +308,7 @@
     return buf.buffer;
   }
 
-  private static final byte[] sshrsa="ssh-rsa".getBytes();
+  private static final byte[] sshrsa=Util.str2byte("ssh-rsa");
   byte[] getKeyTypeName(){return sshrsa;}
   public int getKeyType(){return RSA;}
 
 
=== modified file 'src/main/java/com/jcraft/jsch/KnownHosts.java'
--- src/com/jcraft/jsch/KnownHosts.java	2010-06-27 23:17:34 +0000
+++ src/main/java/com/jcraft/jsch/KnownHosts.java	2012-05-04 10:23:17 +0000
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
-Copyright (c) 2002-2009 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2002-2012 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -100,13 +100,13 @@
           i=buf[j];
 	  if(i==' '||i=='\t'){ j++; continue; }
 	  if(i=='#'){
-	    addInvalidLine(new String(buf, 0, bufl));
+	    addInvalidLine(Util.byte2str(buf, 0, bufl));
 	    continue loop;
 	  }
 	  break;
 	}
 	if(j>=bufl){ 
-	  addInvalidLine(new String(buf, 0, bufl));
+	  addInvalidLine(Util.byte2str(buf, 0, bufl));
 	  continue loop; 
 	}
 
@@ -118,7 +118,7 @@
 	}
 	host=sb.toString();
 	if(j>=bufl || host.length()==0){
-	  addInvalidLine(new String(buf, 0, bufl));
+	  addInvalidLine(Util.byte2str(buf, 0, bufl));
 	  continue loop; 
 	}
 
@@ -133,7 +133,7 @@
 	else if(sb.toString().equals("ssh-rsa")){ type=HostKey.SSHRSA; }
 	else { j=bufl; }
 	if(j>=bufl){
-	  addInvalidLine(new String(buf, 0, bufl));
+	  addInvalidLine(Util.byte2str(buf, 0, bufl));
 	  continue loop; 
 	}
 
@@ -146,7 +146,7 @@
 	}
 	key=sb.toString();