WordPoints / wordpoints

src/library/sodium_compat/src/Core32/XChaCha20.php

Indentation +50 added lines, -50 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_XChaCha20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,54 +9,54 @@ 
  */
 class ParagonIE_Sodium_Core32_XChaCha20 extends ParagonIE_Sodium_Core32_HChaCha20
 {
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws Exception
-     */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new Exception('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
-                self::hChaCha20(
-                    self::substr($nonce, 0, 16),
-                    $key
-                ),
-                self::substr($nonce, 16, 8)
-            ),
-            str_repeat("\x00", $len)
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function stream($len = 64, $nonce = '', $key = '')
+	{
+		if (self::strlen($nonce) !== 24) {
+			throw new Exception('Nonce must be 24 bytes long');
+		}
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
+				self::hChaCha20(
+					self::substr($nonce, 0, 16),
+					$key
+				),
+				self::substr($nonce, 16, 8)
+			),
+			str_repeat("\x00", $len)
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     * @throws Exception
-     */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new Exception('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
-                self::hChaCha20(self::substr($nonce, 0, 16), $key),
-                self::substr($nonce, 16, 8),
-                $ic
-            ),
-            $message
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @param string $ic
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+	{
+		if (self::strlen($nonce) !== 24) {
+			throw new Exception('Nonce must be 24 bytes long');
+		}
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
+				self::hChaCha20(self::substr($nonce, 0, 16), $key),
+				self::substr($nonce, 16, 8),
+				$ic
+			),
+			$message
+		);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_XChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_XChaCha20', false ) ) {
     return;
 }
 
@@ -18,20 +18,20 @@ 
      * @return string
      * @throws Exception
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
+    public static function stream( $len = 64, $nonce = '', $key = '' )
     {
-        if (self::strlen($nonce) !== 24) {
-            throw new Exception('Nonce must be 24 bytes long');
+        if ( self::strlen( $nonce ) !== 24 ) {
+            throw new Exception( 'Nonce must be 24 bytes long' );
         }
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
                 self::hChaCha20(
-                    self::substr($nonce, 0, 16),
+                    self::substr( $nonce, 0, 16 ),
                     $key
                 ),
-                self::substr($nonce, 16, 8)
+                self::substr( $nonce, 16, 8 )
             ),
-            str_repeat("\x00", $len)
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -45,15 +45,15 @@ 
      * @return string
      * @throws Exception
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
-        if (self::strlen($nonce) !== 24) {
-            throw new Exception('Nonce must be 24 bytes long');
+        if ( self::strlen( $nonce ) !== 24 ) {
+            throw new Exception( 'Nonce must be 24 bytes long' );
         }
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
-                self::hChaCha20(self::substr($nonce, 0, 16), $key),
-                self::substr($nonce, 16, 8),
+                self::hChaCha20( self::substr( $nonce, 0, 16 ), $key ),
+                self::substr( $nonce, 16, 8 ),
                 $ic
             ),
             $message

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_XChaCha20
  */
-class ParagonIE_Sodium_Core32_XChaCha20 extends ParagonIE_Sodium_Core32_HChaCha20
-{
+class ParagonIE_Sodium_Core32_XChaCha20 extends ParagonIE_Sodium_Core32_HChaCha20 {
     /**
      * @internal You should not use this directly from another application
      *
@@ -18,8 +17,7 @@ 
      * @return string
      * @throws Exception
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
+    public static function stream($len = 64, $nonce = '', $key = '') {
         if (self::strlen($nonce) !== 24) {
             throw new Exception('Nonce must be 24 bytes long');
         }
@@ -45,8 +43,7 @@ 
      * @return string
      * @throws Exception
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '') {
         if (self::strlen($nonce) !== 24) {
             throw new Exception('Nonce must be 24 bytes long');
         }

src/library/sodium_compat/src/Core32/SipHash.php

Indentation +224 added lines, -224 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_SipHash', false)) {
-    return;
+	return;
 }
 
 /**
@@ -11,227 +11,227 @@ 
  */
 class ParagonIE_Sodium_Core32_SipHash extends ParagonIE_Sodium_Core32_Util
 {
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param array<int, ParagonIE_Sodium_Core32_Int64> $v
-     * @return array<int, ParagonIE_Sodium_Core32_Int64>
-     */
-    public static function sipRound(array $v)
-    {
-        # v0 += v1;
-        $v[0] = $v[0]->addInt64($v[1]);
-
-        # v1 = ROTL(v1, 13);
-        $v[1] = $v[1]->rotateLeft(13);
-
-        #  v1 ^= v0;
-        $v[1] = $v[1]->xorInt64($v[0]);
-
-        #  v0=ROTL(v0,32);
-        $v[0] = $v[0]->rotateLeft(32);
-
-        # v2 += v3;
-        $v[2] = $v[2]->addInt64($v[3]);
-
-        # v3=ROTL(v3,16);
-        $v[3] = $v[3]->rotateLeft(16);
-
-        #  v3 ^= v2;
-        $v[3] = $v[3]->xorInt64($v[2]);
-
-        # v0 += v3;
-        $v[0] = $v[0]->addInt64($v[3]);
-
-        # v3=ROTL(v3,21);
-        $v[3] = $v[3]->rotateLeft(21);
-
-        # v3 ^= v0;
-        $v[3] = $v[3]->xorInt64($v[0]);
-
-        # v2 += v1;
-        $v[2] = $v[2]->addInt64($v[1]);
-
-        # v1=ROTL(v1,17);
-        $v[1] = $v[1]->rotateLeft(17);
-
-        #  v1 ^= v2;
-        $v[1] = $v[1]->xorInt64($v[2]);
-
-        # v2=ROTL(v2,32)
-        $v[2] = $v[2]->rotateLeft(32);
-
-        return $v;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $in
-     * @param string $key
-     * @return string
-     */
-    public static function sipHash24($in, $key)
-    {
-        $inlen = self::strlen($in);
-
-        # /* "somepseudorandomlygeneratedbytes" */
-        # u64 v0 = 0x736f6d6570736575ULL;
-        # u64 v1 = 0x646f72616e646f6dULL;
-        # u64 v2 = 0x6c7967656e657261ULL;
-        # u64 v3 = 0x7465646279746573ULL;
-        $v = array(
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x736f, 0x6d65, 0x7073, 0x6575)
-            ),
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x646f, 0x7261, 0x6e64, 0x6f6d)
-            ),
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x6c79, 0x6765, 0x6e65, 0x7261)
-            ),
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x7465, 0x6462, 0x7974, 0x6573)
-            )
-        );
-
-        # u64 k0 = LOAD64_LE( k );
-        # u64 k1 = LOAD64_LE( k + 8 );
-        $k = array(
-            ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($key, 0, 8)
-            ),
-            ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($key, 8, 8)
-            )
-        );
-
-        # b = ( ( u64 )inlen ) << 56;
-        $b = new ParagonIE_Sodium_Core32_Int64(
-            array(($inlen << 8) & 0xffff, 0, 0, 0)
-        );
-
-        # v3 ^= k1;
-        $v[3] = $v[3]->xorInt64($k[1]);
-        # v2 ^= k0;
-        $v[2] = $v[2]->xorInt64($k[0]);
-        # v1 ^= k1;
-        $v[1] = $v[1]->xorInt64($k[1]);
-        # v0 ^= k0;
-        $v[0] = $v[0]->xorInt64($k[0]);
-
-        $left = $inlen;
-        # for ( ; in != end; in += 8 )
-        while ($left >= 8) {
-            # m = LOAD64_LE( in );
-            $m = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($in, 0, 8)
-            );
-
-            # v3 ^= m;
-            $v[3] = $v[3]->xorInt64($m);
-
-            # SIPROUND;
-            # SIPROUND;
-            $v = self::sipRound($v);
-            $v = self::sipRound($v);
-
-            # v0 ^= m;
-            $v[0] = $v[0]->xorInt64($m);
-
-            $in = self::substr($in, 8);
-            $left -= 8;
-        }
-
-        # switch( left )
-        #  {
-        #     case 7: b |= ( ( u64 )in[ 6] )  << 48;
-        #     case 6: b |= ( ( u64 )in[ 5] )  << 40;
-        #     case 5: b |= ( ( u64 )in[ 4] )  << 32;
-        #     case 4: b |= ( ( u64 )in[ 3] )  << 24;
-        #     case 3: b |= ( ( u64 )in[ 2] )  << 16;
-        #     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
-        #     case 1: b |= ( ( u64 )in[ 0] ); break;
-        #     case 0: break;
-        # }
-        switch ($left) {
-            case 7:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[6]) << 16
-                    )
-                );
-            case 6:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[5]) << 8
-                    )
-                );
-            case 5:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[4])
-                    )
-                );
-            case 4:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[3]) << 24, 0
-                    )
-                );
-            case 3:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[2]) << 16, 0
-                    )
-                );
-            case 2:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[1]) << 8, 0
-                    )
-                );
-            case 1:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[0]), 0
-                    )
-                );
-            case 0:
-                break;
-        }
-        // See docblock for why the 0th index gets the higher bits.
-
-        # v3 ^= b;
-        $v[3] = $v[3]->xorInt64($b);
-
-        # SIPROUND;
-        # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-
-        # v0 ^= b;
-        $v[0] = $v[0]->xorInt64($b);
-
-        // Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
-        # v2 ^= 0xff;
-        $v[2]->limbs[3] ^= 0xff;
-
-        # SIPROUND;
-        # SIPROUND;
-        # SIPROUND;
-        # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-
-        # b = v0 ^ v1 ^ v2 ^ v3;
-        # STORE64_LE( out, b );
-        return $v[0]
-            ->xorInt64($v[1])
-            ->xorInt64($v[2])
-            ->xorInt64($v[3])
-            ->toReverseString();
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param array<int, ParagonIE_Sodium_Core32_Int64> $v
+	 * @return array<int, ParagonIE_Sodium_Core32_Int64>
+	 */
+	public static function sipRound(array $v)
+	{
+		# v0 += v1;
+		$v[0] = $v[0]->addInt64($v[1]);
+
+		# v1 = ROTL(v1, 13);
+		$v[1] = $v[1]->rotateLeft(13);
+
+		#  v1 ^= v0;
+		$v[1] = $v[1]->xorInt64($v[0]);
+
+		#  v0=ROTL(v0,32);
+		$v[0] = $v[0]->rotateLeft(32);
+
+		# v2 += v3;
+		$v[2] = $v[2]->addInt64($v[3]);
+
+		# v3=ROTL(v3,16);
+		$v[3] = $v[3]->rotateLeft(16);
+
+		#  v3 ^= v2;
+		$v[3] = $v[3]->xorInt64($v[2]);
+
+		# v0 += v3;
+		$v[0] = $v[0]->addInt64($v[3]);
+
+		# v3=ROTL(v3,21);
+		$v[3] = $v[3]->rotateLeft(21);
+
+		# v3 ^= v0;
+		$v[3] = $v[3]->xorInt64($v[0]);
+
+		# v2 += v1;
+		$v[2] = $v[2]->addInt64($v[1]);
+
+		# v1=ROTL(v1,17);
+		$v[1] = $v[1]->rotateLeft(17);
+
+		#  v1 ^= v2;
+		$v[1] = $v[1]->xorInt64($v[2]);
+
+		# v2=ROTL(v2,32)
+		$v[2] = $v[2]->rotateLeft(32);
+
+		return $v;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $in
+	 * @param string $key
+	 * @return string
+	 */
+	public static function sipHash24($in, $key)
+	{
+		$inlen = self::strlen($in);
+
+		# /* "somepseudorandomlygeneratedbytes" */
+		# u64 v0 = 0x736f6d6570736575ULL;
+		# u64 v1 = 0x646f72616e646f6dULL;
+		# u64 v2 = 0x6c7967656e657261ULL;
+		# u64 v3 = 0x7465646279746573ULL;
+		$v = array(
+			new ParagonIE_Sodium_Core32_Int64(
+				array(0x736f, 0x6d65, 0x7073, 0x6575)
+			),
+			new ParagonIE_Sodium_Core32_Int64(
+				array(0x646f, 0x7261, 0x6e64, 0x6f6d)
+			),
+			new ParagonIE_Sodium_Core32_Int64(
+				array(0x6c79, 0x6765, 0x6e65, 0x7261)
+			),
+			new ParagonIE_Sodium_Core32_Int64(
+				array(0x7465, 0x6462, 0x7974, 0x6573)
+			)
+		);
+
+		# u64 k0 = LOAD64_LE( k );
+		# u64 k1 = LOAD64_LE( k + 8 );
+		$k = array(
+			ParagonIE_Sodium_Core32_Int64::fromReverseString(
+				self::substr($key, 0, 8)
+			),
+			ParagonIE_Sodium_Core32_Int64::fromReverseString(
+				self::substr($key, 8, 8)
+			)
+		);
+
+		# b = ( ( u64 )inlen ) << 56;
+		$b = new ParagonIE_Sodium_Core32_Int64(
+			array(($inlen << 8) & 0xffff, 0, 0, 0)
+		);
+
+		# v3 ^= k1;
+		$v[3] = $v[3]->xorInt64($k[1]);
+		# v2 ^= k0;
+		$v[2] = $v[2]->xorInt64($k[0]);
+		# v1 ^= k1;
+		$v[1] = $v[1]->xorInt64($k[1]);
+		# v0 ^= k0;
+		$v[0] = $v[0]->xorInt64($k[0]);
+
+		$left = $inlen;
+		# for ( ; in != end; in += 8 )
+		while ($left >= 8) {
+			# m = LOAD64_LE( in );
+			$m = ParagonIE_Sodium_Core32_Int64::fromReverseString(
+				self::substr($in, 0, 8)
+			);
+
+			# v3 ^= m;
+			$v[3] = $v[3]->xorInt64($m);
+
+			# SIPROUND;
+			# SIPROUND;
+			$v = self::sipRound($v);
+			$v = self::sipRound($v);
+
+			# v0 ^= m;
+			$v[0] = $v[0]->xorInt64($m);
+
+			$in = self::substr($in, 8);
+			$left -= 8;
+		}
+
+		# switch( left )
+		#  {
+		#     case 7: b |= ( ( u64 )in[ 6] )  << 48;
+		#     case 6: b |= ( ( u64 )in[ 5] )  << 40;
+		#     case 5: b |= ( ( u64 )in[ 4] )  << 32;
+		#     case 4: b |= ( ( u64 )in[ 3] )  << 24;
+		#     case 3: b |= ( ( u64 )in[ 2] )  << 16;
+		#     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
+		#     case 1: b |= ( ( u64 )in[ 0] ); break;
+		#     case 0: break;
+		# }
+		switch ($left) {
+			case 7:
+				$b = $b->orInt64(
+					ParagonIE_Sodium_Core32_Int64::fromInts(
+						0, self::chrToInt($in[6]) << 16
+					)
+				);
+			case 6:
+				$b = $b->orInt64(
+					ParagonIE_Sodium_Core32_Int64::fromInts(
+						0, self::chrToInt($in[5]) << 8
+					)
+				);
+			case 5:
+				$b = $b->orInt64(
+					ParagonIE_Sodium_Core32_Int64::fromInts(
+						0, self::chrToInt($in[4])
+					)
+				);
+			case 4:
+				$b = $b->orInt64(
+					ParagonIE_Sodium_Core32_Int64::fromInts(
+						self::chrToInt($in[3]) << 24, 0
+					)
+				);
+			case 3:
+				$b = $b->orInt64(
+					ParagonIE_Sodium_Core32_Int64::fromInts(
+						self::chrToInt($in[2]) << 16, 0
+					)
+				);
+			case 2:
+				$b = $b->orInt64(
+					ParagonIE_Sodium_Core32_Int64::fromInts(
+						self::chrToInt($in[1]) << 8, 0
+					)
+				);
+			case 1:
+				$b = $b->orInt64(
+					ParagonIE_Sodium_Core32_Int64::fromInts(
+						self::chrToInt($in[0]), 0
+					)
+				);
+			case 0:
+				break;
+		}
+		// See docblock for why the 0th index gets the higher bits.
+
+		# v3 ^= b;
+		$v[3] = $v[3]->xorInt64($b);
+
+		# SIPROUND;
+		# SIPROUND;
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+
+		# v0 ^= b;
+		$v[0] = $v[0]->xorInt64($b);
+
+		// Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
+		# v2 ^= 0xff;
+		$v[2]->limbs[3] ^= 0xff;
+
+		# SIPROUND;
+		# SIPROUND;
+		# SIPROUND;
+		# SIPROUND;
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+
+		# b = v0 ^ v1 ^ v2 ^ v3;
+		# STORE64_LE( out, b );
+		return $v[0]
+			->xorInt64($v[1])
+			->xorInt64($v[2])
+			->xorInt64($v[3])
+			->toReverseString();
+	}
 }

Spacing +55 added lines, -55 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_SipHash', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_SipHash', false ) ) {
     return;
 }
 
@@ -17,49 +17,49 @@ 
      * @param array<int, ParagonIE_Sodium_Core32_Int64> $v
      * @return array<int, ParagonIE_Sodium_Core32_Int64>
      */
-    public static function sipRound(array $v)
+    public static function sipRound( array $v )
     {
         # v0 += v1;
-        $v[0] = $v[0]->addInt64($v[1]);
+        $v[0] = $v[0]->addInt64( $v[1] );
 
         # v1 = ROTL(v1, 13);
-        $v[1] = $v[1]->rotateLeft(13);
+        $v[1] = $v[1]->rotateLeft( 13 );
 
         #  v1 ^= v0;
-        $v[1] = $v[1]->xorInt64($v[0]);
+        $v[1] = $v[1]->xorInt64( $v[0] );
 
         #  v0=ROTL(v0,32);
-        $v[0] = $v[0]->rotateLeft(32);
+        $v[0] = $v[0]->rotateLeft( 32 );
 
         # v2 += v3;
-        $v[2] = $v[2]->addInt64($v[3]);
+        $v[2] = $v[2]->addInt64( $v[3] );
 
         # v3=ROTL(v3,16);
-        $v[3] = $v[3]->rotateLeft(16);
+        $v[3] = $v[3]->rotateLeft( 16 );
 
         #  v3 ^= v2;
-        $v[3] = $v[3]->xorInt64($v[2]);
+        $v[3] = $v[3]->xorInt64( $v[2] );
 
         # v0 += v3;
-        $v[0] = $v[0]->addInt64($v[3]);
+        $v[0] = $v[0]->addInt64( $v[3] );
 
         # v3=ROTL(v3,21);
-        $v[3] = $v[3]->rotateLeft(21);
+        $v[3] = $v[3]->rotateLeft( 21 );
 
         # v3 ^= v0;
-        $v[3] = $v[3]->xorInt64($v[0]);
+        $v[3] = $v[3]->xorInt64( $v[0] );
 
         # v2 += v1;
-        $v[2] = $v[2]->addInt64($v[1]);
+        $v[2] = $v[2]->addInt64( $v[1] );
 
         # v1=ROTL(v1,17);
-        $v[1] = $v[1]->rotateLeft(17);
+        $v[1] = $v[1]->rotateLeft( 17 );
 
         #  v1 ^= v2;
-        $v[1] = $v[1]->xorInt64($v[2]);
+        $v[1] = $v[1]->xorInt64( $v[2] );
 
         # v2=ROTL(v2,32)
-        $v[2] = $v[2]->rotateLeft(32);
+        $v[2] = $v[2]->rotateLeft( 32 );
 
         return $v;
     }
