octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-15 09:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2021-04-12 08:23:56 -05:00
commit a9aa3b117d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpseclib/Crypt/Common/AsymmetricKey.php
View File

@ -351,6 +351,9 @@ abstract class AsymmetricKey
continue; continue;
} }
$name = $file->getBasename('.php'); $name = $file->getBasename('.php');
if ($name[0] == '.') {
continue;
}
$type = 'phpseclib3\Crypt\\' . static::ALGORITHM . '\\Formats\\' . $format . '\\' . $name; $type = 'phpseclib3\Crypt\\' . static::ALGORITHM . '\\Formats\\' . $format . '\\' . $name;
$reflect = new \ReflectionClass($type); $reflect = new \ReflectionClass($type);
if ($reflect->isTrait()) { if ($reflect->isTrait()) {

4
phpseclib/Net/SFTP.php
View File

@ -272,7 +272,7 @@ class SFTP extends SSH2
* @var array * @var array
* @access private * @access private
*/ */
var $requestBuffer = array(); private $requestBuffer = array();
/** /**
* Preserve timestamps on file downloads / uploads * Preserve timestamps on file downloads / uploads
@ -282,7 +282,7 @@ class SFTP extends SSH2
* @var bool * @var bool
* @access private * @access private
*/ */
var $preserveTime = false; private $preserveTime = false;
/** /**
* Default Constructor. * Default Constructor.

4
phpseclib/Net/SSH2.php
View File

@ -640,7 +640,7 @@ class SSH2
* @see self::exec() * @see self::exec()
* @access private * @access private
*/ */
var $window_resize = 0x40000000; private $window_resize = 0x40000000;
/** /**
* Window size, server to client * Window size, server to client
@ -729,7 +729,7 @@ class SSH2
* @see self::setKeepAlive() * @see self::setKeepAlive()
* @access private * @access private
*/ */
var $keepAlive; private $keepAlive;
/** /**
* Real-time log file pointer * Real-time log file pointer