diff --git a/phpseclib/Crypt/Common/SymmetricKey.php b/phpseclib/Crypt/Common/SymmetricKey.php index 532a1b3e..6069e979 100644 --- a/phpseclib/Crypt/Common/SymmetricKey.php +++ b/phpseclib/Crypt/Common/SymmetricKey.php @@ -382,7 +382,7 @@ abstract class SymmetricKey * @var string * @access private */ - protected $password_default_salt = 'phpseclib/salt'; + private $password_default_salt = 'phpseclib/salt'; /** * The name of the performance-optimized callback function @@ -1898,7 +1898,7 @@ abstract class SymmetricKey * @access private * @internal Could, but not must, extend by the child Crypt_* class */ - protected function setupMcrypt() + private function setupMcrypt() { $this->clearBuffers(); $this->enchanged = $this->dechanged = true; diff --git a/phpseclib/Crypt/RC2.php b/phpseclib/Crypt/RC2.php index 9f6a266b..8854be51 100644 --- a/phpseclib/Crypt/RC2.php +++ b/phpseclib/Crypt/RC2.php @@ -534,21 +534,6 @@ class RC2 extends BlockCipher 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 * diff --git a/phpseclib/Crypt/Rijndael.php b/phpseclib/Crypt/Rijndael.php index 5ffa3bc3..6159da9a 100644 --- a/phpseclib/Crypt/Rijndael.php +++ b/phpseclib/Crypt/Rijndael.php @@ -81,16 +81,6 @@ class Rijndael extends BlockCipher */ 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 * diff --git a/phpseclib/Crypt/TripleDES.php b/phpseclib/Crypt/TripleDES.php index 0a73c41c..b597d29d 100644 --- a/phpseclib/Crypt/TripleDES.php +++ b/phpseclib/Crypt/TripleDES.php @@ -68,16 +68,6 @@ class TripleDES extends DES */ 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 *