@@ -71,9 +71,9 @@ 
      * @param string $key
      * @return string
      */
-    public static function sipHash24($in, $key)
+    public static function sipHash24( $in, $key )
     {
-        $inlen = self::strlen($in);
+        $inlen = self::strlen( $in );
 
         # /* "somepseudorandomlygeneratedbytes" */
         # u64 v0 = 0x736f6d6570736575ULL;
@@ -82,16 +82,16 @@ 
         # u64 v3 = 0x7465646279746573ULL;
         $v = array(
             new ParagonIE_Sodium_Core32_Int64(
-                array(0x736f, 0x6d65, 0x7073, 0x6575)
+                array( 0x736f, 0x6d65, 0x7073, 0x6575 )
             ),
             new ParagonIE_Sodium_Core32_Int64(
-                array(0x646f, 0x7261, 0x6e64, 0x6f6d)
+                array( 0x646f, 0x7261, 0x6e64, 0x6f6d )
             ),
             new ParagonIE_Sodium_Core32_Int64(
-                array(0x6c79, 0x6765, 0x6e65, 0x7261)
+                array( 0x6c79, 0x6765, 0x6e65, 0x7261 )
             ),
             new ParagonIE_Sodium_Core32_Int64(
-                array(0x7465, 0x6462, 0x7974, 0x6573)
+                array( 0x7465, 0x6462, 0x7974, 0x6573 )
             )
         );
 
@@ -99,47 +99,47 @@ 
         # u64 k1 = LOAD64_LE( k + 8 );
         $k = array(
             ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($key, 0, 8)
+                self::substr( $key, 0, 8 )
             ),
             ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($key, 8, 8)
+                self::substr( $key, 8, 8 )
             )
         );
 
         # b = ( ( u64 )inlen ) << 56;
         $b = new ParagonIE_Sodium_Core32_Int64(
-            array(($inlen << 8) & 0xffff, 0, 0, 0)
+            array( ( $inlen << 8 ) & 0xffff, 0, 0, 0 )
         );
 
         # v3 ^= k1;
-        $v[3] = $v[3]->xorInt64($k[1]);
+        $v[3] = $v[3]->xorInt64( $k[1] );
         # v2 ^= k0;
-        $v[2] = $v[2]->xorInt64($k[0]);
+        $v[2] = $v[2]->xorInt64( $k[0] );
         # v1 ^= k1;
-        $v[1] = $v[1]->xorInt64($k[1]);
+        $v[1] = $v[1]->xorInt64( $k[1] );
         # v0 ^= k0;
-        $v[0] = $v[0]->xorInt64($k[0]);
+        $v[0] = $v[0]->xorInt64( $k[0] );
 
         $left = $inlen;
         # for ( ; in != end; in += 8 )
-        while ($left >= 8) {
+        while ( $left >= 8 ) {
             # m = LOAD64_LE( in );
             $m = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($in, 0, 8)
+                self::substr( $in, 0, 8 )
             );
 
             # v3 ^= m;
-            $v[3] = $v[3]->xorInt64($m);
+            $v[3] = $v[3]->xorInt64( $m );
 
             # SIPROUND;
             # SIPROUND;
-            $v = self::sipRound($v);
-            $v = self::sipRound($v);
+            $v = self::sipRound( $v );
+            $v = self::sipRound( $v );
 
             # v0 ^= m;
-            $v[0] = $v[0]->xorInt64($m);
+            $v[0] = $v[0]->xorInt64( $m );
 
-            $in = self::substr($in, 8);
+            $in = self::substr( $in, 8 );
             $left -= 8;
         }
 
@@ -154,47 +154,47 @@ 
         #     case 1: b |= ( ( u64 )in[ 0] ); break;
         #     case 0: break;
         # }
-        switch ($left) {
+        switch ( $left ) {
             case 7:
                 $b = $b->orInt64(
                     ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[6]) << 16
+                        0, self::chrToInt( $in[6] ) << 16
                     )
                 );
             case 6:
                 $b = $b->orInt64(
                     ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[5]) << 8
+                        0, self::chrToInt( $in[5] ) << 8
                     )
                 );
             case 5:
                 $b = $b->orInt64(
                     ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[4])
+                        0, self::chrToInt( $in[4] )
                     )
                 );
             case 4:
                 $b = $b->orInt64(
                     ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[3]) << 24, 0
+                        self::chrToInt( $in[3] ) << 24, 0
                     )
                 );
             case 3:
                 $b = $b->orInt64(
                     ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[2]) << 16, 0
+                        self::chrToInt( $in[2] ) << 16, 0
                     )
                 );
             case 2:
                 $b = $b->orInt64(
                     ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[1]) << 8, 0
+                        self::chrToInt( $in[1] ) << 8, 0
                     )
                 );
             case 1:
                 $b = $b->orInt64(
                     ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[0]), 0
+                        self::chrToInt( $in[0] ), 0
                     )
                 );
             case 0:
@@ -203,15 +203,15 @@ 
         // See docblock for why the 0th index gets the higher bits.
 
         # v3 ^= b;
-        $v[3] = $v[3]->xorInt64($b);
+        $v[3] = $v[3]->xorInt64( $b );
 
         # SIPROUND;
         # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
 
         # v0 ^= b;
-        $v[0] = $v[0]->xorInt64($b);
+        $v[0] = $v[0]->xorInt64( $b );
 
         // Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
         # v2 ^= 0xff;
@@ -221,17 +221,17 @@ 
         # SIPROUND;
         # SIPROUND;
         # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
 
         # b = v0 ^ v1 ^ v2 ^ v3;
         # STORE64_LE( out, b );
         return $v[0]
-            ->xorInt64($v[1])
-            ->xorInt64($v[2])
-            ->xorInt64($v[3])
+            ->xorInt64( $v[1] )
+            ->xorInt64( $v[2] )
+            ->xorInt64( $v[3] )
             ->toReverseString();
     }
 }

Braces +3 added lines, -6 removed lines

@@ -9,16 +9,14 @@ 
  *
  * Only uses 32-bit arithmetic, while the original SipHash used 64-bit integers
  */
-class ParagonIE_Sodium_Core32_SipHash extends ParagonIE_Sodium_Core32_Util
-{
+class ParagonIE_Sodium_Core32_SipHash extends ParagonIE_Sodium_Core32_Util {
     /**
      * @internal You should not use this directly from another application
      *
      * @param array<int, ParagonIE_Sodium_Core32_Int64> $v
      * @return array<int, ParagonIE_Sodium_Core32_Int64>
      */
-    public static function sipRound(array $v)
-    {
+    public static function sipRound(array $v) {
         # v0 += v1;
         $v[0] = $v[0]->addInt64($v[1]);
 
@@ -71,8 +69,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function sipHash24($in, $key)
-    {
+    public static function sipHash24($in, $key) {
         $inlen = self::strlen($in);
 
         # /* "somepseudorandomlygeneratedbytes" */

src/library/sodium_compat/src/Core32/HSalsa20.php

Indentation +119 added lines, -119 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_HSalsa20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,131 +9,131 @@ 
  */
 abstract class ParagonIE_Sodium_Core32_HSalsa20 extends ParagonIE_Sodium_Core32_Salsa20
 {
-    /**
-     * Calculate an hsalsa20 hash of a single block
-     *
-     * HSalsa20 doesn't have a counter and will never be used for more than
-     * one block (used to derive a subkey for xsalsa20).
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $in
-     * @param string $k
-     * @param string|null $c
-     * @return string
-     */
-    public static function hsalsa20($in, $k, $c = null)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32 $x0
-         * @var ParagonIE_Sodium_Core32_Int32 $x1
-         * @var ParagonIE_Sodium_Core32_Int32 $x2
-         * @var ParagonIE_Sodium_Core32_Int32 $x3
-         * @var ParagonIE_Sodium_Core32_Int32 $x4
-         * @var ParagonIE_Sodium_Core32_Int32 $x5
-         * @var ParagonIE_Sodium_Core32_Int32 $x6
-         * @var ParagonIE_Sodium_Core32_Int32 $x7
-         * @var ParagonIE_Sodium_Core32_Int32 $x8
-         * @var ParagonIE_Sodium_Core32_Int32 $x9
-         * @var ParagonIE_Sodium_Core32_Int32 $x10
-         * @var ParagonIE_Sodium_Core32_Int32 $x11
-         * @var ParagonIE_Sodium_Core32_Int32 $x12
-         * @var ParagonIE_Sodium_Core32_Int32 $x13
-         * @var ParagonIE_Sodium_Core32_Int32 $x14
-         * @var ParagonIE_Sodium_Core32_Int32 $x15
-         * @var ParagonIE_Sodium_Core32_Int32 $j0
-         * @var ParagonIE_Sodium_Core32_Int32 $j1
-         * @var ParagonIE_Sodium_Core32_Int32 $j2
-         * @var ParagonIE_Sodium_Core32_Int32 $j3
-         * @var ParagonIE_Sodium_Core32_Int32 $j4
-         * @var ParagonIE_Sodium_Core32_Int32 $j5
-         * @var ParagonIE_Sodium_Core32_Int32 $j6
-         * @var ParagonIE_Sodium_Core32_Int32 $j7
-         * @var ParagonIE_Sodium_Core32_Int32 $j8
-         * @var ParagonIE_Sodium_Core32_Int32 $j9
-         * @var ParagonIE_Sodium_Core32_Int32 $j10
-         * @var ParagonIE_Sodium_Core32_Int32 $j11
-         * @var ParagonIE_Sodium_Core32_Int32 $j12
-         * @var ParagonIE_Sodium_Core32_Int32 $j13
-         * @var ParagonIE_Sodium_Core32_Int32 $j14
-         * @var ParagonIE_Sodium_Core32_Int32 $j15
-         */
-        if (self::strlen($k) < 32) {
-            throw new RangeException('Key must be 32 bytes long');
-        }
-        if ($c === null) {
-            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
-        } else {
-            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
-        }
-        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
-        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
-        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
-        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
-        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
-        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
-        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
-        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
-        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
+	/**
+	 * Calculate an hsalsa20 hash of a single block
+	 *
+	 * HSalsa20 doesn't have a counter and will never be used for more than
+	 * one block (used to derive a subkey for xsalsa20).
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $in
+	 * @param string $k
+	 * @param string|null $c
+	 * @return string
+	 */
+	public static function hsalsa20($in, $k, $c = null)
+	{
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int32 $x0
+		 * @var ParagonIE_Sodium_Core32_Int32 $x1
+		 * @var ParagonIE_Sodium_Core32_Int32 $x2
+		 * @var ParagonIE_Sodium_Core32_Int32 $x3
+		 * @var ParagonIE_Sodium_Core32_Int32 $x4
+		 * @var ParagonIE_Sodium_Core32_Int32 $x5
+		 * @var ParagonIE_Sodium_Core32_Int32 $x6
+		 * @var ParagonIE_Sodium_Core32_Int32 $x7
+		 * @var ParagonIE_Sodium_Core32_Int32 $x8
+		 * @var ParagonIE_Sodium_Core32_Int32 $x9
+		 * @var ParagonIE_Sodium_Core32_Int32 $x10
+		 * @var ParagonIE_Sodium_Core32_Int32 $x11
+		 * @var ParagonIE_Sodium_Core32_Int32 $x12
+		 * @var ParagonIE_Sodium_Core32_Int32 $x13
+		 * @var ParagonIE_Sodium_Core32_Int32 $x14
+		 * @var ParagonIE_Sodium_Core32_Int32 $x15
+		 * @var ParagonIE_Sodium_Core32_Int32 $j0
+		 * @var ParagonIE_Sodium_Core32_Int32 $j1
+		 * @var ParagonIE_Sodium_Core32_Int32 $j2
+		 * @var ParagonIE_Sodium_Core32_Int32 $j3
+		 * @var ParagonIE_Sodium_Core32_Int32 $j4
+		 * @var ParagonIE_Sodium_Core32_Int32 $j5
+		 * @var ParagonIE_Sodium_Core32_Int32 $j6
+		 * @var ParagonIE_Sodium_Core32_Int32 $j7
+		 * @var ParagonIE_Sodium_Core32_Int32 $j8
+		 * @var ParagonIE_Sodium_Core32_Int32 $j9
+		 * @var ParagonIE_Sodium_Core32_Int32 $j10
+		 * @var ParagonIE_Sodium_Core32_Int32 $j11
+		 * @var ParagonIE_Sodium_Core32_Int32 $j12
+		 * @var ParagonIE_Sodium_Core32_Int32 $j13
+		 * @var ParagonIE_Sodium_Core32_Int32 $j14
+		 * @var ParagonIE_Sodium_Core32_Int32 $j15
+		 */
+		if (self::strlen($k) < 32) {
+			throw new RangeException('Key must be 32 bytes long');
+		}
+		if ($c === null) {
+			$x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+			$x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+			$x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+			$x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+		} else {
+			$x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
+			$x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
+			$x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
+			$x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+		}
+		$x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
+		$x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
+		$x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
+		$x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
+		$x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
+		$x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
+		$x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
+		$x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
+		$x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
+		$x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
+		$x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
+		$x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
-            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
+		for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+			$x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
+			$x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
+			$x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
+			$x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
 
-            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
-            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
+			$x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
+			$x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
+			$x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
+			$x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
 
-            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
-            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
+			$x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
+			$x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
+			$x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
+			$x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
 
-            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
-            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
+			$x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
+			$x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
+			$x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
+			$x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
 
-            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
-            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
+			$x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
+			$x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
+			$x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
+			$x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
 
-            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
-            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
+			$x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
+			$x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
+			$x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
+			$x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
 
-            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
-            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
+			$x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
+			$x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
+			$x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
+			$x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
 
-            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
-            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
-        }
+			$x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
+			$x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
+			$x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
+			$x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
+		}
 
-        return $x0->toReverseString() .
-            $x5->toReverseString() .
-            $x10->toReverseString() .
-            $x15->toReverseString() .
-            $x6->toReverseString() .
-            $x7->toReverseString() .
-            $x8->toReverseString() .
-            $x9->toReverseString();
-    }
+		return $x0->toReverseString() .
+			$x5->toReverseString() .
+			$x10->toReverseString() .
+			$x15->toReverseString() .
+			$x6->toReverseString() .
+			$x7->toReverseString() .
+			$x8->toReverseString() .
+			$x9->toReverseString();
+	}
 }

Spacing +58 added lines, -58 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_HSalsa20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_HSalsa20', false ) ) {
     return;
 }
 
@@ -22,7 +22,7 @@ 
      * @param string|null $c
      * @return string
      */
-    public static function hsalsa20($in, $k, $c = null)
+    public static function hsalsa20( $in, $k, $c = null )
     {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $x0
@@ -58,73 +58,73 @@ 
          * @var ParagonIE_Sodium_Core32_Int32 $j14
          * @var ParagonIE_Sodium_Core32_Int32 $j15
          */
-        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) {
-            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        if ( $c === null ) {
+            $x0  = new ParagonIE_Sodium_Core32_Int32( array( 0x6170, 0x7865 ) );
+            $x5  = new ParagonIE_Sodium_Core32_Int32( array( 0x3320, 0x646e ) );
+            $x10 = new ParagonIE_Sodium_Core32_Int32( array( 0x7962, 0x2d32 ) );
+            $x15 = new ParagonIE_Sodium_Core32_Int32( array( 0x6b20, 0x6574 ) );
         } else {
-            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 0, 4 ) );
+            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 4, 4 ) );
+            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 8, 4 ) );
+            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 12, 4 ) );
         }
-        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
-        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
-        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
-        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
-        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
-        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
-        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
-        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
-        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
+        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 0, 4 ) );
+        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 4, 4 ) );
+        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 8, 4 ) );
+        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 12, 4 ) );
+        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 0, 4 ) );
+        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 4, 4 ) );
+        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 8, 4 ) );
+        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 12, 4 ) );
+        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 16, 4 ) );
+        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 20, 4 ) );
+        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 24, 4 ) );
+        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 28, 4 ) );
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
-            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
+        for ( $i = self::ROUNDS; $i > 0; $i -= 2 ) {
+            $x4  = $x4->xorInt32( $x0->addInt32( $x12 )->rotateLeft( 7 ) );
+            $x8  = $x8->xorInt32( $x4->addInt32( $x0 )->rotateLeft( 9 ) );
+            $x12 = $x12->xorInt32( $x8->addInt32( $x4 )->rotateLeft( 13 ) );
+            $x0  = $x0->xorInt32( $x12->addInt32( $x8 )->rotateLeft( 18 ) );
 
-            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
-            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
+            $x9  = $x9->xorInt32( $x5->addInt32( $x1 )->rotateLeft( 7 ) );
+            $x13 = $x13->xorInt32( $x9->addInt32( $x5 )->rotateLeft( 9 ) );
+            $x1  = $x1->xorInt32( $x13->addInt32( $x9 )->rotateLeft( 13 ) );
+            $x5  = $x5->xorInt32( $x1->addInt32( $x13 )->rotateLeft( 18 ) );
 
-            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
-            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
+            $x14 = $x14->xorInt32( $x10->addInt32( $x6 )->rotateLeft( 7 ) );
+            $x2  = $x2->xorInt32( $x14->addInt32( $x10 )->rotateLeft( 9 ) );
+            $x6  = $x6->xorInt32( $x2->addInt32( $x14 )->rotateLeft( 13 ) );
+            $x10 = $x10->xorInt32( $x6->addInt32( $x2 )->rotateLeft( 18 ) );
 
-            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
-            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
+            $x3  = $x3->xorInt32( $x15->addInt32( $x11 )->rotateLeft( 7 ) );
+            $x7  = $x7->xorInt32( $x3->addInt32( $x15 )->rotateLeft( 9 ) );
+            $x11 = $x11->xorInt32( $x7->addInt32( $x3 )->rotateLeft( 13 ) );
+            $x15 = $x15->xorInt32( $x11->addInt32( $x7 )->rotateLeft( 18 ) );
 
-            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
-            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
+            $x1  = $x1->xorInt32( $x0->addInt32( $x3 )->rotateLeft( 7 ) );
+            $x2  = $x2->xorInt32( $x1->addInt32( $x0 )->rotateLeft( 9 ) );
+            $x3  = $x3->xorInt32( $x2->addInt32( $x1 )->rotateLeft( 13 ) );
+            $x0  = $x0->xorInt32( $x3->addInt32( $x2 )->rotateLeft( 18 ) );
 
-            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
-            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
+            $x6  = $x6->xorInt32( $x5->addInt32( $x4 )->rotateLeft( 7 ) );
+            $x7  = $x7->xorInt32( $x6->addInt32( $x5 )->rotateLeft( 9 ) );
+            $x4  = $x4->xorInt32( $x7->addInt32( $x6 )->rotateLeft( 13 ) );
+            $x5  = $x5->xorInt32( $x4->addInt32( $x7 )->rotateLeft( 18 ) );
 
-            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
-            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
+            $x11 = $x11->xorInt32( $x10->addInt32( $x9 )->rotateLeft( 7 ) );
+            $x8  = $x8->xorInt32( $x11->addInt32( $x10 )->rotateLeft( 9 ) );
+            $x9  = $x9->xorInt32( $x8->addInt32( $x11 )->rotateLeft( 13 ) );
+            $x10 = $x10->xorInt32( $x9->addInt32( $x8 )->rotateLeft( 18 ) );
 
-            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
-            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
+            $x12 = $x12->xorInt32( $x15->addInt32( $x14 )->rotateLeft( 7 ) );
+            $x13 = $x13->xorInt32( $x12->addInt32( $x15 )->rotateLeft( 9 ) );
+            $x14 = $x14->xorInt32( $x13->addInt32( $x12 )->rotateLeft( 13 ) );
+            $x15 = $x15->xorInt32( $x14->addInt32( $x13 )->rotateLeft( 18 ) );
         }
 
         return $x0->toReverseString() .

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_HSalsa20
  */
