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

SymmetricCiphers: rm some redundant methods / variables

Browse Source
This commit is contained in:
terrafrost 2016-12-09 15:51:31 -06:00
parent d34a911402
commit 067c1882e5
4 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/Common/SymmetricKey.php
View File

@ -382,7 +382,7 @@ abstract class SymmetricKey
* @var string * @var string
* @access private * @access private
*/ */
protected $password_default_salt = 'phpseclib/salt'; private $password_default_salt = 'phpseclib/salt';
/** /**
* The name of the performance-optimized callback function * The name of the performance-optimized callback function
@ -1898,7 +1898,7 @@ abstract class SymmetricKey
* @access private * @access private
* @internal Could, but not must, extend by the child Crypt_* class * @internal Could, but not must, extend by the child Crypt_* class
*/ */
protected function setupMcrypt() private function setupMcrypt()
{ {
$this->clearBuffers(); $this->clearBuffers();
$this->enchanged = $this->dechanged = true; $this->enchanged = $this->dechanged = true;

15
phpseclib/Crypt/RC2.php
View File

@ -534,21 +534,6 @@ class RC2 extends BlockCipher
return pack('vvvv', $r0, $r1, $r2, $r3); return pack('vvvv', $r0, $r1, $r2, $r3);
} }
/**
* Setup the \phpseclib\Crypt\Common\SymmetricKey::ENGINE_MCRYPT $engine
*
* @see \phpseclib\Crypt\Common\SymmetricKey::setupMcrypt()
* @access private
*/
protected function setupMcrypt()
{
if (!isset($this->key)) {
$this->setKey('');
}
parent::setupMcrypt();
}
/** /**
* Creates the key schedule * Creates the key schedule
* *

10
phpseclib/Crypt/Rijndael.php
View File

@ -81,16 +81,6 @@ class Rijndael extends BlockCipher
*/ */
protected $cipher_name_mcrypt = 'rijndael-128'; protected $cipher_name_mcrypt = 'rijndael-128';
/**
* The default salt used by setPassword()
*
* @see \phpseclib\Crypt\Common\SymmetricKey::password_default_salt
* @see \phpseclib\Crypt\Common\SymmetricKey::setPassword()
* @var string
* @access private
*/
protected $password_default_salt = 'phpseclib';
/** /**
* The Key Schedule * The Key Schedule
* *

10
phpseclib/Crypt/TripleDES.php
View File

@ -68,16 +68,6 @@ class TripleDES extends DES
*/ */
protected $key_length = 24; protected $key_length = 24;
/**
* The default salt used by setPassword()
*
* @see \phpseclib\Crypt\Common\SymmetricKey::password_default_salt
* @see \phpseclib\Crypt\Common\SymmetricKey::setPassword()
* @var string
* @access private
*/
protected $password_default_salt = 'phpseclib';
/** /**
* The mcrypt specific name of the cipher * The mcrypt specific name of the cipher
* *