danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2025-01-22 04:51:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'getkeylength' into getkeylength-2.0-2

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/Base.php
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? * Has the key length explicitly been set or should it be derived from the key, itself?
* *
* @see setKeyLength() * @see Crypt_Base::setKeyLength()
* @var bool * @var bool
* @access private * @access private
*/ */
@ -452,7 +452,7 @@ abstract class Base
/** /**
* Don't truncate / null pad key * Don't truncate / null pad key
* *
* @see Crypt_Base::_clearBuffers * @see Crypt_Base::_clearBuffers()
* @var bool * @var bool
* @access private * @access private
*/ */

2
phpseclib/Crypt/Blowfish.php
View File

@ -275,7 +275,7 @@ class Blowfish extends Base
/** /**
* The Key Length * The Key Length
* *
* @see setKeyLength() * @see \phpseclib\Crypt\Base::setKeyLength()
* @var int * @var int
* @access private * @access private
* @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16. Exists in conjunction with $Nk * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16. Exists in conjunction with $Nk

2
phpseclib/Crypt/RC2.php
View File

@ -79,7 +79,7 @@ class RC2 extends Base
/** /**
* Don't truncate / null pad key * Don't truncate / null pad key
* *
* @see \phpseclib\Crypt\Base::_clearBuffers * @see \phpseclib\Crypt\Base::_clearBuffers()
* @var bool * @var bool
* @access private * @access private
*/ */