Merge branch 'getkeylength' into getkeylength-2.0-2

Conflicts:
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/TripleDES.php
This commit is contained in:
terrafrost 2015-10-04 16:40:15 -05:00
commit 26a0a0890c
3 changed files with 4 additions and 4 deletions

View File

@ -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
*/

View File

@ -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

View File

@ -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
*/