Skip to content

Commit cb7748a

Browse files
committed
Update phpseclib to 2.0.1
New version uses PHP 7.0 random_bytes to generate cryptographically secure pseudo-random bytes. Signed-off-by: Michal Čihař <michal@cihar.com>
1 parent f20970d commit cb7748a

File tree

4 files changed

+305
-339
lines changed

4 files changed

+305
-339
lines changed

Diff for: libraries/phpseclib/Crypt/AES.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* just a wrapper to Rijndael.php you may consider using Rijndael.php instead of
1212
* to save one include_once().
1313
*
14-
* If {@link \phpseclib\Crypt\AES::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
15-
* {@link \phpseclib\Crypt\AES::setKey() setKey()}. ie. if the key is 128-bits, the key length will be 128-bits. If it's 136-bits
16-
* it'll be null-padded to 192-bits and 192 bits will be the key length until {@link \phpseclib\Crypt\AES::setKey() setKey()}
14+
* If {@link self::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
15+
* {@link self::setKey() setKey()}. ie. if the key is 128-bits, the key length will be 128-bits. If it's 136-bits
16+
* it'll be null-padded to 192-bits and 192 bits will be the key length until {@link self::setKey() setKey()}
1717
* is called, again, at which point, it'll be recalculated.
1818
*
1919
* Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
20-
* make a whole lot of sense. {@link \phpseclib\Crypt\AES::setBlockLength() setBlockLength()}, for instance. Calling that function,
20+
* make a whole lot of sense. {@link self::setBlockLength() setBlockLength()}, for instance. Calling that function,
2121
* however possible, won't do anything (AES has a fixed block length whereas Rijndael has a variable one).
2222
*
2323
* Here's a short example of how to use this library:
@@ -67,7 +67,7 @@ class AES extends Rijndael
6767
*
6868
* @see \phpseclib\Crypt\Rijndael::setBlockLength()
6969
* @access public
70-
* @param Integer $length
70+
* @param int $length
7171
*/
7272
function setBlockLength($length)
7373
{
@@ -82,7 +82,7 @@ function setBlockLength($length)
8282
*
8383
* @see \phpseclib\Crypt\Rijndael:setKeyLength()
8484
* @access public
85-
* @param Integer $length
85+
* @param int $length
8686
*/
8787
function setKeyLength($length)
8888
{
@@ -104,7 +104,7 @@ function setKeyLength($length)
104104
* @see \phpseclib\Crypt\Rijndael:setKey()
105105
* @see setKeyLength()
106106
* @access public
107-
* @param String $key
107+
* @param string $key
108108
*/
109109
function setKey($key)
110110
{
@@ -114,13 +114,13 @@ function setKey($key)
114114
$length = strlen($key);
115115
switch (true) {
116116
case $length <= 16:
117-
$this->key_size = 16;
117+
$this->key_length = 16;
118118
break;
119119
case $length <= 24:
120-
$this->key_size = 24;
120+
$this->key_length = 24;
121121
break;
122122
default:
123-
$this->key_size = 32;
123+
$this->key_length = 32;
124124
}
125125
$this->_setEngine();
126126
}

0 commit comments

Comments
 (0)