WordPoints / wordpoints

src/library/sodium_compat/src/Crypto32.php

Spacing +212 added lines, -212 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Crypto32', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Crypto32', false ) ) {
     return;
 }
 
@@ -74,13 +74,13 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core32_Util::strlen( $message );
 
         /** @var int  $clen - Length of ciphertext */
         $clen = $len - self::aead_chacha20poly1305_ABYTES;
 
         /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen( $ad );
 
         /** @var string $mac - Message authentication code */
         $mac = ParagonIE_Sodium_Core32_Util::substr(
@@ -90,7 +90,7 @@ 
         );
 
         /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 0, $clen);
+        $ciphertext = ParagonIE_Sodium_Core32_Util::substr( $message, 0, $clen );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
@@ -100,21 +100,21 @@ 
         );
 
         /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( Error $ex ) {
             $block0 = null;
         }
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
+        $state->update( $ad );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $adlen ) );
+        $state->update( $ciphertext );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $clen ) );
         $computed_mac = $state->finish();
 
         /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
-            throw new Error('Invalid MAC');
+        if ( ! ParagonIE_Sodium_Core32_Util::verify_16( $computed_mac, $mac ) ) {
+            throw new Error( 'Invalid MAC' );
         }
 
         // Here, we know that the MAC is valid, so we decrypt and return the plaintext
@@ -122,7 +122,7 @@ 
             $ciphertext,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
+            ParagonIE_Sodium_Core32_Util::store64_le( 1 )
         );
     }
 
@@ -144,10 +144,10 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core32_Util::strlen( $message );
 
         /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen( $ad );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
@@ -155,10 +155,10 @@ 
             $nonce,
             $key
         );
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( Error $ex ) {
             $block0 = null;
         }
 
@@ -167,13 +167,13 @@ 
             $message,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
+            ParagonIE_Sodium_Core32_Util::store64_le( 1 )
         );
 
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
+        $state->update( $ad );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $adlen ) );
+        $state->update( $ciphertext );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $len ) );
         return $ciphertext . $state->finish();
     }
 
@@ -196,10 +196,10 @@ 
         $key = ''
     ) {
         /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen( $ad );
 
         /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core32_Util::strlen( $message );
 
         /** @var int  $clen - Length of ciphertext */
         $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
@@ -226,23 +226,23 @@ 
         );
 
         /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( Error $ex ) {
             $block0 = null;
         }
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
+        $state->update( $ad );
+        $state->update( str_repeat( "\x00", ( ( 0x10 - $adlen ) & 0xf ) ) );
+        $state->update( $ciphertext );
+        $state->update( str_repeat( "\x00", ( 0x10 - $clen ) & 0xf ) );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $adlen ) );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $clen ) );
         $computed_mac = $state->finish();
 
         /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
-            throw new Error('Invalid MAC');
+        if ( ! ParagonIE_Sodium_Core32_Util::verify_16( $computed_mac, $mac ) ) {
+            throw new Error( 'Invalid MAC' );
         }
 
         // Here, we know that the MAC is valid, so we decrypt and return the plaintext
@@ -250,7 +250,7 @@ 
             $ciphertext,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
+            ParagonIE_Sodium_Core32_Util::store64_le( 1 )
         );
     }
 
@@ -272,10 +272,10 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core32_Util::strlen( $message );
 
         /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen( $ad );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
@@ -283,10 +283,10 @@ 
             $nonce,
             $key
         );
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( Error $ex ) {
             $block0 = null;
         }
 
@@ -295,15 +295,15 @@ 
             $message,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
+            ParagonIE_Sodium_Core32_Util::store64_le( 1 )
         );
 
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
+        $state->update( $ad );
+        $state->update( str_repeat( "\x00", ( ( 0x10 - $adlen ) & 0xf ) ) );
+        $state->update( $ciphertext );
+        $state->update( str_repeat( "\x00", ( ( 0x10 - $len ) & 0xf ) ) );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $adlen ) );
+        $state->update( ParagonIE_Sodium_Core32_Util::store64_le( $len ) );
         return $ciphertext . $state->finish();
     }
 
@@ -326,13 +326,13 @@ 
         $key = ''
     ) {
         $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 0, 16 ),
             $key
         );
         $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 );
 
-        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
+        return self::aead_chacha20poly1305_ietf_decrypt( $message, $ad, $nonceLast, $subkey );
     }
 
     /**
@@ -353,13 +353,13 @@ 
         $key = ''
     ) {
         $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 0, 16 ),
             $key
         );
         $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 );
 
-        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
+        return self::aead_chacha20poly1305_ietf_encrypt( $message, $ad, $nonceLast, $subkey );
     }
 
     /**
@@ -371,10 +371,10 @@ 
      * @param string $key
      * @return string
      */
-    public static function auth($message, $key)
+    public static function auth( $message, $key )
     {
         return ParagonIE_Sodium_Core32_Util::substr(
-            hash_hmac('sha512', $message, $key, true),
+            hash_hmac( 'sha512', $message, $key, true ),
             0,
             32
         );
@@ -390,11 +390,11 @@ 
      * @param string $key
      * @return bool
      */
-    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)
+            self::auth( $message, $key )
         );
     }
 
@@ -408,14 +408,14 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box($plaintext, $nonce, $keypair)
+    public static function box( $plaintext, $nonce, $keypair )
     {
         $c = self::secretbox(
             $plaintext,
             $nonce,
             self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
+                self::box_secretkey( $keypair ),
+                self::box_publickey( $keypair )
             )
         );
         return $c;
@@ -430,16 +430,16 @@ 
      * @param string $publicKey
      * @return string
      */
-    public static function box_seal($message, $publicKey)
+    public static function box_seal( $message, $publicKey )
     {
         /** @var string $ephemeralKeypair */
         $ephemeralKeypair = self::box_keypair();
 
         /** @var string $ephemeralSK */
-        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
+        $ephemeralSK = self::box_secretkey( $ephemeralKeypair );
 
         /** @var string $ephemeralPK */
-        $ephemeralPK = self::box_publickey($ephemeralKeypair);
+        $ephemeralPK = self::box_publickey( $ephemeralKeypair );
 
         /** @var string $nonce */
         $nonce = self::generichash(
@@ -449,15 +449,15 @@ 
         );
 
         /** @var string $keypair - The combined keypair used in crypto_box() */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
+        $keypair = self::box_keypair_from_secretkey_and_publickey( $ephemeralSK, $publicKey );
 
         /** @var string $ciphertext Ciphertext + MAC from crypto_box */
-        $ciphertext = self::box($message, $nonce, $keypair);
+        $ciphertext = self::box( $message, $nonce, $keypair );
         try {
-            ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
-            ParagonIE_Sodium_Compat::memzero($ephemeralSK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $ephemeralKeypair );
+            ParagonIE_Sodium_Compat::memzero( $ephemeralSK );
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+        } catch ( Error $ex ) {
             $ephemeralKeypair = null;
             $ephemeralSK = null;
             $nonce = null;
@@ -474,19 +474,19 @@ 
      * @param string $keypair
      * @return string
      */
-    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);
+        $ephemeralPK = ParagonIE_Sodium_Core32_Util::substr( $message, 0, 32 );
 
         /** @var string $ciphertext (ciphertext + MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 32);
+        $ciphertext = ParagonIE_Sodium_Core32_Util::substr( $message, 32 );
 
         /** @var string $secretKey */
-        $secretKey = self::box_secretkey($keypair);
+        $secretKey = self::box_secretkey( $keypair );
 
         /** @var string $publicKey */
-        $publicKey = self::box_publickey($keypair);
+        $publicKey = self::box_publickey( $keypair );
 
         /** @var string $nonce */
         $nonce = self::generichash(
@@ -496,15 +496,15 @@ 
         );
 
         /** @var string $keypair */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
+        $keypair = self::box_keypair_from_secretkey_and_publickey( $secretKey, $ephemeralPK );
 
         /** @var string $m */
-        $m = self::box_open($ciphertext, $nonce, $keypair);
+        $m = self::box_open( $ciphertext, $nonce, $keypair );
         try {
-            ParagonIE_Sodium_Compat::memzero($secretKey);
-            ParagonIE_Sodium_Compat::memzero($ephemeralPK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $secretKey );
+            ParagonIE_Sodium_Compat::memzero( $ephemeralPK );
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+        } catch ( Error $ex ) {
             $secretKey = null;
             $ephemeralPK = null;
             $nonce = null;
@@ -521,11 +521,11 @@ 
      * @param string $pk
      * @return string
      */
-    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)
+            str_repeat( "\x00", 16 ),
+            self::scalarmult( $sk, $pk )
         );
     }
 
@@ -536,8 +536,8 @@ 
      */
     public static function box_keypair()
     {
-        $sKey = random_bytes(32);
-        $pKey = self::scalarmult_base($sKey);
+        $sKey = random_bytes( 32 );
+        $pKey = self::scalarmult_base( $sKey );
         return $sKey . $pKey;
     }
 
@@ -548,10 +548,10 @@ 
      * @param string $pKey
      * @return string
      */
-    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);
+        return ParagonIE_Sodium_Core32_Util::substr( $sKey, 0, 32 ) .
+            ParagonIE_Sodium_Core32_Util::substr( $pKey, 0, 32 );
     }
 
     /**
@@ -561,12 +561,12 @@ 
      * @return string
      * @throws RangeException
      */
-    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.');
+        if ( ParagonIE_Sodium_Core32_Util::strlen( $keypair ) !== 64 ) {
+            throw new RangeException( 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.' );
         }
-        return ParagonIE_Sodium_Core32_Util::substr($keypair, 0, 32);
+        return ParagonIE_Sodium_Core32_Util::substr( $keypair, 0, 32 );
     }
 
     /**
@@ -576,12 +576,12 @@ 
      * @return string
      * @throws RangeException
      */
-    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.');
+        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.' );
         }
-        return ParagonIE_Sodium_Core32_Util::substr($keypair, 32, 32);
+        return ParagonIE_Sodium_Core32_Util::substr( $keypair, 32, 32 );
     }
 
     /**
@@ -591,12 +591,12 @@ 
      * @return string
      * @throws RangeException
      */
-    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.');
+        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.' );
         }
-        return self::scalarmult_base($sKey);
+        return self::scalarmult_base( $sKey );
     }
 
     /**
@@ -610,14 +610,14 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box_open($ciphertext, $nonce, $keypair)
+    public static function box_open( $ciphertext, $nonce, $keypair )
     {
         return self::secretbox_open(
             $ciphertext,
             $nonce,
             self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
+                self::box_secretkey( $keypair ),
+                self::box_publickey( $keypair )
             )
         );
     }
@@ -633,34 +633,34 @@ 
      * @return string
      * @throws RangeException
      */
-    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();
 
         $k = null;
-        if (!empty($key)) {
+        if ( ! empty( $key ) ) {
             /** @var SplFixedArray $k */
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
+            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray( $key );
+            if ( $k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES ) {
+                throw new RangeException( 'Invalid key size' );
             }
         }
 
         /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
+        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray( $message );
 
         /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outlen);
-        ParagonIE_Sodium_Core32_BLAKE2b::update($ctx, $in, $in->count());
+        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init( $k, $outlen );
+        ParagonIE_Sodium_Core32_BLAKE2b::update( $ctx, $in, $in->count() );
 
         /** @var SplFixedArray $out */
-        $out = new SplFixedArray($outlen);
-        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($ctx, $out);
+        $out = new SplFixedArray( $outlen );
+        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish( $ctx, $out );
 
         /** @var array<int, int> */
         $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
+        return ParagonIE_Sodium_Core32_Util::intArrayToString( $outArray );
     }
 
     /**
@@ -673,22 +673,22 @@ 
      * @return string
      * @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');
+        if ( ! is_string( $ctx ) ) {
+            throw new TypeError( 'Context must be a string' );
         }
-        $out = new SplFixedArray($outlen);
+        $out = new SplFixedArray( $outlen );
 
         /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
+        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext( $ctx );
 
         /** @var SplFixedArray $out */
-        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($context, $out);
+        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish( $context, $out );
 
         /** @var array<int, int> */
         $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
+        return ParagonIE_Sodium_Core32_Util::intArrayToString( $outArray );
     }
 
     /**
@@ -701,23 +701,23 @@ 
      * @return string
      * @throws RangeException
      */
-    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();
 
         $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
+        if ( ! empty( $key ) ) {
+            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray( $key );
+            if ( $k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES ) {
+                throw new RangeException( 'Invalid key size' );
             }
         }
 
         /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength);
