diff --git a/README.md b/README.md index 420fe577..2aa75b9c 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ MIT-licensed pure-PHP implementations of an arbitrary-precision integer arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael, AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509 -* [Download (0.3.5)](http://sourceforge.net/projects/phpseclib/files/phpseclib0.3.5.zip/download) +* [Download (0.3.6)](http://sourceforge.net/projects/phpseclib/files/phpseclib0.3.6.zip/download) * [Browse Git](https://github.com/phpseclib/phpseclib) * [Documentation](http://phpseclib.sourceforge.net/) * [Support](http://www.frostjedi.com/phpbb/viewforum.php?f=46) diff --git a/composer.json b/composer.json index e416a013..0b0789f9 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,8 @@ "Crypt": "phpseclib/", "File": "phpseclib/", "Math": "phpseclib/", - "Net": "phpseclib/" + "Net": "phpseclib/", + "System": "phpseclib/" }, "files": [ "phpseclib/Crypt/Random.php" diff --git a/phpseclib/System/SSH_Agent.php b/phpseclib/System/SSH_Agent.php index 32392a55..2d4c3629 100644 --- a/phpseclib/System/SSH_Agent.php +++ b/phpseclib/System/SSH_Agent.php @@ -227,14 +227,6 @@ class System_SSH_Agent */ var $fsock; - /** - * Is Connected? - * - * @var Boolean - * @access private - */ - var $is_connected = false; - /** * Default Constructor * @@ -251,7 +243,7 @@ class System_SSH_Agent $address = $_ENV['SSH_AUTH_SOCK']; break; default: - user_error('SSH_AUTH_SOCK not found', E_USER_NOTICE); + user_error('SSH_AUTH_SOCK not found'); return false; } @@ -259,7 +251,6 @@ class System_SSH_Agent if (!$this->fsock) { user_error("Unable to connect to ssh-agent (Error $errno: $errstr)"); } - $this->is_connected = true; } /** @@ -273,7 +264,7 @@ class System_SSH_Agent */ function requestIdentities() { - if (!$this->is_connected) { + if (!$this->fsock) { return array(); }