gravityview / GravityView

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

Spacing +126 added lines, -126 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20', false ) ) {
     return;
 }
 
@@ -18,15 +18,15 @@ 
      * @param int $n
      * @return int
      */
-    public static function rotate($v, $n)
+    public static function rotate( $v, $n )
     {
         $v &= 0xffffffff;
         $n &= 31;
-        return (int) (
+        return (int)(
             0xffffffff & (
-                ($v << $n)
+                ( $v << $n )
                     |
-                ($v >> (32 - $n))
+                ( $v >> ( 32 - $n ) )
             )
         );
     }
@@ -42,28 +42,28 @@ 
      * @param int $d
      * @return array<int, int>
      */
-    protected static function quarterRound($a, $b, $c, $d)
+    protected static function quarterRound( $a, $b, $c, $d )
     {
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
         /** @var int $a */
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 16);
+        $a = ( $a + $b ) & 0xffffffff;
+        $d = self::rotate( $d ^ $a, 16 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
         /** @var int $c */
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 12);
+        $c = ( $c + $d ) & 0xffffffff;
+        $b = self::rotate( $b ^ $c, 12 );
 
         # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
         /** @var int $a */
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 8);
+        $a = ( $a + $b ) & 0xffffffff;
+        $d = self::rotate( $d ^ $a, 8 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
         /** @var int $c */
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 7);
-        return array((int) $a, (int) $b, (int) $c, (int) $d);
+        $c = ( $c + $d ) & 0xffffffff;
+        $b = self::rotate( $b ^ $c, 7 );
+        return array( (int)$a, (int)$b, (int)$c, (int)$d );
     }
 
     /**
@@ -80,7 +80,7 @@ 
         ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
         $message = ''
     ) {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /*
         j0 = ctx->input[0];
@@ -100,71 +100,71 @@ 
         j14 = ctx->input[14];
         j15 = ctx->input[15];
         */
-        $j0  = (int) $ctx[0];
-        $j1  = (int) $ctx[1];
-        $j2  = (int) $ctx[2];
-        $j3  = (int) $ctx[3];
-        $j4  = (int) $ctx[4];
-        $j5  = (int) $ctx[5];
-        $j6  = (int) $ctx[6];
-        $j7  = (int) $ctx[7];
-        $j8  = (int) $ctx[8];
-        $j9  = (int) $ctx[9];
-        $j10 = (int) $ctx[10];
-        $j11 = (int) $ctx[11];
-        $j12 = (int) $ctx[12];
-        $j13 = (int) $ctx[13];
-        $j14 = (int) $ctx[14];
-        $j15 = (int) $ctx[15];
+        $j0  = (int)$ctx[ 0 ];
+        $j1  = (int)$ctx[ 1 ];
+        $j2  = (int)$ctx[ 2 ];
+        $j3  = (int)$ctx[ 3 ];
+        $j4  = (int)$ctx[ 4 ];
+        $j5  = (int)$ctx[ 5 ];
+        $j6  = (int)$ctx[ 6 ];
+        $j7  = (int)$ctx[ 7 ];
+        $j8  = (int)$ctx[ 8 ];
+        $j9  = (int)$ctx[ 9 ];
+        $j10 = (int)$ctx[ 10 ];
+        $j11 = (int)$ctx[ 11 ];
+        $j12 = (int)$ctx[ 12 ];
+        $j13 = (int)$ctx[ 13 ];
+        $j14 = (int)$ctx[ 14 ];
+        $j15 = (int)$ctx[ 15 ];
 
         $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
+        for ( ;; ) {
+            if ( $bytes < 64 ) {
+                $message .= str_repeat( "\x00", 64 - $bytes );
             }
 
-            $x0 =  (int) $j0;
-            $x1 =  (int) $j1;
-            $x2 =  (int) $j2;
-            $x3 =  (int) $j3;
-            $x4 =  (int) $j4;
-            $x5 =  (int) $j5;
-            $x6 =  (int) $j6;
-            $x7 =  (int) $j7;
-            $x8 =  (int) $j8;
-            $x9 =  (int) $j9;
-            $x10 = (int) $j10;
-            $x11 = (int) $j11;
-            $x12 = (int) $j12;
-            $x13 = (int) $j13;
-            $x14 = (int) $j14;
-            $x15 = (int) $j15;
+            $x0 = (int)$j0;
+            $x1 = (int)$j1;
+            $x2 = (int)$j2;
+            $x3 = (int)$j3;
+            $x4 = (int)$j4;
+            $x5 = (int)$j5;
+            $x6 = (int)$j6;
+            $x7 = (int)$j7;
+            $x8 = (int)$j8;
+            $x9 = (int)$j9;
+            $x10 = (int)$j10;
+            $x11 = (int)$j11;
+            $x12 = (int)$j12;
+            $x13 = (int)$j13;
+            $x14 = (int)$j14;
+            $x15 = (int)$j15;
 
             # for (i = 20; i > 0; i -= 2) {
-            for ($i = 20; $i > 0; $i -= 2) {
+            for ( $i = 20; $i > 0; $i -= 2 ) {
                 # QUARTERROUND( x0,  x4,  x8,  x12)
-                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+                list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
 
                 # QUARTERROUND( x1,  x5,  x9,  x13)
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+                list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
 
                 # QUARTERROUND( x2,  x6,  x10,  x14)
-                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+                list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
 
                 # QUARTERROUND( x3,  x7,  x11,  x15)
-                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+                list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
 
                 # QUARTERROUND( x0,  x5,  x10,  x15)
-                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+                list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
 
                 # QUARTERROUND( x1,  x6,  x11,  x12)
-                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+                list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
 
                 # QUARTERROUND( x2,  x7,  x8,  x13)
-                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+                list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
 
                 # QUARTERROUND( x3,  x4,  x9,  x14)
-                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+                list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
             }
             /*
             x0 = PLUS(x0, j0);
@@ -185,37 +185,37 @@ 
             x15 = PLUS(x15, j15);
             */
             /** @var int $x0 */
-            $x0  = ($x0 & 0xffffffff) + $j0;
+            $x0  = ( $x0 & 0xffffffff ) + $j0;
             /** @var int $x1 */
-            $x1  = ($x1 & 0xffffffff) + $j1;
+            $x1  = ( $x1 & 0xffffffff ) + $j1;
             /** @var int $x2 */
-            $x2  = ($x2 & 0xffffffff) + $j2;
+            $x2  = ( $x2 & 0xffffffff ) + $j2;
             /** @var int $x3 */
-            $x3  = ($x3 & 0xffffffff) + $j3;
+            $x3  = ( $x3 & 0xffffffff ) + $j3;
             /** @var int $x4 */
-            $x4  = ($x4 & 0xffffffff) + $j4;
+            $x4  = ( $x4 & 0xffffffff ) + $j4;
             /** @var int $x5 */
-            $x5  = ($x5 & 0xffffffff) + $j5;
+            $x5  = ( $x5 & 0xffffffff ) + $j5;
             /** @var int $x6 */
-            $x6  = ($x6 & 0xffffffff) + $j6;
+            $x6  = ( $x6 & 0xffffffff ) + $j6;
             /** @var int $x7 */
-            $x7  = ($x7 & 0xffffffff) + $j7;
+            $x7  = ( $x7 & 0xffffffff ) + $j7;
             /** @var int $x8 */
-            $x8  = ($x8 & 0xffffffff) + $j8;
+            $x8  = ( $x8 & 0xffffffff ) + $j8;
             /** @var int $x9 */
-            $x9  = ($x9 & 0xffffffff) + $j9;
+            $x9  = ( $x9 & 0xffffffff ) + $j9;
             /** @var int $x10 */
-            $x10 = ($x10 & 0xffffffff) + $j10;
+            $x10 = ( $x10 & 0xffffffff ) + $j10;
             /** @var int $x11 */
-            $x11 = ($x11 & 0xffffffff) + $j11;
+            $x11 = ( $x11 & 0xffffffff ) + $j11;
             /** @var int $x12 */
-            $x12 = ($x12 & 0xffffffff) + $j12;
+            $x12 = ( $x12 & 0xffffffff ) + $j12;
             /** @var int $x13 */
-            $x13 = ($x13 & 0xffffffff) + $j13;
+            $x13 = ( $x13 & 0xffffffff ) + $j13;
             /** @var int $x14 */
-            $x14 = ($x14 & 0xffffffff) + $j14;
+            $x14 = ( $x14 & 0xffffffff ) + $j14;
             /** @var int $x15 */
-            $x15 = ($x15 & 0xffffffff) + $j15;
+            $x15 = ( $x15 & 0xffffffff ) + $j15;
 
             /*
             x0 = XOR(x0, LOAD32_LE(m + 0));
@@ -235,22 +235,22 @@ 
             x14 = XOR(x14, LOAD32_LE(m + 56));
             x15 = XOR(x15, LOAD32_LE(m + 60));
             */
-            $x0  ^= self::load_4(self::substr($message, 0, 4));
-            $x1  ^= self::load_4(self::substr($message, 4, 4));
-            $x2  ^= self::load_4(self::substr($message, 8, 4));
-            $x3  ^= self::load_4(self::substr($message, 12, 4));
-            $x4  ^= self::load_4(self::substr($message, 16, 4));
-            $x5  ^= self::load_4(self::substr($message, 20, 4));
-            $x6  ^= self::load_4(self::substr($message, 24, 4));
-            $x7  ^= self::load_4(self::substr($message, 28, 4));
-            $x8  ^= self::load_4(self::substr($message, 32, 4));
-            $x9  ^= self::load_4(self::substr($message, 36, 4));
-            $x10 ^= self::load_4(self::substr($message, 40, 4));
-            $x11 ^= self::load_4(self::substr($message, 44, 4));
-            $x12 ^= self::load_4(self::substr($message, 48, 4));
-            $x13 ^= self::load_4(self::substr($message, 52, 4));
-            $x14 ^= self::load_4(self::substr($message, 56, 4));
-            $x15 ^= self::load_4(self::substr($message, 60, 4));
+            $x0  ^= self::load_4( self::substr( $message, 0, 4 ) );
+            $x1  ^= self::load_4( self::substr( $message, 4, 4 ) );
+            $x2  ^= self::load_4( self::substr( $message, 8, 4 ) );
+            $x3  ^= self::load_4( self::substr( $message, 12, 4 ) );
+            $x4  ^= self::load_4( self::substr( $message, 16, 4 ) );
+            $x5  ^= self::load_4( self::substr( $message, 20, 4 ) );
+            $x6  ^= self::load_4( self::substr( $message, 24, 4 ) );
+            $x7  ^= self::load_4( self::substr( $message, 28, 4 ) );
+            $x8  ^= self::load_4( self::substr( $message, 32, 4 ) );
+            $x9  ^= self::load_4( self::substr( $message, 36, 4 ) );
+            $x10 ^= self::load_4( self::substr( $message, 40, 4 ) );
+            $x11 ^= self::load_4( self::substr( $message, 44, 4 ) );
+            $x12 ^= self::load_4( self::substr( $message, 48, 4 ) );
+            $x13 ^= self::load_4( self::substr( $message, 52, 4 ) );
+            $x14 ^= self::load_4( self::substr( $message, 56, 4 ) );
+            $x15 ^= self::load_4( self::substr( $message, 60, 4 ) );
 
             /*
                 j12 = PLUSONE(j12);
@@ -259,8 +259,8 @@ 
                 }
              */
             ++$j12;
-            if ($j12 & 0xf0000000) {
-                throw new SodiumException('Overflow');
+            if ( $j12 & 0xf0000000 ) {
+                throw new SodiumException( 'Overflow' );
             }
 
             /*
@@ -281,41 +281,41 @@ 
             STORE32_LE(c + 56, x14);
             STORE32_LE(c + 60, x15);
             */
-            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
-                 self::store32_le((int) ($x1  & 0xffffffff)) .
-                 self::store32_le((int) ($x2  & 0xffffffff)) .
-                 self::store32_le((int) ($x3  & 0xffffffff)) .
-                 self::store32_le((int) ($x4  & 0xffffffff)) .
-                 self::store32_le((int) ($x5  & 0xffffffff)) .
-                 self::store32_le((int) ($x6  & 0xffffffff)) .
-                 self::store32_le((int) ($x7  & 0xffffffff)) .
-                 self::store32_le((int) ($x8  & 0xffffffff)) .
-                 self::store32_le((int) ($x9  & 0xffffffff)) .
-                 self::store32_le((int) ($x10 & 0xffffffff)) .
-                 self::store32_le((int) ($x11 & 0xffffffff)) .
-                 self::store32_le((int) ($x12 & 0xffffffff)) .
-                 self::store32_le((int) ($x13 & 0xffffffff)) .
-                 self::store32_le((int) ($x14 & 0xffffffff)) .
-                 self::store32_le((int) ($x15 & 0xffffffff));
+            $block = self::store32_le( (int)( $x0 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x1 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x2 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x3 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x4 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x5 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x6 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x7 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x8 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x9 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x10 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x11 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x12 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x13 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x14 & 0xffffffff ) ) .
+                 self::store32_le( (int)( $x15 & 0xffffffff ) );
 
             /* Partial block */
-            if ($bytes < 64) {
-                $c .= self::substr($block, 0, $bytes);
+            if ( $bytes < 64 ) {
+                $c .= self::substr( $block, 0, $bytes );
                 break;
             }
 
             /* Full block */
             $c .= $block;
             $bytes -= 64;
-            if ($bytes <= 0) {
+            if ( $bytes <= 0 ) {
                 break;
             }
-            $message = self::substr($message, 64);
+            $message = self::substr( $message, 64 );
         }
         /* end for(;;) loop */
 
-        $ctx[12] = $j12;
-        $ctx[13] = $j13;
+        $ctx[ 12 ] = $j12;
+        $ctx[ 13 ] = $j13;
         return $c;
     }
 
@@ -329,11 +329,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
+    public static function stream( $len = 64, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -347,11 +347,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStream($len, $nonce = '', $key = '')
+    public static function ietfStream( $len, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -366,10 +366,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function ietfStreamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce, $ic ),
             $message
         );
     }
@@ -385,10 +385,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce, $ic ),
             $message
         );
     }

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