+        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init( $k, $outputLength );
 
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
+        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString( $ctx );
     }
 
     /**
@@ -729,20 +729,20 @@ 
      * @param string $message
      * @return string
      */
-    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();
 
         /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
+        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext( $ctx );
 
         /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
+        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray( $message );
 
-        ParagonIE_Sodium_Core32_BLAKE2b::update($context, $in, $in->count());
+        ParagonIE_Sodium_Core32_BLAKE2b::update( $context, $in, $in->count() );
 
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($context);
+        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString( $context );
     }
 
     /**
@@ -756,10 +756,10 @@ 
      * @param string $server_pk
      * @return string
      */
-    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) .
+            self::scalarmult( $my_sk, $their_pk ) .
             $client_pk .
             $server_pk
         );
@@ -776,10 +776,10 @@ 
      *
      * @throws Error
      */
-    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);
+        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10( $sKey, $pKey );
+        self::scalarmult_throw_if_zero( $q );
         return $q;
     }
 
@@ -792,10 +792,10 @@ 
      *
      * @throws Error
      */
-    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);
+        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10_base( $secret );
+        self::scalarmult_throw_if_zero( $q );
         return $q;
     }
 
@@ -806,16 +806,16 @@ 
      * @return void
      * @throws Error
      */
-    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]);
+        for ( $i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i ) {
+            $d |= ParagonIE_Sodium_Core32_Util::chrToInt( $q[$i] );
         }
 
         /* branch-free variant of === 0 */
-        if (-(1 & (($d - 1) >> 8))) {
-            throw new Error('Zero public key is not allowed');
+        if (-( 1 & ( ( $d - 1 ) >> 8 ) )) {
+            throw new Error( 'Zero public key is not allowed' );
         }
     }
 
@@ -829,26 +829,26 @@ 
      * @param string $key
      * @return string
      */
-    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);
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
+        $mlen = ParagonIE_Sodium_Core32_Util::strlen( $plaintext );
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core32_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
             $block0,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
 
@@ -857,13 +857,13 @@ 
             $block0,
             self::secretbox_xsalsa20poly1305_ZEROBYTES
         );
-        if ($mlen > $mlen0) {
+        if ( $mlen > $mlen0 ) {
             $c .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
                 ParagonIE_Sodium_Core32_Util::substr(
                     $plaintext,
                     self::secretbox_xsalsa20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 ),
                 1,
                 $subkey
             );
@@ -876,18 +876,18 @@ 
             )
         );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( Error $ex ) {
             $block0 = null;
             $subkey = null;
         }
 
-        $state->update($c);
+        $state->update( $c );
 
         /** @var string $c - MAC || ciphertext */
         $c = $state->finish() . $c;
-        unset($state);
+        unset( $state );
 
         return $c;
     }
@@ -903,7 +903,7 @@ 
      * @return string
      * @throws Error
      */
-    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(
@@ -919,44 +919,44 @@ 
         );
 
         /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
+        $clen = ParagonIE_Sodium_Core32_Util::strlen( $c );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
             64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
         $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
             $mac,
             $c,
-            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
+            ParagonIE_Sodium_Core32_Util::substr( $block0, 0, 32 )
         );
-        if (!$verified) {
+        if ( ! $verified ) {
             try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (Error $ex) {
+                ParagonIE_Sodium_Compat::memzero( $subkey );
+            } catch ( Error $ex ) {
                 $subkey = null;
             }
-            throw new Error('Invalid MAC');
+            throw new Error( 'Invalid MAC' );
         }
 
         /** @var string $m - Decrypted message */
         $m = ParagonIE_Sodium_Core32_Util::xorStrings(
-            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
+            ParagonIE_Sodium_Core32_Util::substr( $block0, self::secretbox_xsalsa20poly1305_ZEROBYTES ),
+            ParagonIE_Sodium_Core32_Util::substr( $c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES )
         );
-        if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $clen > self::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             // We had more than 1 block, so let's continue to decrypt the rest.
             $m .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
                 ParagonIE_Sodium_Core32_Util::substr(
                     $c,
                     self::secretbox_xsalsa20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 ),
                 1,
                 $subkey
             );
@@ -974,25 +974,25 @@ 
      * @param string $key
      * @return string
      */
-    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),
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 0, 16 ),
             $key
         );
-        $nonceLast = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+        $nonceLast = ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
+        $mlen = ParagonIE_Sodium_Core32_Util::strlen( $plaintext );
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core32_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
@@ -1006,7 +1006,7 @@ 
             $block0,
             self::secretbox_xchacha20poly1305_ZEROBYTES
         );
-        if ($mlen > $mlen0) {
+        if ( $mlen > $mlen0 ) {
             $c .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
                 ParagonIE_Sodium_Core32_Util::substr(
                     $plaintext,
@@ -1014,7 +1014,7 @@ 
                 ),
                 $nonceLast,
                 $subkey,
-                ParagonIE_Sodium_Core32_Util::store64_le(1)
+                ParagonIE_Sodium_Core32_Util::store64_le( 1 )
             );
         }
         $state = new ParagonIE_Sodium_Core32_Poly1305_State(
@@ -1025,18 +1025,18 @@ 
             )
         );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( Error $ex ) {
             $block0 = null;
             $subkey = null;
         }
 
-        $state->update($c);
+        $state->update( $c );
 
         /** @var string $c - MAC || ciphertext */
         $c = $state->finish() . $c;
-        unset($state);
+        unset( $state );
 
         return $c;
     }
@@ -1052,7 +1052,7 @@ 
      * @return string
      * @throws Error
      */
-    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(
@@ -1068,48 +1068,48 @@ 
         );
 
         /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
+        $clen = ParagonIE_Sodium_Core32_Util::strlen( $c );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hchacha20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hchacha20( $nonce, $key );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
             64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
         $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
             $mac,
             $c,
-            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
+            ParagonIE_Sodium_Core32_Util::substr( $block0, 0, 32 )
         );
 
-        if (!$verified) {
+        if ( ! $verified ) {
             try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (Error $ex) {
+                ParagonIE_Sodium_Compat::memzero( $subkey );
+            } catch ( Error $ex ) {
                 $subkey = null;
             }
-            throw new Error('Invalid MAC');
+            throw new Error( 'Invalid MAC' );
         }
 
         /** @var string $m - Decrypted message */
         $m = ParagonIE_Sodium_Core32_Util::xorStrings(
-            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
+            ParagonIE_Sodium_Core32_Util::substr( $block0, self::secretbox_xchacha20poly1305_ZEROBYTES ),
+            ParagonIE_Sodium_Core32_Util::substr( $c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES )
         );
 
-        if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
+        if ( $clen > self::secretbox_xchacha20poly1305_ZEROBYTES ) {
             // We had more than 1 block, so let's continue to decrypt the rest.
             $m .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
                 ParagonIE_Sodium_Core32_Util::substr(
                     $c,
                     self::secretbox_xchacha20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 ),
                 $subkey,
-                ParagonIE_Sodium_Core32_Util::store64_le(1)
+                ParagonIE_Sodium_Core32_Util::store64_le( 1 )
             );
         }
         return $m;
@@ -1124,9 +1124,9 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign_detached($message, $sk)
+    public static function sign_detached( $message, $sk )
     {
-        return ParagonIE_Sodium_Core32_Ed25519::sign_detached($message, $sk);
+        return ParagonIE_Sodium_Core32_Ed25519::sign_detached( $message, $sk );
     }
 
     /**
@@ -1138,9 +1138,9 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign($message, $sk)
+    public static function sign( $message, $sk )
     {
-        return ParagonIE_Sodium_Core32_Ed25519::sign($message, $sk);
+        return ParagonIE_Sodium_Core32_Ed25519::sign( $message, $sk );
     }
 
     /**
@@ -1152,9 +1152,9 @@ 
      * @param string $pk
      * @return string
      */
-    public static function sign_open($signedMessage, $pk)
+    public static function sign_open( $signedMessage, $pk )
     {
-        return ParagonIE_Sodium_Core32_Ed25519::sign_open($signedMessage, $pk);
+        return ParagonIE_Sodium_Core32_Ed25519::sign_open( $signedMessage, $pk );
     }
 
     /**
@@ -1167,8 +1167,8 @@ 
      * @param string $pk
      * @return bool
      */
-    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);
+        return ParagonIE_Sodium_Core32_Ed25519::verify_detached( $signature, $message, $pk );
     }
 }

src/library/sodium_compat/src/File.php

Spacing +377 added lines, -377 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_File', false)) {
+if ( class_exists( 'ParagonIE_Sodium_File', false ) ) {
     return;
 }
 /**
@@ -25,52 +25,52 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box($inputFile, $outputFile, $nonce, $keyPair)
+    public static function box( $inputFile, $outputFile, $nonce, $keyPair )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
 
         /* Input validation: */
-        if (!is_string($keyPair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keyPair) . ' given.');
+        if ( ! is_string( $keyPair ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $keyPair ) . ' given.' );
         }
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes' );
         }