-abstract class ParagonIE_Sodium_Core32_HSalsa20 extends ParagonIE_Sodium_Core32_Salsa20
-{
+abstract class ParagonIE_Sodium_Core32_HSalsa20 extends ParagonIE_Sodium_Core32_Salsa20 {
     /**
      * Calculate an hsalsa20 hash of a single block
      *
@@ -22,8 +21,7 @@ 
      * @param string|null $c
      * @return string
      */
-    public static function hsalsa20($in, $k, $c = null)
-    {
+    public static function hsalsa20($in, $k, $c = null) {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $x0
          * @var ParagonIE_Sodium_Core32_Int32 $x1

src/library/sodium_compat/src/Core32/Salsa20.php

Indentation +268 added lines, -268 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Salsa20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,290 +9,290 @@ 
  */
 abstract class ParagonIE_Sodium_Core32_Salsa20 extends ParagonIE_Sodium_Core32_Util
 {
-    const ROUNDS = 20;
+	const ROUNDS = 20;
 
-    /**
-     * Calculate an salsa20 hash of a single block
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $in
-     * @param string $k
-     * @param string|null $c
-     * @return string
-     */
-    public static function core_salsa20($in, $k, $c = null)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32 $x0
-         * @var ParagonIE_Sodium_Core32_Int32 $x1
-         * @var ParagonIE_Sodium_Core32_Int32 $x2
-         * @var ParagonIE_Sodium_Core32_Int32 $x3
-         * @var ParagonIE_Sodium_Core32_Int32 $x4
-         * @var ParagonIE_Sodium_Core32_Int32 $x5
-         * @var ParagonIE_Sodium_Core32_Int32 $x6
-         * @var ParagonIE_Sodium_Core32_Int32 $x7
-         * @var ParagonIE_Sodium_Core32_Int32 $x8
-         * @var ParagonIE_Sodium_Core32_Int32 $x9
-         * @var ParagonIE_Sodium_Core32_Int32 $x10
-         * @var ParagonIE_Sodium_Core32_Int32 $x11
-         * @var ParagonIE_Sodium_Core32_Int32 $x12
-         * @var ParagonIE_Sodium_Core32_Int32 $x13
-         * @var ParagonIE_Sodium_Core32_Int32 $x14
-         * @var ParagonIE_Sodium_Core32_Int32 $x15
-         * @var ParagonIE_Sodium_Core32_Int32 $j0
-         * @var ParagonIE_Sodium_Core32_Int32 $j1
-         * @var ParagonIE_Sodium_Core32_Int32 $j2
-         * @var ParagonIE_Sodium_Core32_Int32 $j3
-         * @var ParagonIE_Sodium_Core32_Int32 $j4
-         * @var ParagonIE_Sodium_Core32_Int32 $j5
-         * @var ParagonIE_Sodium_Core32_Int32 $j6
-         * @var ParagonIE_Sodium_Core32_Int32 $j7
-         * @var ParagonIE_Sodium_Core32_Int32 $j8
-         * @var ParagonIE_Sodium_Core32_Int32 $j9
-         * @var ParagonIE_Sodium_Core32_Int32 $j10
-         * @var ParagonIE_Sodium_Core32_Int32 $j11
-         * @var ParagonIE_Sodium_Core32_Int32 $j12
-         * @var ParagonIE_Sodium_Core32_Int32 $j13
-         * @var ParagonIE_Sodium_Core32_Int32 $j14
-         * @var ParagonIE_Sodium_Core32_Int32 $j15
-         */
-        if (self::strlen($k) < 32) {
-            throw new RangeException('Key must be 32 bytes long');
-        }
-        if ($c === null) {
-            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
-        } else {
-            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
-        }
-        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
-        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
-        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
-        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
-        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
-        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
-        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
-        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
-        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
+	/**
+	 * Calculate an salsa20 hash of a single block
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $in
+	 * @param string $k
+	 * @param string|null $c
+	 * @return string
+	 */
+	public static function core_salsa20($in, $k, $c = null)
+	{
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int32 $x0
+		 * @var ParagonIE_Sodium_Core32_Int32 $x1
+		 * @var ParagonIE_Sodium_Core32_Int32 $x2
+		 * @var ParagonIE_Sodium_Core32_Int32 $x3
+		 * @var ParagonIE_Sodium_Core32_Int32 $x4
+		 * @var ParagonIE_Sodium_Core32_Int32 $x5
+		 * @var ParagonIE_Sodium_Core32_Int32 $x6
+		 * @var ParagonIE_Sodium_Core32_Int32 $x7
+		 * @var ParagonIE_Sodium_Core32_Int32 $x8
+		 * @var ParagonIE_Sodium_Core32_Int32 $x9
+		 * @var ParagonIE_Sodium_Core32_Int32 $x10
+		 * @var ParagonIE_Sodium_Core32_Int32 $x11
+		 * @var ParagonIE_Sodium_Core32_Int32 $x12
+		 * @var ParagonIE_Sodium_Core32_Int32 $x13
+		 * @var ParagonIE_Sodium_Core32_Int32 $x14
+		 * @var ParagonIE_Sodium_Core32_Int32 $x15
+		 * @var ParagonIE_Sodium_Core32_Int32 $j0
+		 * @var ParagonIE_Sodium_Core32_Int32 $j1
+		 * @var ParagonIE_Sodium_Core32_Int32 $j2
+		 * @var ParagonIE_Sodium_Core32_Int32 $j3
+		 * @var ParagonIE_Sodium_Core32_Int32 $j4
+		 * @var ParagonIE_Sodium_Core32_Int32 $j5
+		 * @var ParagonIE_Sodium_Core32_Int32 $j6
+		 * @var ParagonIE_Sodium_Core32_Int32 $j7
+		 * @var ParagonIE_Sodium_Core32_Int32 $j8
+		 * @var ParagonIE_Sodium_Core32_Int32 $j9
+		 * @var ParagonIE_Sodium_Core32_Int32 $j10
+		 * @var ParagonIE_Sodium_Core32_Int32 $j11
+		 * @var ParagonIE_Sodium_Core32_Int32 $j12
+		 * @var ParagonIE_Sodium_Core32_Int32 $j13
+		 * @var ParagonIE_Sodium_Core32_Int32 $j14
+		 * @var ParagonIE_Sodium_Core32_Int32 $j15
+		 */
+		if (self::strlen($k) < 32) {
+			throw new RangeException('Key must be 32 bytes long');
+		}
+		if ($c === null) {
+			$x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+			$x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+			$x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+			$x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+		} else {
+			$x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
+			$x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
+			$x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
+			$x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+		}
+		$x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
+		$x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
+		$x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
+		$x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
+		$x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
+		$x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
+		$x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
+		$x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
+		$x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
+		$x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
+		$x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
+		$x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
 
-        $j0  = clone $x0;
-        $j1  = clone $x1;
-        $j2  = clone $x2;
-        $j3  = clone $x3;
-        $j4  = clone $x4;
-        $j5  = clone $x5;
-        $j6  = clone $x6;
-        $j7  = clone $x7;
-        $j8  = clone $x8;
-        $j9  = clone $x9;
-        $j10  = clone $x10;
-        $j11  = clone $x11;
-        $j12  = clone $x12;
-        $j13  = clone $x13;
-        $j14  = clone $x14;
-        $j15  = clone $x15;
+		$j0  = clone $x0;
+		$j1  = clone $x1;
+		$j2  = clone $x2;
+		$j3  = clone $x3;
+		$j4  = clone $x4;
+		$j5  = clone $x5;
+		$j6  = clone $x6;
+		$j7  = clone $x7;
+		$j8  = clone $x8;
+		$j9  = clone $x9;
+		$j10  = clone $x10;
+		$j11  = clone $x11;
+		$j12  = clone $x12;
+		$j13  = clone $x13;
+		$j14  = clone $x14;
+		$j15  = clone $x15;
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
-            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
+		for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+			$x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
+			$x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
+			$x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
+			$x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
 
-            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
-            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
+			$x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
+			$x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
+			$x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
+			$x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
 
-            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
-            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
+			$x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
+			$x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
+			$x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
+			$x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
 
-            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
-            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
+			$x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
+			$x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
+			$x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
+			$x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
 
-            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
-            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
+			$x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
+			$x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
+			$x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
+			$x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
 
-            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
-            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
+			$x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
+			$x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
+			$x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
+			$x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
 
-            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
-            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
+			$x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
+			$x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
+			$x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
+			$x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
 
-            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
-            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
-        }
+			$x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
+			$x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
+			$x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
+			$x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
+		}
 
-        $x0  = $x0->addInt32($j0);
-        $x1  = $x1->addInt32($j1);
-        $x2  = $x2->addInt32($j2);
-        $x3  = $x3->addInt32($j3);
-        $x4  = $x4->addInt32($j4);
-        $x5  = $x5->addInt32($j5);
-        $x6  = $x6->addInt32($j6);
-        $x7  = $x7->addInt32($j7);
-        $x8  = $x8->addInt32($j8);
-        $x9  = $x9->addInt32($j9);
-        $x10 = $x10->addInt32($j10);
-        $x11 = $x11->addInt32($j11);
-        $x12 = $x12->addInt32($j12);
-        $x13 = $x13->addInt32($j13);
-        $x14 = $x14->addInt32($j14);
-        $x15 = $x15->addInt32($j15);
+		$x0  = $x0->addInt32($j0);
+		$x1  = $x1->addInt32($j1);
+		$x2  = $x2->addInt32($j2);
+		$x3  = $x3->addInt32($j3);
+		$x4  = $x4->addInt32($j4);
+		$x5  = $x5->addInt32($j5);
+		$x6  = $x6->addInt32($j6);
+		$x7  = $x7->addInt32($j7);
+		$x8  = $x8->addInt32($j8);
+		$x9  = $x9->addInt32($j9);
+		$x10 = $x10->addInt32($j10);
+		$x11 = $x11->addInt32($j11);
+		$x12 = $x12->addInt32($j12);
+		$x13 = $x13->addInt32($j13);
+		$x14 = $x14->addInt32($j14);
+		$x15 = $x15->addInt32($j15);
 
-        return $x0->toReverseString() .
-            $x1->toReverseString() .
-            $x2->toReverseString() .
-            $x3->toReverseString() .
-            $x4->toReverseString() .
-            $x5->toReverseString() .
-            $x6->toReverseString() .
-            $x7->toReverseString() .
-            $x8->toReverseString() .
-            $x9->toReverseString() .
-            $x10->toReverseString() .
-            $x11->toReverseString() .
-            $x12->toReverseString() .
-            $x13->toReverseString() .
-            $x14->toReverseString() .
-            $x15->toReverseString();
-    }
+		return $x0->toReverseString() .
+			$x1->toReverseString() .
+			$x2->toReverseString() .
+			$x3->toReverseString() .
+			$x4->toReverseString() .
+			$x5->toReverseString() .
+			$x6->toReverseString() .
+			$x7->toReverseString() .
+			$x8->toReverseString() .
+			$x9->toReverseString() .
+			$x10->toReverseString() .
+			$x11->toReverseString() .
+			$x12->toReverseString() .
+			$x13->toReverseString() .
+			$x14->toReverseString() .
+			$x15->toReverseString();
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    public static function salsa20($len, $nonce, $key)
-    {
-        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);
-        $c = '';
-        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);
-                $u >>= 8;
-            }
-            $len -= 64;
-        }
-        if ($len > 0) {
-            $c .= self::substr(
-                self::core_salsa20($in, $kcopy, null),
-                0,
-                $len
-            );
-        }
-        try {
-            ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (Error $ex) {
-            $kcopy = null;
-        }
-        return $c;
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	public static function salsa20($len, $nonce, $key)
+	{
+		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);
+		$c = '';
+		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);
+				$u >>= 8;
+			}
+			$len -= 64;
+		}
+		if ($len > 0) {
+			$c .= self::substr(
+				self::core_salsa20($in, $kcopy, null),
+				0,
+				$len
+			);
+		}
+		try {
+			ParagonIE_Sodium_Compat::memzero($kcopy);
+		} catch (Error $ex) {
+			$kcopy = null;
+		}
+		return $c;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $m
-     * @param string $n
-     * @param int $ic
-     * @param string $k
-     * @return string
-     */
-    public static function salsa20_xor_ic($m, $n, $ic, $k)
-    {
-        $mlen = self::strlen($m);
-        if ($mlen < 1) {
-            return '';
-        }
-        $kcopy = self::substr($k, 0, 32);
-        $in = self::substr($n, 0, 8);
-        // Initialize the counter
-        $in .= ParagonIE_Sodium_Core32_Util::store64_le($ic);
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $m
+	 * @param string $n
+	 * @param int $ic
+	 * @param string $k
+	 * @return string
+	 */
+	public static function salsa20_xor_ic($m, $n, $ic, $k)
+	{
+		$mlen = self::strlen($m);
+		if ($mlen < 1) {
+			return '';
+		}
+		$kcopy = self::substr($k, 0, 32);
+		$in = self::substr($n, 0, 8);
+		// Initialize the counter
+		$in .= ParagonIE_Sodium_Core32_Util::store64_le($ic);
 
-        $c = '';
-        while ($mlen >= 64) {
-            $block = self::core_salsa20($in, $kcopy, null);
-            $c .= self::xorStrings(
-                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);
-                $u >>= 8;
-            }
+		$c = '';
+		while ($mlen >= 64) {
+			$block = self::core_salsa20($in, $kcopy, null);
+			$c .= self::xorStrings(
+				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);
+				$u >>= 8;
+			}
 
-            $mlen -= 64;
-            $m = self::substr($m, 64);
-        }
+			$mlen -= 64;
+			$m = self::substr($m, 64);
+		}
 
-        if ($mlen) {
-            $block = self::core_salsa20($in, $kcopy, null);
-            $c .= self::xorStrings(
-                self::substr($m, 0, $mlen),
-                self::substr($block, 0, $mlen)
-            );
-        }
-        try {
-            ParagonIE_Sodium_Compat::memzero($block);
-            ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (Error $ex) {
-            $block = null;
-            $kcopy = null;
-        }
+		if ($mlen) {
+			$block = self::core_salsa20($in, $kcopy, null);
+			$c .= self::xorStrings(
+				self::substr($m, 0, $mlen),
+				self::substr($block, 0, $mlen)
+			);
+		}
+		try {
+			ParagonIE_Sodium_Compat::memzero($block);
+			ParagonIE_Sodium_Compat::memzero($kcopy);
+		} catch (Error $ex) {
+			$block = null;
+			$kcopy = null;
+		}
 
-        return $c;
-    }
+		return $c;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    public static function salsa20_xor($message, $nonce, $key)
-    {
-        return self::xorStrings(
-            $message,
-            self::salsa20(
-                self::strlen($message),
-                $nonce,
-                $key
-            )
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	public static function salsa20_xor($message, $nonce, $key)
+	{
+		return self::xorStrings(
+			$message,
+			self::salsa20(
+				self::strlen($message),
+				$nonce,
+				$key
+			)
+		);
+	}
 }

Spacing +110 added lines, -110 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Salsa20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Salsa20', false ) ) {
     return;
 }
 
@@ -21,7 +21,7 @@ 
      * @param string|null $c
      * @return string
      */
-    public static function core_salsa20($in, $k, $c = null)
+    public static function core_salsa20( $in, $k, $c = null )
     {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $x0
@@ -57,32 +57,32 @@ 
          * @var ParagonIE_Sodium_Core32_Int32 $j14
          * @var ParagonIE_Sodium_Core32_Int32 $j15
          */
-        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) {
-            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        if ( $c === null ) {
+            $x0  = new ParagonIE_Sodium_Core32_Int32( array( 0x6170, 0x7865 ) );
+            $x5  = new ParagonIE_Sodium_Core32_Int32( array( 0x3320, 0x646e ) );
+            $x10 = new ParagonIE_Sodium_Core32_Int32( array( 0x7962, 0x2d32 ) );
+            $x15 = new ParagonIE_Sodium_Core32_Int32( array( 0x6b20, 0x6574 ) );
         } else {
-            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 0, 4 ) );
+            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 4, 4 ) );
+            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 8, 4 ) );
+            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 12, 4 ) );
         }