Spacing +58 added lines, -58 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_HChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_HChaCha20', false ) ) {
     return;
 }
 
@@ -16,34 +16,34 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function hChaCha20($in = '', $key = '', $c = null)
+    public static function hChaCha20( $in = '', $key = '', $c = null )
     {
         $ctx = array();
 
-        if ($c === null) {
-            $ctx[0] = 0x61707865;
-            $ctx[1] = 0x3320646e;
-            $ctx[2] = 0x79622d32;
-            $ctx[3] = 0x6b206574;
+        if ( $c === null ) {
+            $ctx[ 0 ] = 0x61707865;
+            $ctx[ 1 ] = 0x3320646e;
+            $ctx[ 2 ] = 0x79622d32;
+            $ctx[ 3 ] = 0x6b206574;
         } else {
-            $ctx[0] = self::load_4(self::substr($c,  0, 4));
-            $ctx[1] = self::load_4(self::substr($c,  4, 4));
-            $ctx[2] = self::load_4(self::substr($c,  8, 4));
-            $ctx[3] = self::load_4(self::substr($c, 12, 4));
+            $ctx[ 0 ] = self::load_4( self::substr( $c, 0, 4 ) );
+            $ctx[ 1 ] = self::load_4( self::substr( $c, 4, 4 ) );
+            $ctx[ 2 ] = self::load_4( self::substr( $c, 8, 4 ) );
+            $ctx[ 3 ] = self::load_4( self::substr( $c, 12, 4 ) );
         }
-        $ctx[4]  = self::load_4(self::substr($key,  0, 4));
-        $ctx[5]  = self::load_4(self::substr($key,  4, 4));
-        $ctx[6]  = self::load_4(self::substr($key,  8, 4));
-        $ctx[7]  = self::load_4(self::substr($key, 12, 4));
-        $ctx[8]  = self::load_4(self::substr($key, 16, 4));
-        $ctx[9]  = self::load_4(self::substr($key, 20, 4));
-        $ctx[10] = self::load_4(self::substr($key, 24, 4));
-        $ctx[11] = self::load_4(self::substr($key, 28, 4));
-        $ctx[12] = self::load_4(self::substr($in,   0, 4));
-        $ctx[13] = self::load_4(self::substr($in,   4, 4));
-        $ctx[14] = self::load_4(self::substr($in,   8, 4));
-        $ctx[15] = self::load_4(self::substr($in,  12, 4));
-        return self::hChaCha20Bytes($ctx);
+        $ctx[ 4 ]  = self::load_4( self::substr( $key, 0, 4 ) );
+        $ctx[ 5 ]  = self::load_4( self::substr( $key, 4, 4 ) );
+        $ctx[ 6 ]  = self::load_4( self::substr( $key, 8, 4 ) );
+        $ctx[ 7 ]  = self::load_4( self::substr( $key, 12, 4 ) );
+        $ctx[ 8 ]  = self::load_4( self::substr( $key, 16, 4 ) );
+        $ctx[ 9 ]  = self::load_4( self::substr( $key, 20, 4 ) );
+        $ctx[ 10 ] = self::load_4( self::substr( $key, 24, 4 ) );
+        $ctx[ 11 ] = self::load_4( self::substr( $key, 28, 4 ) );
+        $ctx[ 12 ] = self::load_4( self::substr( $in, 0, 4 ) );
+        $ctx[ 13 ] = self::load_4( self::substr( $in, 4, 4 ) );
+        $ctx[ 14 ] = self::load_4( self::substr( $in, 8, 4 ) );
+        $ctx[ 15 ] = self::load_4( self::substr( $in, 12, 4 ) );
+        return self::hChaCha20Bytes( $ctx );
     }
 
     /**
@@ -51,58 +51,58 @@ 
      * @return string
      * @throws TypeError
      */
-    protected static function hChaCha20Bytes(array $ctx)
+    protected static function hChaCha20Bytes( array $ctx )
     {
-        $x0  = (int) $ctx[0];
-        $x1  = (int) $ctx[1];
-        $x2  = (int) $ctx[2];
-        $x3  = (int) $ctx[3];
-        $x4  = (int) $ctx[4];
-        $x5  = (int) $ctx[5];
-        $x6  = (int) $ctx[6];
-        $x7  = (int) $ctx[7];
-        $x8  = (int) $ctx[8];
-        $x9  = (int) $ctx[9];
-        $x10 = (int) $ctx[10];
-        $x11 = (int) $ctx[11];
-        $x12 = (int) $ctx[12];
-        $x13 = (int) $ctx[13];
-        $x14 = (int) $ctx[14];
-        $x15 = (int) $ctx[15];
+        $x0  = (int)$ctx[ 0 ];
+        $x1  = (int)$ctx[ 1 ];
+        $x2  = (int)$ctx[ 2 ];
+        $x3  = (int)$ctx[ 3 ];
+        $x4  = (int)$ctx[ 4 ];
+        $x5  = (int)$ctx[ 5 ];
+        $x6  = (int)$ctx[ 6 ];
+        $x7  = (int)$ctx[ 7 ];
+        $x8  = (int)$ctx[ 8 ];
+        $x9  = (int)$ctx[ 9 ];
+        $x10 = (int)$ctx[ 10 ];
+        $x11 = (int)$ctx[ 11 ];
+        $x12 = (int)$ctx[ 12 ];
+        $x13 = (int)$ctx[ 13 ];
+        $x14 = (int)$ctx[ 14 ];
+        $x15 = (int)$ctx[ 15 ];
 
-        for ($i = 0; $i < 10; ++$i) {
+        for ( $i = 0; $i < 10; ++$i ) {
             # QUARTERROUND( x0,  x4,  x8,  x12)
-            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+            list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
 
             # QUARTERROUND( x1,  x5,  x9,  x13)
-            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+            list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
 
             # QUARTERROUND( x2,  x6,  x10,  x14)
-            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+            list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
 
             # QUARTERROUND( x3,  x7,  x11,  x15)
-            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+            list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
 
             # QUARTERROUND( x0,  x5,  x10,  x15)
-            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+            list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
 
             # QUARTERROUND( x1,  x6,  x11,  x12)
-            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+            list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
 
             # QUARTERROUND( x2,  x7,  x8,  x13)
-            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+            list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
 
             # QUARTERROUND( x3,  x4,  x9,  x14)
-            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+            list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
         }
 
-        return self::store32_le((int) ($x0  & 0xffffffff)) .
-            self::store32_le((int) ($x1  & 0xffffffff)) .
-            self::store32_le((int) ($x2  & 0xffffffff)) .
-            self::store32_le((int) ($x3  & 0xffffffff)) .
-            self::store32_le((int) ($x12 & 0xffffffff)) .
-            self::store32_le((int) ($x13 & 0xffffffff)) .
-            self::store32_le((int) ($x14 & 0xffffffff)) .
-            self::store32_le((int) ($x15 & 0xffffffff));
+        return self::store32_le( (int)( $x0 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x1 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x2 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x3 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x12 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x13 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x14 & 0xffffffff ) ) .
+            self::store32_le( (int)( $x15 & 0xffffffff ) );
     }
 }

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

Spacing +60 added lines, -60 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_HSalsa20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_HSalsa20', false ) ) {
     return;
 }
 