-        if (self::strlen($keyPair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        if ( self::strlen( $keyPair ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new Error( 'Could not open output file for writing' );
         }
 
-        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $keyPair);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::box_encrypt( $ifp, $ofp, $size, $nonce, $keyPair );
+        fclose( $ifp );
+        fclose( $ofp );
         return $res;
     }
 
@@ -91,57 +91,57 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box_open($inputFile, $outputFile, $nonce, $keypair)
+    public static function box_open( $inputFile, $outputFile, $nonce, $keypair )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
-        if (!is_string($keypair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keypair) . ' given.');
+        if ( ! is_string( $keypair ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $keypair ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes' );
         }
-        if (self::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        if ( self::strlen( $keypair ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new Error( 'Could not open output file for writing' );
         }
 
-        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $keypair);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::box_decrypt( $ifp, $ofp, $size, $nonce, $keypair );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (Error $ex) {
-            unset($ephKeypair);
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+        } catch ( Error $ex ) {
+            unset( $ephKeypair );
         }
         return $res;
     }
@@ -159,41 +159,41 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box_seal($inputFile, $outputFile, $publicKey)
+    public static function box_seal( $inputFile, $outputFile, $publicKey )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        if ( ! is_string( $publicKey ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $publicKey ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes');
+        if ( self::strlen( $publicKey ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new Error( 'Could not open output file for writing' );
         }
 
         /** @var string $ephKeypair */
@@ -201,12 +201,12 @@ 
 
         /** @var string $msgKeypair */
         $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
-            ParagonIE_Sodium_Compat::crypto_box_secretkey($ephKeypair),
+            ParagonIE_Sodium_Compat::crypto_box_secretkey( $ephKeypair ),
             $publicKey
         );
 
         /** @var string $ephemeralPK */
-        $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey($ephKeypair);
+        $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey( $ephKeypair );
 
         /** @var string $nonce */
         $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
@@ -221,27 +221,27 @@ 
             $ephemeralPK,
             ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES
         );
-        if (!is_int($firstWrite)) {
-            fclose($ifp);
-            fclose($ofp);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-            throw new Error('Could not write to output file');
-        }
-        if ($firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-            fclose($ifp);
-            fclose($ofp);
-            throw new Error('Error writing public key to output file');
-        }
-
-        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
-        fclose($ifp);
-        fclose($ofp);
+        if ( ! is_int( $firstWrite ) ) {
+            fclose( $ifp );
+            fclose( $ofp );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+            throw new Error( 'Could not write to output file' );
+        }
+        if ( $firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+            fclose( $ifp );
+            fclose( $ofp );
+            throw new Error( 'Error writing public key to output file' );
+        }
+
+        $res = self::box_encrypt( $ifp, $ofp, $size, $nonce, $msgKeypair );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (Error $ex) {
-            unset($ephKeypair);
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+        } catch ( Error $ex ) {
+            unset( $ephKeypair );
         }
         return $res;
     }
@@ -262,53 +262,53 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair)
+    public static function box_seal_open( $inputFile, $outputFile, $ecdhKeypair )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($ecdhKeypair)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($ecdhKeypair) . ' given.');
+        if ( ! is_string( $ecdhKeypair ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $ecdhKeypair ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($ecdhKeypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        if ( self::strlen( $ecdhKeypair ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes' );
         }
 
-        $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey($ecdhKeypair);
+        $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey( $ecdhKeypair );
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new Error( 'Could not open output file for writing' );
         }
 
-        $ephemeralPK = fread($ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES);
-        if (!is_string($ephemeralPK)) {
-            throw new Error('Could not read input file');
+        $ephemeralPK = fread( $ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES );
+        if ( ! is_string( $ephemeralPK ) ) {
+            throw new Error( 'Could not read input file' );
         }
-        if (self::strlen($ephemeralPK) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            fclose($ifp);
-            fclose($ofp);
-            throw new Error('Could not read public key from sealed file');
+        if ( self::strlen( $ephemeralPK ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            fclose( $ifp );
+            fclose( $ofp );
+            throw new Error( 'Could not read public key from sealed file' );
         }
 
         $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
@@ -317,18 +317,18 @@ 
             24
         );
         $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
-            ParagonIE_Sodium_Compat::crypto_box_secretkey($ecdhKeypair),
+            ParagonIE_Sodium_Compat::crypto_box_secretkey( $ecdhKeypair ),
             $ephemeralPK
         );
 
-        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::box_decrypt( $ifp, $ofp, $size, $nonce, $msgKeypair );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (Error $ex) {
-            unset($ephKeypair);
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+        } catch ( Error $ex ) {
+            unset( $ephKeypair );
         }
         return $res;
     }
@@ -345,68 +345,68 @@ 
      * @throws TypeError
      * @psalm-suppress FailedTypeResolution
      */
-    public static function generichash($filePath, $key = '', $outputLength = 32)
+    public static function generichash( $filePath, $key = '', $outputLength = 32 )
     {
         /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        if ( ! is_string( $filePath ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $filePath ) . ' given.' );
         }
-        if (!is_string($key)) {
-            if (is_null($key)) {
+        if ( ! is_string( $key ) ) {
+            if ( is_null( $key ) ) {
                 $key = '';
             } else {
-                throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+                throw new TypeError( 'Argument 2 must be a string, ' . gettype( $key ) . ' given.' );
             }
         }
-        if (!is_int($outputLength)) {
-            if (!is_numeric($outputLength)) {
-                throw new TypeError('Argument 3 must be an integer, ' . gettype($outputLength) . ' given.');
+        if ( ! is_int( $outputLength ) ) {
+            if ( ! is_numeric( $outputLength ) ) {
+                throw new TypeError( 'Argument 3 must be an integer, ' . gettype( $outputLength ) . ' given.' );
             }
             $outputLength = (int) $outputLength;
         }
 
         /* Input validation: */
-        if (!empty($key)) {
-            if (self::strlen($key) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new TypeError('Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes');
+        if ( ! empty( $key ) ) {
+            if ( self::strlen( $key ) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN ) {
+                throw new TypeError( 'Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes' );
             }
-            if (self::strlen($key) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
-                throw new TypeError('Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes');
+            if ( self::strlen( $key ) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX ) {
+                throw new TypeError( 'Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes' );
             }
         }
-        if ($outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN) {
-            throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN');
+        if ( $outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN ) {
+            throw new Error( 'Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN' );
         }
-        if ($outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX) {
-            throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX');
+        if ( $outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX ) {
+            throw new Error( 'Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX' );
         }
 
         /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new Error('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
-        $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outputLength);
-        while ($size > 0) {
+        $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init( $key, $outputLength );
+        while ( $size > 0 ) {
             $blockSize = $size > 64
                 ? 64
                 : $size;
-            $read = fread($fp, $blockSize);
-            if (!is_string($read)) {
-                throw new Error('Could not read input file');
+            $read = fread( $fp, $blockSize );
+            if ( ! is_string( $read ) ) {
+                throw new Error( 'Could not read input file' );
             }
-            ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $read);
+            ParagonIE_Sodium_Compat::crypto_generichash_update( $ctx, $read );
             $size -= $blockSize;
         }
 
-        fclose($fp);
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+        fclose( $fp );
+        return ParagonIE_Sodium_Compat::crypto_generichash_final( $ctx, $outputLength );
     }
 
     /**
@@ -423,52 +423,52 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function secretbox($inputFile, $outputFile, $nonce, $key)
+    public static function secretbox( $inputFile, $outputFile, $nonce, $key )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given..' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes' );
         }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        if ( ! is_string( $key ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $key ) . ' given.' );
         }
-        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes');
+        if ( self::strlen( $key ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new Error( 'Could not open output file for writing' );
         }
 
-        $res = self::secretbox_encrypt($ifp, $ofp, $size, $nonce, $key);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::secretbox_encrypt( $ifp, $ofp, $size, $nonce, $key );
+        fclose( $ifp );
+        fclose( $ofp );
         return $res;
     }
     /**
@@ -488,56 +488,56 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function secretbox_open($inputFile, $outputFile, $nonce, $key)
+    public static function secretbox_open( $inputFile, $outputFile, $nonce, $key )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        if ( ! is_string( $key ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $key ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes' );
         }
-        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes');
+        if ( self::strlen( $key ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new Error( 'Could not open output file for writing' );
         }
 
-        $res = self::secretbox_decrypt($ifp, $ofp, $size, $nonce, $key);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::secretbox_decrypt( $ifp, $ofp, $size, $nonce, $key );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($key);
-        } catch (Error $ex) {
-            unset($key);
+            ParagonIE_Sodium_Compat::memzero( $key );
+        } catch ( Error $ex ) {
+            unset( $key );
         }
         return $res;
     }
@@ -554,82 +554,82 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function sign($filePath, $secretKey)
+    public static function sign( $filePath, $secretKey )
     {
         /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        if ( ! is_string( $filePath ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $filePath ) . ' given.' );
         }
-        if (!is_string($secretKey)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
+        if ( ! is_string( $secretKey ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $secretKey ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($secretKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new TypeError('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes');
+        if ( self::strlen( $secretKey ) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES ) {
+            throw new TypeError( 'Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new Error('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var string $az */
-        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
+        $az = hash( 'sha512', self::substr( $secretKey, 0, 32 ), true );
 
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+        $az[0] = self::intToChr( self::chrToInt( $az[0] ) & 248 );
+        $az[31] = self::intToChr( ( self::chrToInt( $az[31] ) & 63 ) | 64 );
 
         /** @var resource $hs */
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($az, 32, 32));
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = hash_init( 'sha512' );
+        hash_update( $hs, self::substr( $az, 32, 32 ) );
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
 
         /** @var string $nonceHash */
-        $nonceHash = hash_final($hs, true);
+        $nonceHash = hash_final( $hs, true );
 
         /** @var string $pk */
-        $pk = self::substr($secretKey, 32, 32);
+        $pk = self::substr( $secretKey, 32, 32 );
 
         /** @var string $nonce */
-        $nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce( $nonceHash ) . self::substr( $nonceHash, 32 );
 
         /** @var string $sig */
         $sig = ParagonIE_Sodium_Core_Ed25519::ge_p3_tobytes(
-            ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base($nonce)
+            ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base( $nonce )
         );
 
         /** @var resource $hs */
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($sig, 0, 32));
-        hash_update($hs, self::substr($pk, 0, 32));
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = hash_init( 'sha512' );
+        hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        hash_update( $hs, self::substr( $pk, 0, 32 ) );
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
 
         /** @var string $hramHash */
-        $hramHash = hash_final($hs, true);
+        $hramHash = hash_final( $hs, true );
 
         /** @var string $hram */
-        $hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hramHash);
+        $hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce( $hramHash );
 
         /** @var string $sigAfter */
-        $sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd($hram, $az, $nonce);
+        $sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd( $hram, $az, $nonce );
 
         /** @var string $sig */
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+        $sig = self::substr( $sig, 0, 32 ) . self::substr( $sigAfter, 0, 32 );
 
         try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $az );
+        } catch ( Error $ex ) {
             $az = null;
         }
-        fclose($fp);
+        fclose( $fp );
         return $sig;
     }
 
@@ -646,58 +646,58 @@ 
      * @throws Error
      * @throws Exception
      */
-    public static function verify($sig, $filePath, $publicKey)
+    public static function verify( $sig, $filePath, $publicKey )
     {
         /* Type checks: */
-        if (!is_string($sig)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
+        if ( ! is_string( $sig ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $sig ) . ' given.' );
         }
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($filePath) . ' given.');
+        if ( ! is_string( $filePath ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $filePath ) . ' given.' );
         }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        if ( ! is_string( $publicKey ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $publicKey ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($sig) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES) {
-            throw new TypeError('Argument 1 must be CRYPTO_SIGN_BYTES bytes');
+        if ( self::strlen( $sig ) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES ) {
+            throw new TypeError( 'Argument 1 must be CRYPTO_SIGN_BYTES bytes' );
         }
-        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes');
+        if ( self::strlen( $publicKey ) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes' );
         }
-        if (self::strlen($sig) < 64) {
-            throw new Exception('Signature is too short');
+        if ( self::strlen( $sig ) < 64 ) {
+            throw new Exception( 'Signature is too short' );
         }
 
         /* Security checks */
-        if (ParagonIE_Sodium_Core_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new Exception('S < L - Invalid signature');
+        if ( ParagonIE_Sodium_Core_Ed25519::check_S_lt_L( self::substr( $sig, 32, 32 ) ) ) {
+            throw new Exception( 'S < L - Invalid signature' );
         }
-        if (ParagonIE_Sodium_Core_Ed25519::small_order($sig)) {
-            throw new Exception('Signature is on too small of an order');
+        if ( ParagonIE_Sodium_Core_Ed25519::small_order( $sig ) ) {
+            throw new Exception( 'Signature is on too small of an order' );
         }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new Exception('Invalid signature');
+        if ( ( self::chrToInt( $sig[63] ) & 224 ) !== 0 ) {
+            throw new Exception( 'Invalid signature' );
         }
         $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($publicKey[$i]);
+        for ( $i = 0; $i < 32; ++$i ) {
+            $d |= self::chrToInt( $publicKey[$i] );
         }
-        if ($d === 0) {
-            throw new Exception('All zero public key');
+        if ( $d === 0 ) {
+            throw new Exception( 'All zero public key' );
         }
 
         /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new Error( 'Could not obtain the file size' );
         }
 
         /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new Error('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new Error( 'Could not open input file for reading' );
         }
 
         /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
@@ -707,35 +707,35 @@ 
         ParagonIE_Sodium_Compat::$fastMult = true;
 
         /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
-        $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime($publicKey);
+        $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime( $publicKey );
 
         /** @var resource $hs */
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($sig, 0, 32));
-        hash_update($hs, self::substr($publicKey, 0, 32));
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = hash_init( 'sha512' );
+        hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        hash_update( $hs, self::substr( $publicKey, 0, 32 ) );
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
         /** @var string $hDigest */
-        $hDigest = hash_final($hs, true);
+        $hDigest = hash_final( $hs, true );
 
         /** @var string $h */
-        $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
+        $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce( $hDigest ) . self::substr( $hDigest, 32 );
 
         /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
         $R = ParagonIE_Sodium_Core_Ed25519::ge_double_scalarmult_vartime(
             $h,
             $A,
-            self::substr($sig, 32)
+            self::substr( $sig, 32 )
         );
 
         /** @var string $rcheck */
-        $rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes($R);
+        $rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes( $R );
 
         // Close the file handle
-        fclose($fp);
+        fclose( $fp );
 
         // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
         ParagonIE_Sodium_Compat::$fastMult = $orig;
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+        return self::verify_32( $rcheck, self::substr( $sig, 0, 32 ) );
     }
 
     /**
@@ -746,7 +746,7 @@ 
      * @param string   $boxKeypair
      * @return bool
      */
-    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    protected static function box_encrypt( $ifp, $ofp, $mlen, $nonce, $boxKeypair )
     {
         return self::secretbox_encrypt(
             $ifp,
@@ -754,8 +754,8 @@ 
             $mlen,
             $nonce,
             ParagonIE_Sodium_Crypto::box_beforenm(
-                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
-                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+                ParagonIE_Sodium_Crypto::box_secretkey( $boxKeypair ),
+                ParagonIE_Sodium_Crypto::box_publickey( $boxKeypair )
             )
         );
     }
@@ -769,7 +769,7 @@ 
      * @param string   $boxKeypair
      * @return bool
      */
-    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    protected static function box_decrypt( $ifp, $ofp, $mlen, $nonce, $boxKeypair )
     {
         return self::secretbox_decrypt(
             $ifp,
@@ -777,8 +777,8 @@ 
             $mlen,
             $nonce,
             ParagonIE_Sodium_Crypto::box_beforenm(
-                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
-                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+                ParagonIE_Sodium_Crypto::box_secretkey( $boxKeypair ),
+                ParagonIE_Sodium_Crypto::box_publickey( $boxKeypair )
             )
         );
     }
@@ -794,29 +794,29 @@ 
      * @return bool
      * @throws Error
      */
-    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
+    protected static function secretbox_encrypt( $ifp, $ofp, $mlen, $nonce, $key )
     {
-        $plaintext = fread($ifp, 32);
-        if (!is_string($plaintext)) {
-            throw new Error('Could not read input file');
+        $plaintext = fread( $ifp, 32 );
+        if ( ! is_string( $plaintext ) ) {
+            throw new Error( 'Could not read input file' );
         }
-        $first32 = ftell($ifp);
+        $first32 = ftell( $ifp );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+        $realNonce = ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
@@ -834,16 +834,16 @@ 
         );
 
         // Pre-write 16 blank bytes for the Poly1305 tag
-        $start = ftell($ofp);
-        fwrite($ofp, str_repeat("\x00", 16));
+        $start = ftell( $ofp );
+        fwrite( $ofp, str_repeat( "\x00", 16 ) );
 
         /** @var string $c */
         $cBlock = ParagonIE_Sodium_Core_Util::substr(
             $block0,
             ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
         );
-        $state->update($cBlock);
-        fwrite($ofp, $cBlock);
+        $state->update( $cBlock );
+        fwrite( $ofp, $cBlock );
         $mlen -= 32;
 
         /** @var int $iter */
@@ -856,15 +856,15 @@ 
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        fseek($ifp, $first32, SEEK_SET);
+        fseek( $ifp, $first32, SEEK_SET );
 
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $plaintext = fread($ifp, $blockSize);
-            if (!is_string($plaintext)) {
-                throw new Error('Could not read input file');
+            $plaintext = fread( $ifp, $blockSize );
+            if ( ! is_string( $plaintext ) ) {
+                throw new Error( 'Could not read input file' );
             }
             $cBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
                 $plaintext,
@@ -872,29 +872,29 @@ 
                 $iter,
                 $subkey
             );
-            fwrite($ofp, $cBlock, $blockSize);
-            $state->update($cBlock);
+            fwrite( $ofp, $cBlock, $blockSize );
+            $state->update( $cBlock );
 
             $mlen -= $blockSize;
             $iter += $incr;
         }
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( Error $ex ) {
             $block0 = null;
             $subkey = null;
         }
-        $end = ftell($ofp);
+        $end = ftell( $ofp );
 
         /*
          * Write the Poly1305 authentication tag that provides integrity
          * over the ciphertext (encrypt-then-MAC)
          */
-        fseek($ofp, $start, SEEK_SET);
-        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
-        fseek($ofp, $end, SEEK_SET);
-        unset($state);
+        fseek( $ofp, $start, SEEK_SET );
+        fwrite( $ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES );
+        fseek( $ofp, $end, SEEK_SET );
+        unset( $state );
 
         return true;
     }
@@ -911,46 +911,46 @@ 
      * @throws Error
      * @throws Exception
      */
-    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
+    protected static function secretbox_decrypt( $ifp, $ofp, $mlen, $nonce, $key )
     {
-        $tag = fread($ifp, 16);
-        if (!is_string($tag)) {
-            throw new Error('Could not read input file');
+        $tag = fread( $ifp, 16 );
+        if ( ! is_string( $tag ) ) {
+            throw new Error( 'Could not read input file' );
         }
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+        $realNonce = ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
             64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
 
         /* Verify the Poly1305 MAC -before- attempting to decrypt! */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State(self::substr($block0, 0, 32));
-        if (!self::onetimeauth_verify($state, $ifp, $tag, $mlen)) {
-            throw new Exception('Invalid MAC');
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( self::substr( $block0, 0, 32 ) );
+        if ( ! self::onetimeauth_verify( $state, $ifp, $tag, $mlen ) ) {
+            throw new Exception( 'Invalid MAC' );
         }
 
         /*
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        $first32 = fread($ifp, 32);
-        if (!is_string($first32)) {
-            throw new Error('Could not read input file');
+        $first32 = fread( $ifp, 32 );
+        if ( ! is_string( $first32 ) ) {
+            throw new Error( 'Could not read input file' );
         }
-        $first32len = self::strlen($first32);
+        $first32len = self::strlen( $first32 );
         fwrite(
             $ofp,
             self::xorStrings(
-                self::substr($block0, 32, $first32len),
-                self::substr($first32, 0, $first32len)
+                self::substr( $block0, 32, $first32len ),
+                self::substr( $first32, 0, $first32len )
             )
         );
         $mlen -= 32;
@@ -962,13 +962,13 @@ 
         $incr = self::BUFFER_SIZE >> 6;
 
         /* Decrypts ciphertext, writes to output file. */
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new Error('Could not read input file');
+            $ciphertext = fread( $ifp, $blockSize );
+            if ( ! is_string( $ciphertext ) ) {
+                throw new Error( 'Could not read input file' );
             }
             $pBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
                 $ciphertext,
@@ -976,7 +976,7 @@ 
                 $iter,
                 $subkey
             );
-            fwrite($ofp, $pBlock, $blockSize);
+            fwrite( $ofp, $pBlock, $blockSize );
             $mlen -= $blockSize;
             $iter += $incr;
         }
@@ -991,10 +991,10 @@ 
      * @return bool
      * @throws Error
      */
-    protected static function onetimeauth_verify(ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0)
+    protected static function onetimeauth_verify( ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0 )
     {
         /** @var int $pos */
-        $pos = ftell($ifp);
+        $pos = ftell( $ifp );
 
         /** @var int $iter */
         $iter = 1;
@@ -1002,21 +1002,21 @@ 
         /** @var int $incr */
         $incr = self::BUFFER_SIZE >> 6;
 
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new Error('Could not read input file');
+            $ciphertext = fread( $ifp, $blockSize );
+            if ( ! is_string( $ciphertext ) ) {
+                throw new Error( 'Could not read input file' );
             }
-            $state->update($ciphertext);
+            $state->update( $ciphertext );
             $mlen -= $blockSize;
             $iter += $incr;
         }
-        $res = ParagonIE_Sodium_Core_Util::verify_16($tag, $state->finish());
+        $res = ParagonIE_Sodium_Core_Util::verify_16( $tag, $state->finish() );
 
-        fseek($ifp, $pos, SEEK_SET);
+        fseek( $ifp, $pos, SEEK_SET );
         return $res;
     }
 
@@ -1034,47 +1034,47 @@ 
      *                 PHP 7.2 changes from a resource to an object,
      *                 which causes Psalm to complain about an error.
      */
-    public static function updateHashWithFile($hash, $fp, $size = 0)
+    public static function updateHashWithFile( $hash, $fp, $size = 0 )
     {
         /* Type checks: */
-        if (PHP_VERSION_ID < 70200) {
-            if (!is_resource($hash)) {
-                throw new TypeError('Argument 1 must be a resource, ' . gettype($hash) . ' given.');
+        if ( PHP_VERSION_ID < 70200 ) {
+            if ( ! is_resource( $hash ) ) {
+                throw new TypeError( 'Argument 1 must be a resource, ' . gettype( $hash ) . ' given.' );
             }
 
         } else {
-            if (!is_object($hash)) {
-                throw new TypeError('Argument 1 must be an object (PHP 7.2+), ' . gettype($hash) . ' given.');
+            if ( ! is_object( $hash ) ) {
+                throw new TypeError( 'Argument 1 must be an object (PHP 7.2+), ' . gettype( $hash ) . ' given.' );
             }
         }
-        if (!is_resource($fp)) {
-            throw new TypeError('Argument 2 must be a resource, ' . gettype($fp) . ' given.');
+        if ( ! is_resource( $fp ) ) {
+            throw new TypeError( 'Argument 2 must be a resource, ' . gettype( $fp ) . ' given.' );
         }
-        if (!is_int($size)) {
-            throw new TypeError('Argument 3 must be an integer, ' . gettype($size) . ' given.');
+        if ( ! is_int( $size ) ) {
+            throw new TypeError( 'Argument 3 must be an integer, ' . gettype( $size ) . ' given.' );
         }
 
         /** @var int $originalPosition */
-        $originalPosition = ftell($fp);
+        $originalPosition = ftell( $fp );
 
         // Move file pointer to beginning of file
-        fseek($fp, 0, SEEK_SET);
-        for ($i = 0; $i < $size; $i += self::BUFFER_SIZE) {
+        fseek( $fp, 0, SEEK_SET );
+        for ( $i = 0; $i < $size; $i += self::BUFFER_SIZE ) {
             /** @var string $message */
             $message = fread(
                 $fp,
-                ($size - $i) > self::BUFFER_SIZE
+                ( $size - $i ) > self::BUFFER_SIZE
                     ? $size - $i
                     : self::BUFFER_SIZE
             );
-            if (!is_string($message)) {
-                throw new Error('Unexpected error reading from file.');
+            if ( ! is_string( $message ) ) {
+                throw new Error( 'Unexpected error reading from file.' );
             }
             /** @psalm-suppress InvalidArgument */
-            hash_update($hash, $message);
+            hash_update( $hash, $message );
         }
         // Reset file pointer's position
-        fseek($fp, $originalPosition, SEEK_SET);
+        fseek( $fp, $originalPosition, SEEK_SET );
         return $hash;
     }
 }

src/library/sodium_compat/src/Core32/Util.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Util', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Util', false ) ) {
     return;
 }
 

src/library/sodium_compat/src/Core32/Poly1305.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Poly1305', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Poly1305', false ) ) {
     return;
 }
 
@@ -18,18 +18,18 @@ 
      * @param string $key
      * @return string
      */
-    public static function onetimeauth($m, $key)
+    public static function onetimeauth( $m, $key )
     {
-        if (self::strlen($key) < 32) {
+        if ( self::strlen( $key ) < 32 ) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'
             );
         }
         $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            self::substr($key, 0, 32)
+            self::substr( $key, 0, 32 )
         );
         return $state
-            ->update($m)
+            ->update( $m )
             ->finish();
     }
 
@@ -41,19 +41,19 @@ 
      * @param string $key
      * @return bool
      */
-    public static function onetimeauth_verify($mac, $m, $key)
+    public static function onetimeauth_verify( $mac, $m, $key )
     {
-        if (self::strlen($key) < 32) {
+        if ( self::strlen( $key ) < 32 ) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'
             );
         }
         $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            self::substr($key, 0, 32)
+            self::substr( $key, 0, 32 )
         );
         $calc = $state
-            ->update($m)
+            ->update( $m )
             ->finish();
-        return self::verify_16($calc, $mac);
+        return self::verify_16( $calc, $mac );
     }
 }

src/library/sodium_compat/src/Core32/Int64.php

Spacing +167 added lines, -167 removed lines

@@ -23,7 +23,7 @@ 
      * ParagonIE_Sodium_Core32_Int64 constructor.
      * @param array $array
      */
-    public function __construct($array = array(0, 0, 0, 0))
+    public function __construct( $array = array( 0, 0, 0, 0 ) )
     {
         $this->limbs = array(
             (int) $array[0],
@@ -40,14 +40,14 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $addend
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function addInt64(ParagonIE_Sodium_Core32_Int64 $addend)
+    public function addInt64( ParagonIE_Sodium_Core32_Int64 $addend )
     {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
+        for ( $i = 3; $i >= 0; --$i ) {
             $tmp = $this->limbs[$i] + $addend->limbs[$i] + $carry;
             $carry = $tmp >> 16;
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
+            $return->limbs[$i] = (int) ( $tmp & 0xffff );
         }
         $return->overflow = $carry;
         return $return;
@@ -59,22 +59,22 @@ 
      * @param int $int
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function addInt($int)
+    public function addInt( $int )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 );
 
         $return = new ParagonIE_Sodium_Core32_Int64();
         $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            $step = (3 - $i) << 4; // 0, 16, 32, 48
-            if ($i < 2) {
+        for ( $i = 3; $i >= 0; --$i ) {
+            $step = ( 3 - $i ) << 4; // 0, 16, 32, 48
+            if ( $i < 2 ) {
                 $toAdd = 0;
             } else {
-                $toAdd = (($int >> $step) & 0xffff);
+                $toAdd = ( ( $int >> $step ) & 0xffff );
             }
             $tmp = $this->limbs[$i] + $toAdd + $carry;
             $carry = $tmp >> 16;
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
+            $return->limbs[$i] = (int) ( $tmp & 0xffff );
         }
         $return->overflow = $carry;
         return $return;
@@ -84,39 +84,39 @@ 
      * @param int $b
      * @return int
      */
-    public function compareInt($b = 0)
+    public function compareInt( $b = 0 )
     {
         $gt = 0;
         $eq = 1;
 
         $i = 4;
         $j = 0;
-        while ($i > 0) {
+        while ( $i > 0 ) {
             --$i;
             $x1 = $this->limbs[$i];
-            $x2 = ($b >> ($j << 4)) & 0xffff;
-            $gt |= (($x2 - $x1) >> 8) & $eq;
-            $eq &= (($x2 ^ $x1) - 1) >> 8;
+            $x2 = ( $b >> ( $j << 4 ) ) & 0xffff;
+            $gt |= ( ( $x2 - $x1 ) >> 8 ) & $eq;
+            $eq &= ( ( $x2 ^ $x1 ) - 1 ) >> 8;
         }
-        return ($gt + $gt - $eq) + 1;
+        return ( $gt + $gt - $eq ) + 1;
     }
 
     /**
      * @param int $b
      * @return bool
      */
-    public function isGreaterThan($b = 0)
+    public function isGreaterThan( $b = 0 )
     {
-        return $this->compareInt($b) > 0;
+        return $this->compareInt( $b ) > 0;
     }
 
     /**
      * @param int $b
      * @return bool
      */
-    public function isLessThanInt($b = 0)
+    public function isLessThanInt( $b = 0 )
     {
-        return $this->compareInt($b) < 0;
+        return $this->compareInt( $b ) < 0;
     }
 
 
@@ -125,12 +125,12 @@ 
      * @param int $lo
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function mask64($hi = 0, $lo = 0)
+    public function mask64( $hi = 0, $lo = 0 )
     {
-        $a = ($hi >> 16) & 0xffff;
-        $b = ($hi) & 0xffff;
-        $c = ($lo >> 16) & 0xffff;
-        $d = ($lo & 0xffff);
+        $a = ( $hi >> 16 ) & 0xffff;
+        $b = ( $hi ) & 0xffff;
+        $c = ( $lo >> 16 ) & 0xffff;
+        $d = ( $lo & 0xffff );
         return new ParagonIE_Sodium_Core32_Int64(
             array(
                 $this->limbs[0] & $a,
@@ -146,25 +146,25 @@ 
      * @param int $size
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function mulInt($int = 0, $size = 0)
+    public function mulInt( $int = 0, $size = 0 )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (!$size) {
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 );
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $size, 'int', 2 );
+        if ( ! $size ) {
             $size = 63;
         }
 
         $a = clone $this;
         $return = new ParagonIE_Sodium_Core32_Int64();
 
-        for ($i = $size; $i >= 0; --$i) {
+        for ( $i = $size; $i >= 0; --$i ) {
             $return = $return->addInt64(
                 $a->mask64(
-                    (int) (-($int & 1)),
-                    (int) (-($int & 1))
+                    (int) (-( $int & 1 )),
+                    (int) (-( $int & 1 ))
                 )
             );
-            $a = $a->shiftLeft(1);
+            $a = $a->shiftLeft( 1 );
             $int >>= 1;
         }
         return $return;
@@ -175,10 +175,10 @@ 
      * @param int $size
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function mulInt64(ParagonIE_Sodium_Core32_Int64 $int, $size = 0)
+    public function mulInt64( ParagonIE_Sodium_Core32_Int64 $int, $size = 0 )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (!$size) {
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $size, 'int', 2 );
+        if ( ! $size ) {
             $size = 63;
         }
 
@@ -186,7 +186,7 @@ 
         $b = clone $int;
         $return = new ParagonIE_Sodium_Core32_Int64();
 
-        for ($i = $size; $i >= 0; --$i) {
+        for ( $i = $size; $i >= 0; --$i ) {
             /*
             $c += (int) ($a & -($b & 1));
             $a <<= 1;
@@ -194,12 +194,12 @@ 
              */
             $return = $return->addInt64(
                 $a->mask64(
-                    (int) (-($b->limbs[3] & 1)),
-                    (int) (-($b->limbs[3] & 1))
+                    (int) (-( $b->limbs[3] & 1 )),
+                    (int) (-( $b->limbs[3] & 1 ))
                 )
             );
-            $a = $a->shiftLeft(1);
-            $b = $b->shiftRight(1);
+            $a = $a->shiftLeft( 1 );
+            $b = $b->shiftRight( 1 );
         }
         return $return;
     }
@@ -210,14 +210,14 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $b
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function orInt64(ParagonIE_Sodium_Core32_Int64 $b)
+    public function orInt64( ParagonIE_Sodium_Core32_Int64 $b )
     {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $return->limbs = array(
-            (int) ($this->limbs[0] | $b->limbs[0]),
-            (int) ($this->limbs[1] | $b->limbs[1]),
-            (int) ($this->limbs[2] | $b->limbs[2]),
-            (int) ($this->limbs[3] | $b->limbs[3])
+            (int) ( $this->limbs[0] | $b->limbs[0] ),
+            (int) ( $this->limbs[1] | $b->limbs[1] ),
+            (int) ( $this->limbs[2] | $b->limbs[2] ),
+            (int) ( $this->limbs[3] | $b->limbs[3] )
         );
         return $return;
     }
@@ -226,27 +226,27 @@ 
      * @param int $c
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function rotateLeft($c = 0)
+    public function rotateLeft( $c = 0 )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 );
 
         $return = new ParagonIE_Sodium_Core32_Int64();
         $c &= 63;
-        if ($c === 0) {
+        if ( $c === 0 ) {
             // NOP, but we want a copy.
             $return->limbs = $this->limbs;
         } else {
-            $idx_shift = ($c >> 4) & 3;
+            $idx_shift = ( $c >> 4 ) & 3;
             $sub_shift = $c & 15;
 
-            for ($i = 3; $i >= 0; --$i) {
-                $j = ($i + $idx_shift) & 3;
-                $k = ($i + $idx_shift + 1) & 3;
+            for ( $i = 3; $i >= 0; --$i ) {
+                $j = ( $i + $idx_shift ) & 3;
+                $k = ( $i + $idx_shift + 1 ) & 3;
                 $return->limbs[$i] = (int) (
                     (
-                        ($this->limbs[$j] << $sub_shift)
+                        ( $this->limbs[$j] << $sub_shift )
                             |
-                        ($this->limbs[$k] >> (16 - $sub_shift))
+                        ( $this->limbs[$k] >> ( 16 - $sub_shift ) )
                     ) & 0xffff
                 );
             }
@@ -260,27 +260,27 @@ 
      * @param int $c
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function rotateRight($c = 0)
+    public function rotateRight( $c = 0 )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 );
 
         $return = new ParagonIE_Sodium_Core32_Int64();
         $c &= 63;
-        if ($c === 0) {
+        if ( $c === 0 ) {
             // NOP, but we want a copy.
             $return->limbs = $this->limbs;
         } else {
-            $idx_shift = ($c >> 4) & 3;
+            $idx_shift = ( $c >> 4 ) & 3;
             $sub_shift = $c & 15;
 
-            for ($i = 3; $i >= 0; --$i) {
-                $j = ($i - $idx_shift) & 3;
-                $k = ($i - $idx_shift - 1) & 3;
+            for ( $i = 3; $i >= 0; --$i ) {
+                $j = ( $i - $idx_shift ) & 3;
+                $k = ( $i - $idx_shift - 1 ) & 3;
                 $return->limbs[$i] = (int) (
                     (
-                        ($this->limbs[$j] >> ($sub_shift))
+                        ( $this->limbs[$j] >> ( $sub_shift ) )
                             |
-                        ($this->limbs[$k] << (16 - $sub_shift))
+                        ( $this->limbs[$k] << ( 16 - $sub_shift ) )
                     ) & 0xffff
                 );
             }
@@ -292,18 +292,18 @@ 
      * @return ParagonIE_Sodium_Core32_Int64
      * @throws TypeError
      */
-    public function shiftLeft($c = 0)
+    public function shiftLeft( $c = 0 )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 );
         $return = new ParagonIE_Sodium_Core32_Int64();
         $c &= 63;
 
-        if ($c >= 16) {
-            if ($c >= 48) {
+        if ( $c >= 16 ) {
+            if ( $c >= 48 ) {
                 $return->limbs = array(
                     $this->limbs[3], 0, 0, 0
                 );
-            } elseif ($c >= 32) {
+            } elseif ( $c >= 32 ) {
                 $return->limbs = array(
                     $this->limbs[2], $this->limbs[3], 0, 0
                 );
@@ -312,20 +312,20 @@ 
                     $this->limbs[1], $this->limbs[2], $this->limbs[3], 0
                 );
             }
-            return $return->shiftLeft($c & 15);
+            return $return->shiftLeft( $c & 15 );
         }
-        if ($c === 0) {
+        if ( $c === 0 ) {
             $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
+        } elseif ( $c < 0 ) {
             return $this->shiftRight(-$c);
         } else {
-            if (is_null($c)) {
+            if ( is_null( $c ) ) {
                 throw new TypeError();
             }
             $carry = 0;
-            for ($i = 3; $i >= 0; --$i) {
-                $tmp = ($this->limbs[$i] << $c) | ($carry & 0xffff);
-                $return->limbs[$i] = (int) ($tmp & 0xffff);
+            for ( $i = 3; $i >= 0; --$i ) {
+                $tmp = ( $this->limbs[$i] << $c ) | ( $carry & 0xffff );
+                $return->limbs[$i] = (int) ( $tmp & 0xffff );
                 $carry = $tmp >> 16;
             }
         }
@@ -337,54 +337,54 @@ 
      * @return ParagonIE_Sodium_Core32_Int64
      * @throws TypeError
      */
-    public function shiftRight($c = 0)
+    public function shiftRight( $c = 0 )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 );
         $return = new ParagonIE_Sodium_Core32_Int64();
         $c &= 63;
 
-        $negative = -(($this->limbs[0] >> 15) & 1);
-        if ($c >= 16) {
-            if ($c >= 48) {
+        $negative = -( ( $this->limbs[0] >> 15 ) & 1 );
+        if ( $c >= 16 ) {
+            if ( $c >= 48 ) {
                 $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
+                    (int) ( $negative & 0xffff ),
+                    (int) ( $negative & 0xffff ),
+                    (int) ( $negative & 0xffff ),
                     (int) $this->limbs[0]
                 );
-            } elseif ($c >= 32) {
+            } elseif ( $c >= 32 ) {
                 $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
+                    (int) ( $negative & 0xffff ),
+                    (int) ( $negative & 0xffff ),
                     (int) $this->limbs[0],
                     (int) $this->limbs[1]
                 );
             } else {
                 $return->limbs = array(
-                    (int) ($negative & 0xffff),
+                    (int) ( $negative & 0xffff ),
                     (int) $this->limbs[0],
                     (int) $this->limbs[1],
                     (int) $this->limbs[2]
                 );
             }
-            return $return->shiftRight($c & 15);
+            return $return->shiftRight( $c & 15 );
         }
 
-        if ($c === 0) {
+        if ( $c === 0 ) {
             $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
+        } elseif ( $c < 0 ) {
             return $this->shiftLeft(-$c);
         } else {
-            if (is_null($c)) {
+            if ( is_null( $c ) ) {
                 throw new TypeError();
             }
-            $carryRight = ($negative & 0xffff);
-            $mask = (int) (((1 << ($c + 1)) - 1) & 0xffff);
-            for ($i = 0; $i < 4; ++$i) {
+            $carryRight = ( $negative & 0xffff );
+            $mask = (int) ( ( ( 1 << ( $c + 1 ) ) - 1 ) & 0xffff );
+            for ( $i = 0; $i < 4; ++$i ) {
                 $return->limbs[$i] = (int) (
-                    (($this->limbs[$i] >> $c) | ($carryRight << (16 - $c))) & 0xffff
+                    ( ( $this->limbs[$i] >> $c ) | ( $carryRight << ( 16 - $c ) ) ) & 0xffff
                 );
-                $carryRight = (int) ($this->limbs[$i] & $mask);
+                $carryRight = (int) ( $this->limbs[$i] & $mask );
             }
         }
         return $return;
@@ -397,17 +397,17 @@ 
      * @param int $int
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function subInt($int)
+    public function subInt( $int )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 );
 
         $return = new ParagonIE_Sodium_Core32_Int64();
 
         $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            $tmp = $this->limbs[$i] - (($int >> 16) & 0xffff) + $carry;
+        for ( $i = 3; $i >= 0; --$i ) {
+            $tmp = $this->limbs[$i] - ( ( $int >> 16 ) & 0xffff ) + $carry;
             $carry = $tmp >> 16;
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
+            $return->limbs[$i] = (int) ( $tmp & 0xffff );
         }
         return $return;
     }
@@ -418,14 +418,14 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $b
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function subInt64(ParagonIE_Sodium_Core32_Int64 $b)
+    public function subInt64( ParagonIE_Sodium_Core32_Int64 $b )
     {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
+        for ( $i = 3; $i >= 0; --$i ) {
             $tmp = $this->limbs[$i] - $b->limbs[$i] + $carry;
-            $carry = ($tmp >> 16);
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
+            $carry = ( $tmp >> 16 );
+            $return->limbs[$i] = (int) ( $tmp & 0xffff );
 
         }
         return $return;
@@ -437,14 +437,14 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $b
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function xorInt64(ParagonIE_Sodium_Core32_Int64 $b)
+    public function xorInt64( ParagonIE_Sodium_Core32_Int64 $b )
     {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $return->limbs = array(
-            (int) ($this->limbs[0] ^ $b->limbs[0]),
-            (int) ($this->limbs[1] ^ $b->limbs[1]),
-            (int) ($this->limbs[2] ^ $b->limbs[2]),
-            (int) ($this->limbs[3] ^ $b->limbs[3])
+            (int) ( $this->limbs[0] ^ $b->limbs[0] ),
+            (int) ( $this->limbs[1] ^ $b->limbs[1] ),
+            (int) ( $this->limbs[2] ^ $b->limbs[2] ),
+            (int) ( $this->limbs[3] ^ $b->limbs[3] )
         );
         return $return;
     }
@@ -454,17 +454,17 @@ 
      * @param int $high
      * @return self
      */
-    public static function fromInts($low, $high)
+    public static function fromInts( $low, $high )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($low, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($high, 'int', 2);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $low, 'int', 1 );
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $high, 'int', 2 );
 
         return new ParagonIE_Sodium_Core32_Int64(
             array(
-                (int) (($high >> 16) & 0xffff),
-                (int) ($high & 0xffff),
-                (int) (($low >> 16) & 0xffff),
-                (int) ($low & 0xffff)
+                (int) ( ( $high >> 16 ) & 0xffff ),
+                (int) ( $high & 0xffff ),
+                (int) ( ( $low >> 16 ) & 0xffff ),
+                (int) ( $low & 0xffff )
             )
         );
     }
@@ -473,25 +473,25 @@ 
      * @param string $string
      * @return self
      */
-    public static function fromString($string)
+    public static function fromString( $string )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $string, 'string', 1 );
         $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
+        if ( ParagonIE_Sodium_Core32_Util::strlen( $string ) !== 8 ) {
             throw new RangeException(
-                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen( $string ) . ' given.'
             );
         }
         $return = new ParagonIE_Sodium_Core32_Int64();
 
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff);
-        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff) << 8);
-        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff);
-        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff) << 8);
-        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff);
+        $return->limbs[0]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[0] ) & 0xff ) << 8 );
+        $return->limbs[0] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[1] ) & 0xff );
+        $return->limbs[1]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[2] ) & 0xff ) << 8 );
+        $return->limbs[1] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[3] ) & 0xff );
+        $return->limbs[2]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[4] ) & 0xff ) << 8 );
+        $return->limbs[2] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[5] ) & 0xff );
+        $return->limbs[3]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[6] ) & 0xff ) << 8 );
+        $return->limbs[3] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[7] ) & 0xff );
         return $return;
     }
 
