backport more changes from master

This commit is contained in:
terrafrost 2022-07-16 09:03:17 -05:00
parent dd9146e259
commit 114f8c8f77
6 changed files with 1 additions and 54 deletions

View File

@ -78,22 +78,6 @@ abstract class AsymmetricKey
*/ */
private static $invisiblePlugins = []; private static $invisiblePlugins = [];
/**
* Supported signature formats (lower case)
*
* @see self::initialize_static_variables()
* @var array
*/
private static $signatureFormats = [];
/**
* Supported signature formats (original case)
*
* @see self::initialize_static_variables()
* @var array
*/
private static $signatureFileFormats = [];
/** /**
* Available Engines * Available Engines
* *

View File

@ -130,7 +130,7 @@ abstract class OpenSSH
if (!isset($parts[1])) { if (!isset($parts[1])) {
$key = base64_decode($parts[0]); $key = base64_decode($parts[0]);
$comment = isset($parts[1]) ? $parts[1] : false; $comment = false;
} else { } else {
$asciiType = $parts[0]; $asciiType = $parts[0];
self::checkType($parts[0]); self::checkType($parts[0]);

View File

@ -22,20 +22,6 @@ use phpseclib3\Math\BigInteger;
*/ */
abstract class Base abstract class Base
{ {
/**
* Doubles
*
* @var object[]
*/
protected $doubles;
/**
* NAF Points
*
* @var int[]
*/
private $naf;
/** /**
* The Order * The Order
* *

View File

@ -70,14 +70,6 @@ class RC2 extends BlockCipher
*/ */
private $orig_key; private $orig_key;
/**
* Don't truncate / null pad key
*
* @see \phpseclib3\Crypt\Common\SymmetricKey::clearBuffers()
* @var bool
*/
private $skip_key_adjustment = true;
/** /**
* Key Length (in bytes) * Key Length (in bytes)
* *

View File

@ -160,14 +160,6 @@ class X509
*/ */
private $privateKey; private $privateKey;
/**
* Object identifiers for X.509 certificates
*
* @var array
* @link http://en.wikipedia.org/wiki/Object_identifier
*/
private $oids;
/** /**
* The certificate authorities * The certificate authorities
* *

View File

@ -107,13 +107,6 @@ class Agent
*/ */
private $expected_bytes = 0; private $expected_bytes = 0;
/**
* The current request channel
*
* @var int
*/
private $request_channel;
/** /**
* Default Constructor * Default Constructor
* *