octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-02-04 21:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into php5

Browse Source 
* master:
  composer: add System to psr-0 autoload section
  update README.md to show latest version
  SSH_Agent: a few changes per bantu
This commit is contained in:
Andreas Fischer 2014-02-28 23:17:46 +01:00
commit 2785826d94
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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, arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509 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) * [Browse Git](https://github.com/phpseclib/phpseclib)
* [Documentation](http://phpseclib.sourceforge.net/) * [Documentation](http://phpseclib.sourceforge.net/)
* [Support](http://www.frostjedi.com/phpbb/viewforum.php?f=46) * [Support](http://www.frostjedi.com/phpbb/viewforum.php?f=46)

3
composer.json
View File

@ -61,7 +61,8 @@
"Crypt": "phpseclib/", "Crypt": "phpseclib/",
"File": "phpseclib/", "File": "phpseclib/",
"Math": "phpseclib/", "Math": "phpseclib/",
"Net": "phpseclib/" "Net": "phpseclib/",
"System": "phpseclib/"
}, },
"files": [ "files": [
"phpseclib/Crypt/Random.php" "phpseclib/Crypt/Random.php"

13
phpseclib/System/SSH_Agent.php
View File

@ -227,14 +227,6 @@ class System_SSH_Agent
*/ */
var $fsock; var $fsock;
/**
* Is Connected?
*
* @var Boolean
* @access private
*/
var $is_connected = false;
/** /**
* Default Constructor * Default Constructor
* *
@ -251,7 +243,7 @@ class System_SSH_Agent
$address = $_ENV['SSH_AUTH_SOCK']; $address = $_ENV['SSH_AUTH_SOCK'];
break; break;
default: default:
user_error('SSH_AUTH_SOCK not found', E_USER_NOTICE); user_error('SSH_AUTH_SOCK not found');
return false; return false;
} }
@ -259,7 +251,6 @@ class System_SSH_Agent
if (!$this->fsock) { if (!$this->fsock) {
user_error("Unable to connect to ssh-agent (Error $errno: $errstr)"); 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() function requestIdentities()
{ {
if (!$this->is_connected) { if (!$this->fsock) {
return array(); return array();
} }