@@ -499,25 +499,25 @@ 
      * @param string $string
      * @return self
      */
-    public static function fromReverseString($string)
+    public static function fromReverseString( $string )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $string, 'string', 1 );
         $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
+        if ( ParagonIE_Sodium_Core32_Util::strlen( $string ) !== 8 ) {
             throw new RangeException(
-                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen( $string ) . ' given.'
             );
         }
         $return = new ParagonIE_Sodium_Core32_Int64();
 
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff);
-        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
-        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
-        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
-        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
+        $return->limbs[0]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[7] ) & 0xff ) << 8 );
+        $return->limbs[0] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[6] ) & 0xff );
+        $return->limbs[1]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[5] ) & 0xff ) << 8 );
+        $return->limbs[1] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[4] ) & 0xff );
+        $return->limbs[2]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[3] ) & 0xff ) << 8 );
+        $return->limbs[2] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[2] ) & 0xff );
+        $return->limbs[3]  = (int) ( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[1] ) & 0xff ) << 8 );
+        $return->limbs[3] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[0] ) & 0xff );
         return $return;
     }
 
@@ -527,8 +527,8 @@ 
     public function toArray()
     {
         return array(
-            (int) ((($this->limbs[0] & 0xffff) << 16) | ($this->limbs[1] & 0xffff)),
-            (int) ((($this->limbs[2] & 0xffff) << 16) | ($this->limbs[3] & 0xffff))
+            (int) ( ( ( $this->limbs[0] & 0xffff ) << 16 ) | ( $this->limbs[1] & 0xffff ) ),
+            (int) ( ( ( $this->limbs[2] & 0xffff ) << 16 ) | ( $this->limbs[3] & 0xffff ) )
         );
     }
 
