octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-06-06 02:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'codelts' into 3.0

Browse Source
This commit is contained in:
terrafrost 2020-11-21 10:51:30 -06:00
commit e69b79eba7
8 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpseclib/Crypt/ChaCha20.php
View File

@ -289,7 +289,22 @@ class ChaCha20 extends Salsa20
/**
* The doubleround function
*
* @param int $x0...$x16
* @param int $x0 (by reference)
* @param int $x1 (by reference)
* @param int $x2 (by reference)
* @param int $x3 (by reference)
* @param int $x4 (by reference)
* @param int $x5 (by reference)
* @param int $x6 (by reference)
* @param int $x7 (by reference)
* @param int $x8 (by reference)
* @param int $x9 (by reference)
* @param int $x10 (by reference)
* @param int $x11 (by reference)
* @param int $x12 (by reference)
* @param int $x13 (by reference)
* @param int $x14 (by reference)
* @param int $x15 (by reference)
*/
protected static function doubleRound(&$x0, &$x1, &$x2, &$x3, &$x4, &$x5, &$x6, &$x7, &$x8, &$x9, &$x10, &$x11, &$x12, &$x13, &$x14, &$x15)
{

2
phpseclib/Crypt/Common/AsymmetricKey.php
View File

@ -183,8 +183,8 @@ abstract class AsymmetricKey
/**
* Load the key, assuming a specific format
*
* @param string $key
* @param string $type
* @param string $key
* @param string $password optional
* @return AsymmetricKey
*/

1
phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
View File

@ -617,6 +617,7 @@ abstract class PKCS8 extends PKCS
* @access public
* @param string $key
* @param mixed $params
* @param string $oid
* @return string
*/
protected static function wrapPublicKey($key, $params, $oid = null)

2
phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
View File

@ -110,8 +110,8 @@ abstract class OpenSSH extends Progenitor
* @param \phpseclib3\Math\BigInteger $p
* @param \phpseclib3\Math\BigInteger $q
* @param \phpseclib3\Math\BigInteger $g
* @param \phpseclib3\Math\BigInteger $x
* @param \phpseclib3\Math\BigInteger $y
* @param \phpseclib3\Math\BigInteger $x
* @param string $password optional
* @param array $options optional
* @return string

2
phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
View File

@ -110,8 +110,8 @@ abstract class PKCS1 extends Progenitor
* @param \phpseclib3\Math\BigInteger $p
* @param \phpseclib3\Math\BigInteger $q
* @param \phpseclib3\Math\BigInteger $g
* @param \phpseclib3\Math\BigInteger $x
* @param \phpseclib3\Math\BigInteger $y
* @param \phpseclib3\Math\BigInteger $x
* @param string $password optional
* @param array $options optional
* @return string

2
phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
View File

@ -125,8 +125,8 @@ abstract class PKCS8 extends Progenitor
* @param \phpseclib3\Math\BigInteger $p
* @param \phpseclib3\Math\BigInteger $q
* @param \phpseclib3\Math\BigInteger $g
* @param \phpseclib3\Math\BigInteger $x
* @param \phpseclib3\Math\BigInteger $y
* @param \phpseclib3\Math\BigInteger $x
* @param string $password optional
* @param array $options optional
* @return string

17
phpseclib/Crypt/Salsa20.php
View File

@ -434,7 +434,22 @@ class Salsa20 extends StreamCipher
/**
* The doubleround function
*
* @param int $x0...$x16
* @param int $x0 (by reference)
* @param int $x1 (by reference)
* @param int $x2 (by reference)
* @param int $x3 (by reference)
* @param int $x4 (by reference)
* @param int $x5 (by reference)
* @param int $x6 (by reference)
* @param int $x7 (by reference)
* @param int $x8 (by reference)
* @param int $x9 (by reference)
* @param int $x10 (by reference)
* @param int $x11 (by reference)
* @param int $x12 (by reference)
* @param int $x13 (by reference)
* @param int $x14 (by reference)
* @param int $x15 (by reference)
*/
protected static function doubleRound(&$x0, &$x1, &$x2, &$x3, &$x4, &$x5, &$x6, &$x7, &$x8, &$x9, &$x10, &$x11, &$x12, &$x13, &$x14, &$x15)
{

1
phpseclib/Math/BigInteger/Engines/Engine.php
View File

@ -1092,6 +1092,7 @@ abstract class Engine implements \Serializable
* Calculates the greatest common divisor and Bezout's identity.
*
* @param Engine $n
* @param Engine $stop (optional)
* @return Engine
*/
protected function extendedGCDHelper(Engine $n, Engine $stop = null)