gravityview / GravityView

vendor/paragonie/sodium_compat/src/PHP52/SplFixedArray.php

Braces +16 added lines, -32 removed lines

@@ -23,8 +23,7 @@ 
      * SplFixedArray constructor.
      * @param int $size
      */
-    public function __construct($size = 0)
-    {
+    public function __construct($size = 0) {
         $this->size = $size;
         $this->internalArray = array();
     }
@@ -32,16 +31,14 @@ 
     /**
      * @return int
      */
-    public function count()
-    {
+    public function count() {
         return count($this->internalArray);
     }
 
     /**
      * @return array
      */
-    public function toArray()
-    {
+    public function toArray() {
         ksort($this->internalArray);
         return (array) $this->internalArray;
     }
@@ -52,8 +49,7 @@ 
      * @return SplFixedArray
      * @psalm-suppress MixedAssignment
      */
-    public static function fromArray(array $array, $save_indexes = true)
-    {
+    public static function fromArray(array $array, $save_indexes = true) {
         $self = new SplFixedArray(count($array));
         if($save_indexes) {
             foreach($array as $key => $value) {
@@ -72,8 +68,7 @@ 
     /**
      * @return int
      */
-    public function getSize()
-    {
+    public function getSize() {
         return $this->size;
     }
 
@@ -81,8 +76,7 @@ 
      * @param int $size
      * @return bool
      */
-    public function setSize($size)
-    {
+    public function setSize($size) {
         $this->size = $size;
         return true;
     }
@@ -91,8 +85,7 @@ 
      * @param string|int $index
      * @return bool
      */
-    public function offsetExists($index)
-    {
+    public function offsetExists($index) {
         return array_key_exists((int) $index, $this->internalArray);
     }
 
@@ -100,8 +93,7 @@ 
      * @param string|int $index
      * @return mixed
      */
-    public function offsetGet($index)
-    {
+    public function offsetGet($index) {
         /** @psalm-suppress MixedReturnStatement */
         return $this->internalArray[(int) $index];
     }
@@ -111,16 +103,14 @@ 
      * @param mixed $newval
      * @psalm-suppress MixedAssignment
      */
-    public function offsetSet($index, $newval)
-    {
+    public function offsetSet($index, $newval) {
         $this->internalArray[(int) $index] = $newval;
     }
 
     /**
      * @param string|int $index
      */
-    public function offsetUnset($index)
-    {
+    public function offsetUnset($index) {
         unset($this->internalArray[(int) $index]);
     }
 
@@ -130,8 +120,7 @@ 
      * @return void
      * @since 5.3.0
      */
-    public function rewind()
-    {
+    public function rewind() {
         reset($this->internalArray);
     }
 
@@ -141,8 +130,7 @@ 
      * @return mixed The current element value.
      * @since 5.3.0
      */
-    public function current()
-    {
+    public function current() {
         /** @psalm-suppress MixedReturnStatement */
         return current($this->internalArray);
     }
@@ -151,16 +139,14 @@ 
      * Return current array index
      * @return int The current array index.
      */
-    public function key()
-    {
+    public function key() {
         return key($this->internalArray);
     }
 
     /**
      * @return void
      */
-    public function next()
-    {
+    public function next() {
         next($this->internalArray);
     }
 
@@ -169,8 +155,7 @@ 
      * @link https://php.net/manual/en/splfixedarray.valid.php
      * @return bool true if the array contains any more elements, false otherwise.
      */
-    public function valid()
-    {
+    public function valid() {
         if (empty($this->internalArray)) {
             return false;
         }
@@ -182,8 +167,7 @@ 
     /**
      * Do nothing.
      */
-    public function __wakeup()
-    {
+    public function __wakeup() {
         // NOP
     }
 }
\ No newline at end of file

vendor/paragonie/sodium_compat/src/Compat.php

Braces +112 added lines, -224 removed lines

@@ -25,8 +25,7 @@ 
     return;
 }
 
-class ParagonIE_Sodium_Compat
-{
+class ParagonIE_Sodium_Compat {
     /**
      * This parameter prevents the use of the PECL extension.
      * It should only be used for unit testing.
@@ -155,8 +154,7 @@ 
      * @return void
      * @throws SodiumException
      */
-    public static function add(&$val, $addv)
-    {
+    public static function add(&$val, $addv) {
         $val_len = ParagonIE_Sodium_Core_Util::strlen($val);
         $addv_len = ParagonIE_Sodium_Core_Util::strlen($addv);
         if ($val_len !== $addv_len) {
@@ -181,8 +179,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function base642bin($encoded, $variant, $ignore = '')
-    {
+    public static function base642bin($encoded, $variant, $ignore = '') {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($encoded, 'string', 1);
 
@@ -224,8 +221,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function bin2base64($decoded, $variant)
-    {
+    public static function bin2base64($decoded, $variant) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($decoded, 'string', 1);
         /** @var string $decoded */
@@ -257,8 +253,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function bin2hex($string)
-    {
+    public static function bin2hex($string) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
 
@@ -284,8 +279,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function compare($left, $right)
-    {
+    public static function compare($left, $right) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
@@ -307,8 +301,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_aead_aes256gcm_is_available()
-    {
+    public static function crypto_aead_aes256gcm_is_available() {
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_aead_aes256gcm_is_available();
         }
@@ -454,8 +447,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_aes256gcm_keygen()
-    {
+    public static function crypto_aead_aes256gcm_keygen() {
         return random_bytes(self::CRYPTO_AEAD_AES256GCM_KEYBYTES);
     }
 
@@ -702,8 +694,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_chacha20poly1305_keygen()
-    {
+    public static function crypto_aead_chacha20poly1305_keygen() {
         return random_bytes(self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES);
     }
 
@@ -790,8 +781,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_chacha20poly1305_ietf_keygen()
-    {
+    public static function crypto_aead_chacha20poly1305_ietf_keygen() {
         return random_bytes(self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES);
     }
 
@@ -949,8 +939,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_xchacha20poly1305_ietf_keygen()
-    {
+    public static function crypto_aead_xchacha20poly1305_ietf_keygen() {
         return random_bytes(self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES);
     }
 
@@ -971,8 +960,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_auth($message, $key)
-    {
+    public static function crypto_auth($message, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
@@ -999,8 +987,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_auth_keygen()
-    {
+    public static function crypto_auth_keygen() {
         return random_bytes(self::CRYPTO_AUTH_KEYBYTES);
     }
 
@@ -1016,8 +1003,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_auth_verify($mac, $message, $key)
-    {
+    public static function crypto_auth_verify($mac, $message, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($mac, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
@@ -1060,8 +1046,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_box($plaintext, $nonce, $keypair)
-    {
+    public static function crypto_box($plaintext, $nonce, $keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1104,8 +1089,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_box_seal($plaintext, $publicKey)
-    {
+    public static function crypto_box_seal($plaintext, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -1142,8 +1126,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_box_seal_open($ciphertext, $keypair)
-    {
+    public static function crypto_box_seal_open($ciphertext, $keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 2);
@@ -1180,8 +1163,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_box_keypair()
-    {
+    public static function crypto_box_keypair() {
         if (self::useNewSodiumAPI()) {
             return (string) sodium_crypto_box_keypair();
         }
@@ -1205,8 +1187,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey)
-    {
+    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -1244,8 +1225,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_box_open($ciphertext, $nonce, $keypair)
-    {
+    public static function crypto_box_open($ciphertext, $nonce, $keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1287,8 +1267,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_box_publickey($keypair)
-    {
+    public static function crypto_box_publickey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -1318,8 +1297,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_box_publickey_from_secretkey($secretKey)
-    {
+    public static function crypto_box_publickey_from_secretkey($secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
 
@@ -1349,8 +1327,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_box_secretkey($keypair)
-    {
+    public static function crypto_box_secretkey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -1381,8 +1358,7 @@ 
      * @psalm-suppress MixedArgument
      * @psalm-suppress UndefinedFunction
      */
-    public static function crypto_box_seed_keypair($seed)
-    {
+    public static function crypto_box_seed_keypair($seed) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
 
@@ -1411,8 +1387,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
+    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         if (is_null($key)) {
@@ -1455,8 +1430,7 @@ 
      * @psalm-suppress ReferenceConstraintViolation
      * @psalm-suppress ConflictingReferenceConstraint
      */
-    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
+    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
@@ -1500,8 +1474,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
+    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES) {
         /* Type checks: */
         if (is_null($key)) {
             $key = '';
@@ -1591,8 +1564,7 @@ 
      * @psalm-suppress MixedArgument
      * @psalm-suppress ReferenceConstraintViolation
      */
-    public static function crypto_generichash_update(&$ctx, $message)
-    {
+    public static function crypto_generichash_update(&$ctx, $message) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
@@ -1618,8 +1590,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_generichash_keygen()
-    {
+    public static function crypto_generichash_keygen() {
         return random_bytes(self::CRYPTO_GENERICHASH_KEYBYTES);
     }
 
@@ -1677,8 +1648,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_kdf_keygen()
-    {
+    public static function crypto_kdf_keygen() {
         return random_bytes(self::CRYPTO_KDF_KEYBYTES);
     }
 
@@ -1712,8 +1682,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public, $dontFallback = false)
-    {
+    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public, $dontFallback = false) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($my_secret, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($their_public, 'string', 2);
@@ -1774,8 +1743,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function crypto_kx_seed_keypair($seed)
-    {
+    public static function crypto_kx_seed_keypair($seed) {
         ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
 
         $seed = (string) $seed;
@@ -1793,8 +1761,7 @@ 
      * @return string
      * @throws Exception
      */
-    public static function crypto_kx_keypair()
-    {
+    public static function crypto_kx_keypair() {
         $sk = self::randombytes_buf(self::CRYPTO_KX_SECRETKEYBYTES);
         $pk = self::crypto_scalarmult_base($sk);
         return $sk . $pk;
@@ -1806,8 +1773,7 @@ 
      * @return array{0: string, 1: string}
      * @throws SodiumException
      */
-    public static function crypto_kx_client_session_keys($keypair, $serverPublicKey)
-    {
+    public static function crypto_kx_client_session_keys($keypair, $serverPublicKey) {
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($serverPublicKey, 'string', 2);
 
@@ -1848,8 +1814,7 @@ 
      * @return array{0: string, 1: string}
      * @throws SodiumException
      */
-    public static function crypto_kx_server_session_keys($keypair, $clientPublicKey)
-    {
+    public static function crypto_kx_server_session_keys($keypair, $clientPublicKey) {
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($clientPublicKey, 'string', 2);
 
@@ -1889,8 +1854,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function crypto_kx_secretkey($kp)
-    {
+    public static function crypto_kx_secretkey($kp) {
         return ParagonIE_Sodium_Core_Util::substr(
             $kp,
             0,
@@ -1903,8 +1867,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function crypto_kx_publickey($kp)
-    {
+    public static function crypto_kx_publickey($kp) {
         return ParagonIE_Sodium_Core_Util::substr(
             $kp,
             self::CRYPTO_KX_SECRETKEYBYTES,
@@ -1924,8 +1887,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $alg = null)
-    {
+    public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $alg = null) {
         ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
@@ -1956,8 +1918,7 @@ 
      *
      * @return bool
      */
-    public static function crypto_pwhash_is_available()
-    {
+    public static function crypto_pwhash_is_available() {
         if (self::useNewSodiumAPI()) {
             return true;
         }
@@ -1976,8 +1937,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash_str($passwd, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
@@ -2003,8 +1963,7 @@ 
      * @return bool
      * @throws SodiumException
      */
-    public static function crypto_pwhash_str_needs_rehash($hash, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash_str_needs_rehash($hash, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
@@ -2032,8 +1991,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_pwhash_str_verify($passwd, $hash)
-    {
+    public static function crypto_pwhash_str_verify($passwd, $hash) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
 
@@ -2059,8 +2017,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
@@ -2100,8 +2057,7 @@ 
      *
      * @return bool
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_is_available()
-    {
+    public static function crypto_pwhash_scryptsalsa208sha256_is_available() {
         if (self::useNewSodiumAPI()) {
             return true;
         }
@@ -2119,8 +2075,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
@@ -2153,8 +2108,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
+    public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
 
@@ -2190,8 +2144,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_scalarmult($secretKey, $publicKey)
-    {
+    public static function crypto_scalarmult($secretKey, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -2234,8 +2187,7 @@ 
      * @psalm-suppress TooFewArguments
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_scalarmult_base($secretKey)
-    {
+    public static function crypto_scalarmult_base($secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
 
@@ -2272,8 +2224,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_secretbox($plaintext, $nonce, $key)
-    {
+    public static function crypto_secretbox($plaintext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -2312,8 +2263,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_secretbox_open($ciphertext, $nonce, $key)
-    {
+    public static function crypto_secretbox_open($ciphertext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -2350,8 +2300,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_secretbox_keygen()
-    {
+    public static function crypto_secretbox_keygen() {
         return random_bytes(self::CRYPTO_SECRETBOX_KEYBYTES);
     }
 
@@ -2368,8 +2317,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
+    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -2398,8 +2346,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
+    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -2425,8 +2372,7 @@ 
      * @throws Exception
      * @throws SodiumException
      */
-    public static function crypto_secretstream_xchacha20poly1305_init_push($key)
-    {
+    public static function crypto_secretstream_xchacha20poly1305_init_push($key) {
         if (PHP_INT_SIZE === 4) {
             return ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_init_push($key);
         }
@@ -2439,8 +2385,7 @@ 
      * @return string Returns a state.
      * @throws Exception
      */
-    public static function crypto_secretstream_xchacha20poly1305_init_pull($header, $key)
-    {
+    public static function crypto_secretstream_xchacha20poly1305_init_pull($header, $key) {
         if (ParagonIE_Sodium_Core_Util::strlen($header) < self::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES) {
             throw new SodiumException(
                 'header size should be SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES bytes'
@@ -2460,8 +2405,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function crypto_secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
-    {
+    public static function crypto_secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0) {
         if (PHP_INT_SIZE === 4) {
             return ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_push(
                 $state,
@@ -2485,8 +2429,7 @@ 
      * @return bool|array{0: string, 1: int}
      * @throws SodiumException
      */
-    public static function crypto_secretstream_xchacha20poly1305_pull(&$state, $msg, $aad = '')
-    {
+    public static function crypto_secretstream_xchacha20poly1305_pull(&$state, $msg, $aad = '') {
         if (PHP_INT_SIZE === 4) {
             return ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_pull(
                 $state,
@@ -2505,8 +2448,7 @@ 
      * @return string
      * @throws Exception
      */
-    public static function crypto_secretstream_xchacha20poly1305_keygen()
-    {
+    public static function crypto_secretstream_xchacha20poly1305_keygen() {
         return random_bytes(self::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_KEYBYTES);
     }
 
@@ -2515,8 +2457,7 @@ 
      * @return void
      * @throws SodiumException
      */
-    public static function crypto_secretstream_xchacha20poly1305_rekey(&$state)
-    {
+    public static function crypto_secretstream_xchacha20poly1305_rekey(&$state) {
         if (PHP_INT_SIZE === 4) {
             ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_rekey($state);
         } else {
@@ -2536,8 +2477,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_shorthash($message, $key)
-    {
+    public static function crypto_shorthash($message, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
@@ -2566,8 +2506,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_shorthash_keygen()
-    {
+    public static function crypto_shorthash_keygen() {
         return random_bytes(self::CRYPTO_SHORTHASH_KEYBYTES);
     }
 
@@ -2586,8 +2525,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_sign($message, $secretKey)
-    {
+    public static function crypto_sign($message, $secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
@@ -2622,8 +2560,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_sign_open($signedMessage, $publicKey)
-    {
+    public static function crypto_sign_open($signedMessage, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($signedMessage, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -2659,8 +2596,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_sign_keypair()
-    {
+    public static function crypto_sign_keypair() {
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_sign_keypair();
         }
@@ -2679,8 +2615,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function crypto_sign_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
+    public static function crypto_sign_keypair_from_secretkey_and_publickey($sk, $pk) {
         ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($pk, 'string', 1);
         $sk = (string) $sk;
@@ -2708,8 +2643,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_seed_keypair($seed)
-    {
+    public static function crypto_sign_seed_keypair($seed) {
         ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
 
         if (self::useNewSodiumAPI()) {
@@ -2737,8 +2671,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_publickey($keypair)
-    {
+    public static function crypto_sign_publickey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -2768,8 +2701,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_publickey_from_secretkey($secretKey)
-    {
+    public static function crypto_sign_publickey_from_secretkey($secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
 
@@ -2799,8 +2731,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_secretkey($keypair)
-    {
+    public static function crypto_sign_secretkey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -2833,8 +2764,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_detached($message, $secretKey)
-    {
+    public static function crypto_sign_detached($message, $secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
@@ -2868,8 +2798,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_verify_detached($signature, $message, $publicKey)
-    {
+    public static function crypto_sign_verify_detached($signature, $message, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($signature, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
@@ -2909,8 +2838,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_ed25519_pk_to_curve25519($pk)
-    {
+    public static function crypto_sign_ed25519_pk_to_curve25519($pk) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($pk, 'string', 1);
 
@@ -2941,8 +2869,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_ed25519_sk_to_curve25519($sk)
-    {
+    public static function crypto_sign_ed25519_sk_to_curve25519($sk) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
 
@@ -2983,8 +2910,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_stream($len, $nonce, $key)
-    {
+    public static function crypto_stream($len, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -3030,8 +2956,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_stream_xor($message, $nonce, $key)
-    {
+    public static function crypto_stream_xor($message, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -3064,8 +2989,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_stream_keygen()
-    {
+    public static function crypto_stream_keygen() {
         return random_bytes(self::CRYPTO_STREAM_KEYBYTES);
     }
 
@@ -3085,8 +3009,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_stream_xchacha20($len, $nonce, $key, $dontFallback = false)
-    {
+    public static function crypto_stream_xchacha20($len, $nonce, $key, $dontFallback = false) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -3130,8 +3053,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function crypto_stream_xchacha20_xor($message, $nonce, $key, $dontFallback = false)
-    {
+    public static function crypto_stream_xchacha20_xor($message, $nonce, $key, $dontFallback = false) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -3161,8 +3083,7 @@ 
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_stream_xchacha20_keygen()
-    {
+    public static function crypto_stream_xchacha20_keygen() {
         return random_bytes(self::CRYPTO_STREAM_XCHACHA20_KEYBYTES);
     }
 
@@ -3176,8 +3097,7 @@ 
      * @psalm-suppress TooFewArguments
      * @psalm-suppress MixedArgument
      */
-    public static function hex2bin($string)
-    {
+    public static function hex2bin($string) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
 
@@ -3202,8 +3122,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function increment(&$var)
-    {
+    public static function increment(&$var) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
 
@@ -3236,8 +3155,7 @@ 
      *
      * @throws SodiumException
      */
-    public static function is_zero($str)
-    {
+    public static function is_zero($str) {
         $d = 0;
         for ($i = 0; $i < 32; ++$i) {
             $d |= ParagonIE_Sodium_Core_Util::chrToInt($str[$i]);
@@ -3251,8 +3169,7 @@ 
      *
      * @return int
      */
-    public static function library_version_major()
-    {
+    public static function library_version_major() {
         if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MAJOR_VERSION')) {
             return SODIUM_LIBRARY_MAJOR_VERSION;
         }
@@ -3269,8 +3186,7 @@ 
      *
      * @return int
      */
-    public static function library_version_minor()
-    {
+    public static function library_version_minor() {
         if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MINOR_VERSION')) {
             return SODIUM_LIBRARY_MINOR_VERSION;
         }
@@ -3291,8 +3207,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArgument
      */
-    public static function memcmp($left, $right)
-    {
+    public static function memcmp($left, $right) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
@@ -3320,8 +3235,7 @@ 
      * @throws TypeError
      * @psalm-suppress TooFewArguments
      */
-    public static function memzero(&$var)
-    {
+    public static function memzero(&$var) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
 
@@ -3351,8 +3265,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function pad($unpadded, $blockSize, $dontFallback = false)
-    {
+    public static function pad($unpadded, $blockSize, $dontFallback = false) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($unpadded, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($blockSize, 'int', 2);
@@ -3437,8 +3350,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function unpad($padded, $blockSize, $dontFallback = false)
-    {
+    public static function unpad($padded, $blockSize, $dontFallback = false) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($padded, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($blockSize, 'int', 2);
@@ -3501,8 +3413,7 @@ 
      *
      * @return bool
      */
-    public static function polyfill_is_fast()
-    {
+    public static function polyfill_is_fast() {
         if (extension_loaded('sodium')) {
             return true;
         }
@@ -3521,8 +3432,7 @@ 
      * @throws Exception
      * @throws TypeError
      */
-    public static function randombytes_buf($numBytes)
-    {
+    public static function randombytes_buf($numBytes) {
         /* Type checks: */
         if (!is_int($numBytes)) {
             if (is_numeric($numBytes)) {
@@ -3548,8 +3458,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function randombytes_uniform($range)
-    {
+    public static function randombytes_uniform($range) {
         /* Type checks: */
         if (!is_int($range)) {
             if (is_numeric($range)) {
@@ -3574,8 +3483,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function randombytes_random16()
-    {
+    public static function randombytes_random16() {
         if (self::use_fallback('randombytes_random16')) {
             return (int) call_user_func('\\Sodium\\randombytes_random16');
         }
@@ -3588,8 +3496,7 @@ 
      * @return bool
      * @throws SodiumException
      */
-    public static function ristretto255_is_valid_point($p, $dontFallback = false)
-    {
+    public static function ristretto255_is_valid_point($p, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_is_valid_point($p);
         }
@@ -3612,8 +3519,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_add($p, $q, $dontFallback = false)
-    {
+    public static function ristretto255_add($p, $q, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_add($p, $q);
         }
@@ -3627,8 +3533,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_sub($p, $q, $dontFallback = false)
-    {
+    public static function ristretto255_sub($p, $q, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_sub($p, $q);
         }
@@ -3642,8 +3547,7 @@ 
      *
      * @throws SodiumException
      */
-    public static function ristretto255_from_hash($r, $dontFallback = false)
-    {
+    public static function ristretto255_from_hash($r, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_from_hash($r);
         }
@@ -3656,8 +3560,7 @@ 
      *
      * @throws SodiumException
      */
-    public static function ristretto255_random($dontFallback = false)
-    {
+    public static function ristretto255_random($dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_random();
         }
@@ -3670,8 +3573,7 @@ 
      *
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_random($dontFallback = false)
-    {
+    public static function ristretto255_scalar_random($dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_random();
         }
@@ -3684,8 +3586,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_invert($s, $dontFallback = false)
-    {
+    public static function ristretto255_scalar_invert($s, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_invert($s);
         }
@@ -3697,8 +3598,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_negate($s, $dontFallback = false)
-    {
+    public static function ristretto255_scalar_negate($s, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_negate($s);
         }
@@ -3711,8 +3611,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_complement($s, $dontFallback = false)
-    {
+    public static function ristretto255_scalar_complement($s, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_complement($s);
         }
@@ -3726,8 +3625,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_add($x, $y, $dontFallback = false)
-    {
+    public static function ristretto255_scalar_add($x, $y, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_add($x, $y);
         }
@@ -3741,8 +3639,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_sub($x, $y, $dontFallback = false)
-    {
+    public static function ristretto255_scalar_sub($x, $y, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_sub($x, $y);
         }
@@ -3756,8 +3653,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_mul($x, $y, $dontFallback = false)
-    {
+    public static function ristretto255_scalar_mul($x, $y, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_mul($x, $y);
         }
@@ -3771,8 +3667,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalarmult_ristretto255($n, $p, $dontFallback = false)
-    {
+    public static function scalarmult_ristretto255($n, $p, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_scalarmult_ristretto255($n, $p);
         }
@@ -3786,8 +3681,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalarmult_ristretto255_base($n, $dontFallback = false)
-    {
+    public static function scalarmult_ristretto255_base($n, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_scalarmult_ristretto255_base($n);
         }
@@ -3800,8 +3694,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_reduce($s, $dontFallback = false)
-    {
+    public static function ristretto255_scalar_reduce($s, $dontFallback = false) {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_reduce($s);
         }
@@ -3821,8 +3714,7 @@ 
      * @return bool           TRUE if we're fast enough, FALSE is not
      * @throws SodiumException
      */
-    public static function runtime_speed_test($iterations, $maxTimeout)
-    {
+    public static function runtime_speed_test($iterations, $maxTimeout) {
         if (self::polyfill_is_fast()) {
             return true;
         }
@@ -3855,8 +3747,7 @@ 
      * @return void
      * @throws SodiumException
      */
-    public static function sub(&$val, $addv)
-    {
+    public static function sub(&$val, $addv) {
         $val_len = ParagonIE_Sodium_Core_Util::strlen($val);
         $addv_len = ParagonIE_Sodium_Core_Util::strlen($addv);
         if ($val_len !== $addv_len) {
@@ -3882,8 +3773,7 @@ 
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress UndefinedFunction
      */
-    public static function version_string()
-    {
+    public static function version_string() {
         if (self::useNewSodiumAPI()) {
             return (string) sodium_version_string();
         }
@@ -3905,8 +3795,7 @@ 
      *
      * @return bool
      */
-    protected static function use_fallback($sodium_func_name = '')
-    {
+    protected static function use_fallback($sodium_func_name = '') {
         static $res = null;
         if ($res === null) {
             $res = extension_loaded('libsodium') && PHP_VERSION_ID >= 50300;
@@ -3932,8 +3821,7 @@ 
      * @ref https://wiki.php.net/rfc/libsodium
      * @return bool
      */
-    protected static function useNewSodiumAPI()
-    {
+    protected static function useNewSodiumAPI() {
         static $res = null;
         if ($res === null) {
             $res = PHP_VERSION_ID >= 70000 && extension_loaded('sodium');

vendor/paragonie/sodium_compat/src/Crypto32.php

Braces +35 added lines, -70 removed lines

@@ -12,8 +12,7 @@ 
  * If you are using this library, you should be using
  * ParagonIE_Sodium_Compat in your code, not this class.
  */
-abstract class ParagonIE_Sodium_Crypto32
-{
+abstract class ParagonIE_Sodium_Crypto32 {
     const aead_chacha20poly1305_KEYBYTES = 32;
     const aead_chacha20poly1305_NSECBYTES = 0;
     const aead_chacha20poly1305_NPUBBYTES = 8;
@@ -381,8 +380,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function auth($message, $key)
-    {
+    public static function auth($message, $key) {
         return ParagonIE_Sodium_Core32_Util::substr(
             hash_hmac('sha512', $message, $key, true),
             0,
@@ -402,8 +400,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function auth_verify($mac, $message, $key)
-    {
+    public static function auth_verify($mac, $message, $key) {
         return ParagonIE_Sodium_Core32_Util::hashEquals(
             $mac,
             self::auth($message, $key)
@@ -422,8 +419,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box($plaintext, $nonce, $keypair)
-    {
+    public static function box($plaintext, $nonce, $keypair) {
         return self::secretbox(
             $plaintext,
             $nonce,
@@ -445,8 +441,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal($message, $publicKey)
-    {
+    public static function box_seal($message, $publicKey) {
         /** @var string $ephemeralKeypair */
         $ephemeralKeypair = self::box_keypair();
 
@@ -491,8 +486,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal_open($message, $keypair)
-    {
+    public static function box_seal_open($message, $keypair) {
         /** @var string $ephemeralPK */
         $ephemeralPK = ParagonIE_Sodium_Core32_Util::substr($message, 0, 32);
 
@@ -540,8 +534,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_beforenm($sk, $pk)
-    {
+    public static function box_beforenm($sk, $pk) {
         return ParagonIE_Sodium_Core32_HSalsa20::hsalsa20(
             str_repeat("\x00", 16),
             self::scalarmult($sk, $pk)
@@ -556,8 +549,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_keypair()
-    {
+    public static function box_keypair() {
         $sKey = random_bytes(32);
         $pKey = self::scalarmult_base($sKey);
         return $sKey . $pKey;
@@ -569,8 +561,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seed_keypair($seed)
-    {
+    public static function box_seed_keypair($seed) {
         $sKey = ParagonIE_Sodium_Core32_Util::substr(
             hash('sha512', $seed, true),
             0,
@@ -588,8 +579,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
-    {
+    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey) {
         return ParagonIE_Sodium_Core32_Util::substr($sKey, 0, 32) .
             ParagonIE_Sodium_Core32_Util::substr($pKey, 0, 32);
     }
@@ -602,8 +592,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function box_secretkey($keypair)
-    {
+    public static function box_secretkey($keypair) {
         if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== 64) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
@@ -620,8 +609,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function box_publickey($keypair)
-    {
+    public static function box_publickey($keypair) {
         if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
@@ -639,8 +627,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_publickey_from_secretkey($sKey)
-    {
+    public static function box_publickey_from_secretkey($sKey) {
         if (ParagonIE_Sodium_Core32_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.'
@@ -661,8 +648,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_open($ciphertext, $nonce, $keypair)
-    {
+    public static function box_open($ciphertext, $nonce, $keypair) {
         return self::secretbox_open(
             $ciphertext,
             $nonce,
@@ -686,8 +672,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash($message, $key = '', $outlen = 32)
-    {
+    public static function generichash($message, $key = '', $outlen = 32) {
         // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
 
@@ -727,8 +712,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_final($ctx, $outlen = 32)
-    {
+    public static function generichash_final($ctx, $outlen = 32) {
         if (!is_string($ctx)) {
             throw new TypeError('Context must be a string');
         }
@@ -757,8 +741,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_init($key = '', $outputLength = 32)
-    {
+    public static function generichash_init($key = '', $outputLength = 32) {
         // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
 
@@ -834,8 +817,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_update($ctx, $message)
-    {
+    public static function generichash_update($ctx, $message) {
         // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
 
@@ -863,8 +845,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
-    {
+    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk) {
         return self::generichash(
             self::scalarmult($my_sk, $their_pk) .
             $client_pk .
@@ -884,8 +865,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function scalarmult($sKey, $pKey)
-    {
+    public static function scalarmult($sKey, $pKey) {
         $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
         self::scalarmult_throw_if_zero($q);
         return $q;
@@ -901,8 +881,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function scalarmult_base($secret)
-    {
+    public static function scalarmult_base($secret) {
         $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
         self::scalarmult_throw_if_zero($q);
         return $q;
@@ -916,8 +895,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function scalarmult_throw_if_zero($q)
-    {
+    protected static function scalarmult_throw_if_zero($q) {
         $d = 0;
         for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
             $d |= ParagonIE_Sodium_Core32_Util::chrToInt($q[$i]);
@@ -941,8 +919,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox($plaintext, $nonce, $key)
-    {
+    public static function secretbox($plaintext, $nonce, $key) {
         /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
 
@@ -1016,8 +993,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_open($ciphertext, $nonce, $key)
-    {
+    public static function secretbox_open($ciphertext, $nonce, $key) {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core32_Util::substr(
             $ciphertext,
@@ -1089,8 +1065,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
+    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key) {
         /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
             ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
@@ -1168,8 +1143,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
+    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key) {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core32_Util::substr(
             $ciphertext,
@@ -1237,8 +1211,7 @@ 
      * @throws Exception
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_init_push($key)
-    {
+    public static function secretstream_xchacha20poly1305_init_push($key) {
         # randombytes_buf(out, crypto_secretstream_xchacha20poly1305_HEADERBYTES);
         $out = random_bytes(24);
 
@@ -1267,8 +1240,7 @@ 
      * @return string Returns a state.
      * @throws Exception
      */
-    public static function secretstream_xchacha20poly1305_init_pull($key, $header)
-    {
+    public static function secretstream_xchacha20poly1305_init_pull($key, $header) {
         # crypto_core_hchacha20(state->k, in, k, NULL);
         $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
             ParagonIE_Sodium_Core32_Util::substr($header, 0, 16),
@@ -1294,8 +1266,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
-    {
+    public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0) {
         $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
         # crypto_onetimeauth_poly1305_state poly1305_state;
         # unsigned char                     block[64U];
@@ -1423,8 +1394,7 @@ 
      * @return bool|array{0: string, 1: int}
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '')
-    {
+    public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '') {
         $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
 
         $cipherlen = ParagonIE_Sodium_Core32_Util::strlen($cipher);
@@ -1546,8 +1516,7 @@ 
      * @return void
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_rekey(&$state)
-    {
+    public static function secretstream_xchacha20poly1305_rekey(&$state) {
         $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
         # unsigned char new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES +
         # crypto_secretstream_xchacha20poly1305_INONCEBYTES];
@@ -1598,8 +1567,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_detached($message, $sk)
-    {
+    public static function sign_detached($message, $sk) {
         return ParagonIE_Sodium_Core32_Ed25519::sign_detached($message, $sk);
     }
 
@@ -1614,8 +1582,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign($message, $sk)
-    {
+    public static function sign($message, $sk) {
         return ParagonIE_Sodium_Core32_Ed25519::sign($message, $sk);
     }
 
@@ -1630,8 +1597,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_open($signedMessage, $pk)
-    {
+    public static function sign_open($signedMessage, $pk) {
         return ParagonIE_Sodium_Core32_Ed25519::sign_open($signedMessage, $pk);
     }
 
@@ -1647,8 +1613,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_verify_detached($signature, $message, $pk)
-    {
+    public static function sign_verify_detached($signature, $message, $pk) {
         return ParagonIE_Sodium_Core32_Ed25519::verify_detached($signature, $message, $pk);
     }
 }

vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php

Braces +21 added lines, -42 removed lines

@@ -9,8 +9,7 @@ 
  *
  * Based on the work of Devi Mandiri in devi/salt.
  */
-abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
-{
+abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util {
     /**
      * @var SplFixedArray
      */
@@ -48,8 +47,7 @@ 
      * @return SplFixedArray
      * @psalm-suppress MixedAssignment
      */
-    public static function new64($high, $low)
-    {
+    public static function new64($high, $low) {
         $i64 = new SplFixedArray(2);
         $i64[0] = $high & 0xffffffff;
         $i64[1] = $low & 0xffffffff;
@@ -65,8 +63,7 @@ 
      * @param int $num
      * @return SplFixedArray
      */
-    protected static function to64($num)
-    {
+    protected static function to64($num) {
         list($hi, $lo) = self::numericTo64BitInteger($num);
         return self::new64($hi, $lo);
     }
@@ -84,8 +81,7 @@ 
      * @psalm-suppress MixedAssignment
      * @psalm-suppress MixedOperand
      */
-    protected static function add64($x, $y)
-    {
+    protected static function add64($x, $y) {
         $l = ($x[1] + $y[1]) & 0xffffffff;
         return self::new64(
             (int) ($x[0] + $y[0] + (
@@ -103,8 +99,7 @@ 
      * @param SplFixedArray $z
      * @return SplFixedArray
      */
-    protected static function add364($x, $y, $z)
-    {
+    protected static function add364($x, $y, $z) {
         return self::add64($x, self::add64($y, $z));
     }
 
@@ -117,8 +112,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
-    {
+    protected static function xor64(SplFixedArray $x, SplFixedArray $y) {
         if (!is_numeric($x[0])) {
             throw new SodiumException('x[0] is not an integer');
         }
@@ -145,8 +139,7 @@ 
      * @return SplFixedArray
      * @psalm-suppress MixedAssignment
      */
-    public static function rotr64($x, $c)
-    {
+    public static function rotr64($x, $c) {
         if ($c >= 64) {
             $c %= 64;
         }
@@ -203,8 +196,7 @@ 
      * @return int
      * @psalm-suppress MixedOperand
      */
-    protected static function flatten64($x)
-    {
+    protected static function flatten64($x) {
         return (int) ($x[0] * 4294967296 + $x[1]);
     }
 
@@ -217,8 +209,7 @@ 
      * @psalm-suppress MixedArgument
      * @psalm-suppress MixedArrayOffset
      */
-    protected static function load64(SplFixedArray $x, $i)
-    {
+    protected static function load64(SplFixedArray $x, $i) {
         /** @var int $l */
         $l = (int) ($x[$i])
              | ((int) ($x[$i+1]) << 8)
@@ -241,8 +232,7 @@ 
      * @return void
      * @psalm-suppress MixedAssignment
      */
-    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
-    {
+    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u) {
         $maxLength = $x->getSize() - 1;
         for ($j = 0; $j < 8; ++$j) {
             /*
@@ -268,8 +258,7 @@ 
      *
      * @return void
      */
-    public static function pseudoConstructor()
-    {
+    public static function pseudoConstructor() {
         static $called = false;
         if ($called) {
             return;
@@ -297,8 +286,7 @@ 
      * @psalm-suppress MixedArrayAccess
      * @psalm-suppress MixedArrayAssignment
      */
-    protected static function context()
-    {
+    protected static function context() {
         $ctx    = new SplFixedArray(6);
         $ctx[0] = new SplFixedArray(8);   // h
         $ctx[1] = new SplFixedArray(2);   // t
@@ -337,8 +325,7 @@ 
      * @psalm-suppress MixedArrayAssignment
      * @psalm-suppress MixedArrayOffset
      */
-    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
-    {
+    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf) {
         $m = new SplFixedArray(16);
         $v = new SplFixedArray(16);
 
@@ -395,8 +382,7 @@ 
      * @psalm-suppress MixedArgument
      * @psalm-suppress MixedArrayOffset
      */
-    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
-    {
+    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m) {
         $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
         $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
         $v[$c] = self::add64($v[$c], $v[$d]);
@@ -419,8 +405,7 @@ 
      * @psalm-suppress MixedArrayAccess
      * @psalm-suppress MixedArrayAssignment
      */
-    public static function increment_counter($ctx, $inc)
-    {
+    public static function increment_counter($ctx, $inc) {
         if ($inc < 0) {
             throw new SodiumException('Increasing by a negative number makes no sense.');
         }
@@ -452,8 +437,7 @@ 
      * @psalm-suppress MixedArrayOffset
      * @psalm-suppress MixedOperand
      */
-    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
-    {
+    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen) {
         self::pseudoConstructor();
 
         $offset = 0;
@@ -515,8 +499,7 @@ 
      * @psalm-suppress MixedArrayOffset
      * @psalm-suppress MixedOperand
      */
-    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
-    {
+    public static function finish(SplFixedArray $ctx, SplFixedArray $out) {
         self::pseudoConstructor();
         if ($ctx[4] > 128) {
             self::increment_counter($ctx, 128);
@@ -646,8 +629,7 @@ 
      * @return SplFixedArray
      * @psalm-suppress MixedArgumentTypeCoercion
      */
-    public static function stringToSplFixedArray($str = '')
-    {
+    public static function stringToSplFixedArray($str = '') {
         $values = unpack('C*', $str);
         return SplFixedArray::fromArray(array_values($values));
     }
@@ -661,8 +643,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function SplFixedArrayToString(SplFixedArray $a)
-    {
+    public static function SplFixedArrayToString(SplFixedArray $a) {
         /**
          * @var array<int, int|string> $arr
          */
@@ -685,8 +666,7 @@ 
      * @psalm-suppress MixedArrayOffset
      * @psalm-suppress MixedMethodCall
      */
-    public static function contextToString(SplFixedArray $ctx)
-    {
+    public static function contextToString(SplFixedArray $ctx) {
         $str = '';
         /** @var array<int, array<int, int>> $ctxA */
         $ctxA = $ctx[0]->toArray();
@@ -740,8 +720,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArrayAssignment
      */
-    public static function stringToContext($string)
-    {
+    public static function stringToContext($string) {
         $ctx = self::context();
 
         # uint64_t h[8];

vendor/paragonie/sodium_compat/src/Core/Ed25519.php

Braces +19 added lines, -38 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_Ed25519
  */
-abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve25519
-{
+abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve25519 {
     const KEYPAIR_BYTES = 96;
     const SEED_BYTES = 32;
     const SCALAR_BYTES = 32;
@@ -21,8 +20,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function keypair()
-    {
+    public static function keypair() {
         $seed = random_bytes(self::SEED_BYTES);
         $pk = '';
         $sk = '';
@@ -40,8 +38,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function seed_keypair(&$pk, &$sk, $seed)
-    {
+    public static function seed_keypair(&$pk, &$sk, $seed) {
         if (self::strlen($seed) !== self::SEED_BYTES) {
             throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
         }
@@ -59,8 +56,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function secretkey($keypair)
-    {
+    public static function secretkey($keypair) {
         if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
             throw new RangeException('crypto_sign keypair must be 96 bytes long');
         }
@@ -74,8 +70,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function publickey($keypair)
-    {
+    public static function publickey($keypair) {
         if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
             throw new RangeException('crypto_sign keypair must be 96 bytes long');
         }
@@ -90,8 +85,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function publickey_from_secretkey($sk)
-    {
+    public static function publickey_from_secretkey($sk) {
         /** @var string $sk */
         $sk = hash('sha512', self::substr($sk, 0, 32), true);
         $sk[0] = self::intToChr(
@@ -109,8 +103,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function pk_to_curve25519($pk)
-    {
+    public static function pk_to_curve25519($pk) {
         if (self::small_order($pk)) {
             throw new SodiumException('Public key is on a small order');
         }
@@ -150,8 +143,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sk_to_pk($sk)
-    {
+    public static function sk_to_pk($sk) {
         return self::ge_p3_tobytes(
             self::ge_scalarmult_base(
                 self::substr($sk, 0, 32)
@@ -168,8 +160,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign($message, $sk)
-    {
+    public static function sign($message, $sk) {
         /** @var string $signature */
         $signature = self::sign_detached($message, $sk);
         return $signature . $message;
@@ -184,8 +175,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_open($message, $pk)
-    {
+    public static function sign_open($message, $pk) {
         /** @var string $signature */
         $signature = self::substr($message, 0, 64);
 
@@ -207,8 +197,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_detached($message, $sk)
-    {
+    public static function sign_detached($message, $sk) {
         # crypto_hash_sha512(az, sk, 32);
         $az =  hash('sha512', self::substr($sk, 0, 32), true);
 
@@ -272,8 +261,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function verify_detached($sig, $message, $pk)
-    {
+    public static function verify_detached($sig, $message, $pk) {
         if (self::strlen($sig) < 64) {
             throw new SodiumException('Signature is too short');
         }
@@ -339,8 +327,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function check_S_lt_L($S)
-    {
+    public static function check_S_lt_L($S) {
         if (self::strlen($S) < 32) {
             throw new SodiumException('Signature must be 32 bytes');
         }
@@ -375,8 +362,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function small_order($R)
-    {
+    public static function small_order($R) {
         /** @var array<int, array<int, int>> $blocklist */
         $blocklist = array(
             /* 0 (order 4) */
@@ -484,8 +470,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_complement($s)
-    {
+    public static function scalar_complement($s) {
         $t_ = self::L . str_repeat("\x00", 32);
         sodium_increment($t_);
         $s_ = $s . str_repeat("\x00", 32);
@@ -497,8 +482,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_random()
-    {
+    public static function scalar_random() {
         do {
             $r = ParagonIE_Sodium_Compat::randombytes_buf(self::SCALAR_BYTES);
             $r[self::SCALAR_BYTES - 1] = self::intToChr(
@@ -515,8 +499,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_negate($s)
-    {
+    public static function scalar_negate($s) {
         $t_ = self::L . str_repeat("\x00", 32) ;
         $s_ = $s . str_repeat("\x00", 32) ;
         ParagonIE_Sodium_Compat::sub($t_, $s_);
@@ -529,8 +512,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_add($a, $b)
-    {
+    public static function scalar_add($a, $b) {
         $a_ = $a . str_repeat("\x00", 32);
         $b_ = $b . str_repeat("\x00", 32);
         ParagonIE_Sodium_Compat::add($a_, $b_);
@@ -543,8 +525,7 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_sub($x, $y)
-    {
+    public static function scalar_sub($x, $y) {
         $yn = self::scalar_negate($y);
         return self::scalar_add($x, $yn);
     }

vendor/paragonie/sodium_compat/src/Core/Util.php

Braces +29 added lines, -58 removed lines

@@ -7,15 +7,13 @@ 
 /**
  * Class ParagonIE_Sodium_Core_Util
  */
-abstract class ParagonIE_Sodium_Core_Util
-{
+abstract class ParagonIE_Sodium_Core_Util {
     /**
      * @param int $integer
      * @param int $size (16, 32, 64)
      * @return int
      */
-    public static function abs($integer, $size = 0)
-    {
+    public static function abs($integer, $size = 0) {
         /** @var int $realSize */
         $realSize = (PHP_INT_SIZE << 3) - 1;
         if ($size) {
@@ -43,8 +41,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function bin2hex($binaryString)
-    {
+    public static function bin2hex($binaryString) {
         /* Type checks: */
         if (!is_string($binaryString)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
@@ -78,8 +75,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function bin2hexUpper($bin_string)
-    {
+    public static function bin2hexUpper($bin_string) {
         $hex = '';
         $len = self::strlen($bin_string);
         for ($i = 0; $i < $len; ++$i) {
@@ -123,8 +119,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function chrToInt($chr)
-    {
+    public static function chrToInt($chr) {
         /* Type checks: */
         if (!is_string($chr)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
@@ -149,8 +144,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function compare($left, $right, $len = null)
-    {
+    public static function compare($left, $right, $len = null) {
         $leftLen = self::strlen($left);
         $rightLen = self::strlen($right);
         if ($len === null) {
@@ -180,8 +174,7 @@ 
      * @throws SodiumException
      * @return void
      */
-    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0)
-    {
+    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0) {
         if (func_num_args() === 0) {
             /* Tautology, by default */
             return;
@@ -257,8 +250,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function hashEquals($left, $right)
-    {
+    public static function hashEquals($left, $right) {
         /* Type checks: */
         if (!is_string($left)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
@@ -295,8 +287,7 @@ 
      * @throws SodiumException
      * @psalm-suppress PossiblyInvalidArgument
      */
-    protected static function hash_update(&$hs, $data)
-    {
+    protected static function hash_update(&$hs, $data) {
         if (!hash_update($hs, $data)) {
             throw new SodiumException('hash_update() failed');
         }
@@ -314,8 +305,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function hex2bin($hexString, $strictPadding = false)
-    {
+    public static function hex2bin($hexString, $strictPadding = false) {
         /* Type checks: */
         if (!is_string($hexString)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
@@ -380,8 +370,7 @@ 
      * @param array<int, int> $ints
      * @return string
      */
-    public static function intArrayToString(array $ints)
-    {
+    public static function intArrayToString(array $ints) {
         /** @var array<int, int> $args */
         $args = $ints;
         foreach ($args as $i => $v) {
@@ -400,8 +389,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function intToChr($int)
-    {
+    public static function intToChr($int) {
         return pack('C', $int);
     }
 
@@ -415,8 +403,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_3($string)
-    {
+    public static function load_3($string) {
         /* Type checks: */
         if (!is_string($string)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
@@ -443,8 +430,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_4($string)
-    {
+    public static function load_4($string) {
         /* Type checks: */
         if (!is_string($string)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
@@ -472,8 +458,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function load64_le($string)
-    {
+    public static function load64_le($string) {
         /* Type checks: */
         if (!is_string($string)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
@@ -512,8 +497,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function memcmp($left, $right)
-    {
+    public static function memcmp($left, $right) {
         if (self::hashEquals($left, $right)) {
             return 0;
         }
@@ -537,8 +521,7 @@ 
      *                  constant operands)
      * @return int
      */
-    public static function mul($a, $b, $size = 0)
-    {
+    public static function mul($a, $b, $size = 0) {
         if (ParagonIE_Sodium_Compat::$fastMult) {
             return (int) ($a * $b);
         }
@@ -609,8 +592,7 @@ 
      * @param int|float $num
      * @return array<int, int>
      */
-    public static function numericTo64BitInteger($num)
-    {
+    public static function numericTo64BitInteger($num) {
         $high = 0;
         /** @var int $low */
         $low = $num & 0xffffffff;
@@ -636,8 +618,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store_3($int)
-    {
+    public static function store_3($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -660,8 +641,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store32_le($int)
-    {
+    public static function store32_le($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -685,8 +665,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store_4($int)
-    {
+    public static function store_4($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -710,8 +689,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store64_le($int)
-    {
+    public static function store64_le($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -763,8 +741,7 @@ 
      * @return int
      * @throws TypeError
      */
-    public static function strlen($str)
-    {
+    public static function strlen($str) {
         /* Type checks: */
         if (!is_string($str)) {
             throw new TypeError('String expected');
@@ -786,8 +763,7 @@ 
      * @return array<int, int>
      * @throws TypeError
      */
-    public static function stringToIntArray($string)
-    {
+    public static function stringToIntArray($string) {
         if (!is_string($string)) {
             throw new TypeError('String expected');
         }
@@ -813,8 +789,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function substr($str, $start = 0, $length = null)
-    {
+    public static function substr($str, $start = 0, $length = null) {
         /* Type checks: */
         if (!is_string($str)) {
             throw new TypeError('String expected');
@@ -851,8 +826,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function verify_16($a, $b)
-    {
+    public static function verify_16($a, $b) {
         /* Type checks: */
         if (!is_string($a)) {
             throw new TypeError('String expected');
@@ -877,8 +851,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function verify_32($a, $b)
-    {
+    public static function verify_32($a, $b) {
         /* Type checks: */
         if (!is_string($a)) {
             throw new TypeError('String expected');
@@ -902,8 +875,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function xorStrings($a, $b)
-    {
+    public static function xorStrings($a, $b) {
         /* Type checks: */
         if (!is_string($a)) {
             throw new TypeError('Argument 1 must be a string');
@@ -925,8 +897,7 @@ 
      *
      * @return bool
      */
-    protected static function isMbStringOverride()
-    {
+    protected static function isMbStringOverride() {
         static $mbstring = null;
 
         if ($mbstring === null) {

vendor/paragonie/sodium_compat/src/Core/SipHash.php

Braces +5 added lines, -10 removed lines

@@ -9,8 +9,7 @@ 
  *
  * Only uses 32-bit arithmetic, while the original SipHash used 64-bit integers
  */
-class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
-{
+class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util {
     /**
      * @internal You should not use this directly from another application
      *
@@ -18,8 +17,7 @@ 
      * @return int[]
      *
      */
-    public static function sipRound(array $v)
-    {
+    public static function sipRound(array $v) {
         # v0 += v1;
         list($v[0], $v[1]) = self::add(
             array($v[0], $v[1]),
@@ -90,8 +88,7 @@ 
      * @param int[] $b
      * @return array<int, mixed>
      */
-    public static function add(array $a, array $b)
-    {
+    public static function add(array $a, array $b) {
         /** @var int $x1 */
         $x1 = $a[1] + $b[1];
         /** @var int $c */
@@ -112,8 +109,7 @@ 
      * @param int $c
      * @return array<int, mixed>
      */
-    public static function rotl_64($int0, $int1, $c)
-    {
+    public static function rotl_64($int0, $int1, $c) {
         $int0 &= 0xffffffff;
         $int1 &= 0xffffffff;
         $c &= 63;
@@ -160,8 +156,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sipHash24($in, $key)
-    {
+    public static function sipHash24($in, $key) {
         $inlen = self::strlen($in);
 
         # /* "somepseudorandomlygeneratedbytes" */

vendor/paragonie/sodium_compat/src/Core/XChaCha20.php

Braces +5 added lines, -10 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_XChaCha20
  */
-class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
-{
+class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20 {
     /**
      * @internal You should not use this directly from another application
      *
@@ -19,8 +18,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
+    public static function stream($len = 64, $nonce = '', $key = '') {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }
@@ -46,8 +44,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStream($len = 64, $nonce = '', $key = '')
-    {
+    public static function ietfStream($len = 64, $nonce = '', $key = '') {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }
@@ -74,8 +71,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '') {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }
@@ -100,8 +96,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '') {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }

vendor/paragonie/sodium_compat/src/Core/X25519.php

Braces +4 added lines, -8 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_X25519
  */
-abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve25519
-{
+abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve25519 {
     /**
      * Alters the objects passed to this method in place.
      *
@@ -84,8 +83,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         $h = array(
             self::mul((int) $f[0], 121666, 17),
             self::mul((int) $f[1], 121666, 17),
@@ -158,8 +156,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10($n, $p)
-    {
+    public static function crypto_scalarmult_curve25519_ref10($n, $p) {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;
         # e[0] &= 248;
@@ -297,8 +294,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10_base($n)
-    {
+    public static function crypto_scalarmult_curve25519_ref10_base($n) {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;