octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-29 04:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phpseclib/phpseclib

Browse Source
This commit is contained in:
terrafrost 2013-03-12 20:58:37 -05:00
commit 3153daf548
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -1,3 +1,5 @@
phpseclib Lead Developer: TerraFrost (Jim Wigginton) phpseclib Lead Developer: TerraFrost (Jim Wigginton)
phpseclib Developers: monnerat (Patrick Monnerat) phpseclib Developers: monnerat (Patrick Monnerat)
bantu (Andreas Fischer)
petrich (Hans-Jürgen Petrich)

3
phpseclib/Crypt/Random.php
View File

@ -53,7 +53,8 @@
* @return String * @return String
* @access public * @access public
*/ */
function crypt_random_string($length) { function crypt_random_string($length)
{
// PHP_OS & "\xDF\xDF\xDF" == strtoupper(substr(PHP_OS, 0, 3)), but a lot faster // PHP_OS & "\xDF\xDF\xDF" == strtoupper(substr(PHP_OS, 0, 3)), but a lot faster
if ((PHP_OS & "\xDF\xDF\xDF") === 'WIN') { if ((PHP_OS & "\xDF\xDF\xDF") === 'WIN') {
// method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call. // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.

7
phpseclib/Net/SFTP.php
View File

@ -985,7 +985,7 @@ class Net_SFTP extends Net_SSH2 {
*/ */
function _size($filename) function _size($filename)
{ {
$result = $this->_stat($filename, NET_SFTP_LSTAT); $result = $this->_stat($filename, NET_SFTP_STAT);
if ($result === false) { if ($result === false) {
return false; return false;
} }
@ -1891,8 +1891,11 @@ class Net_SFTP extends Net_SSH2 {
break; break;
case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004 case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004
$attr+= unpack('Npermissions', $this->_string_shift($response, 4)); $attr+= unpack('Npermissions', $this->_string_shift($response, 4));
// mode == permissions; permissions was the original array key and is retained for bc purposes.
// mode was added because that's the more industry standard terminology
$attr+= array('mode' => $attr['permissions']);
$fileType = $this->_parseMode($attr['permissions']); $fileType = $this->_parseMode($attr['permissions']);
if ($filetype !== false) { if ($fileType !== false) {
$attr+= array('type' => $fileType); $attr+= array('type' => $fileType);
} }
break; break;