@@ -23,74 +23,74 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function hsalsa20($in, $k, $c = null)
+    public static function hsalsa20( $in, $k, $c = null )
     {
-        if ($c === null) {
+        if ( $c === null ) {
             $x0  = 0x61707865;
             $x5  = 0x3320646e;
             $x10 = 0x79622d32;
             $x15 = 0x6b206574;
         } else {
-            $x0  = self::load_4(self::substr($c, 0, 4));
-            $x5  = self::load_4(self::substr($c, 4, 4));
-            $x10 = self::load_4(self::substr($c, 8, 4));
-            $x15 = self::load_4(self::substr($c, 12, 4));
+            $x0  = self::load_4( self::substr( $c, 0, 4 ) );
+            $x5  = self::load_4( self::substr( $c, 4, 4 ) );
+            $x10 = self::load_4( self::substr( $c, 8, 4 ) );
+            $x15 = self::load_4( self::substr( $c, 12, 4 ) );
         }
-        $x1  = self::load_4(self::substr($k, 0, 4));
-        $x2  = self::load_4(self::substr($k, 4, 4));
-        $x3  = self::load_4(self::substr($k, 8, 4));
-        $x4  = self::load_4(self::substr($k, 12, 4));
-        $x11 = self::load_4(self::substr($k, 16, 4));
-        $x12 = self::load_4(self::substr($k, 20, 4));
-        $x13 = self::load_4(self::substr($k, 24, 4));
-        $x14 = self::load_4(self::substr($k, 28, 4));
-        $x6  = self::load_4(self::substr($in, 0, 4));
-        $x7  = self::load_4(self::substr($in, 4, 4));
-        $x8  = self::load_4(self::substr($in, 8, 4));
-        $x9  = self::load_4(self::substr($in, 12, 4));
+        $x1  = self::load_4( self::substr( $k, 0, 4 ) );
+        $x2  = self::load_4( self::substr( $k, 4, 4 ) );
+        $x3  = self::load_4( self::substr( $k, 8, 4 ) );
+        $x4  = self::load_4( self::substr( $k, 12, 4 ) );
+        $x11 = self::load_4( self::substr( $k, 16, 4 ) );
+        $x12 = self::load_4( self::substr( $k, 20, 4 ) );
+        $x13 = self::load_4( self::substr( $k, 24, 4 ) );
+        $x14 = self::load_4( self::substr( $k, 28, 4 ) );
+        $x6  = self::load_4( self::substr( $in, 0, 4 ) );
+        $x7  = self::load_4( self::substr( $in, 4, 4 ) );
+        $x8  = self::load_4( self::substr( $in, 8, 4 ) );
+        $x9  = self::load_4( self::substr( $in, 12, 4 ) );
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4 ^= self::rotate($x0 + $x12, 7);
-            $x8 ^= self::rotate($x4 + $x0, 9);
-            $x12 ^= self::rotate($x8 + $x4, 13);
-            $x0 ^= self::rotate($x12 + $x8, 18);
-            $x9 ^= self::rotate($x5 + $x1, 7);
-            $x13 ^= self::rotate($x9 + $x5, 9);
-            $x1 ^= self::rotate($x13 + $x9, 13);
-            $x5 ^= self::rotate($x1 + $x13, 18);
-            $x14 ^= self::rotate($x10 + $x6, 7);
-            $x2 ^= self::rotate($x14 + $x10, 9);
-            $x6 ^= self::rotate($x2 + $x14, 13);
-            $x10 ^= self::rotate($x6 + $x2, 18);
-            $x3 ^= self::rotate($x15 + $x11, 7);
-            $x7 ^= self::rotate($x3 + $x15, 9);
-            $x11 ^= self::rotate($x7 + $x3, 13);
-            $x15 ^= self::rotate($x11 + $x7, 18);
-            $x1 ^= self::rotate($x0 + $x3, 7);
-            $x2 ^= self::rotate($x1 + $x0, 9);
-            $x3 ^= self::rotate($x2 + $x1, 13);
-            $x0 ^= self::rotate($x3 + $x2, 18);
-            $x6 ^= self::rotate($x5 + $x4, 7);
-            $x7 ^= self::rotate($x6 + $x5, 9);
-            $x4 ^= self::rotate($x7 + $x6, 13);
-            $x5 ^= self::rotate($x4 + $x7, 18);
-            $x11 ^= self::rotate($x10 + $x9, 7);
-            $x8 ^= self::rotate($x11 + $x10, 9);
-            $x9 ^= self::rotate($x8 + $x11, 13);
-            $x10 ^= self::rotate($x9 + $x8, 18);
-            $x12 ^= self::rotate($x15 + $x14, 7);
-            $x13 ^= self::rotate($x12 + $x15, 9);
-            $x14 ^= self::rotate($x13 + $x12, 13);
-            $x15 ^= self::rotate($x14 + $x13, 18);
+        for ( $i = self::ROUNDS; $i > 0; $i -= 2 ) {
+            $x4 ^= self::rotate( $x0 + $x12, 7 );
+            $x8 ^= self::rotate( $x4 + $x0, 9 );
+            $x12 ^= self::rotate( $x8 + $x4, 13 );
+            $x0 ^= self::rotate( $x12 + $x8, 18 );
+            $x9 ^= self::rotate( $x5 + $x1, 7 );
+            $x13 ^= self::rotate( $x9 + $x5, 9 );
+            $x1 ^= self::rotate( $x13 + $x9, 13 );
+            $x5 ^= self::rotate( $x1 + $x13, 18 );
+            $x14 ^= self::rotate( $x10 + $x6, 7 );
+            $x2 ^= self::rotate( $x14 + $x10, 9 );
+            $x6 ^= self::rotate( $x2 + $x14, 13 );
+            $x10 ^= self::rotate( $x6 + $x2, 18 );
+            $x3 ^= self::rotate( $x15 + $x11, 7 );
+            $x7 ^= self::rotate( $x3 + $x15, 9 );
+            $x11 ^= self::rotate( $x7 + $x3, 13 );
+            $x15 ^= self::rotate( $x11 + $x7, 18 );
+            $x1 ^= self::rotate( $x0 + $x3, 7 );
+            $x2 ^= self::rotate( $x1 + $x0, 9 );
+            $x3 ^= self::rotate( $x2 + $x1, 13 );
+            $x0 ^= self::rotate( $x3 + $x2, 18 );
+            $x6 ^= self::rotate( $x5 + $x4, 7 );
+            $x7 ^= self::rotate( $x6 + $x5, 9 );
+            $x4 ^= self::rotate( $x7 + $x6, 13 );
+            $x5 ^= self::rotate( $x4 + $x7, 18 );
+            $x11 ^= self::rotate( $x10 + $x9, 7 );
+            $x8 ^= self::rotate( $x11 + $x10, 9 );
+            $x9 ^= self::rotate( $x8 + $x11, 13 );
+            $x10 ^= self::rotate( $x9 + $x8, 18 );
+            $x12 ^= self::rotate( $x15 + $x14, 7 );
+            $x13 ^= self::rotate( $x12 + $x15, 9 );
+            $x14 ^= self::rotate( $x13 + $x12, 13 );
+            $x15 ^= self::rotate( $x14 + $x13, 18 );
         }
 
-        return self::store32_le($x0) .
-            self::store32_le($x5) .
-            self::store32_le($x10) .
-            self::store32_le($x15) .
-            self::store32_le($x6) .
-            self::store32_le($x7) .
-            self::store32_le($x8) .
-            self::store32_le($x9);
+        return self::store32_le( $x0 ) .
+            self::store32_le( $x5 ) .
+            self::store32_le( $x10 ) .
+            self::store32_le( $x15 ) .
+            self::store32_le( $x6 ) .
+            self::store32_le( $x7 ) .
+            self::store32_le( $x8 ) .
+            self::store32_le( $x9 );
     }
 }

vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php

Spacing +144 added lines, -144 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Poly1305_State', false ) ) {
     return;
 }
 
@@ -48,31 +48,31 @@ 
      * @throws InvalidArgumentException
      * @throws TypeError
      */