-        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
-        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
-        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
-        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
-        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
-        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
-        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
-        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
-        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
+        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 0, 4 ) );
+        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 4, 4 ) );
+        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 8, 4 ) );
+        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 12, 4 ) );
+        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 0, 4 ) );
+        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 4, 4 ) );
+        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 8, 4 ) );
+        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 12, 4 ) );
+        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 16, 4 ) );
+        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 20, 4 ) );
+        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 24, 4 ) );
+        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 28, 4 ) );
 
         $j0  = clone $x0;
         $j1  = clone $x1;
@@ -101,64 +101,64 @@ 
         $j14  = clone $x14;
         $j15  = clone $x15;
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
-            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
+        for ( $i = self::ROUNDS; $i > 0; $i -= 2 ) {
+            $x4  = $x4->xorInt32( $x0->addInt32( $x12 )->rotateLeft( 7 ) );
+            $x8  = $x8->xorInt32( $x4->addInt32( $x0 )->rotateLeft( 9 ) );
+            $x12 = $x12->xorInt32( $x8->addInt32( $x4 )->rotateLeft( 13 ) );
+            $x0  = $x0->xorInt32( $x12->addInt32( $x8 )->rotateLeft( 18 ) );
 
-            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
-            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
+            $x9  = $x9->xorInt32( $x5->addInt32( $x1 )->rotateLeft( 7 ) );
+            $x13 = $x13->xorInt32( $x9->addInt32( $x5 )->rotateLeft( 9 ) );
+            $x1  = $x1->xorInt32( $x13->addInt32( $x9 )->rotateLeft( 13 ) );
+            $x5  = $x5->xorInt32( $x1->addInt32( $x13 )->rotateLeft( 18 ) );
 
-            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
-            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
+            $x14 = $x14->xorInt32( $x10->addInt32( $x6 )->rotateLeft( 7 ) );
+            $x2  = $x2->xorInt32( $x14->addInt32( $x10 )->rotateLeft( 9 ) );
+            $x6  = $x6->xorInt32( $x2->addInt32( $x14 )->rotateLeft( 13 ) );
+            $x10 = $x10->xorInt32( $x6->addInt32( $x2 )->rotateLeft( 18 ) );
 
-            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
-            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
+            $x3  = $x3->xorInt32( $x15->addInt32( $x11 )->rotateLeft( 7 ) );
+            $x7  = $x7->xorInt32( $x3->addInt32( $x15 )->rotateLeft( 9 ) );
+            $x11 = $x11->xorInt32( $x7->addInt32( $x3 )->rotateLeft( 13 ) );
+            $x15 = $x15->xorInt32( $x11->addInt32( $x7 )->rotateLeft( 18 ) );
 
-            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
-            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
+            $x1  = $x1->xorInt32( $x0->addInt32( $x3 )->rotateLeft( 7 ) );
+            $x2  = $x2->xorInt32( $x1->addInt32( $x0 )->rotateLeft( 9 ) );
+            $x3  = $x3->xorInt32( $x2->addInt32( $x1 )->rotateLeft( 13 ) );
+            $x0  = $x0->xorInt32( $x3->addInt32( $x2 )->rotateLeft( 18 ) );
 
-            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
-            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
+            $x6  = $x6->xorInt32( $x5->addInt32( $x4 )->rotateLeft( 7 ) );
+            $x7  = $x7->xorInt32( $x6->addInt32( $x5 )->rotateLeft( 9 ) );
+            $x4  = $x4->xorInt32( $x7->addInt32( $x6 )->rotateLeft( 13 ) );
+            $x5  = $x5->xorInt32( $x4->addInt32( $x7 )->rotateLeft( 18 ) );
 
-            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
-            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
+            $x11 = $x11->xorInt32( $x10->addInt32( $x9 )->rotateLeft( 7 ) );
+            $x8  = $x8->xorInt32( $x11->addInt32( $x10 )->rotateLeft( 9 ) );
+            $x9  = $x9->xorInt32( $x8->addInt32( $x11 )->rotateLeft( 13 ) );
+            $x10 = $x10->xorInt32( $x9->addInt32( $x8 )->rotateLeft( 18 ) );
 
-            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
-            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
+            $x12 = $x12->xorInt32( $x15->addInt32( $x14 )->rotateLeft( 7 ) );
+            $x13 = $x13->xorInt32( $x12->addInt32( $x15 )->rotateLeft( 9 ) );
+            $x14 = $x14->xorInt32( $x13->addInt32( $x12 )->rotateLeft( 13 ) );
+            $x15 = $x15->xorInt32( $x14->addInt32( $x13 )->rotateLeft( 18 ) );
         }
 
-        $x0  = $x0->addInt32($j0);
-        $x1  = $x1->addInt32($j1);
-        $x2  = $x2->addInt32($j2);
-        $x3  = $x3->addInt32($j3);
-        $x4  = $x4->addInt32($j4);
-        $x5  = $x5->addInt32($j5);
-        $x6  = $x6->addInt32($j6);
-        $x7  = $x7->addInt32($j7);
-        $x8  = $x8->addInt32($j8);
-        $x9  = $x9->addInt32($j9);
-        $x10 = $x10->addInt32($j10);
-        $x11 = $x11->addInt32($j11);
-        $x12 = $x12->addInt32($j12);
-        $x13 = $x13->addInt32($j13);
-        $x14 = $x14->addInt32($j14);
-        $x15 = $x15->addInt32($j15);
+        $x0  = $x0->addInt32( $j0 );
+        $x1  = $x1->addInt32( $j1 );
+        $x2  = $x2->addInt32( $j2 );
+        $x3  = $x3->addInt32( $j3 );
+        $x4  = $x4->addInt32( $j4 );
+        $x5  = $x5->addInt32( $j5 );
+        $x6  = $x6->addInt32( $j6 );
+        $x7  = $x7->addInt32( $j7 );
+        $x8  = $x8->addInt32( $j8 );
+        $x9  = $x9->addInt32( $j9 );
+        $x10 = $x10->addInt32( $j10 );
+        $x11 = $x11->addInt32( $j11 );
+        $x12 = $x12->addInt32( $j12 );
+        $x13 = $x13->addInt32( $j13 );
+        $x14 = $x14->addInt32( $j14 );
+        $x15 = $x15->addInt32( $j15 );
 
         return $x0->toReverseString() .
             $x1->toReverseString() .
@@ -186,35 +186,35 @@ 
      * @param string $key
      * @return string
      */
-    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 (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $kcopy );
+        } catch ( Error $ex ) {
             $kcopy = null;
         }
         return $c;
@@ -229,46 +229,46 @@ 
      * @param string $k
      * @return string
      */
-    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_Core32_Util::store64_le($ic);
+        $in .= ParagonIE_Sodium_Core32_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 (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block );
+            ParagonIE_Sodium_Compat::memzero( $kcopy );
+        } catch ( Error $ex ) {
             $block = null;
             $kcopy = null;
         }
@@ -284,12 +284,12 @@ 
      * @param string $key
      * @return string
      */
-    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
             )

Braces +5 added lines, -10 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_Salsa20
  */
-abstract class ParagonIE_Sodium_Core32_Salsa20 extends ParagonIE_Sodium_Core32_Util
-{
+abstract class ParagonIE_Sodium_Core32_Salsa20 extends ParagonIE_Sodium_Core32_Util {
     const ROUNDS = 20;
 
     /**
@@ -21,8 +20,7 @@ 
      * @param string|null $c
      * @return string
      */
-    public static function core_salsa20($in, $k, $c = null)
-    {
+    public static function core_salsa20($in, $k, $c = null) {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $x0
          * @var ParagonIE_Sodium_Core32_Int32 $x1
@@ -186,8 +184,7 @@ 
      * @param string $key
      * @return string
      */
-    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');
         }
@@ -229,8 +226,7 @@ 
      * @param string $k
      * @return string
      */
-    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) {
             return '';
@@ -284,8 +280,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function salsa20_xor($message, $nonce, $key)
-    {
+    public static function salsa20_xor($message, $nonce, $key) {
         return self::xorStrings(
             $message,
             self::salsa20(

src/library/sodium_compat/src/Core32/XSalsa20.php

Indentation +41 added lines, -41 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_XSalsa20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,45 +9,45 @@ 
  */
 abstract class ParagonIE_Sodium_Core32_XSalsa20 extends ParagonIE_Sodium_Core32_HSalsa20
 {
-    /**
-     * Expand a key and nonce into an xsalsa20 keystream.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    public static function xsalsa20($len, $nonce, $key)
-    {
-        $ret = self::salsa20(
-            $len,
-            self::substr($nonce, 16, 8),
-            self::hsalsa20($nonce, $key)
-        );
-        return $ret;
-    }
+	/**
+	 * Expand a key and nonce into an xsalsa20 keystream.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	public static function xsalsa20($len, $nonce, $key)
+	{
+		$ret = self::salsa20(
+			$len,
+			self::substr($nonce, 16, 8),
+			self::hsalsa20($nonce, $key)
+		);
+		return $ret;
+	}
 
-    /**
-     * Encrypt a string with XSalsa20. Doesn't provide integrity.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    public static function xsalsa20_xor($message, $nonce, $key)
-    {
-        return self::xorStrings(
-            $message,
-            self::xsalsa20(
-                self::strlen($message),
-                $nonce,
-                $key
-            )
-        );
-    }
+	/**
+	 * Encrypt a string with XSalsa20. Doesn't provide integrity.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	public static function xsalsa20_xor($message, $nonce, $key)
+	{
+		return self::xorStrings(
+			$message,
+			self::xsalsa20(
+				self::strlen($message),
+				$nonce,
+				$key
+			)
+		);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_XSalsa20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_XSalsa20', false ) ) {
     return;
 }
 
@@ -19,12 +19,12 @@ 
      * @param string $key
      * @return string
      */
-    public static function xsalsa20($len, $nonce, $key)
+    public static function xsalsa20( $len, $nonce, $key )
     {
         $ret = self::salsa20(
             $len,
-            self::substr($nonce, 16, 8),
-            self::hsalsa20($nonce, $key)
+            self::substr( $nonce, 16, 8 ),
+            self::hsalsa20( $nonce, $key )
         );
         return $ret;
     }
@@ -39,12 +39,12 @@ 
      * @param string $key
      * @return string
      */
-    public static function xsalsa20_xor($message, $nonce, $key)
+    public static function xsalsa20_xor( $message, $nonce, $key )
     {
         return self::xorStrings(
             $message,
             self::xsalsa20(
-                self::strlen($message),
+                self::strlen( $message ),
                 $nonce,
                 $key
             )

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_XSalsa20
  */
-abstract class ParagonIE_Sodium_Core32_XSalsa20 extends ParagonIE_Sodium_Core32_HSalsa20
-{
+abstract class ParagonIE_Sodium_Core32_XSalsa20 extends ParagonIE_Sodium_Core32_HSalsa20 {
     /**
      * Expand a key and nonce into an xsalsa20 keystream.
      *
@@ -19,8 +18,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function xsalsa20($len, $nonce, $key)
-    {
+    public static function xsalsa20($len, $nonce, $key) {
         $ret = self::salsa20(
             $len,
             self::substr($nonce, 16, 8),
@@ -39,8 +37,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function xsalsa20_xor($message, $nonce, $key)
-    {
+    public static function xsalsa20_xor($message, $nonce, $key) {
         return self::xorStrings(
             $message,
             self::xsalsa20(

src/library/sodium_compat/src/Core32/ChaCha20.php

Indentation +262 added lines, -262 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_ChaCha20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,82 +9,82 @@ 
  */
 class ParagonIE_Sodium_Core32_ChaCha20 extends ParagonIE_Sodium_Core32_Util
 {
-    /**
-     * The ChaCha20 quarter round function. Works on four 32-bit integers.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $a
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @param ParagonIE_Sodium_Core32_Int32 $c
-     * @param ParagonIE_Sodium_Core32_Int32 $d
-     * @return array<int, ParagonIE_Sodium_Core32_Int32>
-     */
-    protected static function quarterRound(
-        ParagonIE_Sodium_Core32_Int32 $a,
-        ParagonIE_Sodium_Core32_Int32 $b,
-        ParagonIE_Sodium_Core32_Int32 $c,
-        ParagonIE_Sodium_Core32_Int32 $d
-    ) {
-        /** @var ParagonIE_Sodium_Core32_Int32 $a */
-        /** @var ParagonIE_Sodium_Core32_Int32 $b */
-        /** @var ParagonIE_Sodium_Core32_Int32 $c */
-        /** @var ParagonIE_Sodium_Core32_Int32 $d */
+	/**
+	 * The ChaCha20 quarter round function. Works on four 32-bit integers.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int32 $a
+	 * @param ParagonIE_Sodium_Core32_Int32 $b
+	 * @param ParagonIE_Sodium_Core32_Int32 $c
+	 * @param ParagonIE_Sodium_Core32_Int32 $d
+	 * @return array<int, ParagonIE_Sodium_Core32_Int32>
+	 */
+	protected static function quarterRound(
+		ParagonIE_Sodium_Core32_Int32 $a,
+		ParagonIE_Sodium_Core32_Int32 $b,
+		ParagonIE_Sodium_Core32_Int32 $c,
+		ParagonIE_Sodium_Core32_Int32 $d
+	) {
+		/** @var ParagonIE_Sodium_Core32_Int32 $a */
+		/** @var ParagonIE_Sodium_Core32_Int32 $b */
+		/** @var ParagonIE_Sodium_Core32_Int32 $c */
+		/** @var ParagonIE_Sodium_Core32_Int32 $d */
 
-        # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(16);
+		# a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
+		$a = $a->addInt32($b);
+		$d = $d->xorInt32($a)->rotateLeft(16);
 
-        # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(12);
+		# c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
+		$c = $c->addInt32($d);
+		$b = $b->xorInt32($c)->rotateLeft(12);
 
-        # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(8);
+		# a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
+		$a = $a->addInt32($b);
+		$d = $d->xorInt32($a)->rotateLeft(8);
 
-        # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(7);
+		# c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+		$c = $c->addInt32($d);
+		$b = $b->xorInt32($c)->rotateLeft(7);
 
-        return array($a, $b, $c, $d);
-    }
+		return array($a, $b, $c, $d);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx
-     * @param string $message
-     *
-     * @return string
-     * @throws Exception
-     */
-    public static function encryptBytes(
-        ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx,
-        $message = ''
-    ) {
-        $bytes = self::strlen($message);
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx
+	 * @param string $message
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function encryptBytes(
+		ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx,
+		$message = ''
+	) {
+		$bytes = self::strlen($message);
 
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32 $x0
-         * @var ParagonIE_Sodium_Core32_Int32 $x1
-         * @var ParagonIE_Sodium_Core32_Int32 $x2
-         * @var ParagonIE_Sodium_Core32_Int32 $x3
-         * @var ParagonIE_Sodium_Core32_Int32 $x4
-         * @var ParagonIE_Sodium_Core32_Int32 $x5
-         * @var ParagonIE_Sodium_Core32_Int32 $x6
-         * @var ParagonIE_Sodium_Core32_Int32 $x7
-         * @var ParagonIE_Sodium_Core32_Int32 $x8
-         * @var ParagonIE_Sodium_Core32_Int32 $x9
-         * @var ParagonIE_Sodium_Core32_Int32 $x10
-         * @var ParagonIE_Sodium_Core32_Int32 $x11
-         * @var ParagonIE_Sodium_Core32_Int32 $x12
-         * @var ParagonIE_Sodium_Core32_Int32 $x13
-         * @var ParagonIE_Sodium_Core32_Int32 $x14
-         * @var ParagonIE_Sodium_Core32_Int32 $x15
-         */
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int32 $x0
+		 * @var ParagonIE_Sodium_Core32_Int32 $x1
+		 * @var ParagonIE_Sodium_Core32_Int32 $x2
+		 * @var ParagonIE_Sodium_Core32_Int32 $x3
+		 * @var ParagonIE_Sodium_Core32_Int32 $x4
+		 * @var ParagonIE_Sodium_Core32_Int32 $x5
+		 * @var ParagonIE_Sodium_Core32_Int32 $x6
+		 * @var ParagonIE_Sodium_Core32_Int32 $x7
+		 * @var ParagonIE_Sodium_Core32_Int32 $x8
+		 * @var ParagonIE_Sodium_Core32_Int32 $x9
+		 * @var ParagonIE_Sodium_Core32_Int32 $x10
+		 * @var ParagonIE_Sodium_Core32_Int32 $x11
+		 * @var ParagonIE_Sodium_Core32_Int32 $x12
+		 * @var ParagonIE_Sodium_Core32_Int32 $x13
+		 * @var ParagonIE_Sodium_Core32_Int32 $x14
+		 * @var ParagonIE_Sodium_Core32_Int32 $x15
+		 */
 
-        /*
+		/*
         j0 = ctx->input[0];
         j1 = ctx->input[1];
         j2 = ctx->input[2];
@@ -102,73 +102,73 @@ 
         j14 = ctx->input[14];
         j15 = ctx->input[15];
         */
-        $j0  = $ctx[0];
-        $j1  = $ctx[1];
-        $j2  = $ctx[2];
-        $j3  = $ctx[3];
-        $j4  = $ctx[4];
-        $j5  = $ctx[5];
-        $j6  = $ctx[6];
-        $j7  = $ctx[7];
-        $j8  = $ctx[8];
-        $j9  = $ctx[9];
-        $j10 = $ctx[10];
-        $j11 = $ctx[11];
-        $j12 = $ctx[12];
-        $j13 = $ctx[13];
-        $j14 = $ctx[14];
-        $j15 = $ctx[15];
+		$j0  = $ctx[0];
+		$j1  = $ctx[1];
+		$j2  = $ctx[2];
+		$j3  = $ctx[3];
+		$j4  = $ctx[4];
+		$j5  = $ctx[5];
+		$j6  = $ctx[6];
+		$j7  = $ctx[7];
+		$j8  = $ctx[8];
+		$j9  = $ctx[9];
+		$j10 = $ctx[10];
+		$j11 = $ctx[11];
+		$j12 = $ctx[12];
+		$j13 = $ctx[13];
+		$j14 = $ctx[14];
+		$j15 = $ctx[15];
 
-        $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
-            }
+		$c = '';
+		for (;;) {
+			if ($bytes < 64) {
+				$message .= str_repeat("\x00", 64 - $bytes);
+			}
 
-            $x0 =  clone $j0;
-            $x1 =  clone $j1;
-            $x2 =  clone $j2;
-            $x3 =  clone $j3;
-            $x4 =  clone $j4;
-            $x5 =  clone $j5;
-            $x6 =  clone $j6;
-            $x7 =  clone $j7;
-            $x8 =  clone $j8;
-            $x9 =  clone $j9;
-            $x10 = clone $j10;
-            $x11 = clone $j11;
-            $x12 = clone $j12;
-            $x13 = clone $j13;
-            $x14 = clone $j14;
-            $x15 = clone $j15;
+			$x0 =  clone $j0;
+			$x1 =  clone $j1;
+			$x2 =  clone $j2;
+			$x3 =  clone $j3;
+			$x4 =  clone $j4;
+			$x5 =  clone $j5;
+			$x6 =  clone $j6;
+			$x7 =  clone $j7;
+			$x8 =  clone $j8;
+			$x9 =  clone $j9;
+			$x10 = clone $j10;
+			$x11 = clone $j11;
+			$x12 = clone $j12;
+			$x13 = clone $j13;
+			$x14 = clone $j14;
+			$x15 = clone $j15;
 
-            # 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);
+			# 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);
 
-                # QUARTERROUND( x1,  x5,  x9,  x13)
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+				# 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);
+				# 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);
+				# 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);
+				# 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);
+				# 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);
+				# 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);
-            }
-            /*
+				# QUARTERROUND( x3,  x4,  x9,  x14)
+				list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+			}
+			/*
             x0 = PLUS(x0, j0);
             x1 = PLUS(x1, j1);
             x2 = PLUS(x2, j2);
@@ -186,24 +186,24 @@ 
             x14 = PLUS(x14, j14);
             x15 = PLUS(x15, j15);
             */
-            $x0 = $x0->addInt32($j0);
-            $x1 = $x1->addInt32($j1);
-            $x2 = $x2->addInt32($j2);
-            $x3 = $x3->addInt32($j3);
-            $x4 = $x4->addInt32($j4);
-            $x5 = $x5->addInt32($j5);
-            $x6 = $x6->addInt32($j6);
-            $x7 = $x7->addInt32($j7);
-            $x8 = $x8->addInt32($j8);
-            $x9 = $x9->addInt32($j9);
-            $x10 = $x10->addInt32($j10);
-            $x11 = $x11->addInt32($j11);
-            $x12 = $x12->addInt32($j12);
-            $x13 = $x13->addInt32($j13);
-            $x14 = $x14->addInt32($j14);
-            $x15 = $x15->addInt32($j15);
+			$x0 = $x0->addInt32($j0);
+			$x1 = $x1->addInt32($j1);
+			$x2 = $x2->addInt32($j2);
+			$x3 = $x3->addInt32($j3);
+			$x4 = $x4->addInt32($j4);
+			$x5 = $x5->addInt32($j5);
+			$x6 = $x6->addInt32($j6);
+			$x7 = $x7->addInt32($j7);
+			$x8 = $x8->addInt32($j8);
+			$x9 = $x9->addInt32($j9);
+			$x10 = $x10->addInt32($j10);
+			$x11 = $x11->addInt32($j11);
+			$x12 = $x12->addInt32($j12);
+			$x13 = $x13->addInt32($j13);
+			$x14 = $x14->addInt32($j14);
+			$x15 = $x15->addInt32($j15);
 
-            /*
+			/*
             x0 = XOR(x0, LOAD32_LE(m + 0));
             x1 = XOR(x1, LOAD32_LE(m + 4));
             x2 = XOR(x2, LOAD32_LE(m + 8));
@@ -221,36 +221,36 @@ 
             x14 = XOR(x14, LOAD32_LE(m + 56));
             x15 = XOR(x15, LOAD32_LE(m + 60));
             */
-            $x0  =  $x0->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  0, 4)));
-            $x1  =  $x1->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  4, 4)));
-            $x2  =  $x2->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  8, 4)));
-            $x3  =  $x3->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4)));
-            $x4  =  $x4->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 16, 4)));
-            $x5  =  $x5->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 20, 4)));
-            $x6  =  $x6->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 24, 4)));
-            $x7  =  $x7->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 28, 4)));
-            $x8  =  $x8->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 32, 4)));
-            $x9  =  $x9->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 36, 4)));
-            $x10 = $x10->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 40, 4)));
-            $x11 = $x11->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 44, 4)));
-            $x12 = $x12->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 48, 4)));
-            $x13 = $x13->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 52, 4)));
-            $x14 = $x14->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 56, 4)));
-            $x15 = $x15->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 60, 4)));
+			$x0  =  $x0->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  0, 4)));
+			$x1  =  $x1->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  4, 4)));
+			$x2  =  $x2->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  8, 4)));
+			$x3  =  $x3->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4)));
+			$x4  =  $x4->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 16, 4)));
+			$x5  =  $x5->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 20, 4)));
+			$x6  =  $x6->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 24, 4)));
+			$x7  =  $x7->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 28, 4)));
+			$x8  =  $x8->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 32, 4)));
+			$x9  =  $x9->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 36, 4)));
+			$x10 = $x10->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 40, 4)));
+			$x11 = $x11->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 44, 4)));
+			$x12 = $x12->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 48, 4)));
+			$x13 = $x13->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 52, 4)));
+			$x14 = $x14->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 56, 4)));
+			$x15 = $x15->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 60, 4)));
 
