26 files changed, 33 insertions, 5 deletions
diff --git a/auth/authentication.php b/auth/authentication.php
index e460724..ed8e8d4 100644
--- a/auth/authentication.php
+++ b/auth/authentication.php
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-ini_set('include_path', ini_get('include_path').':./libs/phpseclib-1.0.6');
+ini_set('include_path', ini_get('include_path').':./libs/phpseclib-1.0.7');
 
 require_once('ssh.php');
 require_once('telnet.php');
diff --git a/libs/phpseclib-1.0.6/Crypt/AES.php b/libs/phpseclib-1.0.7/Crypt/AES.php
index 594011e..594011e 100644
--- a/libs/phpseclib-1.0.6/Crypt/AES.php
+++ b/libs/phpseclib-1.0.7/Crypt/AES.php
diff --git a/libs/phpseclib-1.0.6/Crypt/Base.php b/libs/phpseclib-1.0.7/Crypt/Base.php
index 91ebe59..91ebe59 100644
--- a/libs/phpseclib-1.0.6/Crypt/Base.php
+++ b/libs/phpseclib-1.0.7/Crypt/Base.php
diff --git a/libs/phpseclib-1.0.6/Crypt/Blowfish.php b/libs/phpseclib-1.0.7/Crypt/Blowfish.php
index 5be5ce3..17c8e7e 100644
--- a/libs/phpseclib-1.0.6/Crypt/Blowfish.php
+++ b/libs/phpseclib-1.0.7/Crypt/Blowfish.php
@@ -390,6 +390,9 @@ class Crypt_Blowfish extends Crypt_Base
     function isValidEngine($engine)
     {
         if ($engine == CRYPT_ENGINE_OPENSSL) {
+            if (version_compare(PHP_VERSION, '5.3.7') < 0 && $this->key_length != 16) {
+                return false;
+            }
             if ($this->key_length < 16) {
                 return false;
             }
diff --git a/libs/phpseclib-1.0.6/Crypt/DES.php b/libs/phpseclib-1.0.7/Crypt/DES.php
index 4c57401..4c57401 100644
--- a/libs/phpseclib-1.0.6/Crypt/DES.php
+++ b/libs/phpseclib-1.0.7/Crypt/DES.php
diff --git a/libs/phpseclib-1.0.6/Crypt/Hash.php b/libs/phpseclib-1.0.7/Crypt/Hash.php
index faa17c5..faa17c5 100644
--- a/libs/phpseclib-1.0.6/Crypt/Hash.php
+++ b/libs/phpseclib-1.0.7/Crypt/Hash.php
diff --git a/libs/phpseclib-1.0.6/Crypt/RC2.php b/libs/phpseclib-1.0.7/Crypt/RC2.php
index 97b4550..97b4550 100644
--- a/libs/phpseclib-1.0.6/Crypt/RC2.php
+++ b/libs/phpseclib-1.0.7/Crypt/RC2.php
diff --git a/libs/phpseclib-1.0.6/Crypt/RC4.php b/libs/phpseclib-1.0.7/Crypt/RC4.php
index 6214554..7cec2e7 100644
--- a/libs/phpseclib-1.0.6/Crypt/RC4.php
+++ b/libs/phpseclib-1.0.7/Crypt/RC4.php
@@ -190,7 +190,23 @@ class Crypt_RC4 extends Crypt_Base
     function isValidEngine($engine)
     {
         if ($engine == CRYPT_ENGINE_OPENSSL) {
-            $this->cipher_name_openssl = 'rc4-40';
+            if (version_compare(PHP_VERSION, '5.3.7') >= 0) {
+                $this->cipher_name_openssl = 'rc4-40';
+            } else {
+                switch (strlen($this->key)) {
+                    case 5:
+                        $this->cipher_name_openssl = 'rc4-40';
+                        break;
+                    case 8:
+                        $this->cipher_name_openssl = 'rc4-64';
+                        break;
+                    case 16:
+                        $this->cipher_name_openssl = 'rc4';
+                        break;
+                    default:
+                        return false;
+                }
+            }
         }
 
         return parent::isValidEngine($engine);
diff --git a/libs/phpseclib-1.0.6/Crypt/RSA.php b/libs/phpseclib-1.0.7/Crypt/RSA.php
index 3eacfe1..b734c9f 100644
--- a/libs/phpseclib-1.0.6/Crypt/RSA.php
+++ b/libs/phpseclib-1.0.7/Crypt/RSA.php
@@ -1661,6 +1661,15 @@ class Crypt_RSA
         }
 
         if ($components === false) {
+            $this->comment = null;
+            $this->modulus = null;
+            $this->k = null;
+            $this->exponent = null;
+            $this->primes = null;
+            $this->exponents = null;
+            $this->coefficients = null;
+            $this->publicExponent = null;
+
             return false;
         }
 
diff --git a/libs/phpseclib-1.0.6/Crypt/Random.php b/libs/phpseclib-1.0.7/Crypt/Random.php
index 472d47c..1803421 100644
--- a/libs/phpseclib-1.0.6/Crypt/Random.php
+++ b/libs/phpseclib-1.0.7/Crypt/Random.php
@@ -70,7 +70,7 @@ if (!function_exists('crypt_random_string')) {
         if (CRYPT_RANDOM_IS_WINDOWS) {
             // method 1. prior to PHP 5.3, mcrypt_create_iv() would call rand() on windows
             if (extension_loaded('mcrypt') && version_compare(PHP_VERSION, '5.3.0', '>=')) {
-                return mcrypt_create_iv($length);
+                return @mcrypt_create_iv($length);
             }
             // method 2. openssl_random_pseudo_bytes was introduced in PHP 5.3.0 but prior to PHP 5.3.4 there was,
             // to quote <http://php.net/ChangeLog-5.php#5.3.4>, "possible blocking behavior". as of 5.3.4
@@ -109,7 +109,7 @@ if (!function_exists('crypt_random_string')) {
             // not doing. regardless, this'll only be called if this PHP script couldn't open /dev/urandom due to open_basedir
             // restrictions or some such
             if (extension_loaded('mcrypt')) {
-                return mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+                return @mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
             }
         }
         // at this point we have no choice but to use a pure-PHP CSPRNG
diff --git a/libs/phpseclib-1.0.6/Crypt/Rijndael.php b/libs/phpseclib-1.0.7/Crypt/Rijndael.php
index 56bc4e9..56bc4e9 100644
--- a/libs/phpseclib-1.0.6/Crypt/Rijndael.php
+++ b/libs/phpseclib-1.0.7/Crypt/Rijndael.php
diff --git a/libs/phpseclib-1.0.6/Crypt/TripleDES.php b/libs/phpseclib-1.0.7/Crypt/TripleDES.php
index 4c0b677..4c0b677 100644
--- a/libs/phpseclib-1.0.6/Crypt/TripleDES.php
+++ b/libs/phpseclib-1.0.7/Crypt/TripleDES.php
diff --git a/libs/phpseclib-1.0.6/Crypt/Twofish.php b/libs/phpseclib-1.0.7/Crypt/Twofish.php
index 7125f6a..7125f6a 100644
--- a/libs/phpseclib-1.0.6/Crypt/Twofish.php
+++ b/libs/phpseclib-1.0.7/Crypt/Twofish.php
diff --git a/libs/phpseclib-1.0.6/File/ANSI.php b/libs/phpseclib-1.0.7/File/ANSI.php
index 989537b..989537b 100644
--- a/libs/phpseclib-1.0.6/File/ANSI.php
+++ b/libs/phpseclib-1.0.7/File/ANSI.php
diff --git a/libs/phpseclib-1.0.6/File/ASN1.php b/libs/phpseclib-1.0.7/File/ASN1.php
index 7ce28bd..7ce28bd 100644
--- a/libs/phpseclib-1.0.6/File/ASN1.php
+++ b/libs/phpseclib-1.0.7/File/ASN1.php
diff --git a/libs/phpseclib-1.0.6/File/X509.php b/libs/phpseclib-1.0.7/File/X509.php
index 932262a..e6c8443 100644
--- a/libs/phpseclib-1.0.6/File/X509.php
+++ b/libs/phpseclib-1.0.7/File/X509.php
@@ -3518,7 +3518,7 @@ class File_X509
 
         $altName = array();
 
-        if (isset($subject->domains) && count($subject->domains) > 1) {
+        if (isset($subject->domains) && count($subject->domains)) {
             $altName = array_map(array('File_X509', '_dnsName'), $subject->domains);
         }
 
diff --git a/libs/phpseclib-1.0.6/Math/BigInteger.php b/libs/phpseclib-1.0.7/Math/BigInteger.php
index 192ce82..192ce82 100644
--- a/libs/phpseclib-1.0.6/Math/BigInteger.php
+++ b/libs/phpseclib-1.0.7/Math/BigInteger.php
diff --git a/libs/phpseclib-1.0.6/Net/SCP.php b/libs/phpseclib-1.0.7/Net/SCP.php
index 354acea..354acea 100644
--- a/libs/phpseclib-1.0.6/Net/SCP.php
+++ b/libs/phpseclib-1.0.7/Net/SCP.php
diff --git a/libs/phpseclib-1.0.6/Net/SFTP.php b/libs/phpseclib-1.0.7/Net/SFTP.php
index 40c97da..40c97da 100644
--- a/libs/phpseclib-1.0.6/Net/SFTP.php
+++ b/libs/phpseclib-1.0.7/Net/SFTP.php
diff --git a/libs/phpseclib-1.0.6/Net/SFTP/Stream.php b/libs/phpseclib-1.0.7/Net/SFTP/Stream.php
index a944d7f..a944d7f 100644
--- a/libs/phpseclib-1.0.6/Net/SFTP/Stream.php
+++ b/libs/phpseclib-1.0.7/Net/SFTP/Stream.php
diff --git a/libs/phpseclib-1.0.6/Net/SSH1.php b/libs/phpseclib-1.0.7/Net/SSH1.php
index 55473d0..55473d0 100644
--- a/libs/phpseclib-1.0.6/Net/SSH1.php
+++ b/libs/phpseclib-1.0.7/Net/SSH1.php
diff --git a/libs/phpseclib-1.0.6/Net/SSH2.php b/libs/phpseclib-1.0.7/Net/SSH2.php
index d104b81..d104b81 100644
--- a/libs/phpseclib-1.0.6/Net/SSH2.php
+++ b/libs/phpseclib-1.0.7/Net/SSH2.php
diff --git a/libs/phpseclib-1.0.6/System/SSH/Agent.php b/libs/phpseclib-1.0.7/System/SSH/Agent.php
index 7388cb4..7388cb4 100644
--- a/libs/phpseclib-1.0.6/System/SSH/Agent.php
+++ b/libs/phpseclib-1.0.7/System/SSH/Agent.php
diff --git a/libs/phpseclib-1.0.6/System/SSH_Agent.php b/libs/phpseclib-1.0.7/System/SSH_Agent.php
index ea434b9..ea434b9 100644
--- a/libs/phpseclib-1.0.6/System/SSH_Agent.php
+++ b/libs/phpseclib-1.0.7/System/SSH_Agent.php
diff --git a/libs/phpseclib-1.0.6/bootstrap.php b/libs/phpseclib-1.0.7/bootstrap.php
index 0da0999..0da0999 100644
--- a/libs/phpseclib-1.0.6/bootstrap.php
+++ b/libs/phpseclib-1.0.7/bootstrap.php
diff --git a/libs/phpseclib-1.0.6/openssl.cnf b/libs/phpseclib-1.0.7/openssl.cnf
index 2b8b52f..2b8b52f 100644
--- a/libs/phpseclib-1.0.6/openssl.cnf
+++ b/libs/phpseclib-1.0.7/openssl.cnf