@@ -538,8 +538,8 @@ 
     public function toInt32()
     {
         $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs[0] = (int) ($this->limbs[2]);
-        $return->limbs[1] = (int) ($this->limbs[3]);
+        $return->limbs[0] = (int) ( $this->limbs[2] );
+        $return->limbs[1] = (int) ( $this->limbs[3] );
         return $return;
     }
 
@@ -549,10 +549,10 @@ 
     public function toInt64()
     {
         $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->limbs[0] = (int) ($this->limbs[0]);
-        $return->limbs[1] = (int) ($this->limbs[1]);
-        $return->limbs[2] = (int) ($this->limbs[2]);
-        $return->limbs[3] = (int) ($this->limbs[3]);
+        $return->limbs[0] = (int) ( $this->limbs[0] );
+        $return->limbs[1] = (int) ( $this->limbs[1] );
+        $return->limbs[2] = (int) ( $this->limbs[2] );
+        $return->limbs[3] = (int) ( $this->limbs[3] );
         return $return;
     }
 
@@ -561,14 +561,14 @@ 
      */
     public function toString()
     {
-        return ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff);
+        return ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[0] >> 8 ) & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[0] & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[1] >> 8 ) & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[1] & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[2] >> 8 ) & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[2] & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[3] >> 8 ) & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[3] & 0xff );
     }
 
     /**
@@ -576,14 +576,14 @@ 
      */
     public function toReverseString()
     {
-        return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff);
+        return ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[3] & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[3] >> 8 ) & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[2] & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[2] >> 8 ) & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[1] & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[1] >> 8 ) & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[0] & 0xff ) .
+            ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[0] >> 8 ) & 0xff );
     }
 
     /**

src/library/sodium_compat/src/Core32/Ed25519.php

Spacing +83 added lines, -83 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Ed25519', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Ed25519', false ) ) {
     return;
 }
 
@@ -19,10 +19,10 @@ 
      */
     public static function keypair()
     {
-        $seed = random_bytes(self::SEED_BYTES);
+        $seed = random_bytes( self::SEED_BYTES );
         $pk = '';
         $sk = '';
-        self::seed_keypair($pk, $sk, $seed);
+        self::seed_keypair( $pk, $sk, $seed );
         return $sk . $pk;
     }
 