-            /*
+			/*
                 j12 = PLUSONE(j12);
                 if (!j12) {
                     j13 = PLUSONE(j13);
                 }
              */
-            /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
-            $j12 = $j12->addInt(1);
-            if ($j12->limbs[0] === 0 && $j12->limbs[1] === 0) {
-                $j13 = $j13->addInt(1);
-            }
+			/** @var ParagonIE_Sodium_Core32_Int32 $j12 */
+			$j12 = $j12->addInt(1);
+			if ($j12->limbs[0] === 0 && $j12->limbs[1] === 0) {
+				$j13 = $j13->addInt(1);
+			}
 
-            /*
+			/*
             STORE32_LE(c + 0, x0);
             STORE32_LE(c + 4, x1);
             STORE32_LE(c + 8, x2);
@@ -269,107 +269,107 @@ 
             STORE32_LE(c + 60, x15);
             */
 
-            $block = $x0->toReverseString() .
-                $x1->toReverseString() .
-                $x2->toReverseString() .
-                $x3->toReverseString() .
-                $x4->toReverseString() .
-                $x5->toReverseString() .
-                $x6->toReverseString() .
-                $x7->toReverseString() .
-                $x8->toReverseString() .
-                $x9->toReverseString() .
-                $x10->toReverseString() .
-                $x11->toReverseString() .
-                $x12->toReverseString() .
-                $x13->toReverseString() .
-                $x14->toReverseString() .
-                $x15->toReverseString();
+			$block = $x0->toReverseString() .
+				$x1->toReverseString() .
+				$x2->toReverseString() .
+				$x3->toReverseString() .
+				$x4->toReverseString() .
+				$x5->toReverseString() .
+				$x6->toReverseString() .
+				$x7->toReverseString() .
+				$x8->toReverseString() .
+				$x9->toReverseString() .
+				$x10->toReverseString() .
+				$x11->toReverseString() .
+				$x12->toReverseString() .
+				$x13->toReverseString() .
+				$x14->toReverseString() .
+				$x15->toReverseString();
 
-            /* Partial block */
-            if ($bytes < 64) {
-                $c .= self::substr($block, 0, $bytes);
-                break;
-            }
+			/* Partial block */
+			if ($bytes < 64) {
+				$c .= self::substr($block, 0, $bytes);
+				break;
+			}
 
-            /* Full block */
-            $c .= $block;
-            $bytes -= 64;
-            if ($bytes <= 0) {
-                break;
-            }
-            $message = self::substr($message, 64);
-        }
-        /* end for(;;) loop */
+			/* Full block */
+			$c .= $block;
+			$bytes -= 64;
+			if ($bytes <= 0) {
+				break;
+			}
+			$message = self::substr($message, 64);
+		}
+		/* end for(;;) loop */
 
-        $ctx[12] = $j12;
-        $ctx[13] = $j13;
-        return $c;
-    }
+		$ctx[12] = $j12;
+		$ctx[13] = $j13;
+		return $c;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
-            str_repeat("\x00", $len)
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	public static function stream($len = 64, $nonce = '', $key = '')
+	{
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
+			str_repeat("\x00", $len)
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    public static function ietfStream($len, $nonce = '', $key = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
-            str_repeat("\x00", $len)
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	public static function ietfStream($len, $nonce = '', $key = '')
+	{
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
+			str_repeat("\x00", $len)
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
-            $message
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @param string $ic
+	 * @return string
+	 */
+	public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+	{
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
+			$message
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
-            $message
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @param string $ic
+	 * @return string
+	 */
+	public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+	{
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
+			$message
+		);
+	}
 }

Spacing +82 added lines, -82 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_ChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_ChaCha20', false ) ) {
     return;
 }
 
@@ -32,22 +32,22 @@ 
         /** @var ParagonIE_Sodium_Core32_Int32 $d */
 
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(16);
+        $a = $a->addInt32( $b );
+        $d = $d->xorInt32( $a )->rotateLeft( 16 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(12);
+        $c = $c->addInt32( $d );
+        $b = $b->xorInt32( $c )->rotateLeft( 12 );
 
         # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(8);
+        $a = $a->addInt32( $b );
+        $d = $d->xorInt32( $a )->rotateLeft( 8 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(7);
+        $c = $c->addInt32( $d );
+        $b = $b->xorInt32( $c )->rotateLeft( 7 );
 
-        return array($a, $b, $c, $d);
+        return array( $a, $b, $c, $d );
     }
 
     /**
@@ -63,7 +63,7 @@ 
         ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx,
         $message = ''
     ) {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $x0
@@ -120,21 +120,21 @@ 
         $j15 = $ctx[15];
 
         $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
+        for ( ;; ) {
+            if ( $bytes < 64 ) {
+                $message .= str_repeat( "\x00", 64 - $bytes );
             }
 
-            $x0 =  clone $j0;
-            $x1 =  clone $j1;
-            $x2 =  clone $j2;
-            $x3 =  clone $j3;
-            $x4 =  clone $j4;
-            $x5 =  clone $j5;
-            $x6 =  clone $j6;
-            $x7 =  clone $j7;
-            $x8 =  clone $j8;
-            $x9 =  clone $j9;
+            $x0 = clone $j0;
+            $x1 = clone $j1;
+            $x2 = clone $j2;
+            $x3 = clone $j3;
+            $x4 = clone $j4;
+            $x5 = clone $j5;
+            $x6 = clone $j6;
+            $x7 = clone $j7;
+            $x8 = clone $j8;
+            $x9 = clone $j9;
             $x10 = clone $j10;
             $x11 = clone $j11;
             $x12 = clone $j12;
@@ -143,30 +143,30 @@ 
             $x15 = clone $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);
@@ -186,22 +186,22 @@ 
             x14 = PLUS(x14, j14);
             x15 = PLUS(x15, j15);
             */
-            $x0 = $x0->addInt32($j0);
-            $x1 = $x1->addInt32($j1);
-            $x2 = $x2->addInt32($j2);
-            $x3 = $x3->addInt32($j3);
-            $x4 = $x4->addInt32($j4);
-            $x5 = $x5->addInt32($j5);
-            $x6 = $x6->addInt32($j6);
-            $x7 = $x7->addInt32($j7);
-            $x8 = $x8->addInt32($j8);
-            $x9 = $x9->addInt32($j9);
-            $x10 = $x10->addInt32($j10);
-            $x11 = $x11->addInt32($j11);
-            $x12 = $x12->addInt32($j12);
-            $x13 = $x13->addInt32($j13);
-            $x14 = $x14->addInt32($j14);
-            $x15 = $x15->addInt32($j15);
+            $x0 = $x0->addInt32( $j0 );
+            $x1 = $x1->addInt32( $j1 );
+            $x2 = $x2->addInt32( $j2 );
+            $x3 = $x3->addInt32( $j3 );
+            $x4 = $x4->addInt32( $j4 );
+            $x5 = $x5->addInt32( $j5 );
+            $x6 = $x6->addInt32( $j6 );
+            $x7 = $x7->addInt32( $j7 );
+            $x8 = $x8->addInt32( $j8 );
+            $x9 = $x9->addInt32( $j9 );
+            $x10 = $x10->addInt32( $j10 );
+            $x11 = $x11->addInt32( $j11 );
+            $x12 = $x12->addInt32( $j12 );
+            $x13 = $x13->addInt32( $j13 );
+            $x14 = $x14->addInt32( $j14 );
+            $x15 = $x15->addInt32( $j15 );
 
             /*
             x0 = XOR(x0, LOAD32_LE(m + 0));
@@ -221,22 +221,22 @@ 
             x14 = XOR(x14, LOAD32_LE(m + 56));
             x15 = XOR(x15, LOAD32_LE(m + 60));
             */
-            $x0  =  $x0->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  0, 4)));
-            $x1  =  $x1->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  4, 4)));
-            $x2  =  $x2->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  8, 4)));
-            $x3  =  $x3->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4)));
-            $x4  =  $x4->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 16, 4)));
-            $x5  =  $x5->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 20, 4)));
-            $x6  =  $x6->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 24, 4)));
-            $x7  =  $x7->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 28, 4)));
-            $x8  =  $x8->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 32, 4)));
-            $x9  =  $x9->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 36, 4)));
-            $x10 = $x10->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 40, 4)));
-            $x11 = $x11->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 44, 4)));
-            $x12 = $x12->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 48, 4)));
-            $x13 = $x13->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 52, 4)));
-            $x14 = $x14->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 56, 4)));
-            $x15 = $x15->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 60, 4)));
+            $x0  = $x0->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 0, 4 ) ) );
+            $x1  = $x1->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 4, 4 ) ) );
+            $x2  = $x2->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 8, 4 ) ) );
+            $x3  = $x3->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 12, 4 ) ) );
+            $x4  = $x4->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 16, 4 ) ) );
+            $x5  = $x5->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 20, 4 ) ) );
+            $x6  = $x6->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 24, 4 ) ) );
+            $x7  = $x7->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 28, 4 ) ) );
+            $x8  = $x8->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 32, 4 ) ) );
+            $x9  = $x9->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 36, 4 ) ) );
+            $x10 = $x10->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 40, 4 ) ) );
+            $x11 = $x11->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 44, 4 ) ) );
+            $x12 = $x12->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 48, 4 ) ) );
+            $x13 = $x13->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 52, 4 ) ) );
+            $x14 = $x14->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 56, 4 ) ) );
+            $x15 = $x15->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 60, 4 ) ) );
 
             /*
                 j12 = PLUSONE(j12);
@@ -245,9 +245,9 @@ 
                 }
              */
             /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
-            $j12 = $j12->addInt(1);
-            if ($j12->limbs[0] === 0 && $j12->limbs[1] === 0) {
-                $j13 = $j13->addInt(1);
+            $j12 = $j12->addInt( 1 );
+            if ( $j12->limbs[0] === 0 && $j12->limbs[1] === 0 ) {
+                $j13 = $j13->addInt( 1 );
             }
 
             /*
@@ -287,18 +287,18 @@ 
                 $x15->toReverseString();
 
             /* 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 */
 
@@ -315,11 +315,11 @@ 
      * @param string $key
      * @return string
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
+    public static function stream( $len = 64, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -331,11 +331,11 @@ 
      * @param string $key
      * @return string
      */
-    public static function ietfStream($len, $nonce = '', $key = '')
+    public static function ietfStream( $len, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -348,10 +348,10 @@ 
      * @param string $ic
      * @return string
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function ietfStreamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx( $key, $nonce, $ic ),
             $message
         );
     }
@@ -365,10 +365,10 @@ 
      * @param string $ic
      * @return string
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx( $key, $nonce, $ic ),
             $message
         );
     }

Braces +5 added lines, -10 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_ChaCha20
  */
