mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-16 02:07:09 +00:00
Merge branch '3.0'
This commit is contained in:
commit
5e524c3f21
@ -80,22 +80,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
|
||||||
*
|
*
|
||||||
|
@ -129,7 +129,7 @@ abstract class OpenSSH
|
|||||||
|
|
||||||
if (!isset($parts[1])) {
|
if (!isset($parts[1])) {
|
||||||
$key = base64_decode($parts[0]);
|
$key = base64_decode($parts[0]);
|
||||||
$comment = $parts[1] ?? false;
|
$comment = false;
|
||||||
} else {
|
} else {
|
||||||
$asciiType = $parts[0];
|
$asciiType = $parts[0];
|
||||||
self::checkType($parts[0]);
|
self::checkType($parts[0]);
|
||||||
|
@ -24,20 +24,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
|
||||||
*
|
*
|
||||||
|
@ -71,14 +71,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)
|
||||||
*
|
*
|
||||||
|
@ -161,14 +161,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
|
||||||
*
|
*
|
||||||
|
@ -109,13 +109,6 @@ class Agent
|
|||||||
*/
|
*/
|
||||||
private $expected_bytes = 0;
|
private $expected_bytes = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* The current request channel
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
private $request_channel;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Constructor
|
* Default Constructor
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user