@@ -34,14 +34,14 @@ 
      * @param string $seed
      * @return string
      */
-    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');
+        if ( self::strlen( $seed ) !== self::SEED_BYTES ) {
+            throw new RangeException( 'crypto_sign keypair seed must be 32 bytes long' );
         }
 
         /** @var string $pk */
-        $pk = self::publickey_from_secretkey($seed);
+        $pk = self::publickey_from_secretkey( $seed );
         $sk = $seed . $pk;
         return $sk;
     }
@@ -52,12 +52,12 @@ 
      * @param string $keypair
      * @return string
      */
-    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');
+        if ( self::strlen( $keypair ) !== self::KEYPAIR_BYTES ) {
+            throw new RangeException( 'crypto_sign keypair must be 96 bytes long' );
         }
-        return self::substr($keypair, 0, 64);
+        return self::substr( $keypair, 0, 64 );
     }
 
     /**
@@ -66,12 +66,12 @@ 
      * @param string $keypair
      * @return string
      */
-    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');
+        if ( self::strlen( $keypair ) !== self::KEYPAIR_BYTES ) {
+            throw new RangeException( 'crypto_sign keypair must be 96 bytes long' );
         }
-        return self::substr($keypair, 64, 32);
+        return self::substr( $keypair, 64, 32 );
     }
 
     /**
@@ -80,17 +80,17 @@ 
      * @param string $sk
      * @return string
      */
-    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 = hash( 'sha512', self::substr( $sk, 0, 32 ), true );
         $sk[0] = self::intToChr(
-            self::chrToInt($sk[0]) & 248
+            self::chrToInt( $sk[0] ) & 248
         );
         $sk[31] = self::intToChr(
-            (self::chrToInt($sk[31]) & 63) | 64
+            ( self::chrToInt( $sk[31] ) & 63 ) | 64
         );
-        return self::sk_to_pk($sk);
+        return self::sk_to_pk( $sk );
     }
 
     /**
@@ -99,11 +99,11 @@ 
      * @param string $sk
      * @return string
      */
-    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)
+                self::substr( $sk, 0, 32 )
             )
         );
     }
@@ -115,10 +115,10 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign($message, $sk)
+    public static function sign( $message, $sk )
     {
         /** @var string $signature */
-        $signature = self::sign_detached($message, $sk);
+        $signature = self::sign_detached( $message, $sk );
         return $signature . $message;
     }
 
@@ -130,18 +130,18 @@ 
      * @return string         Message (without signature)
      * @throws Exception
      */
-    public static function sign_open($message, $pk)
+    public static function sign_open( $message, $pk )
     {
         /** @var string $signature */
-        $signature = self::substr($message, 0, 64);
+        $signature = self::substr( $message, 0, 64 );
 
         /** @var string $message */
-        $message = self::substr($message, 64);
+        $message = self::substr( $message, 64 );
 
-        if (self::verify_detached($signature, $message, $pk)) {
+        if ( self::verify_detached( $signature, $message, $pk ) ) {
             return $message;
         }
-        throw new Exception('Invalid signature');
+        throw new Exception( 'Invalid signature' );
     }
 
     /**
@@ -151,56 +151,56 @@ 
      * @param string $sk
      * @return string
      */
-    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);
+        $az = hash( 'sha512', self::substr( $sk, 0, 32 ), true );
 
         # az[0] &= 248;
         # az[31] &= 63;
         # az[31] |= 64;
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+        $az[0] = self::intToChr( self::chrToInt( $az[0] ) & 248 );
+        $az[31] = self::intToChr( ( self::chrToInt( $az[31] ) & 63 ) | 64 );
 
         # crypto_hash_sha512_init(&hs);
         # crypto_hash_sha512_update(&hs, az + 32, 32);
         # crypto_hash_sha512_update(&hs, m, mlen);
         # crypto_hash_sha512_final(&hs, nonce);
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($az, 32, 32));
-        hash_update($hs, $message);
-        $nonceHash = hash_final($hs, true);
+        $hs = hash_init( 'sha512' );
+        hash_update( $hs, self::substr( $az, 32, 32 ) );
+        hash_update( $hs, $message );
+        $nonceHash = hash_final( $hs, true );
 
         # memmove(sig + 32, sk + 32, 32);
-        $pk = self::substr($sk, 32, 32);
+        $pk = self::substr( $sk, 32, 32 );
 
         # sc_reduce(nonce);
         # ge_scalarmult_base(&R, nonce);
         # ge_p3_tobytes(sig, &R);
-        $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $nonce = self::sc_reduce( $nonceHash ) . self::substr( $nonceHash, 32 );
         $sig = self::ge_p3_tobytes(
-            self::ge_scalarmult_base($nonce)
+            self::ge_scalarmult_base( $nonce )
         );
 
         # crypto_hash_sha512_init(&hs);
         # crypto_hash_sha512_update(&hs, sig, 64);
         # crypto_hash_sha512_update(&hs, m, mlen);
         # crypto_hash_sha512_final(&hs, hram);
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($sig, 0, 32));
-        hash_update($hs, self::substr($pk, 0, 32));
-        hash_update($hs, $message);
-        $hramHash = hash_final($hs, true);
+        $hs = hash_init( 'sha512' );
+        hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        hash_update( $hs, self::substr( $pk, 0, 32 ) );
+        hash_update( $hs, $message );
+        $hramHash = hash_final( $hs, true );
 
         # sc_reduce(hram);
         # sc_muladd(sig + 32, hram, az, nonce);
-        $hram = self::sc_reduce($hramHash);
-        $sigAfter = self::sc_muladd($hram, $az, $nonce);
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+        $hram = self::sc_reduce( $hramHash );
+        $sigAfter = self::sc_muladd( $hram, $az, $nonce );
+        $sig = self::substr( $sig, 0, 32 ) . self::substr( $sigAfter, 0, 32 );
 
         try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $az );
