WordPoints / wordpoints

src/library/sodium_compat/src/Core/Salsa20.php

Indentation +235 added lines, -235 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_Salsa20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,257 +9,257 @@ 
  */
 abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_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)
-    {
-        if (self::strlen($k) < 32) {
-            throw new RangeException('Key must be 32 bytes long');
-        }
-        if ($c === null) {
-            $j0  = $x0  = 0x61707865;
-            $j5  = $x5  = 0x3320646e;
-            $j10 = $x10 = 0x79622d32;
-            $j15 = $x15 = 0x6b206574;
-        } else {
-            $j0  = $x0  = self::load_4(self::substr($c, 0, 4));
-            $j5  = $x5  = self::load_4(self::substr($c, 4, 4));
-            $j10 = $x10 = self::load_4(self::substr($c, 8, 4));
-            $j15 = $x15 = self::load_4(self::substr($c, 12, 4));
-        }
-        $j1  = $x1  = self::load_4(self::substr($k, 0, 4));
-        $j2  = $x2  = self::load_4(self::substr($k, 4, 4));
-        $j3  = $x3  = self::load_4(self::substr($k, 8, 4));
-        $j4  = $x4  = self::load_4(self::substr($k, 12, 4));
-        $j6  = $x6  = self::load_4(self::substr($in, 0, 4));
-        $j7  = $x7  = self::load_4(self::substr($in, 4, 4));
-        $j8  = $x8  = self::load_4(self::substr($in, 8, 4));
-        $j9  = $x9  = self::load_4(self::substr($in, 12, 4));
-        $j11 = $x11 = self::load_4(self::substr($k, 16, 4));
-        $j12 = $x12 = self::load_4(self::substr($k, 20, 4));
-        $j13 = $x13 = self::load_4(self::substr($k, 24, 4));
-        $j14 = $x14 = self::load_4(self::substr($k, 28, 4));
+	/**
+	 * 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)
+	{
+		if (self::strlen($k) < 32) {
+			throw new RangeException('Key must be 32 bytes long');
+		}
+		if ($c === null) {
+			$j0  = $x0  = 0x61707865;
+			$j5  = $x5  = 0x3320646e;
+			$j10 = $x10 = 0x79622d32;
+			$j15 = $x15 = 0x6b206574;
+		} else {
+			$j0  = $x0  = self::load_4(self::substr($c, 0, 4));
+			$j5  = $x5  = self::load_4(self::substr($c, 4, 4));
+			$j10 = $x10 = self::load_4(self::substr($c, 8, 4));
+			$j15 = $x15 = self::load_4(self::substr($c, 12, 4));
+		}
+		$j1  = $x1  = self::load_4(self::substr($k, 0, 4));
+		$j2  = $x2  = self::load_4(self::substr($k, 4, 4));
+		$j3  = $x3  = self::load_4(self::substr($k, 8, 4));
+		$j4  = $x4  = self::load_4(self::substr($k, 12, 4));
+		$j6  = $x6  = self::load_4(self::substr($in, 0, 4));
+		$j7  = $x7  = self::load_4(self::substr($in, 4, 4));
+		$j8  = $x8  = self::load_4(self::substr($in, 8, 4));
+		$j9  = $x9  = self::load_4(self::substr($in, 12, 4));
+		$j11 = $x11 = self::load_4(self::substr($k, 16, 4));
+		$j12 = $x12 = self::load_4(self::substr($k, 20, 4));
+		$j13 = $x13 = self::load_4(self::substr($k, 24, 4));
+		$j14 = $x14 = self::load_4(self::substr($k, 28, 4));
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4 ^= self::rotate($x0 + $x12, 7);
-            $x8 ^= self::rotate($x4 + $x0, 9);
-            $x12 ^= self::rotate($x8 + $x4, 13);
-            $x0 ^= self::rotate($x12 + $x8, 18);
+		for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+			$x4 ^= self::rotate($x0 + $x12, 7);
+			$x8 ^= self::rotate($x4 + $x0, 9);
+			$x12 ^= self::rotate($x8 + $x4, 13);
+			$x0 ^= self::rotate($x12 + $x8, 18);
 
-            $x9 ^= self::rotate($x5 + $x1, 7);
-            $x13 ^= self::rotate($x9 + $x5, 9);
-            $x1 ^= self::rotate($x13 + $x9, 13);
-            $x5 ^= self::rotate($x1 + $x13, 18);
+			$x9 ^= self::rotate($x5 + $x1, 7);
+			$x13 ^= self::rotate($x9 + $x5, 9);
+			$x1 ^= self::rotate($x13 + $x9, 13);
+			$x5 ^= self::rotate($x1 + $x13, 18);
 
-            $x14 ^= self::rotate($x10 + $x6, 7);
-            $x2 ^= self::rotate($x14 + $x10, 9);
-            $x6 ^= self::rotate($x2 + $x14, 13);
-            $x10 ^= self::rotate($x6 + $x2, 18);
+			$x14 ^= self::rotate($x10 + $x6, 7);
+			$x2 ^= self::rotate($x14 + $x10, 9);
+			$x6 ^= self::rotate($x2 + $x14, 13);
+			$x10 ^= self::rotate($x6 + $x2, 18);
 
-            $x3 ^= self::rotate($x15 + $x11, 7);
-            $x7 ^= self::rotate($x3 + $x15, 9);
-            $x11 ^= self::rotate($x7 + $x3, 13);
-            $x15 ^= self::rotate($x11 + $x7, 18);
+			$x3 ^= self::rotate($x15 + $x11, 7);
+			$x7 ^= self::rotate($x3 + $x15, 9);
+			$x11 ^= self::rotate($x7 + $x3, 13);
+			$x15 ^= self::rotate($x11 + $x7, 18);
 
-            $x1 ^= self::rotate($x0 + $x3, 7);
-            $x2 ^= self::rotate($x1 + $x0, 9);
-            $x3 ^= self::rotate($x2 + $x1, 13);
-            $x0 ^= self::rotate($x3 + $x2, 18);
+			$x1 ^= self::rotate($x0 + $x3, 7);
+			$x2 ^= self::rotate($x1 + $x0, 9);
+			$x3 ^= self::rotate($x2 + $x1, 13);
+			$x0 ^= self::rotate($x3 + $x2, 18);
 
-            $x6 ^= self::rotate($x5 + $x4, 7);
-            $x7 ^= self::rotate($x6 + $x5, 9);
-            $x4 ^= self::rotate($x7 + $x6, 13);
-            $x5 ^= self::rotate($x4 + $x7, 18);
+			$x6 ^= self::rotate($x5 + $x4, 7);
+			$x7 ^= self::rotate($x6 + $x5, 9);
+			$x4 ^= self::rotate($x7 + $x6, 13);
+			$x5 ^= self::rotate($x4 + $x7, 18);
 
-            $x11 ^= self::rotate($x10 + $x9, 7);
-            $x8 ^= self::rotate($x11 + $x10, 9);
-            $x9 ^= self::rotate($x8 + $x11, 13);
-            $x10 ^= self::rotate($x9 + $x8, 18);
+			$x11 ^= self::rotate($x10 + $x9, 7);
+			$x8 ^= self::rotate($x11 + $x10, 9);
+			$x9 ^= self::rotate($x8 + $x11, 13);
+			$x10 ^= self::rotate($x9 + $x8, 18);
 
-            $x12 ^= self::rotate($x15 + $x14, 7);
-            $x13 ^= self::rotate($x12 + $x15, 9);
-            $x14 ^= self::rotate($x13 + $x12, 13);
-            $x15 ^= self::rotate($x14 + $x13, 18);
-        }
+			$x12 ^= self::rotate($x15 + $x14, 7);
+			$x13 ^= self::rotate($x12 + $x15, 9);
+			$x14 ^= self::rotate($x13 + $x12, 13);
+			$x15 ^= self::rotate($x14 + $x13, 18);
+		}
 
-        $x0  += $j0;
-        $x1  += $j1;
-        $x2  += $j2;
-        $x3  += $j3;
-        $x4  += $j4;
-        $x5  += $j5;
-        $x6  += $j6;
-        $x7  += $j7;
-        $x8  += $j8;
-        $x9  += $j9;
-        $x10 += $j10;
-        $x11 += $j11;
-        $x12 += $j12;
-        $x13 += $j13;
-        $x14 += $j14;
-        $x15 += $j15;
+		$x0  += $j0;
+		$x1  += $j1;
+		$x2  += $j2;
+		$x3  += $j3;
+		$x4  += $j4;
+		$x5  += $j5;
+		$x6  += $j6;
+		$x7  += $j7;
+		$x8  += $j8;
+		$x9  += $j9;
+		$x10 += $j10;
+		$x11 += $j11;
+		$x12 += $j12;
+		$x13 += $j13;
+		$x14 += $j14;
+		$x15 += $j15;
 
-        return self::store32_le($x0) .
-            self::store32_le($x1) .
-            self::store32_le($x2) .
-            self::store32_le($x3) .
-            self::store32_le($x4) .
-            self::store32_le($x5) .
-            self::store32_le($x6) .
-            self::store32_le($x7) .
-            self::store32_le($x8) .
-            self::store32_le($x9) .
-            self::store32_le($x10) .
-            self::store32_le($x11) .
-            self::store32_le($x12) .
-            self::store32_le($x13) .
-            self::store32_le($x14) .
-            self::store32_le($x15);
-    }
+		return self::store32_le($x0) .
+			self::store32_le($x1) .
+			self::store32_le($x2) .
+			self::store32_le($x3) .
+			self::store32_le($x4) .
+			self::store32_le($x5) .
+			self::store32_le($x6) .
+			self::store32_le($x7) .
+			self::store32_le($x8) .
+			self::store32_le($x9) .
+			self::store32_le($x10) .
+			self::store32_le($x11) .
+			self::store32_le($x12) .
+			self::store32_le($x13) .
+			self::store32_le($x14) .
+			self::store32_le($x15);
+	}
 
-    /**
-     * @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_Core_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_Core_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
+			)
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $u
-     * @param int $c
-     * @return int
-     */
-    public static function rotate($u, $c)
-    {
-        $u &= 0xffffffff;
-        $c %= 32;
-        return 0xffffffff & (
-            ($u << $c)
-                |
-            ($u >> (32 - $c))
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $u
+	 * @param int $c
+	 * @return int
+	 */
+	public static function rotate($u, $c)
+	{
+		$u &= 0xffffffff;
+		$c %= 32;
+		return 0xffffffff & (
+			($u << $c)
+				|
+			($u >> (32 - $c))
+		);
+	}
 }

Spacing +109 added lines, -109 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Salsa20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Salsa20', false ) ) {
     return;
 }
 
@@ -21,75 +21,75 @@ 
      * @param string|null $c
      * @return string
      */
-    public static function core_salsa20($in, $k, $c = null)
+    public static function core_salsa20( $in, $k, $c = null )
     {
-        if (self::strlen($k) < 32) {
-            throw new RangeException('Key must be 32 bytes long');
+        if ( self::strlen( $k ) < 32 ) {
+            throw new RangeException( 'Key must be 32 bytes long' );
         }
-        if ($c === null) {
+        if ( $c === null ) {
             $j0  = $x0  = 0x61707865;
             $j5  = $x5  = 0x3320646e;
             $j10 = $x10 = 0x79622d32;
             $j15 = $x15 = 0x6b206574;
         } else {
-            $j0  = $x0  = self::load_4(self::substr($c, 0, 4));
-            $j5  = $x5  = self::load_4(self::substr($c, 4, 4));
-            $j10 = $x10 = self::load_4(self::substr($c, 8, 4));
-            $j15 = $x15 = self::load_4(self::substr($c, 12, 4));
+            $j0  = $x0  = self::load_4( self::substr( $c, 0, 4 ) );
+            $j5  = $x5  = self::load_4( self::substr( $c, 4, 4 ) );
+            $j10 = $x10 = self::load_4( self::substr( $c, 8, 4 ) );
+            $j15 = $x15 = self::load_4( self::substr( $c, 12, 4 ) );
         }
-        $j1  = $x1  = self::load_4(self::substr($k, 0, 4));
-        $j2  = $x2  = self::load_4(self::substr($k, 4, 4));
-        $j3  = $x3  = self::load_4(self::substr($k, 8, 4));
-        $j4  = $x4  = self::load_4(self::substr($k, 12, 4));
-        $j6  = $x6  = self::load_4(self::substr($in, 0, 4));
-        $j7  = $x7  = self::load_4(self::substr($in, 4, 4));
-        $j8  = $x8  = self::load_4(self::substr($in, 8, 4));
-        $j9  = $x9  = self::load_4(self::substr($in, 12, 4));
-        $j11 = $x11 = self::load_4(self::substr($k, 16, 4));
-        $j12 = $x12 = self::load_4(self::substr($k, 20, 4));
-        $j13 = $x13 = self::load_4(self::substr($k, 24, 4));
-        $j14 = $x14 = self::load_4(self::substr($k, 28, 4));
+        $j1  = $x1  = self::load_4( self::substr( $k, 0, 4 ) );
+        $j2  = $x2  = self::load_4( self::substr( $k, 4, 4 ) );
+        $j3  = $x3  = self::load_4( self::substr( $k, 8, 4 ) );
+        $j4  = $x4  = self::load_4( self::substr( $k, 12, 4 ) );
+        $j6  = $x6  = self::load_4( self::substr( $in, 0, 4 ) );
+        $j7  = $x7  = self::load_4( self::substr( $in, 4, 4 ) );
+        $j8  = $x8  = self::load_4( self::substr( $in, 8, 4 ) );
+        $j9  = $x9  = self::load_4( self::substr( $in, 12, 4 ) );
+        $j11 = $x11 = self::load_4( self::substr( $k, 16, 4 ) );
+        $j12 = $x12 = self::load_4( self::substr( $k, 20, 4 ) );
+        $j13 = $x13 = self::load_4( self::substr( $k, 24, 4 ) );
+        $j14 = $x14 = self::load_4( self::substr( $k, 28, 4 ) );
 
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4 ^= self::rotate($x0 + $x12, 7);
-            $x8 ^= self::rotate($x4 + $x0, 9);
-            $x12 ^= self::rotate($x8 + $x4, 13);
-            $x0 ^= self::rotate($x12 + $x8, 18);
+        for ( $i = self::ROUNDS; $i > 0; $i -= 2 ) {
+            $x4 ^= self::rotate( $x0 + $x12, 7 );
+            $x8 ^= self::rotate( $x4 + $x0, 9 );
+            $x12 ^= self::rotate( $x8 + $x4, 13 );
+            $x0 ^= self::rotate( $x12 + $x8, 18 );
 
-            $x9 ^= self::rotate($x5 + $x1, 7);
-            $x13 ^= self::rotate($x9 + $x5, 9);
-            $x1 ^= self::rotate($x13 + $x9, 13);
-            $x5 ^= self::rotate($x1 + $x13, 18);
+            $x9 ^= self::rotate( $x5 + $x1, 7 );
+            $x13 ^= self::rotate( $x9 + $x5, 9 );
+            $x1 ^= self::rotate( $x13 + $x9, 13 );
+            $x5 ^= self::rotate( $x1 + $x13, 18 );
 
-            $x14 ^= self::rotate($x10 + $x6, 7);
-            $x2 ^= self::rotate($x14 + $x10, 9);
-            $x6 ^= self::rotate($x2 + $x14, 13);
-            $x10 ^= self::rotate($x6 + $x2, 18);
+            $x14 ^= self::rotate( $x10 + $x6, 7 );
+            $x2 ^= self::rotate( $x14 + $x10, 9 );
+            $x6 ^= self::rotate( $x2 + $x14, 13 );
+            $x10 ^= self::rotate( $x6 + $x2, 18 );
 
-            $x3 ^= self::rotate($x15 + $x11, 7);
-            $x7 ^= self::rotate($x3 + $x15, 9);
-            $x11 ^= self::rotate($x7 + $x3, 13);
-            $x15 ^= self::rotate($x11 + $x7, 18);
+            $x3 ^= self::rotate( $x15 + $x11, 7 );
+            $x7 ^= self::rotate( $x3 + $x15, 9 );
+            $x11 ^= self::rotate( $x7 + $x3, 13 );
+            $x15 ^= self::rotate( $x11 + $x7, 18 );
 
-            $x1 ^= self::rotate($x0 + $x3, 7);
-            $x2 ^= self::rotate($x1 + $x0, 9);
-            $x3 ^= self::rotate($x2 + $x1, 13);
-            $x0 ^= self::rotate($x3 + $x2, 18);
+            $x1 ^= self::rotate( $x0 + $x3, 7 );
+            $x2 ^= self::rotate( $x1 + $x0, 9 );
+            $x3 ^= self::rotate( $x2 + $x1, 13 );
+            $x0 ^= self::rotate( $x3 + $x2, 18 );
 
-            $x6 ^= self::rotate($x5 + $x4, 7);
-            $x7 ^= self::rotate($x6 + $x5, 9);
-            $x4 ^= self::rotate($x7 + $x6, 13);
-            $x5 ^= self::rotate($x4 + $x7, 18);
+            $x6 ^= self::rotate( $x5 + $x4, 7 );
+            $x7 ^= self::rotate( $x6 + $x5, 9 );
+            $x4 ^= self::rotate( $x7 + $x6, 13 );
+            $x5 ^= self::rotate( $x4 + $x7, 18 );
 
-            $x11 ^= self::rotate($x10 + $x9, 7);
-            $x8 ^= self::rotate($x11 + $x10, 9);
-            $x9 ^= self::rotate($x8 + $x11, 13);
-            $x10 ^= self::rotate($x9 + $x8, 18);
+            $x11 ^= self::rotate( $x10 + $x9, 7 );
+            $x8 ^= self::rotate( $x11 + $x10, 9 );
+            $x9 ^= self::rotate( $x8 + $x11, 13 );
+            $x10 ^= self::rotate( $x9 + $x8, 18 );
 
-            $x12 ^= self::rotate($x15 + $x14, 7);
-            $x13 ^= self::rotate($x12 + $x15, 9);
-            $x14 ^= self::rotate($x13 + $x12, 13);
-            $x15 ^= self::rotate($x14 + $x13, 18);
+            $x12 ^= self::rotate( $x15 + $x14, 7 );
+            $x13 ^= self::rotate( $x12 + $x15, 9 );
+            $x14 ^= self::rotate( $x13 + $x12, 13 );
+            $x15 ^= self::rotate( $x14 + $x13, 18 );
         }
 
         $x0  += $j0;
@@ -109,22 +109,22 @@ 
         $x14 += $j14;
         $x15 += $j15;
 
-        return self::store32_le($x0) .
-            self::store32_le($x1) .
-            self::store32_le($x2) .
-            self::store32_le($x3) .
-            self::store32_le($x4) .
-            self::store32_le($x5) .
-            self::store32_le($x6) .
-            self::store32_le($x7) .
-            self::store32_le($x8) .
-            self::store32_le($x9) .
-            self::store32_le($x10) .
-            self::store32_le($x11) .
-            self::store32_le($x12) .
-            self::store32_le($x13) .
-            self::store32_le($x14) .
-            self::store32_le($x15);
+        return self::store32_le( $x0 ) .
+            self::store32_le( $x1 ) .
+            self::store32_le( $x2 ) .
+            self::store32_le( $x3 ) .
+            self::store32_le( $x4 ) .
+            self::store32_le( $x5 ) .
+            self::store32_le( $x6 ) .
+            self::store32_le( $x7 ) .
+            self::store32_le( $x8 ) .
+            self::store32_le( $x9 ) .
+            self::store32_le( $x10 ) .
+            self::store32_le( $x11 ) .
+            self::store32_le( $x12 ) .
+            self::store32_le( $x13 ) .
+            self::store32_le( $x14 ) .
+            self::store32_le( $x15 );
     }
 
     /**
@@ -135,35 +135,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;
@@ -178,46 +178,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_Core_Util::store64_le($ic);
+        $in .= ParagonIE_Sodium_Core_Util::store64_le( $ic );
 
         $c = '';
-        while ($mlen >= 64) {
-            $block = self::core_salsa20($in, $kcopy, null);
+        while ( $mlen >= 64 ) {
+            $block = self::core_salsa20( $in, $kcopy, null );
             $c .= self::xorStrings(
-                self::substr($m, 0, 64),
-                self::substr($block, 0, 64)
+                self::substr( $m, 0, 64 ),
+                self::substr( $block, 0, 64 )
             );
             $u = 1;
-            for ($i = 8; $i < 16; ++$i) {
-                $u += self::chrToInt($in[$i]);
-                $in[$i] = self::intToChr($u & 0xff);
+            for ( $i = 8; $i < 16; ++$i ) {
+                $u += self::chrToInt( $in[$i] );
+                $in[$i] = self::intToChr( $u & 0xff );
                 $u >>= 8;
             }
 
             $mlen -= 64;
-            $m = self::substr($m, 64);
+            $m = self::substr( $m, 64 );
         }
 
-        if ($mlen) {
-            $block = self::core_salsa20($in, $kcopy, null);
+        if ( $mlen ) {
+            $block = self::core_salsa20( $in, $kcopy, null );
             $c .= self::xorStrings(
-                self::substr($m, 0, $mlen),
-                self::substr($block, 0, $mlen)
+                self::substr( $m, 0, $mlen ),
+                self::substr( $block, 0, $mlen )
             );
         }
         try {
-            ParagonIE_Sodium_Compat::memzero($block);
-            ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block );
+            ParagonIE_Sodium_Compat::memzero( $kcopy );
+        } catch ( Error $ex ) {
             $block = null;
             $kcopy = null;
         }
@@ -233,12 +233,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
             )
@@ -252,14 +252,14 @@ 
      * @param int $c
      * @return int
      */
-    public static function rotate($u, $c)
+    public static function rotate( $u, $c )
     {
         $u &= 0xffffffff;
         $c %= 32;
         return 0xffffffff & (
-            ($u << $c)
+            ( $u << $c )
                 |
-            ($u >> (32 - $c))
+            ( $u >> ( 32 - $c ) )
         );
     }
 }

Braces +6 added lines, -12 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_Salsa20
  */
-abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
-{
+abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_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) {
         if (self::strlen($k) < 32) {
             throw new RangeException('Key must be 32 bytes long');
         }
@@ -135,8 +133,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');
         }
@@ -178,8 +175,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 '';
@@ -233,8 +229,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(
@@ -252,8 +247,7 @@ 
      * @param int $c
      * @return int
      */
-    public static function rotate($u, $c)
-    {
+    public static function rotate($u, $c) {
         $u &= 0xffffffff;
         $c %= 32;
         return 0xffffffff & (

src/library/sodium_compat/src/Core/XSalsa20.php

Indentation +41 added lines, -41 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_XSalsa20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,45 +9,45 @@ 
  */
 abstract class ParagonIE_Sodium_Core_XSalsa20 extends ParagonIE_Sodium_Core_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_Core_XSalsa20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_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_Core_XSalsa20
  */
-abstract class ParagonIE_Sodium_Core_XSalsa20 extends ParagonIE_Sodium_Core_HSalsa20
-{
+abstract class ParagonIE_Sodium_Core_XSalsa20 extends ParagonIE_Sodium_Core_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/Core/ChaCha20.php

Indentation +254 added lines, -254 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,73 +9,73 @@ 
  */
 class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
 {
-    /**
-     * Bitwise left rotation
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $v
-     * @param int $n
-     * @return int
-     */
-    public static function rotate($v, $n)
-    {
-        $v &= 0xffffffff;
-        $n &= 31;
-        return 0xffffffff & (
-            ($v << $n)
-                |
-            ($v >> (32 - $n))
-        );
-    }
+	/**
+	 * Bitwise left rotation
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $v
+	 * @param int $n
+	 * @return int
+	 */
+	public static function rotate($v, $n)
+	{
+		$v &= 0xffffffff;
+		$n &= 31;
+		return 0xffffffff & (
+			($v << $n)
+				|
+			($v >> (32 - $n))
+		);
+	}
 
-    /**
-     * The ChaCha20 quarter round function. Works on four 32-bit integers.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $a
-     * @param int $b
-     * @param int $c
-     * @param int $d
-     * @return array<int, int>
-     */
-    protected static function quarterRound($a, $b, $c, $d)
-    {
-        # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 16);
+	/**
+	 * The ChaCha20 quarter round function. Works on four 32-bit integers.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $a
+	 * @param int $b
+	 * @param int $c
+	 * @param int $d
+	 * @return array<int, int>
+	 */
+	protected static function quarterRound($a, $b, $c, $d)
+	{
+		# a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
+		$a = ($a + $b) & 0xffffffff;
+		$d = self::rotate($d ^ $a, 16);
 
-        # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 12);
+		# c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
+		$c = ($c + $d) & 0xffffffff;
+		$b = self::rotate($b ^ $c, 12);
 
-        # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 8);
+		# a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
+		$a = ($a + $b) & 0xffffffff;
+		$d = self::rotate($d ^ $a, 8);
 
-        # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 7);
-        return array((int) $a, (int) $b, (int) $c, (int) $d);
-    }
+		# c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+		$c = ($c + $d) & 0xffffffff;
+		$b = self::rotate($b ^ $c, 7);
+		return array((int) $a, (int) $b, (int) $c, (int) $d);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx
-     * @param string $message
-     *
-     * @return string
-     * @throws Exception
-     */
-    public static function encryptBytes(
-        ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
-        $message = ''
-    ) {
-        $bytes = self::strlen($message);
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx
+	 * @param string $message
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function encryptBytes(
+		ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
+		$message = ''
+	) {
+		$bytes = self::strlen($message);
 
-        /*
+		/*
         j0 = ctx->input[0];
         j1 = ctx->input[1];
         j2 = ctx->input[2];
@@ -93,73 +93,73 @@ 
         j14 = ctx->input[14];
         j15 = ctx->input[15];
         */
-        $j0  = (int) $ctx[0];
-        $j1  = (int) $ctx[1];
-        $j2  = (int) $ctx[2];
-        $j3  = (int) $ctx[3];
-        $j4  = (int) $ctx[4];
-        $j5  = (int) $ctx[5];
-        $j6  = (int) $ctx[6];
-        $j7  = (int) $ctx[7];
-        $j8  = (int) $ctx[8];
-        $j9  = (int) $ctx[9];
-        $j10 = (int) $ctx[10];
-        $j11 = (int) $ctx[11];
-        $j12 = (int) $ctx[12];
-        $j13 = (int) $ctx[13];
-        $j14 = (int) $ctx[14];
-        $j15 = (int) $ctx[15];
+		$j0  = (int) $ctx[0];
+		$j1  = (int) $ctx[1];
+		$j2  = (int) $ctx[2];
+		$j3  = (int) $ctx[3];
+		$j4  = (int) $ctx[4];
+		$j5  = (int) $ctx[5];
+		$j6  = (int) $ctx[6];
+		$j7  = (int) $ctx[7];
+		$j8  = (int) $ctx[8];
+		$j9  = (int) $ctx[9];
+		$j10 = (int) $ctx[10];
+		$j11 = (int) $ctx[11];
+		$j12 = (int) $ctx[12];
+		$j13 = (int) $ctx[13];
+		$j14 = (int) $ctx[14];
+		$j15 = (int) $ctx[15];
 
-        $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
-            }
+		$c = '';
+		for (;;) {
+			if ($bytes < 64) {
+				$message .= str_repeat("\x00", 64 - $bytes);
+			}
 
-            $x0 =  (int) $j0;
-            $x1 =  (int) $j1;
-            $x2 =  (int) $j2;
-            $x3 =  (int) $j3;
-            $x4 =  (int) $j4;
-            $x5 =  (int) $j5;
-            $x6 =  (int) $j6;
-            $x7 =  (int) $j7;
-            $x8 =  (int) $j8;
-            $x9 =  (int) $j9;
-            $x10 = (int) $j10;
-            $x11 = (int) $j11;
-            $x12 = (int) $j12;
-            $x13 = (int) $j13;
-            $x14 = (int) $j14;
-            $x15 = (int) $j15;
+			$x0 =  (int) $j0;
+			$x1 =  (int) $j1;
+			$x2 =  (int) $j2;
+			$x3 =  (int) $j3;
+			$x4 =  (int) $j4;
+			$x5 =  (int) $j5;
+			$x6 =  (int) $j6;
+			$x7 =  (int) $j7;
+			$x8 =  (int) $j8;
+			$x9 =  (int) $j9;
+			$x10 = (int) $j10;
+			$x11 = (int) $j11;
+			$x12 = (int) $j12;
+			$x13 = (int) $j13;
+			$x14 = (int) $j14;
+			$x15 = (int) $j15;
 
-            # for (i = 20; i > 0; i -= 2) {
-            for ($i = 20; $i > 0; $i -= 2) {
-                # 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);
@@ -177,24 +177,24 @@ 
             x14 = PLUS(x14, j14);
             x15 = PLUS(x15, j15);
             */
-            $x0  = ($x0 & 0xffffffff) + $j0;
-            $x1  = ($x1 & 0xffffffff) + $j1;
-            $x2  = ($x2 & 0xffffffff) + $j2;
-            $x3  = ($x3 & 0xffffffff) + $j3;
-            $x4  = ($x4 & 0xffffffff) + $j4;
-            $x5  = ($x5 & 0xffffffff) + $j5;
-            $x6  = ($x6 & 0xffffffff) + $j6;
-            $x7  = ($x7 & 0xffffffff) + $j7;
-            $x8  = ($x8 & 0xffffffff) + $j8;
-            $x9  = ($x9 & 0xffffffff) + $j9;
-            $x10 = ($x10 & 0xffffffff) + $j10;
-            $x11 = ($x11 & 0xffffffff) + $j11;
-            $x12 = ($x12 & 0xffffffff) + $j12;
-            $x13 = ($x13 & 0xffffffff) + $j13;
-            $x14 = ($x14 & 0xffffffff) + $j14;
-            $x15 = ($x15 & 0xffffffff) + $j15;
+			$x0  = ($x0 & 0xffffffff) + $j0;
+			$x1  = ($x1 & 0xffffffff) + $j1;
+			$x2  = ($x2 & 0xffffffff) + $j2;
+			$x3  = ($x3 & 0xffffffff) + $j3;
+			$x4  = ($x4 & 0xffffffff) + $j4;
+			$x5  = ($x5 & 0xffffffff) + $j5;
+			$x6  = ($x6 & 0xffffffff) + $j6;
+			$x7  = ($x7 & 0xffffffff) + $j7;
+			$x8  = ($x8 & 0xffffffff) + $j8;
+			$x9  = ($x9 & 0xffffffff) + $j9;
+			$x10 = ($x10 & 0xffffffff) + $j10;
+			$x11 = ($x11 & 0xffffffff) + $j11;
+			$x12 = ($x12 & 0xffffffff) + $j12;
+			$x13 = ($x13 & 0xffffffff) + $j13;
+			$x14 = ($x14 & 0xffffffff) + $j14;
+			$x15 = ($x15 & 0xffffffff) + $j15;
 
-            /*
+			/*
             x0 = XOR(x0, LOAD32_LE(m + 0));
             x1 = XOR(x1, LOAD32_LE(m + 4));
             x2 = XOR(x2, LOAD32_LE(m + 8));
@@ -212,35 +212,35 @@ 
             x14 = XOR(x14, LOAD32_LE(m + 56));
             x15 = XOR(x15, LOAD32_LE(m + 60));
             */
-            $x0  ^= self::load_4(self::substr($message, 0, 4));
-            $x1  ^= self::load_4(self::substr($message, 4, 4));
-            $x2  ^= self::load_4(self::substr($message, 8, 4));
-            $x3  ^= self::load_4(self::substr($message, 12, 4));
-            $x4  ^= self::load_4(self::substr($message, 16, 4));
-            $x5  ^= self::load_4(self::substr($message, 20, 4));
-            $x6  ^= self::load_4(self::substr($message, 24, 4));
-            $x7  ^= self::load_4(self::substr($message, 28, 4));
-            $x8  ^= self::load_4(self::substr($message, 32, 4));
-            $x9  ^= self::load_4(self::substr($message, 36, 4));
-            $x10 ^= self::load_4(self::substr($message, 40, 4));
-            $x11 ^= self::load_4(self::substr($message, 44, 4));
-            $x12 ^= self::load_4(self::substr($message, 48, 4));
-            $x13 ^= self::load_4(self::substr($message, 52, 4));
-            $x14 ^= self::load_4(self::substr($message, 56, 4));
-            $x15 ^= self::load_4(self::substr($message, 60, 4));
+			$x0  ^= self::load_4(self::substr($message, 0, 4));
+			$x1  ^= self::load_4(self::substr($message, 4, 4));
+			$x2  ^= self::load_4(self::substr($message, 8, 4));
+			$x3  ^= self::load_4(self::substr($message, 12, 4));
+			$x4  ^= self::load_4(self::substr($message, 16, 4));
+			$x5  ^= self::load_4(self::substr($message, 20, 4));
+			$x6  ^= self::load_4(self::substr($message, 24, 4));
+			$x7  ^= self::load_4(self::substr($message, 28, 4));
+			$x8  ^= self::load_4(self::substr($message, 32, 4));
+			$x9  ^= self::load_4(self::substr($message, 36, 4));
+			$x10 ^= self::load_4(self::substr($message, 40, 4));
+			$x11 ^= self::load_4(self::substr($message, 44, 4));
+			$x12 ^= self::load_4(self::substr($message, 48, 4));
+			$x13 ^= self::load_4(self::substr($message, 52, 4));
+			$x14 ^= self::load_4(self::substr($message, 56, 4));
+			$x15 ^= self::load_4(self::substr($message, 60, 4));
 
-            /*
+			/*
                 j12 = PLUSONE(j12);
                 if (!j12) {
                     j13 = PLUSONE(j13);
                 }
              */
-            ++$j12;
-            if ($j12 & 0xf0000000) {
-                throw new Exception('Overflow');
-            }
+			++$j12;
+			if ($j12 & 0xf0000000) {
+				throw new Exception('Overflow');
+			}
 
-            /*
+			/*
             STORE32_LE(c + 0, x0);
             STORE32_LE(c + 4, x1);
             STORE32_LE(c + 8, x2);
@@ -258,107 +258,107 @@ 
             STORE32_LE(c + 56, x14);
             STORE32_LE(c + 60, x15);
             */
-            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
-                 self::store32_le((int) ($x1  & 0xffffffff)) .
-                 self::store32_le((int) ($x2  & 0xffffffff)) .
-                 self::store32_le((int) ($x3  & 0xffffffff)) .
-                 self::store32_le((int) ($x4  & 0xffffffff)) .
-                 self::store32_le((int) ($x5  & 0xffffffff)) .
-                 self::store32_le((int) ($x6  & 0xffffffff)) .
-                 self::store32_le((int) ($x7  & 0xffffffff)) .
-                 self::store32_le((int) ($x8  & 0xffffffff)) .
-                 self::store32_le((int) ($x9  & 0xffffffff)) .
-                 self::store32_le((int) ($x10 & 0xffffffff)) .
-                 self::store32_le((int) ($x11 & 0xffffffff)) .
-                 self::store32_le((int) ($x12 & 0xffffffff)) .
-                 self::store32_le((int) ($x13 & 0xffffffff)) .
-                 self::store32_le((int) ($x14 & 0xffffffff)) .
-                 self::store32_le((int) ($x15 & 0xffffffff));
+			$block = self::store32_le((int) ($x0  & 0xffffffff)) .
+				 self::store32_le((int) ($x1  & 0xffffffff)) .
+				 self::store32_le((int) ($x2  & 0xffffffff)) .
+				 self::store32_le((int) ($x3  & 0xffffffff)) .
+				 self::store32_le((int) ($x4  & 0xffffffff)) .
+				 self::store32_le((int) ($x5  & 0xffffffff)) .
+				 self::store32_le((int) ($x6  & 0xffffffff)) .
+				 self::store32_le((int) ($x7  & 0xffffffff)) .
+				 self::store32_le((int) ($x8  & 0xffffffff)) .
+				 self::store32_le((int) ($x9  & 0xffffffff)) .
+				 self::store32_le((int) ($x10 & 0xffffffff)) .
+				 self::store32_le((int) ($x11 & 0xffffffff)) .
+				 self::store32_le((int) ($x12 & 0xffffffff)) .
+				 self::store32_le((int) ($x13 & 0xffffffff)) .
+				 self::store32_le((int) ($x14 & 0xffffffff)) .
+				 self::store32_le((int) ($x15 & 0xffffffff));
 
-            /* Partial block */
-            if ($bytes < 64) {
-                $c .= self::substr($block, 0, $bytes);
-                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_Core_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_Core_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_Core_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_Core_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_Core_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_Core_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_Core_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_Core_ChaCha20_Ctx($key, $nonce, $ic),
+			$message
+		);
+	}
 }

Spacing +101 added lines, -101 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20', false ) ) {
     return;
 }
 
@@ -18,14 +18,14 @@ 
      * @param int $n
      * @return int
      */
-    public static function rotate($v, $n)
+    public static function rotate( $v, $n )
     {
         $v &= 0xffffffff;
         $n &= 31;
         return 0xffffffff & (
-            ($v << $n)
+            ( $v << $n )
                 |
-            ($v >> (32 - $n))
+            ( $v >> ( 32 - $n ) )
         );
     }
 
@@ -40,24 +40,24 @@ 
      * @param int $d
      * @return array<int, int>
      */
-    protected static function quarterRound($a, $b, $c, $d)
+    protected static function quarterRound( $a, $b, $c, $d )
     {
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 16);
+        $a = ( $a + $b ) & 0xffffffff;
+        $d = self::rotate( $d ^ $a, 16 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 12);
+        $c = ( $c + $d ) & 0xffffffff;
+        $b = self::rotate( $b ^ $c, 12 );
 
         # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
-        $a = ($a + $b) & 0xffffffff;
-        $d = self::rotate($d ^ $a, 8);
+        $a = ( $a + $b ) & 0xffffffff;
+        $d = self::rotate( $d ^ $a, 8 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
-        $c = ($c + $d) & 0xffffffff;
-        $b = self::rotate($b ^ $c, 7);
-        return array((int) $a, (int) $b, (int) $c, (int) $d);
+        $c = ( $c + $d ) & 0xffffffff;
+        $b = self::rotate( $b ^ $c, 7 );
+        return array( (int) $a, (int) $b, (int) $c, (int) $d );
     }
 
     /**
@@ -73,7 +73,7 @@ 
         ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
         $message = ''
     ) {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /*
         j0 = ctx->input[0];
@@ -111,21 +111,21 @@ 
         $j15 = (int) $ctx[15];
 
         $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
+        for ( ;; ) {
+            if ( $bytes < 64 ) {
+                $message .= str_repeat( "\x00", 64 - $bytes );
             }
 
-            $x0 =  (int) $j0;
-            $x1 =  (int) $j1;
-            $x2 =  (int) $j2;
-            $x3 =  (int) $j3;
-            $x4 =  (int) $j4;
-            $x5 =  (int) $j5;
-            $x6 =  (int) $j6;
-            $x7 =  (int) $j7;
-            $x8 =  (int) $j8;
-            $x9 =  (int) $j9;
+            $x0 = (int) $j0;
+            $x1 = (int) $j1;
+            $x2 = (int) $j2;
+            $x3 = (int) $j3;
+            $x4 = (int) $j4;
+            $x5 = (int) $j5;
+            $x6 = (int) $j6;
+            $x7 = (int) $j7;
+            $x8 = (int) $j8;
+            $x9 = (int) $j9;
             $x10 = (int) $j10;
             $x11 = (int) $j11;
             $x12 = (int) $j12;
@@ -134,30 +134,30 @@ 
             $x15 = (int) $j15;
 
             # for (i = 20; i > 0; i -= 2) {
-            for ($i = 20; $i > 0; $i -= 2) {
+            for ( $i = 20; $i > 0; $i -= 2 ) {
                 # QUARTERROUND( x0,  x4,  x8,  x12)
-                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+                list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
 
                 # QUARTERROUND( x1,  x5,  x9,  x13)
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+                list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
 
                 # QUARTERROUND( x2,  x6,  x10,  x14)
-                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+                list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
 
                 # QUARTERROUND( x3,  x7,  x11,  x15)
-                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+                list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
 
                 # QUARTERROUND( x0,  x5,  x10,  x15)
-                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+                list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
 
                 # QUARTERROUND( x1,  x6,  x11,  x12)
-                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+                list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
 
                 # QUARTERROUND( x2,  x7,  x8,  x13)
-                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+                list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
 
                 # QUARTERROUND( x3,  x4,  x9,  x14)
-                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+                list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
             }
             /*
             x0 = PLUS(x0, j0);
@@ -177,22 +177,22 @@ 
             x14 = PLUS(x14, j14);
             x15 = PLUS(x15, j15);
             */
-            $x0  = ($x0 & 0xffffffff) + $j0;
-            $x1  = ($x1 & 0xffffffff) + $j1;
-            $x2  = ($x2 & 0xffffffff) + $j2;
-            $x3  = ($x3 & 0xffffffff) + $j3;
-            $x4  = ($x4 & 0xffffffff) + $j4;
-            $x5  = ($x5 & 0xffffffff) + $j5;
-            $x6  = ($x6 & 0xffffffff) + $j6;
-            $x7  = ($x7 & 0xffffffff) + $j7;
-            $x8  = ($x8 & 0xffffffff) + $j8;
-            $x9  = ($x9 & 0xffffffff) + $j9;
-            $x10 = ($x10 & 0xffffffff) + $j10;
-            $x11 = ($x11 & 0xffffffff) + $j11;
-            $x12 = ($x12 & 0xffffffff) + $j12;
-            $x13 = ($x13 & 0xffffffff) + $j13;
-            $x14 = ($x14 & 0xffffffff) + $j14;
-            $x15 = ($x15 & 0xffffffff) + $j15;
+            $x0  = ( $x0 & 0xffffffff ) + $j0;
+            $x1  = ( $x1 & 0xffffffff ) + $j1;
+            $x2  = ( $x2 & 0xffffffff ) + $j2;
+            $x3  = ( $x3 & 0xffffffff ) + $j3;
+            $x4  = ( $x4 & 0xffffffff ) + $j4;
+            $x5  = ( $x5 & 0xffffffff ) + $j5;
+            $x6  = ( $x6 & 0xffffffff ) + $j6;
+            $x7  = ( $x7 & 0xffffffff ) + $j7;
+            $x8  = ( $x8 & 0xffffffff ) + $j8;
+            $x9  = ( $x9 & 0xffffffff ) + $j9;
+            $x10 = ( $x10 & 0xffffffff ) + $j10;
+            $x11 = ( $x11 & 0xffffffff ) + $j11;
+            $x12 = ( $x12 & 0xffffffff ) + $j12;
+            $x13 = ( $x13 & 0xffffffff ) + $j13;
+            $x14 = ( $x14 & 0xffffffff ) + $j14;
+            $x15 = ( $x15 & 0xffffffff ) + $j15;
 
             /*
             x0 = XOR(x0, LOAD32_LE(m + 0));
@@ -212,22 +212,22 @@ 
             x14 = XOR(x14, LOAD32_LE(m + 56));
             x15 = XOR(x15, LOAD32_LE(m + 60));
             */
-            $x0  ^= self::load_4(self::substr($message, 0, 4));
-            $x1  ^= self::load_4(self::substr($message, 4, 4));
-            $x2  ^= self::load_4(self::substr($message, 8, 4));
-            $x3  ^= self::load_4(self::substr($message, 12, 4));
-            $x4  ^= self::load_4(self::substr($message, 16, 4));
-            $x5  ^= self::load_4(self::substr($message, 20, 4));
-            $x6  ^= self::load_4(self::substr($message, 24, 4));
-            $x7  ^= self::load_4(self::substr($message, 28, 4));
-            $x8  ^= self::load_4(self::substr($message, 32, 4));
-            $x9  ^= self::load_4(self::substr($message, 36, 4));
-            $x10 ^= self::load_4(self::substr($message, 40, 4));
-            $x11 ^= self::load_4(self::substr($message, 44, 4));
-            $x12 ^= self::load_4(self::substr($message, 48, 4));
-            $x13 ^= self::load_4(self::substr($message, 52, 4));
-            $x14 ^= self::load_4(self::substr($message, 56, 4));
-            $x15 ^= self::load_4(self::substr($message, 60, 4));
+            $x0  ^= self::load_4( self::substr( $message, 0, 4 ) );
+            $x1  ^= self::load_4( self::substr( $message, 4, 4 ) );
+            $x2  ^= self::load_4( self::substr( $message, 8, 4 ) );
+            $x3  ^= self::load_4( self::substr( $message, 12, 4 ) );
+            $x4  ^= self::load_4( self::substr( $message, 16, 4 ) );
+            $x5  ^= self::load_4( self::substr( $message, 20, 4 ) );
+            $x6  ^= self::load_4( self::substr( $message, 24, 4 ) );
+            $x7  ^= self::load_4( self::substr( $message, 28, 4 ) );
+            $x8  ^= self::load_4( self::substr( $message, 32, 4 ) );
+            $x9  ^= self::load_4( self::substr( $message, 36, 4 ) );
+            $x10 ^= self::load_4( self::substr( $message, 40, 4 ) );
+            $x11 ^= self::load_4( self::substr( $message, 44, 4 ) );
+            $x12 ^= self::load_4( self::substr( $message, 48, 4 ) );
+            $x13 ^= self::load_4( self::substr( $message, 52, 4 ) );
+            $x14 ^= self::load_4( self::substr( $message, 56, 4 ) );
+            $x15 ^= self::load_4( self::substr( $message, 60, 4 ) );
 
             /*
                 j12 = PLUSONE(j12);
@@ -236,8 +236,8 @@ 
                 }
              */
             ++$j12;
-            if ($j12 & 0xf0000000) {
-                throw new Exception('Overflow');
+            if ( $j12 & 0xf0000000 ) {
+                throw new Exception( 'Overflow' );
             }
 
             /*
@@ -258,36 +258,36 @@ 
             STORE32_LE(c + 56, x14);
             STORE32_LE(c + 60, x15);
             */
-            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
-                 self::store32_le((int) ($x1  & 0xffffffff)) .
-                 self::store32_le((int) ($x2  & 0xffffffff)) .
-                 self::store32_le((int) ($x3  & 0xffffffff)) .
-                 self::store32_le((int) ($x4  & 0xffffffff)) .
-                 self::store32_le((int) ($x5  & 0xffffffff)) .
-                 self::store32_le((int) ($x6  & 0xffffffff)) .
-                 self::store32_le((int) ($x7  & 0xffffffff)) .
-                 self::store32_le((int) ($x8  & 0xffffffff)) .
-                 self::store32_le((int) ($x9  & 0xffffffff)) .
-                 self::store32_le((int) ($x10 & 0xffffffff)) .
-                 self::store32_le((int) ($x11 & 0xffffffff)) .
-                 self::store32_le((int) ($x12 & 0xffffffff)) .
-                 self::store32_le((int) ($x13 & 0xffffffff)) .
-                 self::store32_le((int) ($x14 & 0xffffffff)) .
-                 self::store32_le((int) ($x15 & 0xffffffff));
+            $block = self::store32_le( (int) ( $x0 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x1 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x2 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x3 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x4 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x5 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x6 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x7 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x8 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x9 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x10 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x11 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x12 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x13 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x14 & 0xffffffff ) ) .
+                 self::store32_le( (int) ( $x15 & 0xffffffff ) );
 
             /* Partial block */
-            if ($bytes < 64) {
-                $c .= self::substr($block, 0, $bytes);
+            if ( $bytes < 64 ) {
+                $c .= self::substr( $block, 0, $bytes );
                 break;
             }
 
             /* Full block */
             $c .= $block;
             $bytes -= 64;
-            if ($bytes <= 0) {
+            if ( $bytes <= 0 ) {
                 break;
             }
-            $message = self::substr($message, 64);
+            $message = self::substr( $message, 64 );
         }
         /* end for(;;) loop */
 
@@ -304,11 +304,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_Core_ChaCha20_Ctx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -320,11 +320,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_Core_ChaCha20_IetfCtx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -337,10 +337,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_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce, $ic ),
             $message
         );
     }
@@ -354,10 +354,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_Core_ChaCha20_Ctx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce, $ic ),
             $message
         );
     }

Braces +7 added lines, -14 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_ChaCha20
  */
-class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
-{
+class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util {
     /**
      * Bitwise left rotation
      *
@@ -18,8 +17,7 @@ 
      * @param int $n
      * @return int
      */
-    public static function rotate($v, $n)
-    {
+    public static function rotate($v, $n) {
         $v &= 0xffffffff;
         $n &= 31;
         return 0xffffffff & (
@@ -40,8 +38,7 @@ 
      * @param int $d
      * @return array<int, int>
      */
-    protected static function quarterRound($a, $b, $c, $d)
-    {
+    protected static function quarterRound($a, $b, $c, $d) {
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
         $a = ($a + $b) & 0xffffffff;
         $d = self::rotate($d ^ $a, 16);
@@ -304,8 +301,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_Core_ChaCha20_Ctx($key, $nonce),
             str_repeat("\x00", $len)
@@ -320,8 +316,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_Core_ChaCha20_IetfCtx($key, $nonce),
             str_repeat("\x00", $len)
@@ -337,8 +332,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_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
             $message
@@ -354,8 +348,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_Core_ChaCha20_Ctx($key, $nonce, $ic),
             $message

src/library/sodium_compat/src/Core/X25519.php

Indentation +300 added lines, -300 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_X25519', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,303 +9,303 @@ 
  */
 abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve25519
 {
-    /**
-     * Alters the objects passed to this method in place.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
-     * @param int $b
-     * @return void
-     */
-    public static function fe_cswap(
-        ParagonIE_Sodium_Core_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core_Curve25519_Fe $g,
-        $b = 0
-    ) {
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
-        $g0 = (int) $g[0];
-        $g1 = (int) $g[1];
-        $g2 = (int) $g[2];
-        $g3 = (int) $g[3];
-        $g4 = (int) $g[4];
-        $g5 = (int) $g[5];
-        $g6 = (int) $g[6];
-        $g7 = (int) $g[7];
-        $g8 = (int) $g[8];
-        $g9 = (int) $g[9];
-        $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] = $f0 ^ $x0;
-        $f[1] = $f1 ^ $x1;
-        $f[2] = $f2 ^ $x2;
-        $f[3] = $f3 ^ $x3;
-        $f[4] = $f4 ^ $x4;
-        $f[5] = $f5 ^ $x5;
-        $f[6] = $f6 ^ $x6;
-        $f[7] = $f7 ^ $x7;
-        $f[8] = $f8 ^ $x8;
-        $f[9] = $f9 ^ $x9;
-        $g[0] = $g0 ^ $x0;
-        $g[1] = $g1 ^ $x1;
-        $g[2] = $g2 ^ $x2;
-        $g[3] = $g3 ^ $x3;
-        $g[4] = $g4 ^ $x4;
-        $g[5] = $g5 ^ $x5;
-        $g[6] = $g6 ^ $x6;
-        $g[7] = $g7 ^ $x7;
-        $g[8] = $g8 ^ $x8;
-        $g[9] = $g9 ^ $x9;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        $h = array(
-            self::mul($f[0], 121666, 17),
-            self::mul($f[1], 121666, 17),
-            self::mul($f[2], 121666, 17),
-            self::mul($f[3], 121666, 17),
-            self::mul($f[4], 121666, 17),
-            self::mul($f[5], 121666, 17),
-            self::mul($f[6], 121666, 17),
-            self::mul($f[7], 121666, 17),
-            self::mul($f[8], 121666, 17),
-            self::mul($f[9], 121666, 17)
-        );
-
-        $carry9 = ($h[9] + (1 << 24)) >> 25;
-        $h[0] += self::mul($carry9, 19, 5);
-        $h[9] -= $carry9 << 25;
-        $carry1 = ($h[1] + (1 << 24)) >> 25;
-        $h[2] += $carry1;
-        $h[1] -= $carry1 << 25;
-        $carry3 = ($h[3] + (1 << 24)) >> 25;
-        $h[4] += $carry3;
-        $h[3] -= $carry3 << 25;
-        $carry5 = ($h[5] + (1 << 24)) >> 25;
-        $h[6] += $carry5;
-        $h[5] -= $carry5 << 25;
-        $carry7 = ($h[7] + (1 << 24)) >> 25;
-        $h[8] += $carry7;
-        $h[7] -= $carry7 << 25;
-
-        $carry0 = ($h[0] + (1 << 25)) >> 26;
-        $h[1] += $carry0;
-        $h[0] -= $carry0 << 26;
-        $carry2 = ($h[2] + (1 << 25)) >> 26;
-        $h[3] += $carry2;
-        $h[2] -= $carry2 << 26;
-        $carry4 = ($h[4] + (1 << 25)) >> 26;
-        $h[5] += $carry4;
-        $h[4] -= $carry4 << 26;
-        $carry6 = ($h[6] + (1 << 25)) >> 26;
-        $h[7] += $carry6;
-        $h[6] -= $carry6 << 26;
-        $carry8 = ($h[8] + (1 << 25)) >> 26;
-        $h[9] += $carry8;
-        $h[8] -= $carry8 << 26;
-
-        foreach ($h as $i => $value) {
-            $h[$i] = (int) $value;
-        }
-        return ParagonIE_Sodium_Core_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_Core_Curve25519_Fe $edwardsY
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $edwardsZ
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function edwards_to_montgomery(
-        ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY,
-        ParagonIE_Sodium_Core_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_Core_Curve25519_Fe)
-                ||
-            !($A->Z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
-        ) {
-            throw new TypeError('Null points encountered');
-        }
-        $pk = self::edwards_to_montgomery($A->Y, $A->Z);
-        return self::fe_tobytes($pk);
-    }
+	/**
+	 * Alters the objects passed to this method in place.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+	 * @param int $b
+	 * @return void
+	 */
+	public static function fe_cswap(
+		ParagonIE_Sodium_Core_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core_Curve25519_Fe $g,
+		$b = 0
+	) {
+		$f0 = (int) $f[0];
+		$f1 = (int) $f[1];
+		$f2 = (int) $f[2];
+		$f3 = (int) $f[3];
+		$f4 = (int) $f[4];
+		$f5 = (int) $f[5];
+		$f6 = (int) $f[6];
+		$f7 = (int) $f[7];
+		$f8 = (int) $f[8];
+		$f9 = (int) $f[9];
+		$g0 = (int) $g[0];
+		$g1 = (int) $g[1];
+		$g2 = (int) $g[2];
+		$g3 = (int) $g[3];
+		$g4 = (int) $g[4];
+		$g5 = (int) $g[5];
+		$g6 = (int) $g[6];
+		$g7 = (int) $g[7];
+		$g8 = (int) $g[8];
+		$g9 = (int) $g[9];
+		$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] = $f0 ^ $x0;
+		$f[1] = $f1 ^ $x1;
+		$f[2] = $f2 ^ $x2;
+		$f[3] = $f3 ^ $x3;
+		$f[4] = $f4 ^ $x4;
+		$f[5] = $f5 ^ $x5;
+		$f[6] = $f6 ^ $x6;
+		$f[7] = $f7 ^ $x7;
+		$f[8] = $f8 ^ $x8;
+		$f[9] = $f9 ^ $x9;
+		$g[0] = $g0 ^ $x0;
+		$g[1] = $g1 ^ $x1;
+		$g[2] = $g2 ^ $x2;
+		$g[3] = $g3 ^ $x3;
+		$g[4] = $g4 ^ $x4;
+		$g[5] = $g5 ^ $x5;
+		$g[6] = $g6 ^ $x6;
+		$g[7] = $g7 ^ $x7;
+		$g[8] = $g8 ^ $x8;
+		$g[9] = $g9 ^ $x9;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+	{
+		$h = array(
+			self::mul($f[0], 121666, 17),
+			self::mul($f[1], 121666, 17),
+			self::mul($f[2], 121666, 17),
+			self::mul($f[3], 121666, 17),
+			self::mul($f[4], 121666, 17),
+			self::mul($f[5], 121666, 17),
+			self::mul($f[6], 121666, 17),
+			self::mul($f[7], 121666, 17),
+			self::mul($f[8], 121666, 17),
+			self::mul($f[9], 121666, 17)
+		);
+
+		$carry9 = ($h[9] + (1 << 24)) >> 25;
+		$h[0] += self::mul($carry9, 19, 5);
+		$h[9] -= $carry9 << 25;
+		$carry1 = ($h[1] + (1 << 24)) >> 25;
+		$h[2] += $carry1;
+		$h[1] -= $carry1 << 25;
+		$carry3 = ($h[3] + (1 << 24)) >> 25;
+		$h[4] += $carry3;
+		$h[3] -= $carry3 << 25;
+		$carry5 = ($h[5] + (1 << 24)) >> 25;
+		$h[6] += $carry5;
+		$h[5] -= $carry5 << 25;
+		$carry7 = ($h[7] + (1 << 24)) >> 25;
+		$h[8] += $carry7;
+		$h[7] -= $carry7 << 25;
+
+		$carry0 = ($h[0] + (1 << 25)) >> 26;
+		$h[1] += $carry0;
+		$h[0] -= $carry0 << 26;
+		$carry2 = ($h[2] + (1 << 25)) >> 26;
+		$h[3] += $carry2;
+		$h[2] -= $carry2 << 26;
+		$carry4 = ($h[4] + (1 << 25)) >> 26;
+		$h[5] += $carry4;
+		$h[4] -= $carry4 << 26;
+		$carry6 = ($h[6] + (1 << 25)) >> 26;
+		$h[7] += $carry6;
+		$h[6] -= $carry6 << 26;
+		$carry8 = ($h[8] + (1 << 25)) >> 26;
+		$h[9] += $carry8;
+		$h[8] -= $carry8 << 26;
+
+		foreach ($h as $i => $value) {
+			$h[$i] = (int) $value;
+		}
+		return ParagonIE_Sodium_Core_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_Core_Curve25519_Fe $edwardsY
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $edwardsZ
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function edwards_to_montgomery(
+		ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY,
+		ParagonIE_Sodium_Core_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_Core_Curve25519_Fe)
+				||
+			!($A->Z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
+		) {
+			throw new TypeError('Null points encountered');
+		}
+		$pk = self::edwards_to_montgomery($A->Y, $A->Z);
+		return self::fe_tobytes($pk);
+	}
 }

Spacing +81 added lines, -81 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_X25519', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_X25519', false ) ) {
     return;
 }
 
@@ -45,16 +45,16 @@ 
         $g8 = (int) $g[8];
         $g9 = (int) $g[9];
         $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;
+        $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] = $f0 ^ $x0;
         $f[1] = $f1 ^ $x1;
         $f[2] = $f2 ^ $x2;
@@ -83,57 +83,57 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_mul121666( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         $h = array(
-            self::mul($f[0], 121666, 17),
-            self::mul($f[1], 121666, 17),
-            self::mul($f[2], 121666, 17),
-            self::mul($f[3], 121666, 17),
-            self::mul($f[4], 121666, 17),
-            self::mul($f[5], 121666, 17),
-            self::mul($f[6], 121666, 17),
-            self::mul($f[7], 121666, 17),
-            self::mul($f[8], 121666, 17),
-            self::mul($f[9], 121666, 17)
+            self::mul( $f[0], 121666, 17 ),
+            self::mul( $f[1], 121666, 17 ),
+            self::mul( $f[2], 121666, 17 ),
+            self::mul( $f[3], 121666, 17 ),
+            self::mul( $f[4], 121666, 17 ),
+            self::mul( $f[5], 121666, 17 ),
+            self::mul( $f[6], 121666, 17 ),
+            self::mul( $f[7], 121666, 17 ),
+            self::mul( $f[8], 121666, 17 ),
+            self::mul( $f[9], 121666, 17 )
         );
 
-        $carry9 = ($h[9] + (1 << 24)) >> 25;
-        $h[0] += self::mul($carry9, 19, 5);
+        $carry9 = ( $h[9] + ( 1 << 24 ) ) >> 25;
+        $h[0] += self::mul( $carry9, 19, 5 );
         $h[9] -= $carry9 << 25;
-        $carry1 = ($h[1] + (1 << 24)) >> 25;
+        $carry1 = ( $h[1] + ( 1 << 24 ) ) >> 25;
         $h[2] += $carry1;
         $h[1] -= $carry1 << 25;
-        $carry3 = ($h[3] + (1 << 24)) >> 25;
+        $carry3 = ( $h[3] + ( 1 << 24 ) ) >> 25;
         $h[4] += $carry3;
         $h[3] -= $carry3 << 25;
-        $carry5 = ($h[5] + (1 << 24)) >> 25;
+        $carry5 = ( $h[5] + ( 1 << 24 ) ) >> 25;
         $h[6] += $carry5;
         $h[5] -= $carry5 << 25;
-        $carry7 = ($h[7] + (1 << 24)) >> 25;
+        $carry7 = ( $h[7] + ( 1 << 24 ) ) >> 25;
         $h[8] += $carry7;
         $h[7] -= $carry7 << 25;
 
-        $carry0 = ($h[0] + (1 << 25)) >> 26;
+        $carry0 = ( $h[0] + ( 1 << 25 ) ) >> 26;
         $h[1] += $carry0;
         $h[0] -= $carry0 << 26;
-        $carry2 = ($h[2] + (1 << 25)) >> 26;
+        $carry2 = ( $h[2] + ( 1 << 25 ) ) >> 26;
         $h[3] += $carry2;
         $h[2] -= $carry2 << 26;
-        $carry4 = ($h[4] + (1 << 25)) >> 26;
+        $carry4 = ( $h[4] + ( 1 << 25 ) ) >> 26;
         $h[5] += $carry4;
         $h[4] -= $carry4 << 26;
-        $carry6 = ($h[6] + (1 << 25)) >> 26;
+        $carry6 = ( $h[6] + ( 1 << 25 ) ) >> 26;
         $h[7] += $carry6;
         $h[6] -= $carry6 << 26;
-        $carry8 = ($h[8] + (1 << 25)) >> 26;
+        $carry8 = ( $h[8] + ( 1 << 25 ) ) >> 26;
         $h[9] += $carry8;
         $h[8] -= $carry8 << 26;
 
-        foreach ($h as $i => $value) {
+        foreach ( $h as $i => $value ) {
             $h[$i] = (int) $value;
         }
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $h );
     }
 
     /**
@@ -145,27 +145,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();
 
@@ -173,88 +173,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 );
     }
 
     /**
@@ -268,10 +268,10 @@ 
         ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY,
         ParagonIE_Sodium_Core_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 );
     }
 
     /**
@@ -281,31 +281,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_Core_Curve25519_Fe)
+            ! ( $A->Y instanceof ParagonIE_Sodium_Core_Curve25519_Fe )
                 ||
-            !($A->Z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
+            ! ( $A->Z instanceof ParagonIE_Sodium_Core_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_Core_X25519
  */
-abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve25519
-{
+abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve25519 {
     /**
      * Alters the objects passed to this method in place.
      *
@@ -83,8 +82,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         $h = array(
             self::mul($f[0], 121666, 17),
             self::mul($f[1], 121666, 17),
@@ -145,8 +143,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;
@@ -281,8 +278,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/Core/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_Core_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core_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] = self::load_4(self::substr($counter, 0, 4));
-        }
-        $this->container[13] = self::load_4(self::substr($iv, 0, 4));
-        $this->container[14] = self::load_4(self::substr($iv, 4, 4));
-        $this->container[15] = self::load_4(self::substr($iv, 8, 4));
-    }
+		if (!empty($counter)) {
+			$this->container[12] = self::load_4(self::substr($counter, 0, 4));
+		}
+		$this->container[13] = self::load_4(self::substr($iv, 0, 4));
+		$this->container[14] = self::load_4(self::substr($iv, 4, 4));
+		$this->container[15] = self::load_4(self::substr($iv, 8, 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] = self::load_4(self::substr($counter, 0, 4));
+        if ( ! empty( $counter ) ) {
+            $this->container[12] = self::load_4( self::substr( $counter, 0, 4 ) );
         }
-        $this->container[13] = self::load_4(self::substr($iv, 0, 4));
-        $this->container[14] = self::load_4(self::substr($iv, 4, 4));
-        $this->container[15] = self::load_4(self::substr($iv, 8, 4));
+        $this->container[13] = self::load_4( self::substr( $iv, 0, 4 ) );
+        $this->container[14] = self::load_4( self::substr( $iv, 4, 4 ) );
+        $this->container[15] = self::load_4( self::substr( $iv, 8, 4 ) );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_ChaCha20_IetfCtx
  */
-class ParagonIE_Sodium_Core_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core_ChaCha20_Ctx
-{
+class ParagonIE_Sodium_Core_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core_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/Core/ChaCha20/Ctx.php

Indentation +97 added lines, -97 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,107 +9,107 @@ 
  */
 class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util implements ArrayAccess
 {
-    /**
-     * @var SplFixedArray<int, int>
-     */
-    protected $container;
+	/**
+	 * @var SplFixedArray<int, int>
+	 */
+	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]  = 0x61707865;
-        $this->container[1]  = 0x3320646e;
-        $this->container[2]  = 0x79622d32;
-        $this->container[3]  = 0x6b206574;
-        $this->container[4]  = self::load_4(self::substr($key, 0, 4));
-        $this->container[5]  = self::load_4(self::substr($key, 4, 4));
-        $this->container[6]  = self::load_4(self::substr($key, 8, 4));
-        $this->container[7]  = self::load_4(self::substr($key, 12, 4));
-        $this->container[8]  = self::load_4(self::substr($key, 16, 4));
-        $this->container[9]  = self::load_4(self::substr($key, 20, 4));
-        $this->container[10] = self::load_4(self::substr($key, 24, 4));
-        $this->container[11] = self::load_4(self::substr($key, 28, 4));
+		/* "expand 32-byte k" as per ChaCha20 spec */
+		$this->container[0]  = 0x61707865;
+		$this->container[1]  = 0x3320646e;
+		$this->container[2]  = 0x79622d32;
+		$this->container[3]  = 0x6b206574;
+		$this->container[4]  = self::load_4(self::substr($key, 0, 4));
+		$this->container[5]  = self::load_4(self::substr($key, 4, 4));
+		$this->container[6]  = self::load_4(self::substr($key, 8, 4));
+		$this->container[7]  = self::load_4(self::substr($key, 12, 4));
+		$this->container[8]  = self::load_4(self::substr($key, 16, 4));
+		$this->container[9]  = self::load_4(self::substr($key, 20, 4));
+		$this->container[10] = self::load_4(self::substr($key, 24, 4));
+		$this->container[11] = self::load_4(self::substr($key, 28, 4));
 
-        if (empty($counter)) {
-            $this->container[12] = 0;
-            $this->container[13] = 0;
-        } else {
-            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
-            $this->container[13] = self::load_4(self::substr($counter, 4, 4));
-        }
-        $this->container[14] = self::load_4(self::substr($iv, 0, 4));
-        $this->container[15] = self::load_4(self::substr($iv, 4, 4));
-    }
+		if (empty($counter)) {
+			$this->container[12] = 0;
+			$this->container[13] = 0;
+		} else {
+			$this->container[12] = self::load_4(self::substr($counter, 0, 4));
+			$this->container[13] = self::load_4(self::substr($counter, 4, 4));
+		}
+		$this->container[14] = self::load_4(self::substr($iv, 0, 4));
+		$this->container[15] = self::load_4(self::substr($iv, 4, 4));
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $offset
-     * @param int $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (!is_int($offset)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        $this->container[$offset] = $value;
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $offset
+	 * @param int $value
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		if (!is_int($offset)) {
+			throw new InvalidArgumentException('Expected an integer');
+		}
+		if (!is_int($value)) {
+			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 +31 added lines, -31 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,39 +25,39 @@ 
      *                        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]  = 0x61707865;
         $this->container[1]  = 0x3320646e;
         $this->container[2]  = 0x79622d32;
         $this->container[3]  = 0x6b206574;
-        $this->container[4]  = self::load_4(self::substr($key, 0, 4));
-        $this->container[5]  = self::load_4(self::substr($key, 4, 4));
-        $this->container[6]  = self::load_4(self::substr($key, 8, 4));
-        $this->container[7]  = self::load_4(self::substr($key, 12, 4));
-        $this->container[8]  = self::load_4(self::substr($key, 16, 4));
-        $this->container[9]  = self::load_4(self::substr($key, 20, 4));
-        $this->container[10] = self::load_4(self::substr($key, 24, 4));
-        $this->container[11] = self::load_4(self::substr($key, 28, 4));
+        $this->container[4]  = self::load_4( self::substr( $key, 0, 4 ) );
+        $this->container[5]  = self::load_4( self::substr( $key, 4, 4 ) );
+        $this->container[6]  = self::load_4( self::substr( $key, 8, 4 ) );
+        $this->container[7]  = self::load_4( self::substr( $key, 12, 4 ) );
+        $this->container[8]  = self::load_4( self::substr( $key, 16, 4 ) );
+        $this->container[9]  = self::load_4( self::substr( $key, 20, 4 ) );
+        $this->container[10] = self::load_4( self::substr( $key, 24, 4 ) );
+        $this->container[11] = self::load_4( self::substr( $key, 28, 4 ) );
 
-        if (empty($counter)) {
+        if ( empty( $counter ) ) {
             $this->container[12] = 0;
             $this->container[13] = 0;
         } else {
-            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
-            $this->container[13] = self::load_4(self::substr($counter, 4, 4));
+            $this->container[12] = self::load_4( self::substr( $counter, 0, 4 ) );
+            $this->container[13] = self::load_4( self::substr( $counter, 4, 4 ) );
         }
-        $this->container[14] = self::load_4(self::substr($iv, 0, 4));
-        $this->container[15] = self::load_4(self::substr($iv, 4, 4));
+        $this->container[14] = self::load_4( self::substr( $iv, 0, 4 ) );
+        $this->container[15] = self::load_4( self::substr( $iv, 4, 4 ) );
     }
 
     /**
@@ -67,13 +67,13 @@ 
      * @param int $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 (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
+        if ( ! is_int( $value ) ) {
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
         $this->container[$offset] = $value;
     }
@@ -84,9 +84,9 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[$offset] );
     }
 
     /**
@@ -95,9 +95,9 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[$offset] );
     }
 
     /**
@@ -106,9 +106,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_Core_ChaCha20_Ctx
  */
-class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util implements ArrayAccess
-{
+class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util implements ArrayAccess {
     /**
      * @var SplFixedArray<int, int>
      */
@@ -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.');
         }
@@ -67,8 +65,7 @@ 
      * @param int $value
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         if (!is_int($offset)) {
             throw new InvalidArgumentException('Expected an integer');
         }
@@ -84,8 +81,7 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         return isset($this->container[$offset]);
     }
 
@@ -95,8 +91,7 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         unset($this->container[$offset]);
     }
 
@@ -106,8 +101,7 @@ 
      * @param mixed $offset
      * @return mixed|null
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         return isset($this->container[$offset])
             ? $this->container[$offset]
             : null;

src/library/sodium_compat/src/Core/HChaCha20.php

Indentation +84 added lines, -84 removed lines

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

Spacing +38 added lines, -38 removed lines

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

Braces +3 added lines, -6 removed lines

@@ -7,16 +7,14 @@ 
 /**
  * Class ParagonIE_Sodium_Core_HChaCha20
  */
-class ParagonIE_Sodium_Core_HChaCha20 extends ParagonIE_Sodium_Core_ChaCha20
-{
+class ParagonIE_Sodium_Core_HChaCha20 extends ParagonIE_Sodium_Core_ChaCha20 {
     /**
      * @param string $in
      * @param string $key
      * @param string|null $c
      * @return string
      */
-    public static function hChaCha20($in = '', $key = '', $c = null)
-    {
+    public static function hChaCha20($in = '', $key = '', $c = null) {
         $ctx = array();
 
         if ($c === null) {
@@ -49,8 +47,7 @@ 
      * @param array $ctx
      * @return string
      */
-    protected static function hChaCha20Bytes(array $ctx)
-    {
+    protected static function hChaCha20Bytes(array $ctx) {
         $x0  = (int) $ctx[0];
         $x1  = (int) $ctx[1];
         $x2  = (int) $ctx[2];

src/library/sodium_compat/lib/namespaced.php

Indentation +23 added lines, -23 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (PHP_VERSION_ID < 50300) {
-    return;
+	return;
 }
 
 /*
@@ -19,28 +19,28 @@ 
  * $x = Compat::crypto_aead_xchacha20poly1305_encrypt(...$args);
  */
 spl_autoload_register(function ($class) {
-    if ($class[0] === '\\') {
-        $class = substr($class, 1);
-    }
-    $namespace = 'ParagonIE\\Sodium';
-    // Does the class use the namespace prefix?
-    $len = strlen($namespace);
-    if (strncmp($namespace, $class, $len) !== 0) {
-        // no, move to the next registered autoloader
-        return false;
-    }
+	if ($class[0] === '\\') {
+		$class = substr($class, 1);
+	}
+	$namespace = 'ParagonIE\\Sodium';
+	// Does the class use the namespace prefix?
+	$len = strlen($namespace);
+	if (strncmp($namespace, $class, $len) !== 0) {
+		// no, move to the next registered autoloader
+		return false;
+	}
 
-    // Get the relative class name
-    $relative_class = substr($class, $len);
+	// Get the relative class name
+	$relative_class = substr($class, $len);
 
-    // Replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file = dirname(__DIR__) . '/namespaced/' . str_replace('\\', '/', $relative_class) . '.php';
-    // if the file exists, require it
-    if (file_exists($file)) {
-        require_once $file;
-        return true;
-    }
-    return false;
+	// Replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = dirname(__DIR__) . '/namespaced/' . str_replace('\\', '/', $relative_class) . '.php';
+	// if the file exists, require it
+	if (file_exists($file)) {
+		require_once $file;
+		return true;
+	}
+	return false;
 });

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (PHP_VERSION_ID < 50300) {
+if ( PHP_VERSION_ID < 50300 ) {
     return;
 }
 
@@ -18,27 +18,27 @@ 
  *
  * $x = Compat::crypto_aead_xchacha20poly1305_encrypt(...$args);
  */
-spl_autoload_register(function ($class) {
-    if ($class[0] === '\\') {
-        $class = substr($class, 1);
+spl_autoload_register( function ( $class ) {
+    if ( $class[0] === '\\' ) {
+        $class = substr( $class, 1 );
     }
     $namespace = 'ParagonIE\\Sodium';
     // Does the class use the namespace prefix?
-    $len = strlen($namespace);
-    if (strncmp($namespace, $class, $len) !== 0) {
+    $len = strlen( $namespace );
+    if ( strncmp( $namespace, $class, $len ) !== 0 ) {
         // no, move to the next registered autoloader
         return false;
     }
 
     // Get the relative class name
-    $relative_class = substr($class, $len);
+    $relative_class = substr( $class, $len );
 
     // Replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = dirname(__DIR__) . '/namespaced/' . str_replace('\\', '/', $relative_class) . '.php';
+    $file = dirname( __DIR__ ) . '/namespaced/' . str_replace( '\\', '/', $relative_class ) . '.php';
     // if the file exists, require it
-    if (file_exists($file)) {
+    if ( file_exists( $file ) ) {
         require_once $file;
         return true;
     }

src/library/sodium_compat/autoload.php

Indentation +36 added lines, -36 removed lines

@@ -1,48 +1,48 @@
 <?php
 
 if (!is_callable('sodiumCompatAutoloader')) {
-    /**
-     * Sodium_Compat autoloader.
-     *
-     * @param string $class Class name to be autoloaded.
-     *
-     * @return bool         Stop autoloading?
-     */
-    function sodiumCompatAutoader($class)
-    {
-        $namespace = 'ParagonIE_Sodium_';
-        // Does the class use the namespace prefix?
-        $len = strlen($namespace);
-        if (strncmp($namespace, $class, $len) !== 0) {
-            // no, move to the next registered autoloader
-            return false;
-        }
+	/**
+	 * Sodium_Compat autoloader.
+	 *
+	 * @param string $class Class name to be autoloaded.
+	 *
+	 * @return bool         Stop autoloading?
+	 */
+	function sodiumCompatAutoader($class)
+	{
+		$namespace = 'ParagonIE_Sodium_';
+		// Does the class use the namespace prefix?
+		$len = strlen($namespace);
+		if (strncmp($namespace, $class, $len) !== 0) {
+			// no, move to the next registered autoloader
+			return false;
+		}
 
-        // Get the relative class name
-        $relative_class = substr($class, $len);
+		// Get the relative class name
+		$relative_class = substr($class, $len);
 
-        // Replace the namespace prefix with the base directory, replace namespace
-        // separators with directory separators in the relative class name, append
-        // with .php
-        $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
-        // if the file exists, require it
-        if (file_exists($file)) {
-            require_once $file;
-            return true;
-        }
-        return false;
-    }
+		// Replace the namespace prefix with the base directory, replace namespace
+		// separators with directory separators in the relative class name, append
+		// with .php
+		$file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+		// if the file exists, require it
+		if (file_exists($file)) {
+			require_once $file;
+			return true;
+		}
+		return false;
+	}
 
-    // Now that we have an autoloader, let's register it!
-    spl_autoload_register('sodiumCompatAutoader');
+	// Now that we have an autoloader, let's register it!
+	spl_autoload_register('sodiumCompatAutoader');
 }
 
 if (PHP_VERSION_ID >= 50300) {
-    // Namespaces didn't exist before 5.3.0, so don't even try to use this
-    // unless PHP >= 5.3.0
-    require_once dirname(__FILE__) . '/lib/namespaced.php';
-    require_once dirname(__FILE__) . '/lib/sodium_compat.php';
+	// Namespaces didn't exist before 5.3.0, so don't even try to use this
+	// unless PHP >= 5.3.0
+	require_once dirname(__FILE__) . '/lib/namespaced.php';
+	require_once dirname(__FILE__) . '/lib/sodium_compat.php';
 }
 if (PHP_VERSION_ID < 70200 || !extension_loaded('sodium')) {
-    require_once dirname(__FILE__) . '/lib/php72compat.php';
+	require_once dirname(__FILE__) . '/lib/php72compat.php';
 }

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!is_callable('sodiumCompatAutoloader')) {
+if ( ! is_callable( 'sodiumCompatAutoloader' ) ) {
     /**
      * Sodium_Compat autoloader.
      *
@@ -8,25 +8,25 @@ 
      *
      * @return bool         Stop autoloading?
      */
-    function sodiumCompatAutoader($class)
+    function sodiumCompatAutoader( $class )
     {
         $namespace = 'ParagonIE_Sodium_';
         // Does the class use the namespace prefix?
-        $len = strlen($namespace);
-        if (strncmp($namespace, $class, $len) !== 0) {
+        $len = strlen( $namespace );
+        if ( strncmp( $namespace, $class, $len ) !== 0 ) {
             // no, move to the next registered autoloader
             return false;
         }
 
         // Get the relative class name
-        $relative_class = substr($class, $len);
+        $relative_class = substr( $class, $len );
 
         // Replace the namespace prefix with the base directory, replace namespace
         // separators with directory separators in the relative class name, append
         // with .php
-        $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+        $file = dirname( __FILE__ ) . '/src/' . str_replace( '_', '/', $relative_class ) . '.php';
         // if the file exists, require it
-        if (file_exists($file)) {
+        if ( file_exists( $file ) ) {
             require_once $file;
             return true;
         }
@@ -34,15 +34,15 @@ 
     }
 
     // Now that we have an autoloader, let's register it!
-    spl_autoload_register('sodiumCompatAutoader');
+    spl_autoload_register( 'sodiumCompatAutoader' );
 }
 
-if (PHP_VERSION_ID >= 50300) {
+if ( PHP_VERSION_ID >= 50300 ) {
     // Namespaces didn't exist before 5.3.0, so don't even try to use this
     // unless PHP >= 5.3.0
-    require_once dirname(__FILE__) . '/lib/namespaced.php';
-    require_once dirname(__FILE__) . '/lib/sodium_compat.php';
+    require_once dirname( __FILE__ ) . '/lib/namespaced.php';
+    require_once dirname( __FILE__ ) . '/lib/sodium_compat.php';
 }
-if (PHP_VERSION_ID < 70200 || !extension_loaded('sodium')) {
-    require_once dirname(__FILE__) . '/lib/php72compat.php';
+if ( PHP_VERSION_ID < 70200 || ! extension_loaded( 'sodium' ) ) {
+    require_once dirname( __FILE__ ) . '/lib/php72compat.php';
 }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
      *
      * @return bool         Stop autoloading?
      */
-    function sodiumCompatAutoader($class)
-    {
+    function sodiumCompatAutoader($class) {
         $namespace = 'ParagonIE_Sodium_';
         // Does the class use the namespace prefix?
         $len = strlen($namespace);