mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-08 14:51:00 +00:00
Merge branch 'getkeylength' into getkeylength-2.0-2
Conflicts: phpseclib/Crypt/RC2.php phpseclib/Crypt/TripleDES.php
This commit is contained in:
commit
26a0a0890c
@ -443,7 +443,7 @@ abstract class Base
|
||||
/**
|
||||
* Has the key length explicitly been set or should it be derived from the key, itself?
|
||||
*
|
||||
* @see setKeyLength()
|
||||
* @see Crypt_Base::setKeyLength()
|
||||
* @var bool
|
||||
* @access private
|
||||
*/
|
||||
@ -452,7 +452,7 @@ abstract class Base
|
||||
/**
|
||||
* Don't truncate / null pad key
|
||||
*
|
||||
* @see Crypt_Base::_clearBuffers
|
||||
* @see Crypt_Base::_clearBuffers()
|
||||
* @var bool
|
||||
* @access private
|
||||
*/
|
||||
|
@ -275,7 +275,7 @@ class Blowfish extends Base
|
||||
/**
|
||||
* The Key Length
|
||||
*
|
||||
* @see setKeyLength()
|
||||
* @see \phpseclib\Crypt\Base::setKeyLength()
|
||||
* @var int
|
||||
* @access private
|
||||
* @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16. Exists in conjunction with $Nk
|
||||
|
@ -79,7 +79,7 @@ class RC2 extends Base
|
||||
/**
|
||||
* Don't truncate / null pad key
|
||||
*
|
||||
* @see \phpseclib\Crypt\Base::_clearBuffers
|
||||
* @see \phpseclib\Crypt\Base::_clearBuffers()
|
||||
* @var bool
|
||||
* @access private
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user