+        } catch ( Error $ex ) {
             $az = null;
         }
         return $sig;
@@ -215,26 +215,26 @@ 
      * @return bool
      * @throws Exception
      */
-    public static function verify_detached($sig, $message, $pk)
+    public static function verify_detached( $sig, $message, $pk )
     {
-        if (self::strlen($sig) < 64) {
-            throw new Exception('Signature is too short');
+        if ( self::strlen( $sig ) < 64 ) {
+            throw new Exception( 'Signature is too short' );
         }
-        if (self::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new Exception('S < L - Invalid signature');
+        if ( self::check_S_lt_L( self::substr( $sig, 32, 32 ) ) ) {
+            throw new Exception( 'S < L - Invalid signature' );
         }
-        if (self::small_order($sig)) {
-            throw new Exception('Signature is on too small of an order');
+        if ( self::small_order( $sig ) ) {
+            throw new Exception( 'Signature is on too small of an order' );
         }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new Exception('Invalid signature');
+        if ( ( self::chrToInt( $sig[63] ) & 224 ) !== 0 ) {
+            throw new Exception( 'Invalid signature' );
         }
         $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($pk[$i]);
+        for ( $i = 0; $i < 32; ++$i ) {
+            $d |= self::chrToInt( $pk[$i] );
         }
-        if ($d === 0) {
-            throw new Exception('All zero public key');
+        if ( $d === 0 ) {
+            throw new Exception( 'All zero public key' );
         }
 
         /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
@@ -244,34 +244,34 @@ 
         ParagonIE_Sodium_Compat::$fastMult = true;
 
         /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
-        $A = self::ge_frombytes_negate_vartime($pk);
+        $A = self::ge_frombytes_negate_vartime( $pk );
 
         /** @var string $hDigest */
         $hDigest = hash(
             'sha512',
-            self::substr($sig, 0, 32) .
-            self::substr($pk, 0, 32) .
+            self::substr( $sig, 0, 32 ) .
+            self::substr( $pk, 0, 32 ) .
             $message,
             true
         );
 
         /** @var string $h */
-        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
+        $h = self::sc_reduce( $hDigest ) . self::substr( $hDigest, 32 );
 
         /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
         $R = self::ge_double_scalarmult_vartime(
             $h,
             $A,
-            self::substr($sig, 32)
+            self::substr( $sig, 32 )
         );
 
         /** @var string $rcheck */
-        $rcheck = self::ge_tobytes($R);
+        $rcheck = self::ge_tobytes( $R );
 
         // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
         ParagonIE_Sodium_Compat::$fastMult = $orig;
 
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+        return self::verify_32( $rcheck, self::substr( $sig, 0, 32 ) );
     }
 
     /**
@@ -281,10 +281,10 @@ 
      * @return bool
      * @throws Exception
      */
-    public static function check_S_lt_L($S)
+    public static function check_S_lt_L( $S )
     {
-        if (self::strlen($S) < 32) {
-            throw new Exception('Signature must be 32 bytes');
+        if ( self::strlen( $S ) < 32 ) {
+            throw new Exception( 'Signature must be 32 bytes' );
         }
         static $L = array(
             0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
@@ -298,14 +298,14 @@ 
 
         do {
             --$i;
-            $x = self::chrToInt($S[$i]);
+            $x = self::chrToInt( $S[$i] );
             $c |= (
-                (($x - $L[$i]) >> 8) & $n
+                ( ( $x - $L[$i] ) >> 8 ) & $n
             );
             $n &= (
-                (($x ^ $L[$i]) - 1) >> 8
+                ( ( $x ^ $L[$i] ) - 1 ) >> 8
             );
-        } while ($i !== 0);
+        } while ( $i !== 0 );
 
         return $c === 0;
     }
@@ -314,7 +314,7 @@ 
      * @param string $R
      * @return bool
      */
-    public static function small_order($R)
+    public static function small_order( $R )
     {
         static $blacklist = array(
             /* 0 (order 4) */
@@ -402,14 +402,14 @@ 
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
             )
         );
-        $countBlacklist = count($blacklist);
+        $countBlacklist = count( $blacklist );
 
-        for ($i = 0; $i < $countBlacklist; ++$i) {
+        for ( $i = 0; $i < $countBlacklist; ++$i ) {
             $c = 0;
-            for ($j = 0; $j < 32; ++$j) {
-                $c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
+            for ( $j = 0; $j < 32; ++$j ) {
+                $c |= self::chrToInt( $R[$j] ) ^ $blacklist[$i][$j];
             }
-            if ($c === 0) {
+            if ( $c === 0 ) {
                 return true;
             }
         }

src/library/sodium_compat/src/Core32/Poly1305/State.php

Spacing +160 added lines, -160 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Poly1305_State', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Poly1305_State', false ) ) {
     return;
 }
 
@@ -47,9 +47,9 @@ 
      * @param string $key
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '')
+    public function __construct( $key = '' )
     {
-        if (self::strlen($key) < 32) {
+        if ( self::strlen( $key ) < 32 ) {
             throw new InvalidArgumentException(
                 'Poly1305 requires a 32-byte key'
             );
@@ -57,24 +57,24 @@ 
         /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
         $this->r = array(
             // st->r[0] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4))
-                ->mask(0x3ffffff),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 0, 4 ) )
+                ->mask( 0x3ffffff ),
             // st->r[1] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 3, 4))
-                ->shiftRight(2)
-                ->mask(0x3ffff03),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 3, 4 ) )
+                ->shiftRight( 2 )
+                ->mask( 0x3ffff03 ),
             // st->r[2] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 6, 4))
-                ->shiftRight(4)
-                ->mask(0x3ffc0ff),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 6, 4 ) )
+                ->shiftRight( 4 )
+                ->mask( 0x3ffc0ff ),
             // st->r[3] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 9, 4))
-                ->shiftRight(6)
-                ->mask(0x3f03fff),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 9, 4 ) )
+                ->shiftRight( 6 )
+                ->mask( 0x3f03fff ),
             // st->r[4] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4))
-                ->shiftRight(8)
-                ->mask(0x00fffff)
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 12, 4 ) )
+                ->shiftRight( 8 )
+                ->mask( 0x00fffff )
         );
 
         /* h = 0 */
@@ -88,10 +88,10 @@ 
 
         /* save pad for later */
         $this->pad = array(
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4))->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 16, 4 ) )->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 20, 4 ) )->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 24, 4 ) )->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 28, 4 ) )->toInt64(),
         );
 
         $this->leftover = 0;
@@ -104,53 +104,53 @@ 
      * @param string $message
      * @return self
      */
-    public function update($message = '')
+    public function update( $message = '' )
     {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /* handle leftover */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $want = ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - $this->leftover;
-            if ($want > $bytes) {
+            if ( $want > $bytes ) {
                 $want = $bytes;
             }
-            for ($i = 0; $i < $want; ++$i) {
-                $mi = self::chrToInt($message[$i]);
+            for ( $i = 0; $i < $want; ++$i ) {
+                $mi = self::chrToInt( $message[$i] );
                 $this->buffer[$this->leftover + $i] = $mi;
             }
             // We snip off the leftmost bytes.
-            $message = self::substr($message, $want);
-            $bytes = self::strlen($message);
+            $message = self::substr( $message, $want );
+            $bytes = self::strlen( $message );
             $this->leftover += $want;
-            if ($this->leftover < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
+            if ( $this->leftover < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) {
                 // We still don't have enough to run $this->blocks()
                 return $this;
             }
 
             $this->blocks(
-                static::intArrayToString($this->buffer),
+                static::intArrayToString( $this->buffer ),
                 ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
             );
             $this->leftover = 0;
         }
 
         /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-            $want = $bytes & ~(ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-                $block = self::substr($message, 0, $want);
-                if (self::strlen($block) >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-                    $this->blocks($block, $want);
-                    $message = self::substr($message, $want);
-                    $bytes = self::strlen($message);
+        if ( $bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) {
+            $want = $bytes & ~( ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1 );
+            if ( $want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) {
+                $block = self::substr( $message, 0, $want );
+                if ( self::strlen( $block ) >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) {
+                    $this->blocks( $block, $want );
+                    $message = self::substr( $message, $want );
+                    $bytes = self::strlen( $message );
                 }
             }
         }
 
         /* store leftover */
-        if ($bytes) {
-            for ($i = 0; $i < $bytes; ++$i) {
-                $mi = self::chrToInt($message[$i]);
+        if ( $bytes ) {
+            for ( $i = 0; $i < $bytes; ++$i ) {
+                $mi = self::chrToInt( $message[$i] );
                 $this->buffer[$this->leftover + $i] = $mi;
             }
             $this->leftover = (int) $this->leftover + $bytes;
@@ -165,12 +165,12 @@ 
      * @param int $bytes
      * @return self
      */
-    public function blocks($message, $bytes)
+    public function blocks( $message, $bytes )
     {
-        if (self::strlen($message) < 16) {
-            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
+        if ( self::strlen( $message ) < 16 ) {
+            $message = str_pad( $message, 16, "\x00", STR_PAD_RIGHT );
         }
-        $hibit = ParagonIE_Sodium_Core32_Int32::fromInt($this->final ? 0 : 1 << 24); /* 1 << 128 */
+        $hibit = ParagonIE_Sodium_Core32_Int32::fromInt( $this->final ? 0 : 1 << 24 ); /* 1 << 128 */
         $zero = new ParagonIE_Sodium_Core32_Int64();
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $d0
@@ -196,10 +196,10 @@ 
         $r3 = $this->r[3]->toInt64();
         $r4 = $this->r[4]->toInt64();
 
-        $s1 = $r1->toInt64()->mulInt(5);
-        $s2 = $r2->toInt64()->mulInt(5);
-        $s3 = $r3->toInt64()->mulInt(5);
-        $s4 = $r4->toInt64()->mulInt(5);
+        $s1 = $r1->toInt64()->mulInt( 5 );
+        $s2 = $r2->toInt64()->mulInt( 5 );
+        $s3 = $r3->toInt64()->mulInt( 5 );
+        $s4 = $r4->toInt64()->mulInt( 5 );
 
         $h0 = $this->h[0];
         $h1 = $this->h[1];
@@ -207,93 +207,93 @@ 
         $h3 = $this->h[3];
         $h4 = $this->h[4];
 
-        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+        while ( $bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
             /* h += m[i] */
             $h0 = $h0->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 0, 4))
-                    ->mask(0x3ffffff)
+                ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 0, 4 ) )
+                    ->mask( 0x3ffffff )
             );
             $h1 = $h1->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 3, 4))
-                    ->shiftRight(2)
-                    ->mask(0x3ffffff)
+                ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 3, 4 ) )
+                    ->shiftRight( 2 )
+                    ->mask( 0x3ffffff )
             );
             $h2 = $h2->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 6, 4))
-                    ->shiftRight(4)
-                    ->mask(0x3ffffff)
+                ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 6, 4 ) )
+                    ->shiftRight( 4 )
+                    ->mask( 0x3ffffff )
             );
             $h3 = $h3->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 9, 4))
-                    ->shiftRight(6)
-                    ->mask(0x3ffffff)
+                ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 9, 4 ) )
+                    ->shiftRight( 6 )
+                    ->mask( 0x3ffffff )
             );
             $h4 = $h4->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4))
-                    ->shiftRight(8)
-                    ->orInt32($hibit)
+                ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 12, 4 ) )
+                    ->shiftRight( 8 )
+                    ->orInt32( $hibit )
             );
 
             /* h *= r */
             $d0 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r0))
-                ->addInt64($h1->toInt64()->mulInt64($s4))
-                ->addInt64($h2->toInt64()->mulInt64($s3))
-                ->addInt64($h3->toInt64()->mulInt64($s2))
-                ->addInt64($h4->toInt64()->mulInt64($s1));
+                ->addInt64( $h0->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $s4 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $s3 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $s2 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s1 ) );
 
             $d1 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r1))
-                ->addInt64($h1->toInt64()->mulInt64($r0))
-                ->addInt64($h2->toInt64()->mulInt64($s4))
-                ->addInt64($h3->toInt64()->mulInt64($s3))
-                ->addInt64($h4->toInt64()->mulInt64($s2));
+                ->addInt64( $h0->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $s4 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $s3 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s2 ) );
 
             $d2 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r2))
-                ->addInt64($h1->toInt64()->mulInt64($r1))
-                ->addInt64($h2->toInt64()->mulInt64($r0))
-                ->addInt64($h3->toInt64()->mulInt64($s4))
-                ->addInt64($h4->toInt64()->mulInt64($s3));
+                ->addInt64( $h0->toInt64()->mulInt64( $r2 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $s4 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s3 ) );
 
             $d3 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r3))