-class ParagonIE_Sodium_Core32_ChaCha20 extends ParagonIE_Sodium_Core32_Util
-{
+class ParagonIE_Sodium_Core32_ChaCha20 extends ParagonIE_Sodium_Core32_Util {
     /**
      * The ChaCha20 quarter round function. Works on four 32-bit integers.
      *
@@ -315,8 +314,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
+    public static function stream($len = 64, $nonce = '', $key = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
             str_repeat("\x00", $len)
@@ -331,8 +329,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function ietfStream($len, $nonce = '', $key = '')
-    {
+    public static function ietfStream($len, $nonce = '', $key = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
             str_repeat("\x00", $len)
@@ -348,8 +345,7 @@ 
      * @param string $ic
      * @return string
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
             $message
@@ -365,8 +361,7 @@ 
      * @param string $ic
      * @return string
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
             $message

src/library/sodium_compat/src/Core32/X25519.php

Indentation +304 added lines, -304 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_X25519', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,118 +9,118 @@ 
  */
 abstract class ParagonIE_Sodium_Core32_X25519 extends ParagonIE_Sodium_Core32_Curve25519
 {
-    /**
-     * Alters the objects passed to this method in place.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @param int $b
-     * @return void
-     */
-    public static function fe_cswap(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g,
-        $b = 0
-    ) {
-        $f0 = (int) $f[0]->toInt();
-        $f1 = (int) $f[1]->toInt();
-        $f2 = (int) $f[2]->toInt();
-        $f3 = (int) $f[3]->toInt();
-        $f4 = (int) $f[4]->toInt();
-        $f5 = (int) $f[5]->toInt();
-        $f6 = (int) $f[6]->toInt();
-        $f7 = (int) $f[7]->toInt();
-        $f8 = (int) $f[8]->toInt();
-        $f9 = (int) $f[9]->toInt();
-        $g0 = (int) $g[0]->toInt();
-        $g1 = (int) $g[1]->toInt();
-        $g2 = (int) $g[2]->toInt();
-        $g3 = (int) $g[3]->toInt();
-        $g4 = (int) $g[4]->toInt();
-        $g5 = (int) $g[5]->toInt();
-        $g6 = (int) $g[6]->toInt();
-        $g7 = (int) $g[7]->toInt();
-        $g8 = (int) $g[8]->toInt();
-        $g9 = (int) $g[9]->toInt();
-        $b = -$b;
-        $x0 = ($f0 ^ $g0) & $b;
-        $x1 = ($f1 ^ $g1) & $b;
-        $x2 = ($f2 ^ $g2) & $b;
-        $x3 = ($f3 ^ $g3) & $b;
-        $x4 = ($f4 ^ $g4) & $b;
-        $x5 = ($f5 ^ $g5) & $b;
-        $x6 = ($f6 ^ $g6) & $b;
-        $x7 = ($f7 ^ $g7) & $b;
-        $x8 = ($f8 ^ $g8) & $b;
-        $x9 = ($f9 ^ $g9) & $b;
-        $f[0] = ParagonIE_Sodium_Core32_Int32::fromInt($f0 ^ $x0);
-        $f[1] = ParagonIE_Sodium_Core32_Int32::fromInt($f1 ^ $x1);
-        $f[2] = ParagonIE_Sodium_Core32_Int32::fromInt($f2 ^ $x2);
-        $f[3] = ParagonIE_Sodium_Core32_Int32::fromInt($f3 ^ $x3);
-        $f[4] = ParagonIE_Sodium_Core32_Int32::fromInt($f4 ^ $x4);
-        $f[5] = ParagonIE_Sodium_Core32_Int32::fromInt($f5 ^ $x5);
-        $f[6] = ParagonIE_Sodium_Core32_Int32::fromInt($f6 ^ $x6);
-        $f[7] = ParagonIE_Sodium_Core32_Int32::fromInt($f7 ^ $x7);
-        $f[8] = ParagonIE_Sodium_Core32_Int32::fromInt($f8 ^ $x8);
-        $f[9] = ParagonIE_Sodium_Core32_Int32::fromInt($f9 ^ $x9);
-        $g[0] = ParagonIE_Sodium_Core32_Int32::fromInt($g0 ^ $x0);
-        $g[1] = ParagonIE_Sodium_Core32_Int32::fromInt($g1 ^ $x1);
-        $g[2] = ParagonIE_Sodium_Core32_Int32::fromInt($g2 ^ $x2);
-        $g[3] = ParagonIE_Sodium_Core32_Int32::fromInt($g3 ^ $x3);
-        $g[4] = ParagonIE_Sodium_Core32_Int32::fromInt($g4 ^ $x4);
-        $g[5] = ParagonIE_Sodium_Core32_Int32::fromInt($g5 ^ $x5);
-        $g[6] = ParagonIE_Sodium_Core32_Int32::fromInt($g6 ^ $x6);
-        $g[7] = ParagonIE_Sodium_Core32_Int32::fromInt($g7 ^ $x7);
-        $g[8] = ParagonIE_Sodium_Core32_Int32::fromInt($g8 ^ $x8);
-        $g[9] = ParagonIE_Sodium_Core32_Int32::fromInt($g9 ^ $x9);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        /** @var ParagonIE_Sodium_Core32_Int32[] $h */
-        $h = array(
-            $f[0]->mulInt(121666),
-            $f[1]->mulInt(121666),
-            $f[2]->mulInt(121666),
-            $f[3]->mulInt(121666),
-            $f[4]->mulInt(121666),
-            $f[5]->mulInt(121666),
-            $f[6]->mulInt(121666),
-            $f[7]->mulInt(121666),
-            $f[8]->mulInt(121666),
-            $f[9]->mulInt(121666),
-        );
-
-        /** @var ParagonIE_Sodium_Core32_Int32 $carry9 */
-        $carry9 = $h[9]->addInt(1 << 24)->shiftRight(25);
-        $h[0] = $carry9->mulInt(19);
-        $h[9] = $h[9]->subInt32($carry9->shiftLeft(25));
-
-        $carry1 = $h[1]->addInt(1 << 24)->shiftRight(25);
-        $h[2] = $h[2]->addInt32($carry1);
-        $h[1] = $h[1]->subInt32($carry1->shiftLeft(25));
-
-        $carry3 = $h[3]->addInt(1 << 24)->shiftRight(25);
-        $h[4] = $h[4]->addInt32($carry3);
-        $h[3] = $h[3]->subInt32($carry3->shiftLeft(25));
-
-        $carry5 = $h[3]->addInt(1 << 24)->shiftRight(25);
-        $h[6] = $h[6]->addInt32($carry5);
-        $h[5] = $h[5]->subInt32($carry5->shiftLeft(25));
-
-        $carry7 = $h[3]->addInt(1 << 24)->shiftRight(25);
-        $h[8] = $h[8]->addInt32($carry7);
-        $h[7] = $h[7]->subInt32($carry7->shiftLeft(25));
-
-        /*
+	/**
+	 * Alters the objects passed to this method in place.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+	 * @param int $b
+	 * @return void
+	 */
+	public static function fe_cswap(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $g,
+		$b = 0
+	) {
+		$f0 = (int) $f[0]->toInt();
+		$f1 = (int) $f[1]->toInt();
+		$f2 = (int) $f[2]->toInt();
+		$f3 = (int) $f[3]->toInt();
+		$f4 = (int) $f[4]->toInt();
+		$f5 = (int) $f[5]->toInt();
+		$f6 = (int) $f[6]->toInt();
+		$f7 = (int) $f[7]->toInt();
+		$f8 = (int) $f[8]->toInt();
+		$f9 = (int) $f[9]->toInt();
+		$g0 = (int) $g[0]->toInt();
+		$g1 = (int) $g[1]->toInt();
+		$g2 = (int) $g[2]->toInt();
+		$g3 = (int) $g[3]->toInt();
+		$g4 = (int) $g[4]->toInt();
+		$g5 = (int) $g[5]->toInt();
+		$g6 = (int) $g[6]->toInt();
+		$g7 = (int) $g[7]->toInt();
+		$g8 = (int) $g[8]->toInt();
+		$g9 = (int) $g[9]->toInt();
+		$b = -$b;
+		$x0 = ($f0 ^ $g0) & $b;
+		$x1 = ($f1 ^ $g1) & $b;
+		$x2 = ($f2 ^ $g2) & $b;
+		$x3 = ($f3 ^ $g3) & $b;
+		$x4 = ($f4 ^ $g4) & $b;
+		$x5 = ($f5 ^ $g5) & $b;
+		$x6 = ($f6 ^ $g6) & $b;
+		$x7 = ($f7 ^ $g7) & $b;
+		$x8 = ($f8 ^ $g8) & $b;
+		$x9 = ($f9 ^ $g9) & $b;
+		$f[0] = ParagonIE_Sodium_Core32_Int32::fromInt($f0 ^ $x0);
+		$f[1] = ParagonIE_Sodium_Core32_Int32::fromInt($f1 ^ $x1);
+		$f[2] = ParagonIE_Sodium_Core32_Int32::fromInt($f2 ^ $x2);
+		$f[3] = ParagonIE_Sodium_Core32_Int32::fromInt($f3 ^ $x3);
+		$f[4] = ParagonIE_Sodium_Core32_Int32::fromInt($f4 ^ $x4);
+		$f[5] = ParagonIE_Sodium_Core32_Int32::fromInt($f5 ^ $x5);
+		$f[6] = ParagonIE_Sodium_Core32_Int32::fromInt($f6 ^ $x6);
+		$f[7] = ParagonIE_Sodium_Core32_Int32::fromInt($f7 ^ $x7);
+		$f[8] = ParagonIE_Sodium_Core32_Int32::fromInt($f8 ^ $x8);
+		$f[9] = ParagonIE_Sodium_Core32_Int32::fromInt($f9 ^ $x9);
+		$g[0] = ParagonIE_Sodium_Core32_Int32::fromInt($g0 ^ $x0);
+		$g[1] = ParagonIE_Sodium_Core32_Int32::fromInt($g1 ^ $x1);
+		$g[2] = ParagonIE_Sodium_Core32_Int32::fromInt($g2 ^ $x2);
+		$g[3] = ParagonIE_Sodium_Core32_Int32::fromInt($g3 ^ $x3);
+		$g[4] = ParagonIE_Sodium_Core32_Int32::fromInt($g4 ^ $x4);
+		$g[5] = ParagonIE_Sodium_Core32_Int32::fromInt($g5 ^ $x5);
+		$g[6] = ParagonIE_Sodium_Core32_Int32::fromInt($g6 ^ $x6);
+		$g[7] = ParagonIE_Sodium_Core32_Int32::fromInt($g7 ^ $x7);
+		$g[8] = ParagonIE_Sodium_Core32_Int32::fromInt($g8 ^ $x8);
+		$g[9] = ParagonIE_Sodium_Core32_Int32::fromInt($g9 ^ $x9);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+	{
+		/** @var ParagonIE_Sodium_Core32_Int32[] $h */
+		$h = array(
+			$f[0]->mulInt(121666),
+			$f[1]->mulInt(121666),
+			$f[2]->mulInt(121666),
+			$f[3]->mulInt(121666),
+			$f[4]->mulInt(121666),
+			$f[5]->mulInt(121666),
+			$f[6]->mulInt(121666),
+			$f[7]->mulInt(121666),
+			$f[8]->mulInt(121666),
+			$f[9]->mulInt(121666),
+		);
+
+		/** @var ParagonIE_Sodium_Core32_Int32 $carry9 */
+		$carry9 = $h[9]->addInt(1 << 24)->shiftRight(25);
+		$h[0] = $carry9->mulInt(19);
+		$h[9] = $h[9]->subInt32($carry9->shiftLeft(25));
+
+		$carry1 = $h[1]->addInt(1 << 24)->shiftRight(25);
+		$h[2] = $h[2]->addInt32($carry1);
+		$h[1] = $h[1]->subInt32($carry1->shiftLeft(25));
+
+		$carry3 = $h[3]->addInt(1 << 24)->shiftRight(25);
+		$h[4] = $h[4]->addInt32($carry3);
+		$h[3] = $h[3]->subInt32($carry3->shiftLeft(25));
+
+		$carry5 = $h[3]->addInt(1 << 24)->shiftRight(25);
+		$h[6] = $h[6]->addInt32($carry5);
+		$h[5] = $h[5]->subInt32($carry5->shiftLeft(25));
+
+		$carry7 = $h[3]->addInt(1 << 24)->shiftRight(25);
+		$h[8] = $h[8]->addInt32($carry7);
+		$h[7] = $h[7]->subInt32($carry7->shiftLeft(25));
+
+		/*
         $carry9 = ($h[9] + (1 << 24)) >> 25;
         $h[0] += self::mul($carry9, 19);
         $h[9] -= $carry9 << 25;
@@ -138,27 +138,27 @@ 
         $h[7] -= $carry7 << 25;
         */
 
-        $carry0 = $h[0]->addInt(1 << 25)->shiftRight(26);
-        $h[1] = $h[1]->addInt32($carry0);
-        $h[0] = $h[0]->subInt32($carry0->shiftLeft(26));
+		$carry0 = $h[0]->addInt(1 << 25)->shiftRight(26);
+		$h[1] = $h[1]->addInt32($carry0);
+		$h[0] = $h[0]->subInt32($carry0->shiftLeft(26));
 
-        $carry2 = $h[2]->addInt(1 << 25)->shiftRight(26);
-        $h[3] = $h[3]->addInt32($carry2);
-        $h[2] = $h[2]->subInt32($carry2->shiftLeft(26));
+		$carry2 = $h[2]->addInt(1 << 25)->shiftRight(26);
+		$h[3] = $h[3]->addInt32($carry2);
+		$h[2] = $h[2]->subInt32($carry2->shiftLeft(26));
 
-        $carry4 = $h[4]->addInt(1 << 25)->shiftRight(26);
-        $h[5] = $h[5]->addInt32($carry4);
-        $h[4] = $h[4]->subInt32($carry4->shiftLeft(26));
+		$carry4 = $h[4]->addInt(1 << 25)->shiftRight(26);
+		$h[5] = $h[5]->addInt32($carry4);
+		$h[4] = $h[4]->subInt32($carry4->shiftLeft(26));
 
-        $carry6 = $h[6]->addInt(1 << 25)->shiftRight(26);
-        $h[7] = $h[7]->addInt32($carry6);
-        $h[6] = $h[6]->subInt32($carry6->shiftLeft(26));
+		$carry6 = $h[6]->addInt(1 << 25)->shiftRight(26);
+		$h[7] = $h[7]->addInt32($carry6);
+		$h[6] = $h[6]->subInt32($carry6->shiftLeft(26));
 
-        $carry8 = $h[8]->addInt(1 << 25)->shiftRight(26);
-        $h[9] = $h[9]->addInt32($carry8);
-        $h[8] = $h[8]->subInt32($carry8->shiftLeft(26));
+		$carry8 = $h[8]->addInt(1 << 25)->shiftRight(26);
+		$h[9] = $h[9]->addInt32($carry8);
+		$h[8] = $h[8]->subInt32($carry8->shiftLeft(26));
 
-        /*
+		/*
         $carry0 = ($h[0] + (1 << 25)) >> 26;
         $h[1] += $carry0;
         $h[0] -= $carry0 << 26;
@@ -176,179 +176,179 @@ 
         $h[8] -= $carry8 << 26;
         */
 
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * Inline comments preceded by # are from libsodium's ref10 code.
-     *
-     * @param string $n
-     * @param string $p
-     * @return string
-     */
-    public static function crypto_scalarmult_curve25519_ref10($n, $p)
-    {
-        # for (i = 0;i < 32;++i) e[i] = n[i];
-        $e = '' . $n;
-        # e[0] &= 248;
-        $e[0] = self::intToChr(
-            self::chrToInt($e[0]) & 248
-        );
-        # e[31] &= 127;
-        # e[31] |= 64;
-        $e[31] = self::intToChr(
-            (self::chrToInt($e[31]) & 127) | 64
-        );
-        # fe_frombytes(x1,p);
-        $x1 = self::fe_frombytes($p);
-        # fe_1(x2);
-        $x2 = self::fe_1();
-        # fe_0(z2);
-        $z2 = self::fe_0();
-        # fe_copy(x3,x1);
-        $x3 = self::fe_copy($x1);
-        # fe_1(z3);
-        $z3 = self::fe_1();
-
-        # swap = 0;
-        $swap = 0;
-
-        # for (pos = 254;pos >= 0;--pos) {
-        for ($pos = 254; $pos >= 0; --$pos) {
-            # b = e[pos / 8] >> (pos & 7);
-            $b = self::chrToInt(
-                    $e[(int) floor($pos / 8)]
-                ) >> ($pos & 7);
-            # b &= 1;
-            $b &= 1;
-            # swap ^= b;
-            $swap ^= $b;
-            # fe_cswap(x2,x3,swap);
-            self::fe_cswap($x2, $x3, $swap);
-            # fe_cswap(z2,z3,swap);
-            self::fe_cswap($z2, $z3, $swap);
-            # swap = b;
-            $swap = $b;
-            # fe_sub(tmp0,x3,z3);
-            $tmp0 = self::fe_sub($x3, $z3);
-            # fe_sub(tmp1,x2,z2);
-            $tmp1 = self::fe_sub($x2, $z2);
-
-            # fe_add(x2,x2,z2);
-            $x2 = self::fe_add($x2, $z2);
-
-            # fe_add(z2,x3,z3);
-            $z2 = self::fe_add($x3, $z3);
-
-            # fe_mul(z3,tmp0,x2);
-            $z3 = self::fe_mul($tmp0, $x2);
-
-            # fe_mul(z2,z2,tmp1);
-            $z2 = self::fe_mul($z2, $tmp1);
-
-            # fe_sq(tmp0,tmp1);
-            $tmp0 = self::fe_sq($tmp1);
-
-            # fe_sq(tmp1,x2);
-            $tmp1 = self::fe_sq($x2);
-
-            # fe_add(x3,z3,z2);
-            $x3 = self::fe_add($z3, $z2);
-
-            # fe_sub(z2,z3,z2);
-            $z2 = self::fe_sub($z3, $z2);
-
-            # fe_mul(x2,tmp1,tmp0);
-            $x2 = self::fe_mul($tmp1, $tmp0);
-
-            # fe_sub(tmp1,tmp1,tmp0);
-            $tmp1 = self::fe_sub($tmp1, $tmp0);
-
-            # fe_sq(z2,z2);
-            $z2 = self::fe_sq($z2);
-
-            # fe_mul121666(z3,tmp1);
-            $z3 = self::fe_mul121666($tmp1);
-
-            # fe_sq(x3,x3);
-            $x3 = self::fe_sq($x3);
-
-            # fe_add(tmp0,tmp0,z3);
-            $tmp0 = self::fe_add($tmp0, $z3);
-
-            # fe_mul(z3,x1,z2);
-            $z3 = self::fe_mul($x1, $z2);
-
-            # fe_mul(z2,tmp1,tmp0);
-            $z2 = self::fe_mul($tmp1, $tmp0);
-        }
-
-        # fe_cswap(x2,x3,swap);
-        self::fe_cswap($x2, $x3, $swap);
-
-        # fe_cswap(z2,z3,swap);
-        self::fe_cswap($z2, $z3, $swap);
-
-        # fe_invert(z2,z2);
-        $z2 = self::fe_invert($z2);
-
-        # fe_mul(x2,x2,z2);
-        $x2 = self::fe_mul($x2, $z2);
-        # fe_tobytes(q,x2);
-        return self::fe_tobytes($x2);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function edwards_to_montgomery(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
-    ) {
-        $tempX = self::fe_add($edwardsZ, $edwardsY);
-        $tempZ = self::fe_sub($edwardsZ, $edwardsY);
-        $tempZ = self::fe_invert($tempZ);
-        return self::fe_mul($tempX, $tempZ);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $n
-     * @return string
-     * @throws TypeError
-     */
-    public static function crypto_scalarmult_curve25519_ref10_base($n)
-    {
-        # for (i = 0;i < 32;++i) e[i] = n[i];
-        $e = '' . $n;
-
-        # e[0] &= 248;
-        $e[0] = self::intToChr(
-            self::chrToInt($e[0]) & 248
-        );
-
-        # e[31] &= 127;
-        # e[31] |= 64;
-        $e[31] = self::intToChr(
-            (self::chrToInt($e[31]) & 127) | 64
-        );
-
-        $A = self::ge_scalarmult_base($e);
-        if (
-            !($A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
-            ||
-            !($A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
-        ) {
-            throw new TypeError('Null points encountered');
-        }
-        $pk = self::edwards_to_montgomery($A->Y, $A->Z);
-        return self::fe_tobytes($pk);
-    }
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * Inline comments preceded by # are from libsodium's ref10 code.
+	 *
+	 * @param string $n
+	 * @param string $p
+	 * @return string
+	 */
+	public static function crypto_scalarmult_curve25519_ref10($n, $p)
+	{
+		# for (i = 0;i < 32;++i) e[i] = n[i];
+		$e = '' . $n;
+		# e[0] &= 248;
+		$e[0] = self::intToChr(
+			self::chrToInt($e[0]) & 248
+		);
+		# e[31] &= 127;
+		# e[31] |= 64;
+		$e[31] = self::intToChr(
+			(self::chrToInt($e[31]) & 127) | 64
+		);
+		# fe_frombytes(x1,p);
+		$x1 = self::fe_frombytes($p);
+		# fe_1(x2);
+		$x2 = self::fe_1();
+		# fe_0(z2);
+		$z2 = self::fe_0();
+		# fe_copy(x3,x1);
+		$x3 = self::fe_copy($x1);
+		# fe_1(z3);
+		$z3 = self::fe_1();
+
+		# swap = 0;
+		$swap = 0;
+
+		# for (pos = 254;pos >= 0;--pos) {
+		for ($pos = 254; $pos >= 0; --$pos) {
+			# b = e[pos / 8] >> (pos & 7);
+			$b = self::chrToInt(
+					$e[(int) floor($pos / 8)]
+				) >> ($pos & 7);
+			# b &= 1;
+			$b &= 1;
+			# swap ^= b;
+			$swap ^= $b;
+			# fe_cswap(x2,x3,swap);
+			self::fe_cswap($x2, $x3, $swap);
+			# fe_cswap(z2,z3,swap);
+			self::fe_cswap($z2, $z3, $swap);
+			# swap = b;
+			$swap = $b;
+			# fe_sub(tmp0,x3,z3);
+			$tmp0 = self::fe_sub($x3, $z3);
+			# fe_sub(tmp1,x2,z2);
+			$tmp1 = self::fe_sub($x2, $z2);
+
+			# fe_add(x2,x2,z2);
+			$x2 = self::fe_add($x2, $z2);
+
+			# fe_add(z2,x3,z3);
+			$z2 = self::fe_add($x3, $z3);
+
+			# fe_mul(z3,tmp0,x2);
+			$z3 = self::fe_mul($tmp0, $x2);
+
+			# fe_mul(z2,z2,tmp1);
+			$z2 = self::fe_mul($z2, $tmp1);
+
+			# fe_sq(tmp0,tmp1);
+			$tmp0 = self::fe_sq($tmp1);
+
+			# fe_sq(tmp1,x2);
+			$tmp1 = self::fe_sq($x2);
+
+			# fe_add(x3,z3,z2);
+			$x3 = self::fe_add($z3, $z2);
+
+			# fe_sub(z2,z3,z2);
+			$z2 = self::fe_sub($z3, $z2);
+
+			# fe_mul(x2,tmp1,tmp0);
+			$x2 = self::fe_mul($tmp1, $tmp0);
+
+			# fe_sub(tmp1,tmp1,tmp0);
+			$tmp1 = self::fe_sub($tmp1, $tmp0);
+
+			# fe_sq(z2,z2);
+			$z2 = self::fe_sq($z2);
+
+			# fe_mul121666(z3,tmp1);
+			$z3 = self::fe_mul121666($tmp1);
+
+			# fe_sq(x3,x3);
+			$x3 = self::fe_sq($x3);
+
+			# fe_add(tmp0,tmp0,z3);
+			$tmp0 = self::fe_add($tmp0, $z3);
+
+			# fe_mul(z3,x1,z2);
+			$z3 = self::fe_mul($x1, $z2);
+
+			# fe_mul(z2,tmp1,tmp0);
+			$z2 = self::fe_mul($tmp1, $tmp0);
+		}
+
+		# fe_cswap(x2,x3,swap);
+		self::fe_cswap($x2, $x3, $swap);
+
+		# fe_cswap(z2,z3,swap);
+		self::fe_cswap($z2, $z3, $swap);
+
+		# fe_invert(z2,z2);
+		$z2 = self::fe_invert($z2);
+
+		# fe_mul(x2,x2,z2);
+		$x2 = self::fe_mul($x2, $z2);
+		# fe_tobytes(q,x2);
+		return self::fe_tobytes($x2);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function edwards_to_montgomery(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
+	) {
+		$tempX = self::fe_add($edwardsZ, $edwardsY);
+		$tempZ = self::fe_sub($edwardsZ, $edwardsY);
+		$tempZ = self::fe_invert($tempZ);
+		return self::fe_mul($tempX, $tempZ);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $n
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function crypto_scalarmult_curve25519_ref10_base($n)
+	{
+		# for (i = 0;i < 32;++i) e[i] = n[i];
+		$e = '' . $n;
+
+		# e[0] &= 248;
+		$e[0] = self::intToChr(
+			self::chrToInt($e[0]) & 248
+		);
+
+		# e[31] &= 127;
+		# e[31] |= 64;
+		$e[31] = self::intToChr(
+			(self::chrToInt($e[31]) & 127) | 64
+		);
+
+		$A = self::ge_scalarmult_base($e);
+		if (
+			!($A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
+			||
+			!($A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
+		) {
+			throw new TypeError('Null points encountered');
+		}
+		$pk = self::edwards_to_montgomery($A->Y, $A->Z);
+		return self::fe_tobytes($pk);
+	}
 }

Spacing +119 added lines, -119 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_X25519', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_X25519', false ) ) {
     return;
 }
 
@@ -45,36 +45,36 @@ 
         $g8 = (int) $g[8]->toInt();
         $g9 = (int) $g[9]->toInt();
         $b = -$b;
-        $x0 = ($f0 ^ $g0) & $b;
-        $x1 = ($f1 ^ $g1) & $b;
-        $x2 = ($f2 ^ $g2) & $b;
-        $x3 = ($f3 ^ $g3) & $b;
-        $x4 = ($f4 ^ $g4) & $b;
-        $x5 = ($f5 ^ $g5) & $b;
-        $x6 = ($f6 ^ $g6) & $b;
-        $x7 = ($f7 ^ $g7) & $b;
-        $x8 = ($f8 ^ $g8) & $b;
-        $x9 = ($f9 ^ $g9) & $b;
-        $f[0] = ParagonIE_Sodium_Core32_Int32::fromInt($f0 ^ $x0);
-        $f[1] = ParagonIE_Sodium_Core32_Int32::fromInt($f1 ^ $x1);
-        $f[2] = ParagonIE_Sodium_Core32_Int32::fromInt($f2 ^ $x2);
-        $f[3] = ParagonIE_Sodium_Core32_Int32::fromInt($f3 ^ $x3);
-        $f[4] = ParagonIE_Sodium_Core32_Int32::fromInt($f4 ^ $x4);
-        $f[5] = ParagonIE_Sodium_Core32_Int32::fromInt($f5 ^ $x5);
-        $f[6] = ParagonIE_Sodium_Core32_Int32::fromInt($f6 ^ $x6);
-        $f[7] = ParagonIE_Sodium_Core32_Int32::fromInt($f7 ^ $x7);
-        $f[8] = ParagonIE_Sodium_Core32_Int32::fromInt($f8 ^ $x8);
-        $f[9] = ParagonIE_Sodium_Core32_Int32::fromInt($f9 ^ $x9);
-        $g[0] = ParagonIE_Sodium_Core32_Int32::fromInt($g0 ^ $x0);
-        $g[1] = ParagonIE_Sodium_Core32_Int32::fromInt($g1 ^ $x1);
-        $g[2] = ParagonIE_Sodium_Core32_Int32::fromInt($g2 ^ $x2);
-        $g[3] = ParagonIE_Sodium_Core32_Int32::fromInt($g3 ^ $x3);
-        $g[4] = ParagonIE_Sodium_Core32_Int32::fromInt($g4 ^ $x4);
-        $g[5] = ParagonIE_Sodium_Core32_Int32::fromInt($g5 ^ $x5);
-        $g[6] = ParagonIE_Sodium_Core32_Int32::fromInt($g6 ^ $x6);
-        $g[7] = ParagonIE_Sodium_Core32_Int32::fromInt($g7 ^ $x7);
-        $g[8] = ParagonIE_Sodium_Core32_Int32::fromInt($g8 ^ $x8);
-        $g[9] = ParagonIE_Sodium_Core32_Int32::fromInt($g9 ^ $x9);
+        $x0 = ( $f0 ^ $g0 ) & $b;
+        $x1 = ( $f1 ^ $g1 ) & $b;
+        $x2 = ( $f2 ^ $g2 ) & $b;
+        $x3 = ( $f3 ^ $g3 ) & $b;
+        $x4 = ( $f4 ^ $g4 ) & $b;
+        $x5 = ( $f5 ^ $g5 ) & $b;
+        $x6 = ( $f6 ^ $g6 ) & $b;
+        $x7 = ( $f7 ^ $g7 ) & $b;
+        $x8 = ( $f8 ^ $g8 ) & $b;
+        $x9 = ( $f9 ^ $g9 ) & $b;
+        $f[0] = ParagonIE_Sodium_Core32_Int32::fromInt( $f0 ^ $x0 );
+        $f[1] = ParagonIE_Sodium_Core32_Int32::fromInt( $f1 ^ $x1 );
+        $f[2] = ParagonIE_Sodium_Core32_Int32::fromInt( $f2 ^ $x2 );
+        $f[3] = ParagonIE_Sodium_Core32_Int32::fromInt( $f3 ^ $x3 );
+        $f[4] = ParagonIE_Sodium_Core32_Int32::fromInt( $f4 ^ $x4 );
+        $f[5] = ParagonIE_Sodium_Core32_Int32::fromInt( $f5 ^ $x5 );
+        $f[6] = ParagonIE_Sodium_Core32_Int32::fromInt( $f6 ^ $x6 );
+        $f[7] = ParagonIE_Sodium_Core32_Int32::fromInt( $f7 ^ $x7 );
+        $f[8] = ParagonIE_Sodium_Core32_Int32::fromInt( $f8 ^ $x8 );
+        $f[9] = ParagonIE_Sodium_Core32_Int32::fromInt( $f9 ^ $x9 );
+        $g[0] = ParagonIE_Sodium_Core32_Int32::fromInt( $g0 ^ $x0 );
+        $g[1] = ParagonIE_Sodium_Core32_Int32::fromInt( $g1 ^ $x1 );
+        $g[2] = ParagonIE_Sodium_Core32_Int32::fromInt( $g2 ^ $x2 );
+        $g[3] = ParagonIE_Sodium_Core32_Int32::fromInt( $g3 ^ $x3 );
+        $g[4] = ParagonIE_Sodium_Core32_Int32::fromInt( $g4 ^ $x4 );
+        $g[5] = ParagonIE_Sodium_Core32_Int32::fromInt( $g5 ^ $x5 );
+        $g[6] = ParagonIE_Sodium_Core32_Int32::fromInt( $g6 ^ $x6 );
+        $g[7] = ParagonIE_Sodium_Core32_Int32::fromInt( $g7 ^ $x7 );
+        $g[8] = ParagonIE_Sodium_Core32_Int32::fromInt( $g8 ^ $x8 );
+        $g[9] = ParagonIE_Sodium_Core32_Int32::fromInt( $g9 ^ $x9 );
     }
 
     /**
@@ -83,42 +83,42 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    public static function fe_mul121666( ParagonIE_Sodium_Core32_Curve25519_Fe $f )
     {
         /** @var ParagonIE_Sodium_Core32_Int32[] $h */
         $h = array(
-            $f[0]->mulInt(121666),
-            $f[1]->mulInt(121666),
-            $f[2]->mulInt(121666),
-            $f[3]->mulInt(121666),
-            $f[4]->mulInt(121666),
-            $f[5]->mulInt(121666),
-            $f[6]->mulInt(121666),
-            $f[7]->mulInt(121666),
-            $f[8]->mulInt(121666),
-            $f[9]->mulInt(121666),
+            $f[0]->mulInt( 121666 ),
+            $f[1]->mulInt( 121666 ),
+            $f[2]->mulInt( 121666 ),
+            $f[3]->mulInt( 121666 ),
+            $f[4]->mulInt( 121666 ),
+            $f[5]->mulInt( 121666 ),
+            $f[6]->mulInt( 121666 ),
+            $f[7]->mulInt( 121666 ),
+            $f[8]->mulInt( 121666 ),
+            $f[9]->mulInt( 121666 ),
         );
 
         /** @var ParagonIE_Sodium_Core32_Int32 $carry9 */
-        $carry9 = $h[9]->addInt(1 << 24)->shiftRight(25);
-        $h[0] = $carry9->mulInt(19);
-        $h[9] = $h[9]->subInt32($carry9->shiftLeft(25));
+        $carry9 = $h[9]->addInt( 1 << 24 )->shiftRight( 25 );
+        $h[0] = $carry9->mulInt( 19 );
+        $h[9] = $h[9]->subInt32( $carry9->shiftLeft( 25 ) );
 
-        $carry1 = $h[1]->addInt(1 << 24)->shiftRight(25);
-        $h[2] = $h[2]->addInt32($carry1);
-        $h[1] = $h[1]->subInt32($carry1->shiftLeft(25));
+        $carry1 = $h[1]->addInt( 1 << 24 )->shiftRight( 25 );
+        $h[2] = $h[2]->addInt32( $carry1 );
+        $h[1] = $h[1]->subInt32( $carry1->shiftLeft( 25 ) );
 
-        $carry3 = $h[3]->addInt(1 << 24)->shiftRight(25);
-        $h[4] = $h[4]->addInt32($carry3);
-        $h[3] = $h[3]->subInt32($carry3->shiftLeft(25));
+        $carry3 = $h[3]->addInt( 1 << 24 )->shiftRight( 25 );
+        $h[4] = $h[4]->addInt32( $carry3 );
+        $h[3] = $h[3]->subInt32( $carry3->shiftLeft( 25 ) );
 
-        $carry5 = $h[3]->addInt(1 << 24)->shiftRight(25);
-        $h[6] = $h[6]->addInt32($carry5);
-        $h[5] = $h[5]->subInt32($carry5->shiftLeft(25));
+        $carry5 = $h[3]->addInt( 1 << 24 )->shiftRight( 25 );
+        $h[6] = $h[6]->addInt32( $carry5 );
+        $h[5] = $h[5]->subInt32( $carry5->shiftLeft( 25 ) );
 
-        $carry7 = $h[3]->addInt(1 << 24)->shiftRight(25);
-        $h[8] = $h[8]->addInt32($carry7);
-        $h[7] = $h[7]->subInt32($carry7->shiftLeft(25));
+        $carry7 = $h[3]->addInt( 1 << 24 )->shiftRight( 25 );
+        $h[8] = $h[8]->addInt32( $carry7 );
+        $h[7] = $h[7]->subInt32( $carry7->shiftLeft( 25 ) );
 
         /*
         $carry9 = ($h[9] + (1 << 24)) >> 25;
@@ -138,25 +138,25 @@ 
         $h[7] -= $carry7 << 25;
         */
 
-        $carry0 = $h[0]->addInt(1 << 25)->shiftRight(26);
-        $h[1] = $h[1]->addInt32($carry0);
-        $h[0] = $h[0]->subInt32($carry0->shiftLeft(26));
+        $carry0 = $h[0]->addInt( 1 << 25 )->shiftRight( 26 );
+        $h[1] = $h[1]->addInt32( $carry0 );
+        $h[0] = $h[0]->subInt32( $carry0->shiftLeft( 26 ) );
 
-        $carry2 = $h[2]->addInt(1 << 25)->shiftRight(26);
-        $h[3] = $h[3]->addInt32($carry2);
-        $h[2] = $h[2]->subInt32($carry2->shiftLeft(26));
+        $carry2 = $h[2]->addInt( 1 << 25 )->shiftRight( 26 );
+        $h[3] = $h[3]->addInt32( $carry2 );
+        $h[2] = $h[2]->subInt32( $carry2->shiftLeft( 26 ) );
 
-        $carry4 = $h[4]->addInt(1 << 25)->shiftRight(26);
-        $h[5] = $h[5]->addInt32($carry4);
-        $h[4] = $h[4]->subInt32($carry4->shiftLeft(26));
+        $carry4 = $h[4]->addInt( 1 << 25 )->shiftRight( 26 );
+        $h[5] = $h[5]->addInt32( $carry4 );
+        $h[4] = $h[4]->subInt32( $carry4->shiftLeft( 26 ) );
 
-        $carry6 = $h[6]->addInt(1 << 25)->shiftRight(26);
-        $h[7] = $h[7]->addInt32($carry6);
-        $h[6] = $h[6]->subInt32($carry6->shiftLeft(26));
+        $carry6 = $h[6]->addInt( 1 << 25 )->shiftRight( 26 );
+        $h[7] = $h[7]->addInt32( $carry6 );
+        $h[6] = $h[6]->subInt32( $carry6->shiftLeft( 26 ) );
 
-        $carry8 = $h[8]->addInt(1 << 25)->shiftRight(26);
-        $h[9] = $h[9]->addInt32($carry8);
-        $h[8] = $h[8]->subInt32($carry8->shiftLeft(26));
+        $carry8 = $h[8]->addInt( 1 << 25 )->shiftRight( 26 );
+        $h[9] = $h[9]->addInt32( $carry8 );
+        $h[8] = $h[8]->subInt32( $carry8->shiftLeft( 26 ) );
 
         /*
         $carry0 = ($h[0] + (1 << 25)) >> 26;
@@ -176,7 +176,7 @@ 
         $h[8] -= $carry8 << 26;
         */
 
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray( $h );
     }
 
     /**
@@ -188,27 +188,27 @@ 
      * @param string $p
      * @return string
      */
-    public static function crypto_scalarmult_curve25519_ref10($n, $p)
+    public static function crypto_scalarmult_curve25519_ref10( $n, $p )
     {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;
         # e[0] &= 248;
         $e[0] = self::intToChr(
-            self::chrToInt($e[0]) & 248
+            self::chrToInt( $e[0] ) & 248
         );
         # e[31] &= 127;
         # e[31] |= 64;
         $e[31] = self::intToChr(
-            (self::chrToInt($e[31]) & 127) | 64
+            ( self::chrToInt( $e[31] ) & 127 ) | 64
         );
         # fe_frombytes(x1,p);
-        $x1 = self::fe_frombytes($p);
+        $x1 = self::fe_frombytes( $p );
         # fe_1(x2);
         $x2 = self::fe_1();
         # fe_0(z2);
         $z2 = self::fe_0();
         # fe_copy(x3,x1);
-        $x3 = self::fe_copy($x1);
+        $x3 = self::fe_copy( $x1 );
         # fe_1(z3);
         $z3 = self::fe_1();
 
@@ -216,88 +216,88 @@ 
         $swap = 0;
 
         # for (pos = 254;pos >= 0;--pos) {
-        for ($pos = 254; $pos >= 0; --$pos) {
+        for ( $pos = 254; $pos >= 0; --$pos ) {
             # b = e[pos / 8] >> (pos & 7);
             $b = self::chrToInt(
-                    $e[(int) floor($pos / 8)]
-                ) >> ($pos & 7);
+                    $e[(int) floor( $pos / 8 )]
+                ) >> ( $pos & 7 );
             # b &= 1;
             $b &= 1;
             # swap ^= b;
             $swap ^= $b;
             # fe_cswap(x2,x3,swap);
-            self::fe_cswap($x2, $x3, $swap);
+            self::fe_cswap( $x2, $x3, $swap );
             # fe_cswap(z2,z3,swap);
-            self::fe_cswap($z2, $z3, $swap);
+            self::fe_cswap( $z2, $z3, $swap );
             # swap = b;
             $swap = $b;
             # fe_sub(tmp0,x3,z3);
-            $tmp0 = self::fe_sub($x3, $z3);
+            $tmp0 = self::fe_sub( $x3, $z3 );
             # fe_sub(tmp1,x2,z2);
-            $tmp1 = self::fe_sub($x2, $z2);
+            $tmp1 = self::fe_sub( $x2, $z2 );
 
             # fe_add(x2,x2,z2);
-            $x2 = self::fe_add($x2, $z2);
+            $x2 = self::fe_add( $x2, $z2 );
 
             # fe_add(z2,x3,z3);
-            $z2 = self::fe_add($x3, $z3);
+            $z2 = self::fe_add( $x3, $z3 );
 
             # fe_mul(z3,tmp0,x2);
-            $z3 = self::fe_mul($tmp0, $x2);
+            $z3 = self::fe_mul( $tmp0, $x2 );
 
             # fe_mul(z2,z2,tmp1);
-            $z2 = self::fe_mul($z2, $tmp1);
+            $z2 = self::fe_mul( $z2, $tmp1 );
 
             # fe_sq(tmp0,tmp1);
-            $tmp0 = self::fe_sq($tmp1);
+            $tmp0 = self::fe_sq( $tmp1 );
 
             # fe_sq(tmp1,x2);
-            $tmp1 = self::fe_sq($x2);
+            $tmp1 = self::fe_sq( $x2 );
 
             # fe_add(x3,z3,z2);
-            $x3 = self::fe_add($z3, $z2);
+            $x3 = self::fe_add( $z3, $z2 );
 
             # fe_sub(z2,z3,z2);
-            $z2 = self::fe_sub($z3, $z2);
+            $z2 = self::fe_sub( $z3, $z2 );
 
             # fe_mul(x2,tmp1,tmp0);
-            $x2 = self::fe_mul($tmp1, $tmp0);
+            $x2 = self::fe_mul( $tmp1, $tmp0 );
 
             # fe_sub(tmp1,tmp1,tmp0);
-            $tmp1 = self::fe_sub($tmp1, $tmp0);
+            $tmp1 = self::fe_sub( $tmp1, $tmp0 );
 
             # fe_sq(z2,z2);
-            $z2 = self::fe_sq($z2);
+            $z2 = self::fe_sq( $z2 );
 
             # fe_mul121666(z3,tmp1);
-            $z3 = self::fe_mul121666($tmp1);
+            $z3 = self::fe_mul121666( $tmp1 );
 
             # fe_sq(x3,x3);
-            $x3 = self::fe_sq($x3);
+            $x3 = self::fe_sq( $x3 );
 
             # fe_add(tmp0,tmp0,z3);
-            $tmp0 = self::fe_add($tmp0, $z3);
+            $tmp0 = self::fe_add( $tmp0, $z3 );
 
             # fe_mul(z3,x1,z2);
-            $z3 = self::fe_mul($x1, $z2);
+            $z3 = self::fe_mul( $x1, $z2 );
 
             # fe_mul(z2,tmp1,tmp0);
-            $z2 = self::fe_mul($tmp1, $tmp0);
+            $z2 = self::fe_mul( $tmp1, $tmp0 );
         }
 
         # fe_cswap(x2,x3,swap);
-        self::fe_cswap($x2, $x3, $swap);
+        self::fe_cswap( $x2, $x3, $swap );
 
         # fe_cswap(z2,z3,swap);
-        self::fe_cswap($z2, $z3, $swap);
+        self::fe_cswap( $z2, $z3, $swap );
 
         # fe_invert(z2,z2);
-        $z2 = self::fe_invert($z2);
+        $z2 = self::fe_invert( $z2 );
 
         # fe_mul(x2,x2,z2);
-        $x2 = self::fe_mul($x2, $z2);
+        $x2 = self::fe_mul( $x2, $z2 );
         # fe_tobytes(q,x2);
-        return self::fe_tobytes($x2);
+        return self::fe_tobytes( $x2 );
     }
 
     /**
@@ -311,10 +311,10 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY,
         ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
     ) {
-        $tempX = self::fe_add($edwardsZ, $edwardsY);
-        $tempZ = self::fe_sub($edwardsZ, $edwardsY);
-        $tempZ = self::fe_invert($tempZ);
-        return self::fe_mul($tempX, $tempZ);
+        $tempX = self::fe_add( $edwardsZ, $edwardsY );
+        $tempZ = self::fe_sub( $edwardsZ, $edwardsY );
+        $tempZ = self::fe_invert( $tempZ );
+        return self::fe_mul( $tempX, $tempZ );
     }
 
     /**
@@ -324,31 +324,31 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10_base($n)
+    public static function crypto_scalarmult_curve25519_ref10_base( $n )
     {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;
 
         # e[0] &= 248;
         $e[0] = self::intToChr(
-            self::chrToInt($e[0]) & 248
+            self::chrToInt( $e[0] ) & 248
         );
 
         # e[31] &= 127;
         # e[31] |= 64;
         $e[31] = self::intToChr(
-            (self::chrToInt($e[31]) & 127) | 64
+            ( self::chrToInt( $e[31] ) & 127 ) | 64
         );
 
-        $A = self::ge_scalarmult_base($e);
+        $A = self::ge_scalarmult_base( $e );
         if (
-            !($A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
+            ! ( $A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe )
             ||
-            !($A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
+            ! ( $A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe )
         ) {
-            throw new TypeError('Null points encountered');
+            throw new TypeError( 'Null points encountered' );
         }
-        $pk = self::edwards_to_montgomery($A->Y, $A->Z);
-        return self::fe_tobytes($pk);
+        $pk = self::edwards_to_montgomery( $A->Y, $A->Z );
+        return self::fe_tobytes( $pk );
     }
 }

Braces +4 added lines, -8 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_X25519
  */
-abstract class ParagonIE_Sodium_Core32_X25519 extends ParagonIE_Sodium_Core32_Curve25519
-{
+abstract class ParagonIE_Sodium_Core32_X25519 extends ParagonIE_Sodium_Core32_Curve25519 {
     /**
      * Alters the objects passed to this method in place.
      *
@@ -83,8 +82,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         /** @var ParagonIE_Sodium_Core32_Int32[] $h */
         $h = array(
             $f[0]->mulInt(121666),
@@ -188,8 +186,7 @@ 
      * @param string $p
      * @return string
      */
-    public static function crypto_scalarmult_curve25519_ref10($n, $p)
-    {
+    public static function crypto_scalarmult_curve25519_ref10($n, $p) {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;
         # e[0] &= 248;
@@ -324,8 +321,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10_base($n)
-    {
+    public static function crypto_scalarmult_curve25519_ref10_base($n) {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;
 

src/library/sodium_compat/src/Core32/ChaCha20/IetfCtx.php

Indentation +25 added lines, -25 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,29 +9,29 @@ 
  */
 class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core32_ChaCha20_Ctx
 {
-    /**
-     * ParagonIE_Sodium_Core_ChaCha20_IetfCtx constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $key     ChaCha20 key.
-     * @param string $iv      Initialization Vector (a.k.a. nonce).
-     * @param string $counter The initial counter value.
-     *                        Defaults to 4 0x00 bytes.
-     * @throws InvalidArgumentException
-     */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
-        if (self::strlen($iv) !== 12) {
-            throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
-        }
-        parent::__construct($key, self::substr($iv, 0, 8), $counter);
+	/**
+	 * ParagonIE_Sodium_Core_ChaCha20_IetfCtx constructor.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $key     ChaCha20 key.
+	 * @param string $iv      Initialization Vector (a.k.a. nonce).
+	 * @param string $counter The initial counter value.
+	 *                        Defaults to 4 0x00 bytes.
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($key = '', $iv = '', $counter = '')
+	{
+		if (self::strlen($iv) !== 12) {
+			throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
+		}
+		parent::__construct($key, self::substr($iv, 0, 8), $counter);
 
-        if (!empty($counter)) {
-            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($counter, 0, 4));
-        }
-        $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 0, 4));
-        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 4, 4));
-        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 4, 4));
-    }
+		if (!empty($counter)) {
+			$this->container[12] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($counter, 0, 4));
+		}
+		$this->container[13] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 0, 4));
+		$this->container[14] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 4, 4));
+		$this->container[15] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 4, 4));
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false ) ) {
     return;
 }
 
@@ -20,18 +20,18 @@ 
      *                        Defaults to 4 0x00 bytes.
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '', $iv = '', $counter = '')
+    public function __construct( $key = '', $iv = '', $counter = '' )
     {
-        if (self::strlen($iv) !== 12) {
-            throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
+        if ( self::strlen( $iv ) !== 12 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 96-bit nonce in IETF mode.' );
         }
-        parent::__construct($key, self::substr($iv, 0, 8), $counter);
+        parent::__construct( $key, self::substr( $iv, 0, 8 ), $counter );
 
-        if (!empty($counter)) {
-            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($counter, 0, 4));
+        if ( ! empty( $counter ) ) {
+            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromString( self::substr( $counter, 0, 4 ) );
         }
-        $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 0, 4));
-        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 4, 4));
-        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromString(self::substr($iv, 4, 4));
+        $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromString( self::substr( $iv, 0, 4 ) );
+        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromString( self::substr( $iv, 4, 4 ) );
+        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromString( self::substr( $iv, 4, 4 ) );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx
  */
-class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core32_ChaCha20_Ctx
-{
+class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core32_ChaCha20_Ctx {
     /**
      * ParagonIE_Sodium_Core_ChaCha20_IetfCtx constructor.
      *
@@ -20,8 +19,7 @@ 
      *                        Defaults to 4 0x00 bytes.
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
+    public function __construct($key = '', $iv = '', $counter = '') {
         if (self::strlen($iv) !== 12) {
             throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
         }

src/library/sodium_compat/src/Core32/ChaCha20/Ctx.php

Indentation +99 added lines, -99 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,113 +9,113 @@ 
  */
 class ParagonIE_Sodium_Core32_ChaCha20_Ctx extends ParagonIE_Sodium_Core32_Util implements ArrayAccess
 {
-    /**
-     * @var SplFixedArray<int, ParagonIE_Sodium_Core32_Int32>
-     */
-    protected $container;
+	/**
+	 * @var SplFixedArray<int, ParagonIE_Sodium_Core32_Int32>
+	 */
+	protected $container;
 
-    /**
-     * ParagonIE_Sodium_Core_ChaCha20_Ctx constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $key     ChaCha20 key.
-     * @param string $iv      Initialization Vector (a.k.a. nonce).
-     * @param string $counter The initial counter value.
-     *                        Defaults to 8 0x00 bytes.
-     * @throws InvalidArgumentException
-     */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
-        if (self::strlen($key) !== 32) {
-            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
-        }
-        if (self::strlen($iv) !== 8) {
-            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
-        }
-        $this->container = new SplFixedArray(16);
+	/**
+	 * ParagonIE_Sodium_Core_ChaCha20_Ctx constructor.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $key     ChaCha20 key.
+	 * @param string $iv      Initialization Vector (a.k.a. nonce).
+	 * @param string $counter The initial counter value.
+	 *                        Defaults to 8 0x00 bytes.
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($key = '', $iv = '', $counter = '')
+	{
+		if (self::strlen($key) !== 32) {
+			throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
+		}
+		if (self::strlen($iv) !== 8) {
+			throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
+		}
+		$this->container = new SplFixedArray(16);
 
-        /* "expand 32-byte k" as per ChaCha20 spec */
-        $this->container[0]  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-        $this->container[1]  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-        $this->container[2]  = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-        $this->container[3]  = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+		/* "expand 32-byte k" as per ChaCha20 spec */
+		$this->container[0]  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+		$this->container[1]  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+		$this->container[2]  = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+		$this->container[3]  = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
 
-        $this->container[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
-        $this->container[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
-        $this->container[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
-        $this->container[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
-        $this->container[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
-        $this->container[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
-        $this->container[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
-        $this->container[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
+		$this->container[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
+		$this->container[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
+		$this->container[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
+		$this->container[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
+		$this->container[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
+		$this->container[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
+		$this->container[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
+		$this->container[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
 
-        if (empty($counter)) {
-            $this->container[12] = new ParagonIE_Sodium_Core32_Int32();
-            $this->container[13] = new ParagonIE_Sodium_Core32_Int32();
-        } else {
-            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
-            $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 4, 4));
-        }
-        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
-        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
-    }
+		if (empty($counter)) {
+			$this->container[12] = new ParagonIE_Sodium_Core32_Int32();
+			$this->container[13] = new ParagonIE_Sodium_Core32_Int32();
+		} else {
+			$this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
+			$this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 4, 4));
+		}
+		$this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
+		$this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $offset
-     * @param int|ParagonIE_Sodium_Core32_Int32 $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (!is_int($offset)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        if ($value instanceof ParagonIE_Sodium_Core32_Int32) {
-            /*
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $offset
+	 * @param int|ParagonIE_Sodium_Core32_Int32 $value
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		if (!is_int($offset)) {
+			throw new InvalidArgumentException('Expected an integer');
+		}
+		if ($value instanceof ParagonIE_Sodium_Core32_Int32) {
+			/*
         } elseif (is_int($value)) {
             $value = ParagonIE_Sodium_Core32_Int32::fromInt($value);
             */
-        } else {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        $this->container[$offset] = $value;
-    }
+		} else {
+			throw new InvalidArgumentException('Expected an integer');
+		}
+		$this->container[$offset] = $value;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->container[$offset]);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->container[$offset]);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset])
-            ? $this->container[$offset]
-            : null;
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return mixed|null
+	 */
+	public function offsetGet($offset)
+	{
+		return isset($this->container[$offset])
+			? $this->container[$offset]
+			: null;
+	}
 }

Spacing +35 added lines, -35 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20_Ctx', false ) ) {
     return;
 }
 
@@ -25,40 +25,40 @@ 
      *                        Defaults to 8 0x00 bytes.
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '', $iv = '', $counter = '')
+    public function __construct( $key = '', $iv = '', $counter = '' )
     {
-        if (self::strlen($key) !== 32) {
-            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
+        if ( self::strlen( $key ) !== 32 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 256-bit key.' );
         }
-        if (self::strlen($iv) !== 8) {
-            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
+        if ( self::strlen( $iv ) !== 8 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 64-bit nonce.' );
         }
-        $this->container = new SplFixedArray(16);
+        $this->container = new SplFixedArray( 16 );
 
         /* "expand 32-byte k" as per ChaCha20 spec */
-        $this->container[0]  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-        $this->container[1]  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-        $this->container[2]  = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-        $this->container[3]  = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        $this->container[0]  = new ParagonIE_Sodium_Core32_Int32( array( 0x6170, 0x7865 ) );
+        $this->container[1]  = new ParagonIE_Sodium_Core32_Int32( array( 0x3320, 0x646e ) );
+        $this->container[2]  = new ParagonIE_Sodium_Core32_Int32( array( 0x7962, 0x2d32 ) );
+        $this->container[3]  = new ParagonIE_Sodium_Core32_Int32( array( 0x6b20, 0x6574 ) );
 
-        $this->container[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
-        $this->container[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
-        $this->container[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
-        $this->container[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
-        $this->container[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
-        $this->container[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
-        $this->container[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
-        $this->container[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
+        $this->container[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 0, 4 ) );
+        $this->container[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 4, 4 ) );
+        $this->container[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 8, 4 ) );
+        $this->container[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 12, 4 ) );
+        $this->container[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 16, 4 ) );
+        $this->container[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 20, 4 ) );
+        $this->container[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 24, 4 ) );
+        $this->container[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 28, 4 ) );
 
-        if (empty($counter)) {
+        if ( empty( $counter ) ) {
             $this->container[12] = new ParagonIE_Sodium_Core32_Int32();
             $this->container[13] = new ParagonIE_Sodium_Core32_Int32();
         } else {
-            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
-            $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 4, 4));
+            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $counter, 0, 4 ) );
+            $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $counter, 4, 4 ) );
         }
-        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
-        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
+        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $iv, 0, 4 ) );
+        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $iv, 4, 4 ) );
     }
 
     /**
@@ -68,18 +68,18 @@ 
      * @param int|ParagonIE_Sodium_Core32_Int32 $value
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        if (!is_int($offset)) {
-            throw new InvalidArgumentException('Expected an integer');
+        if ( ! is_int( $offset ) ) {
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
-        if ($value instanceof ParagonIE_Sodium_Core32_Int32) {
+        if ( $value instanceof ParagonIE_Sodium_Core32_Int32 ) {
             /*
         } elseif (is_int($value)) {
             $value = ParagonIE_Sodium_Core32_Int32::fromInt($value);
             */
         } else {
-            throw new InvalidArgumentException('Expected an integer');
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
         $this->container[$offset] = $value;
     }
@@ -90,9 +90,9 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[$offset] );
     }
 
     /**
@@ -101,9 +101,9 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[$offset] );
     }
 
     /**
@@ -112,9 +112,9 @@ 
      * @param mixed $offset
      * @return mixed|null
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        return isset($this->container[$offset])
+        return isset( $this->container[$offset] )
             ? $this->container[$offset]
             : null;
     }

Braces +6 added lines, -12 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_ChaCha20_Ctx
  */
-class ParagonIE_Sodium_Core32_ChaCha20_Ctx extends ParagonIE_Sodium_Core32_Util implements ArrayAccess
-{
+class ParagonIE_Sodium_Core32_ChaCha20_Ctx extends ParagonIE_Sodium_Core32_Util implements ArrayAccess {
     /**
      * @var SplFixedArray<int, ParagonIE_Sodium_Core32_Int32>
      */
@@ -25,8 +24,7 @@ 
      *                        Defaults to 8 0x00 bytes.
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
+    public function __construct($key = '', $iv = '', $counter = '') {
         if (self::strlen($key) !== 32) {
             throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
         }
@@ -68,8 +66,7 @@ 
      * @param int|ParagonIE_Sodium_Core32_Int32 $value
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         if (!is_int($offset)) {
             throw new InvalidArgumentException('Expected an integer');
         }
@@ -90,8 +87,7 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         return isset($this->container[$offset]);
     }
 
@@ -101,8 +97,7 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         unset($this->container[$offset]);
     }
 
@@ -112,8 +107,7 @@ 
      * @param mixed $offset
      * @return mixed|null
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         return isset($this->container[$offset])
             ? $this->container[$offset]
             : null;