-    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'
             );
         }
         /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
         $this->r = array(
-            (int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
-            (int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
-            (int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
-            (int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
-            (int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
+            (int)( ( self::load_4( self::substr( $key, 0, 4 ) ) ) & 0x3ffffff ),
+            (int)( ( self::load_4( self::substr( $key, 3, 4 ) ) >> 2 ) & 0x3ffff03 ),
+            (int)( ( self::load_4( self::substr( $key, 6, 4 ) ) >> 4 ) & 0x3ffc0ff ),
+            (int)( ( self::load_4( self::substr( $key, 9, 4 ) ) >> 6 ) & 0x3f03fff ),
+            (int)( ( self::load_4( self::substr( $key, 12, 4 ) ) >> 8 ) & 0x00fffff )
         );
 
         /* h = 0 */
-        $this->h = array(0, 0, 0, 0, 0);
+        $this->h = array( 0, 0, 0, 0, 0 );
 
         /* save pad for later */
         $this->pad = array(
-            self::load_4(self::substr($key, 16, 4)),
-            self::load_4(self::substr($key, 20, 4)),
-            self::load_4(self::substr($key, 24, 4)),
-            self::load_4(self::substr($key, 28, 4)),
+            self::load_4( self::substr( $key, 16, 4 ) ),
+            self::load_4( self::substr( $key, 20, 4 ) ),
+            self::load_4( self::substr( $key, 24, 4 ) ),
+            self::load_4( self::substr( $key, 28, 4 ) ),
         );
 
         $this->leftover = 0;
@@ -84,20 +84,20 @@ 
      */
     public function __destruct()
     {
-        $this->r[0] ^= $this->r[0];
-        $this->r[1] ^= $this->r[1];
-        $this->r[2] ^= $this->r[2];
-        $this->r[3] ^= $this->r[3];
-        $this->r[4] ^= $this->r[4];
-        $this->h[0] ^= $this->h[0];
-        $this->h[1] ^= $this->h[1];
-        $this->h[2] ^= $this->h[2];
-        $this->h[3] ^= $this->h[3];
-        $this->h[4] ^= $this->h[4];
-        $this->pad[0] ^= $this->pad[0];
-        $this->pad[1] ^= $this->pad[1];
-        $this->pad[2] ^= $this->pad[2];
-        $this->pad[3] ^= $this->pad[3];
+        $this->r[ 0 ] ^= $this->r[ 0 ];
+        $this->r[ 1 ] ^= $this->r[ 1 ];
+        $this->r[ 2 ] ^= $this->r[ 2 ];
+        $this->r[ 3 ] ^= $this->r[ 3 ];
+        $this->r[ 4 ] ^= $this->r[ 4 ];
+        $this->h[ 0 ] ^= $this->h[ 0 ];
+        $this->h[ 1 ] ^= $this->h[ 1 ];
+        $this->h[ 2 ] ^= $this->h[ 2 ];
+        $this->h[ 3 ] ^= $this->h[ 3 ];
+        $this->h[ 4 ] ^= $this->h[ 4 ];
+        $this->pad[ 0 ] ^= $this->pad[ 0 ];
+        $this->pad[ 1 ] ^= $this->pad[ 1 ];
+        $this->pad[ 2 ] ^= $this->pad[ 2 ];
+        $this->pad[ 3 ] ^= $this->pad[ 3 ];
         $this->leftover = 0;
         $this->final = true;
     }
@@ -110,60 +110,60 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function update($message = '')
+    public function update( $message = '' )
     {
-        $bytes = self::strlen($message);
-        if ($bytes < 1) {
+        $bytes = self::strlen( $message );
+        if ( $bytes < 1 ) {
             return $this;
         }
 
         /* handle leftover */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $want = ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - $this->leftover;
-            if ($want > $bytes) {
+            if ( $want > $bytes ) {
                 $want = $bytes;
             }
-            for ($i = 0; $i < $want; ++$i) {
-                $mi = self::chrToInt($message[$i]);
-                $this->buffer[$this->leftover + $i] = $mi;
+            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_Core_Poly1305::BLOCK_SIZE) {
+            if ( $this->leftover < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
                 // We still don't have enough to run $this->blocks()
                 return $this;
             }
 
             $this->blocks(
-                self::intArrayToString($this->buffer),
+                self::intArrayToString( $this->buffer ),
                 ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
             );
             $this->leftover = 0;
         }
 
         /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+        if ( $bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
             /** @var int $want */
-            $want = $bytes & ~(ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-                $block = self::substr($message, 0, $want);
-                if (self::strlen($block) >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-                    $this->blocks($block, $want);
-                    $message = self::substr($message, $want);
-                    $bytes = self::strlen($message);
+            $want = $bytes & ~( ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1 );
+            if ( $want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
+                $block = self::substr( $message, 0, $want );
+                if ( self::strlen( $block ) >= ParagonIE_Sodium_Core_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]);
-                $this->buffer[$this->leftover + $i] = $mi;
+        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;
+            $this->leftover = (int)$this->leftover + $bytes;
         }
         return $this;
     }
@@ -176,77 +176,77 @@ 
      * @return self
      * @throws TypeError
      */
-    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 );
         }
         /** @var int $hibit */
         $hibit = $this->final ? 0 : 1 << 24; /* 1 << 128 */
-        $r0 = (int) $this->r[0];
-        $r1 = (int) $this->r[1];
-        $r2 = (int) $this->r[2];
-        $r3 = (int) $this->r[3];
-        $r4 = (int) $this->r[4];
-
-        $s1 = self::mul($r1, 5, 3);
-        $s2 = self::mul($r2, 5, 3);
-        $s3 = self::mul($r3, 5, 3);
-        $s4 = self::mul($r4, 5, 3);
-
-        $h0 = $this->h[0];
-        $h1 = $this->h[1];
-        $h2 = $this->h[2];
-        $h3 = $this->h[3];
-        $h4 = $this->h[4];
-
-        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+        $r0 = (int)$this->r[ 0 ];
+        $r1 = (int)$this->r[ 1 ];
+        $r2 = (int)$this->r[ 2 ];
+        $r3 = (int)$this->r[ 3 ];
+        $r4 = (int)$this->r[ 4 ];
+
+        $s1 = self::mul( $r1, 5, 3 );
+        $s2 = self::mul( $r2, 5, 3 );
+        $s3 = self::mul( $r3, 5, 3 );
+        $s4 = self::mul( $r4, 5, 3 );
+
+        $h0 = $this->h[ 0 ];
+        $h1 = $this->h[ 1 ];
+        $h2 = $this->h[ 2 ];
+        $h3 = $this->h[ 3 ];
+        $h4 = $this->h[ 4 ];
+
+        while ( $bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
             /* h += m[i] */
-            $h0 +=  self::load_4(self::substr($message, 0, 4))       & 0x3ffffff;
-            $h1 += (self::load_4(self::substr($message, 3, 4)) >> 2) & 0x3ffffff;
-            $h2 += (self::load_4(self::substr($message, 6, 4)) >> 4) & 0x3ffffff;
-            $h3 += (self::load_4(self::substr($message, 9, 4)) >> 6) & 0x3ffffff;
-            $h4 += (self::load_4(self::substr($message, 12, 4)) >> 8) | $hibit;
+            $h0 += self::load_4( self::substr( $message, 0, 4 ) ) & 0x3ffffff;
+            $h1 += ( self::load_4( self::substr( $message, 3, 4 ) ) >> 2 ) & 0x3ffffff;
+            $h2 += ( self::load_4( self::substr( $message, 6, 4 ) ) >> 4 ) & 0x3ffffff;
+            $h3 += ( self::load_4( self::substr( $message, 9, 4 ) ) >> 6 ) & 0x3ffffff;
+            $h4 += ( self::load_4( self::substr( $message, 12, 4 ) ) >> 8 ) | $hibit;
 
             /* h *= r */
             $d0 = (
-                self::mul($h0, $r0, 25) +
-                self::mul($s4, $h1, 26) +
-                self::mul($s3, $h2, 26) +
-                self::mul($s2, $h3, 26) +
-                self::mul($s1, $h4, 26)
+                self::mul( $h0, $r0, 25 ) +
+                self::mul( $s4, $h1, 26 ) +
+                self::mul( $s3, $h2, 26 ) +
+                self::mul( $s2, $h3, 26 ) +
+                self::mul( $s1, $h4, 26 )
             );
 
             $d1 = (
-                self::mul($h0, $r1, 25) +
-                self::mul($h1, $r0, 25) +
-                self::mul($s4, $h2, 26) +
-                self::mul($s3, $h3, 26) +
-                self::mul($s2, $h4, 26)
+                self::mul( $h0, $r1, 25 ) +
+                self::mul( $h1, $r0, 25 ) +
+                self::mul( $s4, $h2, 26 ) +
+                self::mul( $s3, $h3, 26 ) +
+                self::mul( $s2, $h4, 26 )
             );
 
             $d2 = (
-                self::mul($h0, $r2, 25) +
-                self::mul($h1, $r1, 25) +
-                self::mul($h2, $r0, 25) +
-                self::mul($s4, $h3, 26) +
-                self::mul($s3, $h4, 26)
+                self::mul( $h0, $r2, 25 ) +
+                self::mul( $h1, $r1, 25 ) +
+                self::mul( $h2, $r0, 25 ) +
+                self::mul( $s4, $h3, 26 ) +
+                self::mul( $s3, $h4, 26 )
             );
 
             $d3 = (
-                self::mul($h0, $r3, 25) +
-                self::mul($h1, $r2, 25) +
-                self::mul($h2, $r1, 25) +
-                self::mul($h3, $r0, 25) +
-                self::mul($s4, $h4, 26)
+                self::mul( $h0, $r3, 25 ) +
+                self::mul( $h1, $r2, 25 ) +
+                self::mul( $h2, $r1, 25 ) +
+                self::mul( $h3, $r0, 25 ) +
+                self::mul( $s4, $h4, 26 )
             );
 
             $d4 = (
-                self::mul($h0, $r4, 25) +
-                self::mul($h1, $r3, 25) +
-                self::mul($h2, $r2, 25) +
-                self::mul($h3, $r1, 25) +
-                self::mul($h4, $r0, 25)
+                self::mul( $h0, $r4, 25 ) +
+                self::mul( $h1, $r3, 25 ) +
+                self::mul( $h2, $r2, 25 ) +
+                self::mul( $h3, $r1, 25 ) +
+                self::mul( $h4, $r0, 25 )
             );
 
             /* (partial) h %= p */
@@ -278,7 +278,7 @@ 
             $c = $d4 >> 26;
             /** @var int $h4 */
             $h4 = $d4 & 0x3ffffff;
-            $h0 += (int) self::mul($c, 5, 3);
+            $h0 += (int)self::mul( $c, 5, 3 );
 
             /** @var int $c */
             $c = $h0 >> 26;
@@ -295,11 +295,11 @@ 
         }
 
         $this->h = array(
-            (int) ($h0 & 0xffffffff),
-            (int) ($h1 & 0xffffffff),
-            (int) ($h2 & 0xffffffff),
-            (int) ($h3 & 0xffffffff),
-            (int) ($h4 & 0xffffffff)
+            (int)( $h0 & 0xffffffff ),
+            (int)( $h1 & 0xffffffff ),
+            (int)( $h2 & 0xffffffff ),
+            (int)( $h3 & 0xffffffff ),
+            (int)( $h4 & 0xffffffff )
         );
         return $this;
     }
@@ -313,16 +313,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_Core_Poly1305::BLOCK_SIZE; ++$i) {
-                $this->buffer[$i] = 0;
+            $this->buffer[ $i++ ] = 1;
+            for ( ; $i < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE; ++$i ) {
+                $this->buffer[ $i ] = 0;
             }
             $this->final = true;
             $this->blocks(
                 self::substr(
-                    self::intArrayToString($this->buffer),
+                    self::intArrayToString( $this->buffer ),
                     0,
                     ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
                 ),
@@ -330,11 +330,11 @@ 
             );
         }
 
-        $h0 = (int) $this->h[0];
-        $h1 = (int) $this->h[1];
-        $h2 = (int) $this->h[2];
-        $h3 = (int) $this->h[3];
-        $h4 = (int) $this->h[4];
+        $h0 = (int)$this->h[ 0 ];
+        $h1 = (int)$this->h[ 1 ];
+        $h2 = (int)$this->h[ 2 ];
+        $h3 = (int)$this->h[ 3 ];
+        $h4 = (int)$this->h[ 4 ];
 
         /** @var int $c */
         $c = $h1 >> 26;
@@ -355,7 +355,7 @@ 
         $c = $h4 >> 26;
         $h4 &= 0x3ffffff;
         /** @var int $h0 */
-        $h0 += self::mul($c, 5, 3);
+        $h0 += self::mul( $c, 5, 3 );
         /** @var int $c */
         $c = $h0 >> 26;
         /** @var int $h0 */
@@ -392,11 +392,11 @@ 
         $g3 &= 0x3ffffff;
 
         /** @var int $g4 */
-        $g4 = ($h4 + $c - (1 << 26)) & 0xffffffff;
+        $g4 = ( $h4 + $c - ( 1 << 26 ) ) & 0xffffffff;
 
         /* select h if h < p, or h + -p if h >= p */
         /** @var int $mask */
-        $mask = ($g4 >> 31) - 1;
+        $mask = ( $g4 >> 31 ) - 1;
 
         $g0 &= $mask;
         $g1 &= $mask;
@@ -407,39 +407,39 @@ 
         /** @var int $mask */
         $mask = ~$mask & 0xffffffff;
         /** @var int $h0 */
-        $h0 = ($h0 & $mask) | $g0;
+        $h0 = ( $h0 & $mask ) | $g0;
         /** @var int $h1 */
-        $h1 = ($h1 & $mask) | $g1;
+        $h1 = ( $h1 & $mask ) | $g1;
         /** @var int $h2 */
-        $h2 = ($h2 & $mask) | $g2;
+        $h2 = ( $h2 & $mask ) | $g2;
         /** @var int $h3 */
-        $h3 = ($h3 & $mask) | $g3;
+        $h3 = ( $h3 & $mask ) | $g3;
         /** @var int $h4 */
-        $h4 = ($h4 & $mask) | $g4;
+        $h4 = ( $h4 & $mask ) | $g4;
 
         /* h = h % (2^128) */
         /** @var int $h0 */
-        $h0 = (($h0) | ($h1 << 26)) & 0xffffffff;
+        $h0 = ( ( $h0 ) | ( $h1 << 26 ) ) & 0xffffffff;
         /** @var int $h1 */
-        $h1 = (($h1 >>  6) | ($h2 << 20)) & 0xffffffff;
+        $h1 = ( ( $h1 >> 6 ) | ( $h2 << 20 ) ) & 0xffffffff;
         /** @var int $h2 */
-        $h2 = (($h2 >> 12) | ($h3 << 14)) & 0xffffffff;
+        $h2 = ( ( $h2 >> 12 ) | ( $h3 << 14 ) ) & 0xffffffff;
         /** @var int $h3 */
-        $h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
+        $h3 = ( ( $h3 >> 18 ) | ( $h4 << 8 ) ) & 0xffffffff;
 
         /* mac = (h + pad) % (2^128) */
-        $f = (int) ($h0 + $this->pad[0]);
-        $h0 = (int) $f;
-        $f = (int) ($h1 + $this->pad[1] + ($f >> 32));
-        $h1 = (int) $f;
-        $f = (int) ($h2 + $this->pad[2] + ($f >> 32));
-        $h2 = (int) $f;
-        $f = (int) ($h3 + $this->pad[3] + ($f >> 32));
-        $h3 = (int) $f;
-
-        return self::store32_le($h0 & 0xffffffff) .
-            self::store32_le($h1 & 0xffffffff) .
-            self::store32_le($h2 & 0xffffffff) .
-            self::store32_le($h3 & 0xffffffff);
+        $f = (int)( $h0 + $this->pad[ 0 ] );
+        $h0 = (int)$f;
+        $f = (int)( $h1 + $this->pad[ 1 ] + ( $f >> 32 ) );
+        $h1 = (int)$f;
+        $f = (int)( $h2 + $this->pad[ 2 ] + ( $f >> 32 ) );
+        $h2 = (int)$f;
+        $f = (int)( $h3 + $this->pad[ 3 ] + ( $f >> 32 ) );
+        $h3 = (int)$f;
+
+        return self::store32_le( $h0 & 0xffffffff ) .
+            self::store32_le( $h1 & 0xffffffff ) .
+            self::store32_le( $h2 & 0xffffffff ) .
+            self::store32_le( $h3 & 0xffffffff );
     }
 }

vendor/paragonie/sodium_compat/src/Core/Base64/Original.php

Spacing +76 added lines, -76 removed lines

@@ -18,9 +18,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encode($src)
+    public static function encode( $src )
     {
-        return self::doEncode($src, true);
+        return self::doEncode( $src, true );
     }
 
     /**
@@ -32,9 +32,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded($src)
+    public static function encodeUnpadded( $src )
     {
-        return self::doEncode($src, false);
+        return self::doEncode( $src, false );
     }
 
     /**
@@ -43,43 +43,43 @@ 
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode($src, $pad = true)
+    protected static function doEncode( $src, $pad = true )
     {
         $dest = '';
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         // Main loop (no padding):
-        for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
+        for ( $i = 0; $i + 3 <= $srcLen; $i += 3 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 3));
-            $b0 = $chunk[1];
-            $b1 = $chunk[2];
-            $b2 = $chunk[3];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 3 ) );
+            $b0 = $chunk[ 1 ];
+            $b1 = $chunk[ 2 ];
+            $b2 = $chunk[ 3 ];
 
             $dest .=
-                self::encode6Bits(               $b0 >> 2       ) .
-                self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                self::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
-                self::encode6Bits(  $b2                     & 63);
+                self::encode6Bits( $b0 >> 2 ) .
+                self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                self::encode6Bits( ( ( $b1 << 2 ) | ( $b2 >> 6 ) ) & 63 ) .
+                self::encode6Bits( $b2 & 63 );
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $b0 = $chunk[1];
-            if ($i + 1 < $srcLen) {
-                $b1 = $chunk[2];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $b0 = $chunk[ 1 ];
+            if ( $i + 1 < $srcLen ) {
+                $b1 = $chunk[ 2 ];
                 $dest .=
-                    self::encode6Bits($b0 >> 2) .
-                    self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    self::encode6Bits(($b1 << 2) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                    self::encode6Bits( ( $b1 << 2 ) & 63 );
+                if ( $pad ) {
                     $dest .= '=';
                 }
             } else {
                 $dest .=
-                    self::encode6Bits( $b0 >> 2) .
-                    self::encode6Bits(($b0 << 4) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( $b0 << 4 ) & 63 );
+                if ( $pad ) {
                     $dest .= '==';
                 }
             }
@@ -99,86 +99,86 @@ 
      * @throws TypeError
      * @psalm-suppress RedundantCondition
      */
-    public static function decode($src, $strictPadding = false)
+    public static function decode( $src, $strictPadding = false )
     {
         // Remove padding
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
-        if ($srcLen === 0) {
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
+        if ( $srcLen === 0 ) {
             return '';
         }
 
-        if ($strictPadding) {
-            if (($srcLen & 3) === 0) {
-                if ($src[$srcLen - 1] === '=') {
+        if ( $strictPadding ) {
+            if ( ( $srcLen & 3 ) === 0 ) {
+                if ( $src[ $srcLen - 1 ] === '=' ) {
                     $srcLen--;
-                    if ($src[$srcLen - 1] === '=') {
+                    if ( $src[ $srcLen - 1 ] === '=' ) {
                         $srcLen--;
                     }
                 }
             }
-            if (($srcLen & 3) === 1) {
+            if ( ( $srcLen & 3 ) === 1 ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
-            if ($src[$srcLen - 1] === '=') {
+            if ( $src[ $srcLen - 1 ] === '=' ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
         } else {
-            $src = rtrim($src, '=');
-            $srcLen =  ParagonIE_Sodium_Core_Util::strlen($src);
+            $src = rtrim( $src, '=' );
+            $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         }
 
         $err = 0;
         $dest = '';
         // Main loop (no padding):
-        for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
+        for ( $i = 0; $i + 4 <= $srcLen; $i += 4 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 4));
-            $c0 = self::decode6Bits($chunk[1]);
-            $c1 = self::decode6Bits($chunk[2]);
-            $c2 = self::decode6Bits($chunk[3]);
-            $c3 = self::decode6Bits($chunk[4]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 4 ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
+            $c1 = self::decode6Bits( $chunk[ 2 ] );
+            $c2 = self::decode6Bits( $chunk[ 3 ] );
+            $c3 = self::decode6Bits( $chunk[ 4 ] );
 
             $dest .= pack(
                 'CCC',
-                ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                ((($c1 << 4) | ($c2 >> 2)) & 0xff),
-                ((($c2 << 6) | $c3) & 0xff)
+                ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff ),
+                ( ( ( $c2 << 6 ) | $c3 ) & 0xff )
             );
-            $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
+            $err |= ( $c0 | $c1 | $c2 | $c3 ) >> 8;
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $c0 = self::decode6Bits($chunk[1]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
 
-            if ($i + 2 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
-                $c2 = self::decode6Bits($chunk[3]);
+            if ( $i + 2 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
+                $c2 = self::decode6Bits( $chunk[ 3 ] );
                 $dest .= pack(
                     'CC',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                    ((($c1 << 4) | ($c2 >> 2)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                    ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1 | $c2) >> 8;
-            } elseif ($i + 1 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
+                $err |= ( $c0 | $c1 | $c2 ) >> 8;
+            } elseif ( $i + 1 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
                 $dest .= pack(
                     'C',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1) >> 8;
-            } elseif ($i < $srcLen && $strictPadding) {
+                $err |= ( $c0 | $c1 ) >> 8;
+            } elseif ( $i < $srcLen && $strictPadding ) {
                 $err |= 1;
             }
         }
         /** @var bool $check */
-        $check = ($err === 0);
-        if (!$check) {
+        $check = ( $err === 0 );
+        if ( ! $check ) {
             throw new RangeException(
                 'Base64::decode() only expects characters in the correct base64 alphabet'
             );
@@ -198,24 +198,24 @@ 
      * @param int $src
      * @return int
      */
-    protected static function decode6Bits($src)
+    protected static function decode6Bits( $src )
     {
         $ret = -1;
 
         // if ($src > 0x40 && $src < 0x5b) $ret += $src - 0x41 + 1; // -64
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 64);
+        $ret += ( ( ( 0x40 - $src ) & ( $src - 0x5b ) ) >> 8 ) & ( $src - 64 );
 
         // if ($src > 0x60 && $src < 0x7b) $ret += $src - 0x61 + 26 + 1; // -70
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 70);
+        $ret += ( ( ( 0x60 - $src ) & ( $src - 0x7b ) ) >> 8 ) & ( $src - 70 );
 
         // if ($src > 0x2f && $src < 0x3a) $ret += $src - 0x30 + 52 + 1; // 5
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src + 5);
+        $ret += ( ( ( 0x2f - $src ) & ( $src - 0x3a ) ) >> 8 ) & ( $src + 5 );
 
         // if ($src == 0x2b) $ret += 62 + 1;
-        $ret += (((0x2a - $src) & ($src - 0x2c)) >> 8) & 63;
+        $ret += ( ( ( 0x2a - $src ) & ( $src - 0x2c ) ) >> 8 ) & 63;
 
         // if ($src == 0x2f) ret += 63 + 1;
-        $ret += (((0x2e - $src) & ($src - 0x30)) >> 8) & 64;
+        $ret += ( ( ( 0x2e - $src ) & ( $src - 0x30 ) ) >> 8 ) & 64;
 
         return $ret;
     }
@@ -227,22 +227,22 @@ 
      * @param int $src
      * @return string
      */
-    protected static function encode6Bits($src)
+    protected static function encode6Bits( $src )
     {
         $diff = 0x41;
 
         // if ($src > 25) $diff += 0x61 - 0x41 - 26; // 6
-        $diff += ((25 - $src) >> 8) & 6;
+        $diff += ( ( 25 - $src ) >> 8 ) & 6;
 
         // if ($src > 51) $diff += 0x30 - 0x61 - 26; // -75
-        $diff -= ((51 - $src) >> 8) & 75;
+        $diff -= ( ( 51 - $src ) >> 8 ) & 75;
 
         // if ($src > 61) $diff += 0x2b - 0x30 - 10; // -15
-        $diff -= ((61 - $src) >> 8) & 15;
+        $diff -= ( ( 61 - $src ) >> 8 ) & 15;
 
         // if ($src > 62) $diff += 0x2f - 0x2b - 1; // 3
-        $diff += ((62 - $src) >> 8) & 3;
+        $diff += ( ( 62 - $src ) >> 8 ) & 3;
 
-        return pack('C', $src + $diff);
+        return pack( 'C', $src + $diff );
     }
 }

vendor/paragonie/sodium_compat/src/Core/Base64/Common.php

Spacing +66 added lines, -66 removed lines

@@ -21,9 +21,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encode($src)
+    public static function encode( $src )
     {
-        return self::doEncode($src, true);
+        return self::doEncode( $src, true );
     }
 
     /**
@@ -35,9 +35,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded($src)
+    public static function encodeUnpadded( $src )
     {
-        return self::doEncode($src, false);
+        return self::doEncode( $src, false );
     }
 
     /**
@@ -46,43 +46,43 @@ 
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode($src, $pad = true)
+    protected static function doEncode( $src, $pad = true )
     {
         $dest = '';
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         // Main loop (no padding):
-        for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
+        for ( $i = 0; $i + 3 <= $srcLen; $i += 3 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 3));
-            $b0 = $chunk[1];
-            $b1 = $chunk[2];
-            $b2 = $chunk[3];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 3 ) );
+            $b0 = $chunk[ 1 ];
+            $b1 = $chunk[ 2 ];
+            $b2 = $chunk[ 3 ];
 
             $dest .=
-                self::encode6Bits(               $b0 >> 2       ) .
-                self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                self::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
-                self::encode6Bits(  $b2                     & 63);
+                self::encode6Bits( $b0 >> 2 ) .
+                self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                self::encode6Bits( ( ( $b1 << 2 ) | ( $b2 >> 6 ) ) & 63 ) .
+                self::encode6Bits( $b2 & 63 );
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $b0 = $chunk[1];
-            if ($i + 1 < $srcLen) {
-                $b1 = $chunk[2];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $b0 = $chunk[ 1 ];
+            if ( $i + 1 < $srcLen ) {
+                $b1 = $chunk[ 2 ];
                 $dest .=
-                    self::encode6Bits($b0 >> 2) .
-                    self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    self::encode6Bits(($b1 << 2) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                    self::encode6Bits( ( $b1 << 2 ) & 63 );
+                if ( $pad ) {
                     $dest .= '=';
                 }
             } else {
                 $dest .=
-                    self::encode6Bits( $b0 >> 2) .
-                    self::encode6Bits(($b0 << 4) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( $b0 << 4 ) & 63 );
+                if ( $pad ) {
                     $dest .= '==';
                 }
             }
@@ -102,86 +102,86 @@ 
      * @throws TypeError
      * @psalm-suppress RedundantCondition
      */
-    public static function decode($src, $strictPadding = false)
+    public static function decode( $src, $strictPadding = false )
     {
         // Remove padding
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
-        if ($srcLen === 0) {
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
+        if ( $srcLen === 0 ) {
             return '';
         }
 
-        if ($strictPadding) {
-            if (($srcLen & 3) === 0) {
-                if ($src[$srcLen - 1] === '=') {
+        if ( $strictPadding ) {
+            if ( ( $srcLen & 3 ) === 0 ) {
+                if ( $src[ $srcLen - 1 ] === '=' ) {
                     $srcLen--;
-                    if ($src[$srcLen - 1] === '=') {
+                    if ( $src[ $srcLen - 1 ] === '=' ) {
                         $srcLen--;
                     }
                 }
             }
-            if (($srcLen & 3) === 1) {
+            if ( ( $srcLen & 3 ) === 1 ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
-            if ($src[$srcLen - 1] === '=') {
+            if ( $src[ $srcLen - 1 ] === '=' ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
         } else {
-            $src = rtrim($src, '=');
-            $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
+            $src = rtrim( $src, '=' );
+            $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         }
 
         $err = 0;
         $dest = '';
         // Main loop (no padding):
-        for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
+        for ( $i = 0; $i + 4 <= $srcLen; $i += 4 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 4));
-            $c0 = self::decode6Bits($chunk[1]);
-            $c1 = self::decode6Bits($chunk[2]);
-            $c2 = self::decode6Bits($chunk[3]);
-            $c3 = self::decode6Bits($chunk[4]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 4 ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
+            $c1 = self::decode6Bits( $chunk[ 2 ] );
+            $c2 = self::decode6Bits( $chunk[ 3 ] );
+            $c3 = self::decode6Bits( $chunk[ 4 ] );
 
             $dest .= pack(
                 'CCC',
-                ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                ((($c1 << 4) | ($c2 >> 2)) & 0xff),
-                ((($c2 << 6) |  $c3      ) & 0xff)
+                ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff ),
+                ( ( ( $c2 << 6 ) | $c3 ) & 0xff )
             );
-            $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
+            $err |= ( $c0 | $c1 | $c2 | $c3 ) >> 8;
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $c0 = self::decode6Bits($chunk[1]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
 
-            if ($i + 2 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
-                $c2 = self::decode6Bits($chunk[3]);
+            if ( $i + 2 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
+                $c2 = self::decode6Bits( $chunk[ 3 ] );
                 $dest .= pack(
                     'CC',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                    ((($c1 << 4) | ($c2 >> 2)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                    ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1 | $c2) >> 8;
-            } elseif ($i + 1 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
+                $err |= ( $c0 | $c1 | $c2 ) >> 8;
+            } elseif ( $i + 1 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
                 $dest .= pack(
                     'C',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1) >> 8;
-            } elseif ($i < $srcLen && $strictPadding) {
+                $err |= ( $c0 | $c1 ) >> 8;
+            } elseif ( $i < $srcLen && $strictPadding ) {
                 $err |= 1;
             }
         }
         /** @var bool $check */
-        $check = ($err === 0);
-        if (!$check) {
+        $check = ( $err === 0 );
+        if ( ! $check ) {
             throw new RangeException(
                 'Base64::decode() only expects characters in the correct base64 alphabet'
             );
@@ -200,7 +200,7 @@ 
      * @param int $src
      * @return int
      */
-    abstract protected static function decode6Bits($src);
+    abstract protected static function decode6Bits( $src );
 
     /**
      * Uses bitwise operators instead of table-lookups to turn 8-bit integers
@@ -209,5 +209,5 @@ 
      * @param int $src
      * @return string
      */
-    abstract protected static function encode6Bits($src);
+    abstract protected static function encode6Bits( $src );
 }

vendor/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php

Spacing +76 added lines, -76 removed lines

@@ -18,9 +18,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encode($src)
+    public static function encode( $src )
     {
-        return self::doEncode($src, true);
+        return self::doEncode( $src, true );
     }
 
     /**
@@ -32,9 +32,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded($src)
+    public static function encodeUnpadded( $src )
     {
-        return self::doEncode($src, false);
+        return self::doEncode( $src, false );
     }
 
     /**
@@ -43,43 +43,43 @@ 
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode($src, $pad = true)
+    protected static function doEncode( $src, $pad = true )
     {
         $dest = '';
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         // Main loop (no padding):
-        for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
+        for ( $i = 0; $i + 3 <= $srcLen; $i += 3 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 3));
-            $b0 = $chunk[1];
-            $b1 = $chunk[2];
-            $b2 = $chunk[3];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 3 ) );
+            $b0 = $chunk[ 1 ];
+            $b1 = $chunk[ 2 ];
+            $b2 = $chunk[ 3 ];
 
             $dest .=
-                self::encode6Bits(               $b0 >> 2       ) .
-                self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                self::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
-                self::encode6Bits(  $b2                     & 63);
+                self::encode6Bits( $b0 >> 2 ) .
+                self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                self::encode6Bits( ( ( $b1 << 2 ) | ( $b2 >> 6 ) ) & 63 ) .
+                self::encode6Bits( $b2 & 63 );
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $b0 = $chunk[1];
-            if ($i + 1 < $srcLen) {
-                $b1 = $chunk[2];
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $b0 = $chunk[ 1 ];
+            if ( $i + 1 < $srcLen ) {
+                $b1 = $chunk[ 2 ];
                 $dest .=
-                    self::encode6Bits($b0 >> 2) .
-                    self::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    self::encode6Bits(($b1 << 2) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( ( $b0 << 4 ) | ( $b1 >> 4 ) ) & 63 ) .
+                    self::encode6Bits( ( $b1 << 2 ) & 63 );
+                if ( $pad ) {
                     $dest .= '=';
                 }
             } else {
                 $dest .=
-                    self::encode6Bits( $b0 >> 2) .
-                    self::encode6Bits(($b0 << 4) & 63);
-                if ($pad) {
+                    self::encode6Bits( $b0 >> 2 ) .
+                    self::encode6Bits( ( $b0 << 4 ) & 63 );
+                if ( $pad ) {
                     $dest .= '==';
                 }
             }
@@ -99,86 +99,86 @@ 
      * @throws TypeError
      * @psalm-suppress RedundantCondition
      */
-    public static function decode($src, $strictPadding = false)
+    public static function decode( $src, $strictPadding = false )
     {
         // Remove padding
-        $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
-        if ($srcLen === 0) {
+        $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
+        if ( $srcLen === 0 ) {
             return '';
         }
 
-        if ($strictPadding) {
-            if (($srcLen & 3) === 0) {
-                if ($src[$srcLen - 1] === '=') {
+        if ( $strictPadding ) {
+            if ( ( $srcLen & 3 ) === 0 ) {
+                if ( $src[ $srcLen - 1 ] === '=' ) {
                     $srcLen--;
-                    if ($src[$srcLen - 1] === '=') {
+                    if ( $src[ $srcLen - 1 ] === '=' ) {
                         $srcLen--;
                     }
                 }
             }
-            if (($srcLen & 3) === 1) {
+            if ( ( $srcLen & 3 ) === 1 ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
-            if ($src[$srcLen - 1] === '=') {
+            if ( $src[ $srcLen - 1 ] === '=' ) {
                 throw new RangeException(
                     'Incorrect padding'
                 );
             }
         } else {
-            $src = rtrim($src, '=');
-            $srcLen =  ParagonIE_Sodium_Core_Util::strlen($src);
+            $src = rtrim( $src, '=' );
+            $srcLen = ParagonIE_Sodium_Core_Util::strlen( $src );
         }
 
         $err = 0;
         $dest = '';
         // Main loop (no padding):
-        for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
+        for ( $i = 0; $i + 4 <= $srcLen; $i += 4 ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, 4));
-            $c0 = self::decode6Bits($chunk[1]);
-            $c1 = self::decode6Bits($chunk[2]);
-            $c2 = self::decode6Bits($chunk[3]);
-            $c3 = self::decode6Bits($chunk[4]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, 4 ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
+            $c1 = self::decode6Bits( $chunk[ 2 ] );
+            $c2 = self::decode6Bits( $chunk[ 3 ] );
+            $c3 = self::decode6Bits( $chunk[ 4 ] );
 
             $dest .= pack(
                 'CCC',
-                ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                ((($c1 << 4) | ($c2 >> 2)) & 0xff),
-                ((($c2 << 6) | $c3) & 0xff)
+                ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff ),
+                ( ( ( $c2 << 6 ) | $c3 ) & 0xff )
             );
-            $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
+            $err |= ( $c0 | $c1 | $c2 | $c3 ) >> 8;
         }
         // The last chunk, which may have padding:
-        if ($i < $srcLen) {
+        if ( $i < $srcLen ) {
             /** @var array<int, int> $chunk */
-            $chunk = unpack('C*', ParagonIE_Sodium_Core_Util::substr($src, $i, $srcLen - $i));
-            $c0 = self::decode6Bits($chunk[1]);
+            $chunk = unpack( 'C*', ParagonIE_Sodium_Core_Util::substr( $src, $i, $srcLen - $i ) );
+            $c0 = self::decode6Bits( $chunk[ 1 ] );
 
-            if ($i + 2 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
-                $c2 = self::decode6Bits($chunk[3]);
+            if ( $i + 2 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
+                $c2 = self::decode6Bits( $chunk[ 3 ] );
                 $dest .= pack(
                     'CC',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                    ((($c1 << 4) | ($c2 >> 2)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff ),
+                    ( ( ( $c1 << 4 ) | ( $c2 >> 2 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1 | $c2) >> 8;
-            } elseif ($i + 1 < $srcLen) {
-                $c1 = self::decode6Bits($chunk[2]);
+                $err |= ( $c0 | $c1 | $c2 ) >> 8;
+            } elseif ( $i + 1 < $srcLen ) {
+                $c1 = self::decode6Bits( $chunk[ 2 ] );
                 $dest .= pack(
                     'C',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff)
+                    ( ( ( $c0 << 2 ) | ( $c1 >> 4 ) ) & 0xff )
                 );
-                $err |= ($c0 | $c1) >> 8;
-            } elseif ($i < $srcLen && $strictPadding) {
+                $err |= ( $c0 | $c1 ) >> 8;
+            } elseif ( $i < $srcLen && $strictPadding ) {
                 $err |= 1;
             }
         }
         /** @var bool $check */
-        $check = ($err === 0);
-        if (!$check) {
+        $check = ( $err === 0 );
+        if ( ! $check ) {
             throw new RangeException(
                 'Base64::decode() only expects characters in the correct base64 alphabet'
             );
@@ -197,24 +197,24 @@ 
      * @param int $src
      * @return int
      */
-    protected static function decode6Bits($src)
+    protected static function decode6Bits( $src )
     {
         $ret = -1;
 
         // if ($src > 0x40 && $src < 0x5b) $ret += $src - 0x41 + 1; // -64
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 64);
+        $ret += ( ( ( 0x40 - $src ) & ( $src - 0x5b ) ) >> 8 ) & ( $src - 64 );
 
         // if ($src > 0x60 && $src < 0x7b) $ret += $src - 0x61 + 26 + 1; // -70
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 70);
+        $ret += ( ( ( 0x60 - $src ) & ( $src - 0x7b ) ) >> 8 ) & ( $src - 70 );
 
         // if ($src > 0x2f && $src < 0x3a) $ret += $src - 0x30 + 52 + 1; // 5
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src + 5);
+        $ret += ( ( ( 0x2f - $src ) & ( $src - 0x3a ) ) >> 8 ) & ( $src + 5 );
 
         // if ($src == 0x2c) $ret += 62 + 1;
-        $ret += (((0x2c - $src) & ($src - 0x2e)) >> 8) & 63;
+        $ret += ( ( ( 0x2c - $src ) & ( $src - 0x2e ) ) >> 8 ) & 63;
 
         // if ($src == 0x5f) ret += 63 + 1;
-        $ret += (((0x5e - $src) & ($src - 0x60)) >> 8) & 64;
+        $ret += ( ( ( 0x5e - $src ) & ( $src - 0x60 ) ) >> 8 ) & 64;
 
         return $ret;
     }
@@ -226,22 +226,22 @@ 
      * @param int $src
      * @return string
      */
-    protected static function encode6Bits($src)
+    protected static function encode6Bits( $src )
     {
         $diff = 0x41;
 
         // if ($src > 25) $diff += 0x61 - 0x41 - 26; // 6
-        $diff += ((25 - $src) >> 8) & 6;
+        $diff += ( ( 25 - $src ) >> 8 ) & 6;
 
         // if ($src > 51) $diff += 0x30 - 0x61 - 26; // -75
-        $diff -= ((51 - $src) >> 8) & 75;
+        $diff -= ( ( 51 - $src ) >> 8 ) & 75;
 
         // if ($src > 61) $diff += 0x2d - 0x30 - 10; // -13
-        $diff -= ((61 - $src) >> 8) & 13;
+        $diff -= ( ( 61 - $src ) >> 8 ) & 13;
 
         // if ($src > 62) $diff += 0x5f - 0x2b - 1; // 3
-        $diff += ((62 - $src) >> 8) & 49;
+        $diff += ( ( 62 - $src ) >> 8 ) & 49;
 
-        return pack('C', $src + $diff);
+        return pack( 'C', $src + $diff );
     }
 }

vendor/paragonie/sodium_compat/src/Core/SecretStream/State.php

Spacing +23 added lines, -23 removed lines

@@ -22,15 +22,15 @@ 
      * @param string $key
      * @param string|null $nonce
      */
-    public function __construct($key, $nonce = null)
+    public function __construct( $key, $nonce = null )
     {
         $this->key = $key;
         $this->counter = 1;
-        if (is_null($nonce)) {
-            $nonce = str_repeat("\0", 12);
+        if ( is_null( $nonce ) ) {
+            $nonce = str_repeat( "\0", 12 );
         }
-        $this->nonce = str_pad($nonce, 12, "\0", STR_PAD_RIGHT);;
-        $this->_pad = str_repeat("\0", 4);
+        $this->nonce = str_pad( $nonce, 12, "\0", STR_PAD_RIGHT ); ;
+        $this->_pad = str_repeat( "\0", 4 );
     }
 
     /**
@@ -39,7 +39,7 @@ 
     public function counterReset()
     {
         $this->counter = 1;
-        $this->_pad = str_repeat("\0", 4);
+        $this->_pad = str_repeat( "\0", 4 );
         return $this;
     }
 
@@ -56,7 +56,7 @@ 
      */
     public function getCounter()
     {
-        return ParagonIE_Sodium_Core_Util::store32_le($this->counter);
+        return ParagonIE_Sodium_Core_Util::store32_le( $this->counter );
     }
 
     /**
@@ -64,11 +64,11 @@ 
      */
     public function getNonce()
     {
-        if (!is_string($this->nonce)) {
-            $this->nonce = str_repeat("\0", 12);
+        if ( ! is_string( $this->nonce ) ) {
+            $this->nonce = str_repeat( "\0", 12 );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($this->nonce) !== 12) {
-            $this->nonce = str_pad($this->nonce, 12, "\0", STR_PAD_RIGHT);
+        if ( ParagonIE_Sodium_Core_Util::strlen( $this->nonce ) !== 12 ) {
+            $this->nonce = str_pad( $this->nonce, 12, "\0", STR_PAD_RIGHT );
         }
         return $this->nonce;
     }
@@ -79,7 +79,7 @@ 
     public function getCombinedNonce()
     {
         return $this->getCounter() .
-            ParagonIE_Sodium_Core_Util::substr($this->getNonce(), 0, 8);
+            ParagonIE_Sodium_Core_Util::substr( $this->getNonce(), 0, 8 );
     }
 
     /**
@@ -96,18 +96,18 @@ 
      */
     public function needsRekey()
     {
-        return ($this->counter & 0xffff) === 0;
+        return ( $this->counter & 0xffff ) === 0;
     }
 
     /**
      * @param string $newKeyAndNonce
      * @return self
      */
-    public function rekey($newKeyAndNonce)
+    public function rekey( $newKeyAndNonce )
     {
-        $this->key = ParagonIE_Sodium_Core_Util::substr($newKeyAndNonce, 0, 32);
+        $this->key = ParagonIE_Sodium_Core_Util::substr( $newKeyAndNonce, 0, 32 );
         $this->nonce = str_pad(
-            ParagonIE_Sodium_Core_Util::substr($newKeyAndNonce, 32),
+            ParagonIE_Sodium_Core_Util::substr( $newKeyAndNonce, 32 ),
             12,
             "\0",
             STR_PAD_RIGHT
@@ -119,12 +119,12 @@ 
      * @param string $str
      * @return self
      */
-    public function xorNonce($str)
+    public function xorNonce( $str )
     {
         $this->nonce = ParagonIE_Sodium_Core_Util::xorStrings(
             $this->getNonce(),
             str_pad(
-                ParagonIE_Sodium_Core_Util::substr($str, 0, 8),
+                ParagonIE_Sodium_Core_Util::substr( $str, 0, 8 ),
                 12,
                 "\0",
                 STR_PAD_RIGHT
@@ -137,16 +137,16 @@ 
      * @param string $string
      * @return self
      */
-    public static function fromString($string)
+    public static function fromString( $string )
     {
         $state = new ParagonIE_Sodium_Core_SecretStream_State(
-            ParagonIE_Sodium_Core_Util::substr($string, 0, 32)
+            ParagonIE_Sodium_Core_Util::substr( $string, 0, 32 )
         );
         $state->counter = ParagonIE_Sodium_Core_Util::load_4(
-            ParagonIE_Sodium_Core_Util::substr($string, 32, 4)
+            ParagonIE_Sodium_Core_Util::substr( $string, 32, 4 )
         );
-        $state->nonce = ParagonIE_Sodium_Core_Util::substr($string, 36, 12);
-        $state->_pad = ParagonIE_Sodium_Core_Util::substr($string, 48, 8);
+        $state->nonce = ParagonIE_Sodium_Core_Util::substr( $string, 36, 12 );
+        $state->_pad = ParagonIE_Sodium_Core_Util::substr( $string, 48, 8 );
         return $state;
     }
 

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

Spacing +110 added lines, -110 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Salsa20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Salsa20', false ) ) {
     return;
 }
 
@@ -22,75 +22,75 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function core_salsa20($in, $k, $c = null)
+    public static function core_salsa20( $in, $k, $c = null )
     {
-        if (self::strlen($k) < 32) {
-            throw new RangeException('Key must be 32 bytes long');
+        if ( self::strlen( $k ) < 32 ) {
+            throw new RangeException( 'Key must be 32 bytes long' );
         }
-        if ($c === null) {
+        if ( $c === null ) {
             $j0  = $x0  = 0x61707865;
             $j5  = $x5  = 0x3320646e;
             $j10 = $x10 = 0x79622d32;
             $j15 = $x15 = 0x6b206574;
         } else {
-            $j0  = $x0  = self::load_4(self::substr($c, 0, 4));
-            $j5  = $x5  = self::load_4(self::substr($c, 4, 4));
-            $j10 = $x10 = self::load_4(self::substr($c, 8, 4));
-            $j15 = $x15 = self::load_4(self::substr($c, 12, 4));
+            $j0  = $x0  = self::load_4( self::substr( $c, 0, 4 ) );
+            $j5  = $x5  = self::load_4( self::substr( $c, 4, 4 ) );
+            $j10 = $x10 = self::load_4( self::substr( $c, 8, 4 ) );
+            $j15 = $x15 = self::load_4( self::substr( $c, 12, 4 ) );
         }
-        $j1  = $x1  = self::load_4(self::substr($k, 0, 4));
-        $j2  = $x2  = self::load_4(self::substr($k, 4, 4));
-        $j3  = $x3  = self::load_4(self::substr($k, 8, 4));
-        $j4  = $x4  = self::load_4(self::substr($k, 12, 4));
-        $j6  = $x6  = self::load_4(self::substr($in, 0, 4));
-        $j7  = $x7  = self::load_4(self::substr($in, 4, 4));
-        $j8  = $x8  = self::load_4(self::substr($in, 8, 4));
-        $j9  = $x9  = self::load_4(self::substr($in, 12, 4));
-        $j11 = $x11 = self::load_4(self::substr($k, 16, 4));
-        $j12 = $x12 = self::load_4(self::substr($k, 20, 4));
-        $j13 = $x13 = self::load_4(self::substr($k, 24, 4));
-        $j14 = $x14 = self::load_4(self::substr($k, 28, 4));
+        $j1  = $x1  = self::load_4( self::substr( $k, 0, 4 ) );
+        $j2  = $x2  = self::load_4( self::substr( $k, 4, 4 ) );
+        $j3  = $x3  = self::load_4( self::substr( $k, 8, 4 ) );
+        $j4  = $x4  = self::load_4( self::substr( $k, 12, 4 ) );
+        $j6  = $x6  = self::load_4( self::substr( $in, 0, 4 ) );
+        $j7  = $x7  = self::load_4( self::substr( $in, 4, 4 ) );
+        $j8  = $x8  = self::load_4( self::substr( $in, 8, 4 ) );
+        $j9  = $x9  = self::load_4( self::substr( $in, 12, 4 ) );
+        $j11 = $x11 = self::load_4( self::substr( $k, 16, 4 ) );
+        $j12 = $x12 = self::load_4( self::substr( $k, 20, 4 ) );
+        $j13 = $x13 = self::load_4( self::substr( $k, 24, 4 ) );
+        $j14 = $x14 = self::load_4( self::substr( $k, 28, 4 ) );
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4 ^= self::rotate($x0 + $x12, 7);
-            $x8 ^= self::rotate($x4 + $x0, 9);
-            $x12 ^= self::rotate($x8 + $x4, 13);
-            $x0 ^= self::rotate($x12 + $x8, 18);
+        for ( $i = self::ROUNDS; $i > 0; $i -= 2 ) {
+            $x4 ^= self::rotate( $x0 + $x12, 7 );
+            $x8 ^= self::rotate( $x4 + $x0, 9 );
+            $x12 ^= self::rotate( $x8 + $x4, 13 );
+            $x0 ^= self::rotate( $x12 + $x8, 18 );
 
-            $x9 ^= self::rotate($x5 + $x1, 7);
-            $x13 ^= self::rotate($x9 + $x5, 9);
-            $x1 ^= self::rotate($x13 + $x9, 13);
-            $x5 ^= self::rotate($x1 + $x13, 18);
+            $x9 ^= self::rotate( $x5 + $x1, 7 );
+            $x13 ^= self::rotate( $x9 + $x5, 9 );
+            $x1 ^= self::rotate( $x13 + $x9, 13 );
+            $x5 ^= self::rotate( $x1 + $x13, 18 );
 
-            $x14 ^= self::rotate($x10 + $x6, 7);
-            $x2 ^= self::rotate($x14 + $x10, 9);
-            $x6 ^= self::rotate($x2 + $x14, 13);
-            $x10 ^= self::rotate($x6 + $x2, 18);
+            $x14 ^= self::rotate( $x10 + $x6, 7 );
+            $x2 ^= self::rotate( $x14 + $x10, 9 );
+            $x6 ^= self::rotate( $x2 + $x14, 13 );
+            $x10 ^= self::rotate( $x6 + $x2, 18 );
 
-            $x3 ^= self::rotate($x15 + $x11, 7);
-            $x7 ^= self::rotate($x3 + $x15, 9);
-            $x11 ^= self::rotate($x7 + $x3, 13);
-            $x15 ^= self::rotate($x11 + $x7, 18);
+            $x3 ^= self::rotate( $x15 + $x11, 7 );
+            $x7 ^= self::rotate( $x3 + $x15, 9 );
+            $x11 ^= self::rotate( $x7 + $x3, 13 );
+            $x15 ^= self::rotate( $x11 + $x7, 18 );
 
-            $x1 ^= self::rotate($x0 + $x3, 7);
-            $x2 ^= self::rotate($x1 + $x0, 9);
-            $x3 ^= self::rotate($x2 + $x1, 13);
-            $x0 ^= self::rotate($x3 + $x2, 18);
+            $x1 ^= self::rotate( $x0 + $x3, 7 );
+            $x2 ^= self::rotate( $x1 + $x0, 9 );
+            $x3 ^= self::rotate( $x2 + $x1, 13 );
+            $x0 ^= self::rotate( $x3 + $x2, 18 );
 
-            $x6 ^= self::rotate($x5 + $x4, 7);
-            $x7 ^= self::rotate($x6 + $x5, 9);
-            $x4 ^= self::rotate($x7 + $x6, 13);
-            $x5 ^= self::rotate($x4 + $x7, 18);
+            $x6 ^= self::rotate( $x5 + $x4, 7 );
+            $x7 ^= self::rotate( $x6 + $x5, 9 );
+            $x4 ^= self::rotate( $x7 + $x6, 13 );
+            $x5 ^= self::rotate( $x4 + $x7, 18 );
 
-            $x11 ^= self::rotate($x10 + $x9, 7);
-            $x8 ^= self::rotate($x11 + $x10, 9);
-            $x9 ^= self::rotate($x8 + $x11, 13);
-            $x10 ^= self::rotate($x9 + $x8, 18);
+            $x11 ^= self::rotate( $x10 + $x9, 7 );
+            $x8 ^= self::rotate( $x11 + $x10, 9 );
+            $x9 ^= self::rotate( $x8 + $x11, 13 );
+            $x10 ^= self::rotate( $x9 + $x8, 18 );
 
-            $x12 ^= self::rotate($x15 + $x14, 7);
-            $x13 ^= self::rotate($x12 + $x15, 9);
-            $x14 ^= self::rotate($x13 + $x12, 13);
-            $x15 ^= self::rotate($x14 + $x13, 18);
+            $x12 ^= self::rotate( $x15 + $x14, 7 );
+            $x13 ^= self::rotate( $x12 + $x15, 9 );
+            $x14 ^= self::rotate( $x13 + $x12, 13 );
+            $x15 ^= self::rotate( $x14 + $x13, 18 );
         }
 
         $x0  += $j0;
@@ -110,22 +110,22 @@ 
         $x14 += $j14;
         $x15 += $j15;
 
-        return self::store32_le($x0) .
-            self::store32_le($x1) .
-            self::store32_le($x2) .
-            self::store32_le($x3) .
-            self::store32_le($x4) .
-            self::store32_le($x5) .
-            self::store32_le($x6) .
-            self::store32_le($x7) .
-            self::store32_le($x8) .
-            self::store32_le($x9) .
-            self::store32_le($x10) .
-            self::store32_le($x11) .
-            self::store32_le($x12) .
-            self::store32_le($x13) .
-            self::store32_le($x14) .
-            self::store32_le($x15);
+        return self::store32_le( $x0 ) .
+            self::store32_le( $x1 ) .
+            self::store32_le( $x2 ) .
+            self::store32_le( $x3 ) .
+            self::store32_le( $x4 ) .
+            self::store32_le( $x5 ) .
+            self::store32_le( $x6 ) .
+            self::store32_le( $x7 ) .
+            self::store32_le( $x8 ) .
+            self::store32_le( $x9 ) .
+            self::store32_le( $x10 ) .
+            self::store32_le( $x11 ) .
+            self::store32_le( $x12 ) .
+            self::store32_le( $x13 ) .
+            self::store32_le( $x14 ) .
+            self::store32_le( $x15 );
     }
 
     /**
@@ -138,35 +138,35 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function salsa20($len, $nonce, $key)
+    public static function salsa20( $len, $nonce, $key )
     {
-        if (self::strlen($key) !== 32) {
-            throw new RangeException('Key must be 32 bytes long');
+        if ( self::strlen( $key ) !== 32 ) {
+            throw new RangeException( 'Key must be 32 bytes long' );
         }
         $kcopy = '' . $key;
-        $in = self::substr($nonce, 0, 8) . str_repeat("\0", 8);
+        $in = self::substr( $nonce, 0, 8 ) . str_repeat( "\0", 8 );
         $c = '';
-        while ($len >= 64) {
-            $c .= self::core_salsa20($in, $kcopy, null);
+        while ( $len >= 64 ) {
+            $c .= self::core_salsa20( $in, $kcopy, null );
             $u = 1;
             // Internal counter.
-            for ($i = 8; $i < 16; ++$i) {
-                $u += self::chrToInt($in[$i]);
-                $in[$i] = self::intToChr($u & 0xff);
+            for ( $i = 8; $i < 16; ++$i ) {
+                $u += self::chrToInt( $in[ $i ] );
+                $in[ $i ] = self::intToChr( $u & 0xff );
                 $u >>= 8;
             }
             $len -= 64;
         }
-        if ($len > 0) {
+        if ( $len > 0 ) {
             $c .= self::substr(
-                self::core_salsa20($in, $kcopy, null),
+                self::core_salsa20( $in, $kcopy, null ),
                 0,
                 $len
             );
         }
         try {
-            ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $kcopy );
+        } catch ( SodiumException $ex ) {
             $kcopy = null;
         }
         return $c;
@@ -183,46 +183,46 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function salsa20_xor_ic($m, $n, $ic, $k)
+    public static function salsa20_xor_ic( $m, $n, $ic, $k )
     {
-        $mlen = self::strlen($m);
-        if ($mlen < 1) {
+        $mlen = self::strlen( $m );
+        if ( $mlen < 1 ) {
             return '';
         }
-        $kcopy = self::substr($k, 0, 32);
-        $in = self::substr($n, 0, 8);
+        $kcopy = self::substr( $k, 0, 32 );
+        $in = self::substr( $n, 0, 8 );
         // Initialize the counter
-        $in .= ParagonIE_Sodium_Core_Util::store64_le($ic);
+        $in .= ParagonIE_Sodium_Core_Util::store64_le( $ic );
 
         $c = '';
-        while ($mlen >= 64) {
-            $block = self::core_salsa20($in, $kcopy, null);
+        while ( $mlen >= 64 ) {
+            $block = self::core_salsa20( $in, $kcopy, null );
             $c .= self::xorStrings(
-                self::substr($m, 0, 64),
-                self::substr($block, 0, 64)
+                self::substr( $m, 0, 64 ),
+                self::substr( $block, 0, 64 )
             );
             $u = 1;
-            for ($i = 8; $i < 16; ++$i) {
-                $u += self::chrToInt($in[$i]);
-                $in[$i] = self::intToChr($u & 0xff);
+            for ( $i = 8; $i < 16; ++$i ) {
+                $u += self::chrToInt( $in[ $i ] );
+                $in[ $i ] = self::intToChr( $u & 0xff );
                 $u >>= 8;
             }
 
             $mlen -= 64;
-            $m = self::substr($m, 64);
+            $m = self::substr( $m, 64 );
         }
 
-        if ($mlen) {
-            $block = self::core_salsa20($in, $kcopy, null);
+        if ( $mlen ) {
+            $block = self::core_salsa20( $in, $kcopy, null );
             $c .= self::xorStrings(
-                self::substr($m, 0, $mlen),
-                self::substr($block, 0, $mlen)
+                self::substr( $m, 0, $mlen ),
+                self::substr( $block, 0, $mlen )
             );
         }
         try {
-            ParagonIE_Sodium_Compat::memzero($block);
-            ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block );
+            ParagonIE_Sodium_Compat::memzero( $kcopy );
+        } catch ( SodiumException $ex ) {
             $block = null;
             $kcopy = null;
         }
@@ -240,12 +240,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function salsa20_xor($message, $nonce, $key)
+    public static function salsa20_xor( $message, $nonce, $key )
     {
         return self::xorStrings(
             $message,
             self::salsa20(
-                self::strlen($message),
+                self::strlen( $message ),
                 $nonce,
                 $key
             )
@@ -259,14 +259,14 @@ 
      * @param int $c
      * @return int
      */
-    public static function rotate($u, $c)
+    public static function rotate( $u, $c )
     {
         $u &= 0xffffffff;
         $c %= 32;
-        return (int) (0xffffffff & (
-                ($u << $c)
+        return (int)( 0xffffffff & (
+                ( $u << $c )
                     |
-                ($u >> (32 - $c))
+                ( $u >> ( 32 - $c ) )
             )
         );
     }