-                ->addInt64($h1->toInt64()->mulInt64($r2))
-                ->addInt64($h2->toInt64()->mulInt64($r1))
-                ->addInt64($h3->toInt64()->mulInt64($r0))
-                ->addInt64($h4->toInt64()->mulInt64($s4));
+                ->addInt64( $h0->toInt64()->mulInt64( $r3 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r2 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s4 ) );
 
             $d4 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r4))
-                ->addInt64($h1->toInt64()->mulInt64($r3))
-                ->addInt64($h2->toInt64()->mulInt64($r2))
-                ->addInt64($h3->toInt64()->mulInt64($r1))
-                ->addInt64($h4->toInt64()->mulInt64($r0));
+                ->addInt64( $h0->toInt64()->mulInt64( $r4 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r3 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $r2 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $r0 ) );
 
             /* (partial) h %= p */
-            $c = $d0->shiftRight(26);
-            $h0 = $d0->toInt32()->mask(0x3ffffff);
-            $d1 = $d1->addInt64($c);
+            $c = $d0->shiftRight( 26 );
+            $h0 = $d0->toInt32()->mask( 0x3ffffff );
+            $d1 = $d1->addInt64( $c );
 
-            $c = $d1->shiftRight(26);
-            $h1 = $d1->toInt32()->mask(0x3ffffff);
-            $d2 = $d2->addInt64($c);
+            $c = $d1->shiftRight( 26 );
+            $h1 = $d1->toInt32()->mask( 0x3ffffff );
+            $d2 = $d2->addInt64( $c );
 
-            $c = $d2->shiftRight(26);
-            $h2 = $d2->toInt32()->mask(0x3ffffff);
-            $d3 = $d3->addInt64($c);
+            $c = $d2->shiftRight( 26 );
+            $h2 = $d2->toInt32()->mask( 0x3ffffff );
+            $d3 = $d3->addInt64( $c );
 
-            $c = $d3->shiftRight(26);
-            $h3 = $d3->toInt32()->mask(0x3ffffff);
-            $d4 = $d4->addInt64($c);
+            $c = $d3->shiftRight( 26 );
+            $h3 = $d3->toInt32()->mask( 0x3ffffff );
+            $d4 = $d4->addInt64( $c );
 
-            $c = $d4->shiftRight(26);
-            $h4 = $d4->toInt32()->mask(0x3ffffff);
-            $h0 = $h0->addInt32($c->toInt32()->mulInt(5));
+            $c = $d4->shiftRight( 26 );
+            $h4 = $d4->toInt32()->mask( 0x3ffffff );
+            $h0 = $h0->addInt32( $c->toInt32()->mulInt( 5 ) );
 
-            $c = $h0->shiftRight(26);
-            $h0 = $h0->mask(0x3ffffff);
-            $h1 = $h1->addInt32($c);
+            $c = $h0->shiftRight( 26 );
+            $h0 = $h0->mask( 0x3ffffff );
+            $h1 = $h1->addInt32( $c );
 
             // Chop off the left 32 bytes.
             $message = self::substr(
@@ -304,7 +304,7 @@ 
         }
 
         /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
-        $this->h = array($h0, $h1, $h2, $h3, $h4);
+        $this->h = array( $h0, $h1, $h2, $h3, $h4 );
         return $this;
     }
 
@@ -316,16 +316,16 @@ 
     public function finish()
     {
         /* process the remaining block */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $i = $this->leftover;
             $this->buffer[$i++] = 1;
-            for (; $i < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE; ++$i) {
+            for ( ; $i < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE; ++$i ) {
                 $this->buffer[$i] = 0;
             }
             $this->final = true;
             $this->blocks(
                 self::substr(
-                    static::intArrayToString($this->buffer),
+                    static::intArrayToString( $this->buffer ),
                     0,
                     ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
                 ),
@@ -352,73 +352,73 @@ 
         $h3 = $this->h[3];
         $h4 = $this->h[4];
 
-        $c = $h1->shiftRight(26);           # $c = $h1 >> 26;
-        $h1 = $h1->mask(0x3ffffff);         # $h1 &= 0x3ffffff;
+        $c = $h1->shiftRight( 26 ); # $c = $h1 >> 26;
+        $h1 = $h1->mask( 0x3ffffff ); # $h1 &= 0x3ffffff;
 
-        $h2 = $h2->addInt32($c);            # $h2 += $c;
-        $c = $h2->shiftRight(26);           # $c = $h2 >> 26;
-        $h2 = $h2->mask(0x3ffffff);         # $h2 &= 0x3ffffff;
+        $h2 = $h2->addInt32( $c ); # $h2 += $c;
+        $c = $h2->shiftRight( 26 ); # $c = $h2 >> 26;
+        $h2 = $h2->mask( 0x3ffffff ); # $h2 &= 0x3ffffff;
 
-        $h3 = $h3->addInt32($c);            # $h3 += $c;
-        $c = $h3->shiftRight(26);           # $c = $h3 >> 26;
-        $h3 = $h3->mask(0x3ffffff);         # $h3 &= 0x3ffffff;
+        $h3 = $h3->addInt32( $c ); # $h3 += $c;
+        $c = $h3->shiftRight( 26 ); # $c = $h3 >> 26;
+        $h3 = $h3->mask( 0x3ffffff ); # $h3 &= 0x3ffffff;
 
-        $h4 = $h4->addInt32($c);            # $h4 += $c;
-        $c = $h4->shiftRight(26);           # $c = $h4 >> 26;
-        $h4 = $h4->mask(0x3ffffff);         # $h4 &= 0x3ffffff;
+        $h4 = $h4->addInt32( $c ); # $h4 += $c;
+        $c = $h4->shiftRight( 26 ); # $c = $h4 >> 26;
+        $h4 = $h4->mask( 0x3ffffff ); # $h4 &= 0x3ffffff;
 
-        $h0 = $h0->addInt32($c->mulInt(5)); # $h0 += self::mul($c, 5);
-        $c = $h0->shiftRight(26);           # $c = $h0 >> 26;
-        $h0 = $h0->mask(0x3ffffff);         # $h0 &= 0x3ffffff;
-        $h1 = $h1->addInt32($c);            # $h1 += $c;
+        $h0 = $h0->addInt32( $c->mulInt( 5 ) ); # $h0 += self::mul($c, 5);
+        $c = $h0->shiftRight( 26 ); # $c = $h0 >> 26;
+        $h0 = $h0->mask( 0x3ffffff ); # $h0 &= 0x3ffffff;
+        $h1 = $h1->addInt32( $c ); # $h1 += $c;
 
         /* compute h + -p */
-        $g0 = $h0->addInt(5);
-        $c  = $g0->shiftRight(26);
-        $g0 = $g0->mask(0x3ffffff);
-        $g1 = $h1->addInt32($c);
-        $c  = $g1->shiftRight(26);
-        $g1 = $g1->mask(0x3ffffff);
-        $g2 = $h2->addInt32($c);
-        $c  = $g2->shiftRight(26);
-        $g2 = $g2->mask(0x3ffffff);
-        $g3 = $h3->addInt32($c);
-        $c  = $g3->shiftRight(26);
-        $g3 = $g3->mask(0x3ffffff);
-        $g4 = $h4->addInt32($c)->subInt(1 << 26);
+        $g0 = $h0->addInt( 5 );
+        $c  = $g0->shiftRight( 26 );
+        $g0 = $g0->mask( 0x3ffffff );
+        $g1 = $h1->addInt32( $c );
+        $c  = $g1->shiftRight( 26 );
+        $g1 = $g1->mask( 0x3ffffff );
+        $g2 = $h2->addInt32( $c );
+        $c  = $g2->shiftRight( 26 );
+        $g2 = $g2->mask( 0x3ffffff );
+        $g3 = $h3->addInt32( $c );
+        $c  = $g3->shiftRight( 26 );
+        $g3 = $g3->mask( 0x3ffffff );
+        $g4 = $h4->addInt32( $c )->subInt( 1 << 26 );
 
         # $mask = ($g4 >> 31) - 1;
         /* select h if h < p, or h + -p if h >= p */
-        $mask = (int) (($g4->toInt() >> 31) + 1);
+        $mask = (int) ( ( $g4->toInt() >> 31 ) + 1 );
 
-        $g0 = $g0->mask($mask);
-        $g1 = $g1->mask($mask);
-        $g2 = $g2->mask($mask);
-        $g3 = $g3->mask($mask);
-        $g4 = $g4->mask($mask);
+        $g0 = $g0->mask( $mask );
+        $g1 = $g1->mask( $mask );
+        $g2 = $g2->mask( $mask );
+        $g3 = $g3->mask( $mask );
+        $g4 = $g4->mask( $mask );
 
-        $mask = (~$mask) & 0xffffffff;
+        $mask = ( ~$mask ) & 0xffffffff;
 
-        $h0 = $h0->mask($mask)->orInt32($g0);
-        $h1 = $h1->mask($mask)->orInt32($g1);
-        $h2 = $h2->mask($mask)->orInt32($g2);
-        $h3 = $h3->mask($mask)->orInt32($g3);
-        $h4 = $h4->mask($mask)->orInt32($g4);
+        $h0 = $h0->mask( $mask )->orInt32( $g0 );
+        $h1 = $h1->mask( $mask )->orInt32( $g1 );
+        $h2 = $h2->mask( $mask )->orInt32( $g2 );
+        $h3 = $h3->mask( $mask )->orInt32( $g3 );
+        $h4 = $h4->mask( $mask )->orInt32( $g4 );
 
         /* h = h % (2^128) */
-        $h0 = $h0->orInt32($h1->shiftLeft(26));
-        $h1 = $h1->shiftRight(6)->orInt32($h2->shiftLeft(20));
-        $h2 = $h2->shiftRight(12)->orInt32($h3->shiftLeft(14));
-        $h3 = $h3->shiftRight(18)->orInt32($h4->shiftLeft(8));
+        $h0 = $h0->orInt32( $h1->shiftLeft( 26 ) );
+        $h1 = $h1->shiftRight( 6 )->orInt32( $h2->shiftLeft( 20 ) );
+        $h2 = $h2->shiftRight( 12 )->orInt32( $h3->shiftLeft( 14 ) );
+        $h3 = $h3->shiftRight( 18 )->orInt32( $h4->shiftLeft( 8 ) );
 
         /* mac = (h + pad) % (2^128) */
-        $f = $h0->toInt64()->addInt64($this->pad[0]);
+        $f = $h0->toInt64()->addInt64( $this->pad[0] );
         $h0 = $f->toInt32();
-        $f = $h1->toInt64()->addInt64($this->pad[1])->addInt($h0->overflow);
+        $f = $h1->toInt64()->addInt64( $this->pad[1] )->addInt( $h0->overflow );
         $h1 = $f->toInt32();
-        $f = $h2->toInt64()->addInt64($this->pad[2])->addInt($h1->overflow);
+        $f = $h2->toInt64()->addInt64( $this->pad[2] )->addInt( $h1->overflow );
         $h2 = $f->toInt32();
-        $f = $h3->toInt64()->addInt64($this->pad[3])->addInt($h2->overflow);
+        $f = $h3->toInt64()->addInt64( $this->pad[3] )->addInt( $h2->overflow );
         $h3 = $f->toInt32();
 
         return $h0->toReverseString() .

src/library/sodium_compat/src/Core32/Curve25519/Ge/P3.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P3', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Ge_P3', false ) ) {
     return;
 }
 
@@ -45,19 +45,19 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
         ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
     ) {
-        if ($x === null) {
+        if ( $x === null ) {
             $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->X = $x;
-        if ($y === null) {
+        if ( $y === null ) {
             $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Y = $y;
-        if ($z === null) {
+        if ( $z === null ) {
             $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Z = $z;
-        if ($t === null) {
+        if ( $t === null ) {
             $t = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->T = $t;

src/library/sodium_compat/src/Core32/Curve25519/Ge/Cached.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Cached', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Ge_Cached', false ) ) {
     return;
 }
 /**
@@ -45,19 +45,19 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $Z = null,
         ParagonIE_Sodium_Core32_Curve25519_Fe $T2d = null
     ) {
-        if ($YplusX === null) {
+        if ( $YplusX === null ) {
             $YplusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->YplusX = $YplusX;
-        if ($YminusX === null) {
+        if ( $YminusX === null ) {
             $YminusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->YminusX = $YminusX;
-        if ($Z === null) {
+        if ( $Z === null ) {
             $Z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Z = $Z;
-        if ($T2d === null) {
+        if ( $T2d === null ) {
             $T2d = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->T2d = $T2d;