WordPoints / wordpoints

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

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     /**
      * ParagonIE_Sodium_Core32_Int64 constructor.
-     * @param array $array
+     * @param integer[] $array
      */
     public function __construct($array = array(0, 0, 0, 0))
     {

Indentation +580 added lines, -580 removed lines

@@ -9,588 +9,588 @@
  */
 class ParagonIE_Sodium_Core32_Int64
 {
-    /**
-     * @var array<int, int> - four 16-bit integers
-     */
-    public $limbs;
-
-    /**
-     * @var int
-     */
-    public $overflow = 0;
-
-    /**
-     * ParagonIE_Sodium_Core32_Int64 constructor.
-     * @param array $array
-     */
-    public function __construct($array = array(0, 0, 0, 0))
-    {
-        $this->limbs = array(
-            (int) $array[0],
-            (int) $array[1],
-            (int) $array[2],
-            (int) $array[3]
-        );
-        $this->overflow = 0;
-    }
-
-    /**
-     * Adds two int64 objects
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $addend
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function addInt64(ParagonIE_Sodium_Core32_Int64 $addend)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            $tmp = $this->limbs[$i] + $addend->limbs[$i] + $carry;
-            $carry = $tmp >> 16;
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
-        }
-        $return->overflow = $carry;
-        return $return;
-    }
-
-    /**
-     * Adds a normal integer to an int64 object
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function addInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            $step = (3 - $i) << 4; // 0, 16, 32, 48
-            if ($i < 2) {
-                $toAdd = 0;
-            } else {
-                $toAdd = (($int >> $step) & 0xffff);
-            }
-            $tmp = $this->limbs[$i] + $toAdd + $carry;
-            $carry = $tmp >> 16;
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
-        }
-        $return->overflow = $carry;
-        return $return;
-    }
-
-    /**
-     * @param int $b
-     * @return int
-     */
-    public function compareInt($b = 0)
-    {
-        $gt = 0;
-        $eq = 1;
-
-        $i = 4;
-        $j = 0;
-        while ($i > 0) {
-            --$i;
-            $x1 = $this->limbs[$i];
-            $x2 = ($b >> ($j << 4)) & 0xffff;
-            $gt |= (($x2 - $x1) >> 8) & $eq;
-            $eq &= (($x2 ^ $x1) - 1) >> 8;
-        }
-        return ($gt + $gt - $eq) + 1;
-    }
-
-    /**
-     * @param int $b
-     * @return bool
-     */
-    public function isGreaterThan($b = 0)
-    {
-        return $this->compareInt($b) > 0;
-    }
-
-    /**
-     * @param int $b
-     * @return bool
-     */
-    public function isLessThanInt($b = 0)
-    {
-        return $this->compareInt($b) < 0;
-    }
-
-
-    /**
-     * @param int $hi
-     * @param int $lo
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function mask64($hi = 0, $lo = 0)
-    {
-        $a = ($hi >> 16) & 0xffff;
-        $b = ($hi) & 0xffff;
-        $c = ($lo >> 16) & 0xffff;
-        $d = ($lo & 0xffff);
-        return new ParagonIE_Sodium_Core32_Int64(
-            array(
-                $this->limbs[0] & $a,
-                $this->limbs[1] & $b,
-                $this->limbs[2] & $c,
-                $this->limbs[3] & $d
-            )
-        );
-    }
-
-    /**
-     * @param int $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function mulInt($int = 0, $size = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (!$size) {
-            $size = 63;
-        }
-
-        $a = clone $this;
-        $return = new ParagonIE_Sodium_Core32_Int64();
-
-        for ($i = $size; $i >= 0; --$i) {
-            $return = $return->addInt64(
-                $a->mask64(
-                    (int) (-($int & 1)),
-                    (int) (-($int & 1))
-                )
-            );
-            $a = $a->shiftLeft(1);
-            $int >>= 1;
-        }
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int64 $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function mulInt64(ParagonIE_Sodium_Core32_Int64 $int, $size = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (!$size) {
-            $size = 63;
-        }
-
-        $a = clone $this;
-        $b = clone $int;
-        $return = new ParagonIE_Sodium_Core32_Int64();
-
-        for ($i = $size; $i >= 0; --$i) {
-            /*
+	/**
+	 * @var array<int, int> - four 16-bit integers
+	 */
+	public $limbs;
+
+	/**
+	 * @var int
+	 */
+	public $overflow = 0;
+
+	/**
+	 * ParagonIE_Sodium_Core32_Int64 constructor.
+	 * @param array $array
+	 */
+	public function __construct($array = array(0, 0, 0, 0))
+	{
+		$this->limbs = array(
+			(int) $array[0],
+			(int) $array[1],
+			(int) $array[2],
+			(int) $array[3]
+		);
+		$this->overflow = 0;
+	}
+
+	/**
+	 * Adds two int64 objects
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int64 $addend
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function addInt64(ParagonIE_Sodium_Core32_Int64 $addend)
+	{
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$carry = 0;
+		for ($i = 3; $i >= 0; --$i) {
+			$tmp = $this->limbs[$i] + $addend->limbs[$i] + $carry;
+			$carry = $tmp >> 16;
+			$return->limbs[$i] = (int) ($tmp & 0xffff);
+		}
+		$return->overflow = $carry;
+		return $return;
+	}
+
+	/**
+	 * Adds a normal integer to an int64 object
+	 *
+	 * @param int $int
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function addInt($int)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$carry = 0;
+		for ($i = 3; $i >= 0; --$i) {
+			$step = (3 - $i) << 4; // 0, 16, 32, 48
+			if ($i < 2) {
+				$toAdd = 0;
+			} else {
+				$toAdd = (($int >> $step) & 0xffff);
+			}
+			$tmp = $this->limbs[$i] + $toAdd + $carry;
+			$carry = $tmp >> 16;
+			$return->limbs[$i] = (int) ($tmp & 0xffff);
+		}
+		$return->overflow = $carry;
+		return $return;
+	}
+
+	/**
+	 * @param int $b
+	 * @return int
+	 */
+	public function compareInt($b = 0)
+	{
+		$gt = 0;
+		$eq = 1;
+
+		$i = 4;
+		$j = 0;
+		while ($i > 0) {
+			--$i;
+			$x1 = $this->limbs[$i];
+			$x2 = ($b >> ($j << 4)) & 0xffff;
+			$gt |= (($x2 - $x1) >> 8) & $eq;
+			$eq &= (($x2 ^ $x1) - 1) >> 8;
+		}
+		return ($gt + $gt - $eq) + 1;
+	}
+
+	/**
+	 * @param int $b
+	 * @return bool
+	 */
+	public function isGreaterThan($b = 0)
+	{
+		return $this->compareInt($b) > 0;
+	}
+
+	/**
+	 * @param int $b
+	 * @return bool
+	 */
+	public function isLessThanInt($b = 0)
+	{
+		return $this->compareInt($b) < 0;
+	}
+
+
+	/**
+	 * @param int $hi
+	 * @param int $lo
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function mask64($hi = 0, $lo = 0)
+	{
+		$a = ($hi >> 16) & 0xffff;
+		$b = ($hi) & 0xffff;
+		$c = ($lo >> 16) & 0xffff;
+		$d = ($lo & 0xffff);
+		return new ParagonIE_Sodium_Core32_Int64(
+			array(
+				$this->limbs[0] & $a,
+				$this->limbs[1] & $b,
+				$this->limbs[2] & $c,
+				$this->limbs[3] & $d
+			)
+		);
+	}
+
+	/**
+	 * @param int $int
+	 * @param int $size
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function mulInt($int = 0, $size = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+		ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+		if (!$size) {
+			$size = 63;
+		}
+
+		$a = clone $this;
+		$return = new ParagonIE_Sodium_Core32_Int64();
+
+		for ($i = $size; $i >= 0; --$i) {
+			$return = $return->addInt64(
+				$a->mask64(
+					(int) (-($int & 1)),
+					(int) (-($int & 1))
+				)
+			);
+			$a = $a->shiftLeft(1);
+			$int >>= 1;
+		}
+		return $return;
+	}
+
+	/**
+	 * @param ParagonIE_Sodium_Core32_Int64 $int
+	 * @param int $size
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function mulInt64(ParagonIE_Sodium_Core32_Int64 $int, $size = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+		if (!$size) {
+			$size = 63;
+		}
+
+		$a = clone $this;
+		$b = clone $int;
+		$return = new ParagonIE_Sodium_Core32_Int64();
+
+		for ($i = $size; $i >= 0; --$i) {
+			/*
             $c += (int) ($a & -($b & 1));
             $a <<= 1;
             $b >>= 1;
              */
-            $return = $return->addInt64(
-                $a->mask64(
-                    (int) (-($b->limbs[3] & 1)),
-                    (int) (-($b->limbs[3] & 1))
-                )
-            );
-            $a = $a->shiftLeft(1);
-            $b = $b->shiftRight(1);
-        }
-        return $return;
-    }
-
-    /**
-     * OR this 64-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $b
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function orInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->limbs = array(
-            (int) ($this->limbs[0] | $b->limbs[0]),
-            (int) ($this->limbs[1] | $b->limbs[1]),
-            (int) ($this->limbs[2] | $b->limbs[2]),
-            (int) ($this->limbs[3] | $b->limbs[3])
-        );
-        return $return;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function rotateLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $c &= 63;
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            $idx_shift = ($c >> 4) & 3;
-            $sub_shift = $c & 15;
-
-            for ($i = 3; $i >= 0; --$i) {
-                $j = ($i + $idx_shift) & 3;
-                $k = ($i + $idx_shift + 1) & 3;
-                $return->limbs[$i] = (int) (
-                    (
-                        ($this->limbs[$j] << $sub_shift)
-                            |
-                        ($this->limbs[$k] >> (16 - $sub_shift))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Rotate to the right
-     *
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function rotateRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $c &= 63;
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            $idx_shift = ($c >> 4) & 3;
-            $sub_shift = $c & 15;
-
-            for ($i = 3; $i >= 0; --$i) {
-                $j = ($i - $idx_shift) & 3;
-                $k = ($i - $idx_shift - 1) & 3;
-                $return->limbs[$i] = (int) (
-                    (
-                        ($this->limbs[$j] >> ($sub_shift))
-                            |
-                        ($this->limbs[$k] << (16 - $sub_shift))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws TypeError
-     */
-    public function shiftLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $c &= 63;
-
-        if ($c >= 16) {
-            if ($c >= 48) {
-                $return->limbs = array(
-                    $this->limbs[3], 0, 0, 0
-                );
-            } elseif ($c >= 32) {
-                $return->limbs = array(
-                    $this->limbs[2], $this->limbs[3], 0, 0
-                );
-            } else {
-                $return->limbs = array(
-                    $this->limbs[1], $this->limbs[2], $this->limbs[3], 0
-                );
-            }
-            return $return->shiftLeft($c & 15);
-        }
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            return $this->shiftRight(-$c);
-        } else {
-            if (is_null($c)) {
-                throw new TypeError();
-            }
-            $carry = 0;
-            for ($i = 3; $i >= 0; --$i) {
-                $tmp = ($this->limbs[$i] << $c) | ($carry & 0xffff);
-                $return->limbs[$i] = (int) ($tmp & 0xffff);
-                $carry = $tmp >> 16;
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws TypeError
-     */
-    public function shiftRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $c &= 63;
-
-        $negative = -(($this->limbs[0] >> 15) & 1);
-        if ($c >= 16) {
-            if ($c >= 48) {
-                $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
-                    (int) $this->limbs[0]
-                );
-            } elseif ($c >= 32) {
-                $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
-                    (int) $this->limbs[0],
-                    (int) $this->limbs[1]
-                );
-            } else {
-                $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) $this->limbs[0],
-                    (int) $this->limbs[1],
-                    (int) $this->limbs[2]
-                );
-            }
-            return $return->shiftRight($c & 15);
-        }
-
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            return $this->shiftLeft(-$c);
-        } else {
-            if (is_null($c)) {
-                throw new TypeError();
-            }
-            $carryRight = ($negative & 0xffff);
-            $mask = (int) (((1 << ($c + 1)) - 1) & 0xffff);
-            for ($i = 0; $i < 4; ++$i) {
-                $return->limbs[$i] = (int) (
-                    (($this->limbs[$i] >> $c) | ($carryRight << (16 - $c))) & 0xffff
-                );
-                $carryRight = (int) ($this->limbs[$i] & $mask);
-            }
-        }
-        return $return;
-    }
-
-
-    /**
-     * Subtract a normal integer from an int64 object.
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function subInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            $tmp = $this->limbs[$i] - (($int >> 16) & 0xffff) + $carry;
-            $carry = $tmp >> 16;
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
-        }
-        return $return;
-    }
-
-    /**
-     * The difference between two Int64 objects.
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $b
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function subInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            $tmp = $this->limbs[$i] - $b->limbs[$i] + $carry;
-            $carry = ($tmp >> 16);
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
-
-        }
-        return $return;
-    }
-
-    /**
-     * XOR this 64-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $b
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function xorInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->limbs = array(
-            (int) ($this->limbs[0] ^ $b->limbs[0]),
-            (int) ($this->limbs[1] ^ $b->limbs[1]),
-            (int) ($this->limbs[2] ^ $b->limbs[2]),
-            (int) ($this->limbs[3] ^ $b->limbs[3])
-        );
-        return $return;
-    }
-
-    /**
-     * @param int $low
-     * @param int $high
-     * @return self
-     */
-    public static function fromInts($low, $high)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($low, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($high, 'int', 2);
-
-        return new ParagonIE_Sodium_Core32_Int64(
-            array(
-                (int) (($high >> 16) & 0xffff),
-                (int) ($high & 0xffff),
-                (int) (($low >> 16) & 0xffff),
-                (int) ($low & 0xffff)
-            )
-        );
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     */
-    public static function fromString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
-            throw new RangeException(
-                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int64();
-
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff);
-        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff) << 8);
-        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff);
-        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff) << 8);
-        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff);
-        return $return;
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     */
-    public static function fromReverseString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
-            throw new RangeException(
-                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int64();
-
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff);
-        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
-        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
-        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
-        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
-        return $return;
-    }
-
-    /**
-     * @return array<int, int>
-     */
-    public function toArray()
-    {
-        return array(
-            (int) ((($this->limbs[0] & 0xffff) << 16) | ($this->limbs[1] & 0xffff)),
-            (int) ((($this->limbs[2] & 0xffff) << 16) | ($this->limbs[3] & 0xffff))
-        );
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function toInt32()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs[0] = (int) ($this->limbs[2]);
-        $return->limbs[1] = (int) ($this->limbs[3]);
-        return $return;
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function toInt64()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->limbs[0] = (int) ($this->limbs[0]);
-        $return->limbs[1] = (int) ($this->limbs[1]);
-        $return->limbs[2] = (int) ($this->limbs[2]);
-        $return->limbs[3] = (int) ($this->limbs[3]);
-        return $return;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff);
-    }
-
-    /**
-     * @return string
-     */
-    public function toReverseString()
-    {
-        return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff);
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
+			$return = $return->addInt64(
+				$a->mask64(
+					(int) (-($b->limbs[3] & 1)),
+					(int) (-($b->limbs[3] & 1))
+				)
+			);
+			$a = $a->shiftLeft(1);
+			$b = $b->shiftRight(1);
+		}
+		return $return;
+	}
+
+	/**
+	 * OR this 64-bit integer with another.
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int64 $b
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function orInt64(ParagonIE_Sodium_Core32_Int64 $b)
+	{
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$return->limbs = array(
+			(int) ($this->limbs[0] | $b->limbs[0]),
+			(int) ($this->limbs[1] | $b->limbs[1]),
+			(int) ($this->limbs[2] | $b->limbs[2]),
+			(int) ($this->limbs[3] | $b->limbs[3])
+		);
+		return $return;
+	}
+
+	/**
+	 * @param int $c
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function rotateLeft($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$c &= 63;
+		if ($c === 0) {
+			// NOP, but we want a copy.
+			$return->limbs = $this->limbs;
+		} else {
+			$idx_shift = ($c >> 4) & 3;
+			$sub_shift = $c & 15;
+
+			for ($i = 3; $i >= 0; --$i) {
+				$j = ($i + $idx_shift) & 3;
+				$k = ($i + $idx_shift + 1) & 3;
+				$return->limbs[$i] = (int) (
+					(
+						($this->limbs[$j] << $sub_shift)
+							|
+						($this->limbs[$k] >> (16 - $sub_shift))
+					) & 0xffff
+				);
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * Rotate to the right
+	 *
+	 * @param int $c
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function rotateRight($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$c &= 63;
+		if ($c === 0) {
+			// NOP, but we want a copy.
+			$return->limbs = $this->limbs;
+		} else {
+			$idx_shift = ($c >> 4) & 3;
+			$sub_shift = $c & 15;
+
+			for ($i = 3; $i >= 0; --$i) {
+				$j = ($i - $idx_shift) & 3;
+				$k = ($i - $idx_shift - 1) & 3;
+				$return->limbs[$i] = (int) (
+					(
+						($this->limbs[$j] >> ($sub_shift))
+							|
+						($this->limbs[$k] << (16 - $sub_shift))
+					) & 0xffff
+				);
+			}
+		}
+		return $return;
+	}
+	/**
+	 * @param int $c
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 * @throws TypeError
+	 */
+	public function shiftLeft($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$c &= 63;
+
+		if ($c >= 16) {
+			if ($c >= 48) {
+				$return->limbs = array(
+					$this->limbs[3], 0, 0, 0
+				);
+			} elseif ($c >= 32) {
+				$return->limbs = array(
+					$this->limbs[2], $this->limbs[3], 0, 0
+				);
+			} else {
+				$return->limbs = array(
+					$this->limbs[1], $this->limbs[2], $this->limbs[3], 0
+				);
+			}
+			return $return->shiftLeft($c & 15);
+		}
+		if ($c === 0) {
+			$return->limbs = $this->limbs;
+		} elseif ($c < 0) {
+			return $this->shiftRight(-$c);
+		} else {
+			if (is_null($c)) {
+				throw new TypeError();
+			}
+			$carry = 0;
+			for ($i = 3; $i >= 0; --$i) {
+				$tmp = ($this->limbs[$i] << $c) | ($carry & 0xffff);
+				$return->limbs[$i] = (int) ($tmp & 0xffff);
+				$carry = $tmp >> 16;
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * @param int $c
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 * @throws TypeError
+	 */
+	public function shiftRight($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$c &= 63;
+
+		$negative = -(($this->limbs[0] >> 15) & 1);
+		if ($c >= 16) {
+			if ($c >= 48) {
+				$return->limbs = array(
+					(int) ($negative & 0xffff),
+					(int) ($negative & 0xffff),
+					(int) ($negative & 0xffff),
+					(int) $this->limbs[0]
+				);
+			} elseif ($c >= 32) {
+				$return->limbs = array(
+					(int) ($negative & 0xffff),
+					(int) ($negative & 0xffff),
+					(int) $this->limbs[0],
+					(int) $this->limbs[1]
+				);
+			} else {
+				$return->limbs = array(
+					(int) ($negative & 0xffff),
+					(int) $this->limbs[0],
+					(int) $this->limbs[1],
+					(int) $this->limbs[2]
+				);
+			}
+			return $return->shiftRight($c & 15);
+		}
+
+		if ($c === 0) {
+			$return->limbs = $this->limbs;
+		} elseif ($c < 0) {
+			return $this->shiftLeft(-$c);
+		} else {
+			if (is_null($c)) {
+				throw new TypeError();
+			}
+			$carryRight = ($negative & 0xffff);
+			$mask = (int) (((1 << ($c + 1)) - 1) & 0xffff);
+			for ($i = 0; $i < 4; ++$i) {
+				$return->limbs[$i] = (int) (
+					(($this->limbs[$i] >> $c) | ($carryRight << (16 - $c))) & 0xffff
+				);
+				$carryRight = (int) ($this->limbs[$i] & $mask);
+			}
+		}
+		return $return;
+	}
+
+
+	/**
+	 * Subtract a normal integer from an int64 object.
+	 *
+	 * @param int $int
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function subInt($int)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+
+		$return = new ParagonIE_Sodium_Core32_Int64();
+
+		$carry = 0;
+		for ($i = 3; $i >= 0; --$i) {
+			$tmp = $this->limbs[$i] - (($int >> 16) & 0xffff) + $carry;
+			$carry = $tmp >> 16;
+			$return->limbs[$i] = (int) ($tmp & 0xffff);
+		}
+		return $return;
+	}
+
+	/**
+	 * The difference between two Int64 objects.
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int64 $b
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function subInt64(ParagonIE_Sodium_Core32_Int64 $b)
+	{
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$carry = 0;
+		for ($i = 3; $i >= 0; --$i) {
+			$tmp = $this->limbs[$i] - $b->limbs[$i] + $carry;
+			$carry = ($tmp >> 16);
+			$return->limbs[$i] = (int) ($tmp & 0xffff);
+
+		}
+		return $return;
+	}
+
+	/**
+	 * XOR this 64-bit integer with another.
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int64 $b
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function xorInt64(ParagonIE_Sodium_Core32_Int64 $b)
+	{
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$return->limbs = array(
+			(int) ($this->limbs[0] ^ $b->limbs[0]),
+			(int) ($this->limbs[1] ^ $b->limbs[1]),
+			(int) ($this->limbs[2] ^ $b->limbs[2]),
+			(int) ($this->limbs[3] ^ $b->limbs[3])
+		);
+		return $return;
+	}
+
+	/**
+	 * @param int $low
+	 * @param int $high
+	 * @return self
+	 */
+	public static function fromInts($low, $high)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($low, 'int', 1);
+		ParagonIE_Sodium_Core32_Util::declareScalarType($high, 'int', 2);
+
+		return new ParagonIE_Sodium_Core32_Int64(
+			array(
+				(int) (($high >> 16) & 0xffff),
+				(int) ($high & 0xffff),
+				(int) (($low >> 16) & 0xffff),
+				(int) ($low & 0xffff)
+			)
+		);
+	}
+
+	/**
+	 * @param string $string
+	 * @return self
+	 */
+	public static function fromString($string)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+		$string = (string) $string;
+		if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
+			throw new RangeException(
+				'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+			);
+		}
+		$return = new ParagonIE_Sodium_Core32_Int64();
+
+		$return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8);
+		$return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff);
+		$return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8);
+		$return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff);
+		$return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff) << 8);
+		$return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff);
+		$return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff) << 8);
+		$return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff);
+		return $return;
+	}
+
+	/**
+	 * @param string $string
+	 * @return self
+	 */
+	public static function fromReverseString($string)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+		$string = (string) $string;
+		if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
+			throw new RangeException(
+				'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+			);
+		}
+		$return = new ParagonIE_Sodium_Core32_Int64();
+
+		$return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff) << 8);
+		$return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff);
+		$return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff) << 8);
+		$return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff);
+		$return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
+		$return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
+		$return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
+		$return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
+		return $return;
+	}
+
+	/**
+	 * @return array<int, int>
+	 */
+	public function toArray()
+	{
+		return array(
+			(int) ((($this->limbs[0] & 0xffff) << 16) | ($this->limbs[1] & 0xffff)),
+			(int) ((($this->limbs[2] & 0xffff) << 16) | ($this->limbs[3] & 0xffff))
+		);
+	}
+
+	/**
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function toInt32()
+	{
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->limbs[0] = (int) ($this->limbs[2]);
+		$return->limbs[1] = (int) ($this->limbs[3]);
+		return $return;
+	}
+
+	/**
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function toInt64()
+	{
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$return->limbs[0] = (int) ($this->limbs[0]);
+		$return->limbs[1] = (int) ($this->limbs[1]);
+		$return->limbs[2] = (int) ($this->limbs[2]);
+		$return->limbs[3] = (int) ($this->limbs[3]);
+		return $return;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function toString()
+	{
+		return ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function toReverseString()
+	{
+		return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
+			ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
 }

Spacing +167 added lines, -167 removed lines

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

Braces +27 added lines, -54 removed lines

@@ -7,8 +7,7 @@ 
  *
  * These are immutable. It always returns a new instance.
  */
-class ParagonIE_Sodium_Core32_Int64
-{
+class ParagonIE_Sodium_Core32_Int64 {
     /**
      * @var array<int, int> - four 16-bit integers
      */
@@ -23,8 +22,7 @@ 
      * ParagonIE_Sodium_Core32_Int64 constructor.
      * @param array $array
      */
-    public function __construct($array = array(0, 0, 0, 0))
-    {
+    public function __construct($array = array(0, 0, 0, 0)) {
         $this->limbs = array(
             (int) $array[0],
             (int) $array[1],
@@ -40,8 +38,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $addend
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function addInt64(ParagonIE_Sodium_Core32_Int64 $addend)
-    {
+    public function addInt64(ParagonIE_Sodium_Core32_Int64 $addend) {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $carry = 0;
         for ($i = 3; $i >= 0; --$i) {
@@ -59,8 +56,7 @@ 
      * @param int $int
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function addInt($int)
-    {
+    public function addInt($int) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
 
         $return = new ParagonIE_Sodium_Core32_Int64();
@@ -84,8 +80,7 @@ 
      * @param int $b
      * @return int
      */
-    public function compareInt($b = 0)
-    {
+    public function compareInt($b = 0) {
         $gt = 0;
         $eq = 1;
 
@@ -105,8 +100,7 @@ 
      * @param int $b
      * @return bool
      */
-    public function isGreaterThan($b = 0)
-    {
+    public function isGreaterThan($b = 0) {
         return $this->compareInt($b) > 0;
     }
 
@@ -114,8 +108,7 @@ 
      * @param int $b
      * @return bool
      */
-    public function isLessThanInt($b = 0)
-    {
+    public function isLessThanInt($b = 0) {
         return $this->compareInt($b) < 0;
     }
 
@@ -125,8 +118,7 @@ 
      * @param int $lo
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function mask64($hi = 0, $lo = 0)
-    {
+    public function mask64($hi = 0, $lo = 0) {
         $a = ($hi >> 16) & 0xffff;
         $b = ($hi) & 0xffff;
         $c = ($lo >> 16) & 0xffff;
@@ -146,8 +138,7 @@ 
      * @param int $size
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function mulInt($int = 0, $size = 0)
-    {
+    public function mulInt($int = 0, $size = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
         ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
         if (!$size) {
@@ -175,8 +166,7 @@ 
      * @param int $size
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function mulInt64(ParagonIE_Sodium_Core32_Int64 $int, $size = 0)
-    {
+    public function mulInt64(ParagonIE_Sodium_Core32_Int64 $int, $size = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
         if (!$size) {
             $size = 63;
@@ -210,8 +200,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $b
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function orInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
+    public function orInt64(ParagonIE_Sodium_Core32_Int64 $b) {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $return->limbs = array(
             (int) ($this->limbs[0] | $b->limbs[0]),
@@ -226,8 +215,7 @@ 
      * @param int $c
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function rotateLeft($c = 0)
-    {
+    public function rotateLeft($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
 
         $return = new ParagonIE_Sodium_Core32_Int64();
@@ -260,8 +248,7 @@ 
      * @param int $c
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function rotateRight($c = 0)
-    {
+    public function rotateRight($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
 
         $return = new ParagonIE_Sodium_Core32_Int64();
@@ -292,8 +279,7 @@ 
      * @return ParagonIE_Sodium_Core32_Int64
      * @throws TypeError
      */
-    public function shiftLeft($c = 0)
-    {
+    public function shiftLeft($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
         $return = new ParagonIE_Sodium_Core32_Int64();
         $c &= 63;
@@ -337,8 +323,7 @@ 
      * @return ParagonIE_Sodium_Core32_Int64
      * @throws TypeError
      */
-    public function shiftRight($c = 0)
-    {
+    public function shiftRight($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
         $return = new ParagonIE_Sodium_Core32_Int64();
         $c &= 63;
@@ -397,8 +382,7 @@ 
      * @param int $int
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function subInt($int)
-    {
+    public function subInt($int) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
 
         $return = new ParagonIE_Sodium_Core32_Int64();
@@ -418,8 +402,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $b
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function subInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
+    public function subInt64(ParagonIE_Sodium_Core32_Int64 $b) {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $carry = 0;
         for ($i = 3; $i >= 0; --$i) {
@@ -437,8 +420,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $b
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function xorInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
+    public function xorInt64(ParagonIE_Sodium_Core32_Int64 $b) {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $return->limbs = array(
             (int) ($this->limbs[0] ^ $b->limbs[0]),
@@ -454,8 +436,7 @@ 
      * @param int $high
      * @return self
      */
-    public static function fromInts($low, $high)
-    {
+    public static function fromInts($low, $high) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($low, 'int', 1);
         ParagonIE_Sodium_Core32_Util::declareScalarType($high, 'int', 2);
 
@@ -473,8 +454,7 @@ 
      * @param string $string
      * @return self
      */
-    public static function fromString($string)
-    {
+    public static function fromString($string) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
         $string = (string) $string;
         if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
@@ -499,8 +479,7 @@ 
      * @param string $string
      * @return self
      */
-    public static function fromReverseString($string)
-    {
+    public static function fromReverseString($string) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
         $string = (string) $string;
         if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
@@ -524,8 +503,7 @@ 
     /**
      * @return array<int, int>
      */
-    public function toArray()
-    {
+    public function toArray() {
         return array(
             (int) ((($this->limbs[0] & 0xffff) << 16) | ($this->limbs[1] & 0xffff)),
             (int) ((($this->limbs[2] & 0xffff) << 16) | ($this->limbs[3] & 0xffff))
@@ -535,8 +513,7 @@ 
     /**
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function toInt32()
-    {
+    public function toInt32() {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->limbs[0] = (int) ($this->limbs[2]);
         $return->limbs[1] = (int) ($this->limbs[3]);
@@ -546,8 +523,7 @@ 
     /**
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function toInt64()
-    {
+    public function toInt64() {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $return->limbs[0] = (int) ($this->limbs[0]);
         $return->limbs[1] = (int) ($this->limbs[1]);
@@ -559,8 +535,7 @@ 
     /**
      * @return string
      */
-    public function toString()
-    {
+    public function toString() {
         return ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
             ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
             ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
@@ -574,8 +549,7 @@ 
     /**
      * @return string
      */
-    public function toReverseString()
-    {
+    public function toReverseString() {
         return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff) .
             ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
             ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
@@ -589,8 +563,7 @@ 
     /**
      * @return string
      */
-    public function __toString()
-    {
+    public function __toString() {
         return $this->toString();
     }
 }

src/library/sodium_compat/src/File.php

Doc Comments +2 added lines, -2 removed lines

@@ -1024,10 +1024,10 @@
      * Update a hash context with the contents of a file, without
      * loading the entire file into memory.
      *
-     * @param resource|object $hash
+     * @param resource $hash
      * @param resource $fp
      * @param int $size
-     * @return mixed (resource on PHP < 7.2, object on PHP >= 7.2)
+     * @return resource (resource on PHP < 7.2, object on PHP >= 7.2)
      * @throws Error
      * @throws TypeError
      * @psalm-suppress PossiblyInvalidArgument

Indentation +1061 added lines, -1061 removed lines

@@ -1,1080 +1,1080 @@
 <?php
 
 if (class_exists('ParagonIE_Sodium_File', false)) {
-    return;
+	return;
 }
 /**
  * Class ParagonIE_Sodium_File
  */
 class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
 {
-    /* PHP's default buffer size is 8192 for fread()/fwrite(). */
-    const BUFFER_SIZE = 8192;
-
-    /**
-     * Box a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_box(), but produces
-     * the same result.
-     *
-     * @param string $inputFile  Absolute path to a file on the filesystem
-     * @param string $outputFile Absolute path to a file on the filesystem
-     * @param string $nonce      Number to be used only once
-     * @param string $keyPair    ECDH secret key and ECDH public key concatenated
-     *
-     * @return bool
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function box($inputFile, $outputFile, $nonce, $keyPair)
-    {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-
-        /* Input validation: */
-        if (!is_string($keyPair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keyPair) . ' given.');
-        }
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes');
-        }
-        if (self::strlen($keyPair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
-        }
-
-        /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
-        }
-
-        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $keyPair);
-        fclose($ifp);
-        fclose($ofp);
-        return $res;
-    }
-
-    /**
-     * Open a boxed file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_box_open(), but produces
-     * the same result.
-     *
-     * Warning: Does not protect against TOCTOU attacks. You should
-     * just load the file into memory and use crypto_box_open() if
-     * you are worried about those.
-     *
-     * @param string $inputFile
-     * @param string $outputFile
-     * @param string $nonce
-     * @param string $keypair
-     * @return bool
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function box_open($inputFile, $outputFile, $nonce, $keypair)
-    {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-        if (!is_string($keypair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keypair) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes');
-        }
-        if (self::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
-        }
-
-        /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
-        }
-
-        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $keypair);
-        fclose($ifp);
-        fclose($ofp);
-        try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (Error $ex) {
-            unset($ephKeypair);
-        }
-        return $res;
-    }
-
-    /**
-     * Seal a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_box_seal(), but produces
-     * the same result.
-     *
-     * @param string $inputFile  Absolute path to a file on the filesystem
-     * @param string $outputFile Absolute path to a file on the filesystem
-     * @param string $publicKey  ECDH public key
-     *
-     * @return bool
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function box_seal($inputFile, $outputFile, $publicKey)
-    {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes');
-        }
-
-        /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
-        }
-
-        /** @var string $ephKeypair */
-        $ephKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair();
-
-        /** @var string $msgKeypair */
-        $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
-            ParagonIE_Sodium_Compat::crypto_box_secretkey($ephKeypair),
-            $publicKey
-        );
-
-        /** @var string $ephemeralPK */
-        $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey($ephKeypair);
-
-        /** @var string $nonce */
-        $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
-            $ephemeralPK . $publicKey,
-            '',
-            24
-        );
-
-        /** @var int $firstWrite */
-        $firstWrite = fwrite(
-            $ofp,
-            $ephemeralPK,
-            ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES
-        );
-        if (!is_int($firstWrite)) {
-            fclose($ifp);
-            fclose($ofp);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-            throw new Error('Could not write to output file');
-        }
-        if ($firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-            fclose($ifp);
-            fclose($ofp);
-            throw new Error('Error writing public key to output file');
-        }
-
-        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
-        fclose($ifp);
-        fclose($ofp);
-        try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (Error $ex) {
-            unset($ephKeypair);
-        }
-        return $res;
-    }
-
-    /**
-     * Open a sealed file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_box_seal_open(), but produces
-     * the same result.
-     *
-     * Warning: Does not protect against TOCTOU attacks. You should
-     * just load the file into memory and use crypto_box_seal_open() if
-     * you are worried about those.
-     *
-     * @param string $inputFile
-     * @param string $outputFile
-     * @param string $ecdhKeypair
-     * @return bool
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair)
-    {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($ecdhKeypair)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($ecdhKeypair) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($ecdhKeypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
-        }
-
-        $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey($ecdhKeypair);
-
-        /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
-        }
-
-        $ephemeralPK = fread($ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES);
-        if (!is_string($ephemeralPK)) {
-            throw new Error('Could not read input file');
-        }
-        if (self::strlen($ephemeralPK) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            fclose($ifp);
-            fclose($ofp);
-            throw new Error('Could not read public key from sealed file');
-        }
-
-        $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
-            $ephemeralPK . $publicKey,
-            '',
-            24
-        );
-        $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
-            ParagonIE_Sodium_Compat::crypto_box_secretkey($ecdhKeypair),
-            $ephemeralPK
-        );
-
-        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
-        fclose($ifp);
-        fclose($ofp);
-        try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (Error $ex) {
-            unset($ephKeypair);
-        }
-        return $res;
-    }
-
-    /**
-     * Calculate the BLAKE2b hash of a file.
-     *
-     * @param string      $filePath     Absolute path to a file on the filesystem
-     * @param string|null $key          BLAKE2b key
-     * @param int         $outputLength Length of hash output
-     *
-     * @return string                   BLAKE2b hash
-     * @throws Error
-     * @throws TypeError
-     * @psalm-suppress FailedTypeResolution
-     */
-    public static function generichash($filePath, $key = '', $outputLength = 32)
-    {
-        /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
-        }
-        if (!is_string($key)) {
-            if (is_null($key)) {
-                $key = '';
-            } else {
-                throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
-            }
-        }
-        if (!is_int($outputLength)) {
-            if (!is_numeric($outputLength)) {
-                throw new TypeError('Argument 3 must be an integer, ' . gettype($outputLength) . ' given.');
-            }
-            $outputLength = (int) $outputLength;
-        }
-
-        /* Input validation: */
-        if (!empty($key)) {
-            if (self::strlen($key) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new TypeError('Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes');
-            }
-            if (self::strlen($key) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
-                throw new TypeError('Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes');
-            }
-        }
-        if ($outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN) {
-            throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN');
-        }
-        if ($outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX) {
-            throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX');
-        }
-
-        /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new Error('Could not open input file for reading');
-        }
-        $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outputLength);
-        while ($size > 0) {
-            $blockSize = $size > 64
-                ? 64
-                : $size;
-            $read = fread($fp, $blockSize);
-            if (!is_string($read)) {
-                throw new Error('Could not read input file');
-            }
-            ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $read);
-            $size -= $blockSize;
-        }
-
-        fclose($fp);
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
-    }
-
-    /**
-     * Encrypt a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_secretbox(), but produces
-     * the same result.
-     *
-     * @param string $inputFile  Absolute path to a file on the filesystem
-     * @param string $outputFile Absolute path to a file on the filesystem
-     * @param string $nonce      Number to be used only once
-     * @param string $key        Encryption key
-     *
-     * @return bool
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function secretbox($inputFile, $outputFile, $nonce, $key)
-    {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
-        }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
-        }
-        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes');
-        }
-
-        /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
-        }
-
-        $res = self::secretbox_encrypt($ifp, $ofp, $size, $nonce, $key);
-        fclose($ifp);
-        fclose($ofp);
-        return $res;
-    }
-    /**
-     * Seal a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_secretbox_open(), but produces
-     * the same result.
-     *
-     * Warning: Does not protect against TOCTOU attacks. You should
-     * just load the file into memory and use crypto_secretbox_open() if
-     * you are worried about those.
-     *
-     * @param string $inputFile
-     * @param string $outputFile
-     * @param string $nonce
-     * @param string $key
-     * @return bool
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function secretbox_open($inputFile, $outputFile, $nonce, $key)
-    {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
-        }
-        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes');
-        }
-
-        /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new Error('Could not open output file for writing');
-        }
-
-        $res = self::secretbox_decrypt($ifp, $ofp, $size, $nonce, $key);
-        fclose($ifp);
-        fclose($ofp);
-        try {
-            ParagonIE_Sodium_Compat::memzero($key);
-        } catch (Error $ex) {
-            unset($key);
-        }
-        return $res;
-    }
-
-    /**
-     * Sign a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_sign_detached(), but produces
-     * the same result.
-     *
-     * @param string $filePath  Absolute path to a file on the filesystem
-     * @param string $secretKey Secret signing key
-     *
-     * @return string           Ed25519 signature
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function sign($filePath, $secretKey)
-    {
-        /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
-        }
-        if (!is_string($secretKey)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($secretKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new TypeError('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes');
-        }
-
-        /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var string $az */
-        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
-
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
-
-        /** @var resource $hs */
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($az, 32, 32));
-        $hs = self::updateHashWithFile($hs, $fp, $size);
-
-        /** @var string $nonceHash */
-        $nonceHash = hash_final($hs, true);
-
-        /** @var string $pk */
-        $pk = self::substr($secretKey, 32, 32);
-
-        /** @var string $nonce */
-        $nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
-
-        /** @var string $sig */
-        $sig = ParagonIE_Sodium_Core_Ed25519::ge_p3_tobytes(
-            ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base($nonce)
-        );
-
-        /** @var resource $hs */
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($sig, 0, 32));
-        hash_update($hs, self::substr($pk, 0, 32));
-        $hs = self::updateHashWithFile($hs, $fp, $size);
-
-        /** @var string $hramHash */
-        $hramHash = hash_final($hs, true);
-
-        /** @var string $hram */
-        $hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hramHash);
-
-        /** @var string $sigAfter */
-        $sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd($hram, $az, $nonce);
-
-        /** @var string $sig */
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
-
-        try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (Error $ex) {
-            $az = null;
-        }
-        fclose($fp);
-        return $sig;
-    }
-
-    /**
-     * Verify a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_sign_verify_detached(), but
-     * produces the same result.
-     *
-     * @param string $sig       Ed25519 signature
-     * @param string $filePath  Absolute path to a file on the filesystem
-     * @param string $publicKey Signing public key
-     *
-     * @return bool
-     * @throws Error
-     * @throws Exception
-     */
-    public static function verify($sig, $filePath, $publicKey)
-    {
-        /* Type checks: */
-        if (!is_string($sig)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
-        }
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($filePath) . ' given.');
-        }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($sig) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES) {
-            throw new TypeError('Argument 1 must be CRYPTO_SIGN_BYTES bytes');
-        }
-        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes');
-        }
-        if (self::strlen($sig) < 64) {
-            throw new Exception('Signature is too short');
-        }
-
-        /* Security checks */
-        if (ParagonIE_Sodium_Core_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new Exception('S < L - Invalid signature');
-        }
-        if (ParagonIE_Sodium_Core_Ed25519::small_order($sig)) {
-            throw new Exception('Signature is on too small of an order');
-        }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new Exception('Invalid signature');
-        }
-        $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($publicKey[$i]);
-        }
-        if ($d === 0) {
-            throw new Exception('All zero public key');
-        }
-
-        /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new Error('Could not obtain the file size');
-        }
-
-        /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new Error('Could not open input file for reading');
-        }
-
-        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
-        $orig = ParagonIE_Sodium_Compat::$fastMult;
-
-        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
-        ParagonIE_Sodium_Compat::$fastMult = true;
-
-        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
-        $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime($publicKey);
-
-        /** @var resource $hs */
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($sig, 0, 32));
-        hash_update($hs, self::substr($publicKey, 0, 32));
-        $hs = self::updateHashWithFile($hs, $fp, $size);
-        /** @var string $hDigest */
-        $hDigest = hash_final($hs, true);
-
-        /** @var string $h */
-        $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
-
-        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
-        $R = ParagonIE_Sodium_Core_Ed25519::ge_double_scalarmult_vartime(
-            $h,
-            $A,
-            self::substr($sig, 32)
-        );
-
-        /** @var string $rcheck */
-        $rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes($R);
-
-        // Close the file handle
-        fclose($fp);
-
-        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
-        ParagonIE_Sodium_Compat::$fastMult = $orig;
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
-    }
-
-    /**
-     * @param resource $ifp
-     * @param resource $ofp
-     * @param int      $mlen
-     * @param string   $nonce
-     * @param string   $boxKeypair
-     * @return bool
-     */
-    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
-    {
-        return self::secretbox_encrypt(
-            $ifp,
-            $ofp,
-            $mlen,
-            $nonce,
-            ParagonIE_Sodium_Crypto::box_beforenm(
-                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
-                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
-            )
-        );
-    }
-
-
-    /**
-     * @param resource $ifp
-     * @param resource $ofp
-     * @param int      $mlen
-     * @param string   $nonce
-     * @param string   $boxKeypair
-     * @return bool
-     */
-    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
-    {
-        return self::secretbox_decrypt(
-            $ifp,
-            $ofp,
-            $mlen,
-            $nonce,
-            ParagonIE_Sodium_Crypto::box_beforenm(
-                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
-                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
-            )
-        );
-    }
-
-    /**
-     * Encrypt a file
-     *
-     * @param resource $ifp
-     * @param resource $ofp
-     * @param int $mlen
-     * @param string $nonce
-     * @param string $key
-     * @return bool
-     * @throws Error
-     */
-    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
-    {
-        $plaintext = fread($ifp, 32);
-        if (!is_string($plaintext)) {
-            throw new Error('Could not read input file');
-        }
-        $first32 = ftell($ifp);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
-            $block0,
-            $realNonce,
-            $subkey
-        );
-
-        $state = new ParagonIE_Sodium_Core_Poly1305_State(
-            ParagonIE_Sodium_Core_Util::substr(
-                $block0,
-                0,
-                ParagonIE_Sodium_Crypto::onetimeauth_poly1305_KEYBYTES
-            )
-        );
-
-        // Pre-write 16 blank bytes for the Poly1305 tag
-        $start = ftell($ofp);
-        fwrite($ofp, str_repeat("\x00", 16));
-
-        /** @var string $c */
-        $cBlock = ParagonIE_Sodium_Core_Util::substr(
-            $block0,
-            ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
-        );
-        $state->update($cBlock);
-        fwrite($ofp, $cBlock);
-        $mlen -= 32;
-
-        /** @var int $iter */
-        $iter = 1;
-
-        /** @var int $incr */
-        $incr = self::BUFFER_SIZE >> 6;
-
-        /*
+	/* PHP's default buffer size is 8192 for fread()/fwrite(). */
+	const BUFFER_SIZE = 8192;
+
+	/**
+	 * Box a file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_box(), but produces
+	 * the same result.
+	 *
+	 * @param string $inputFile  Absolute path to a file on the filesystem
+	 * @param string $outputFile Absolute path to a file on the filesystem
+	 * @param string $nonce      Number to be used only once
+	 * @param string $keyPair    ECDH secret key and ECDH public key concatenated
+	 *
+	 * @return bool
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function box($inputFile, $outputFile, $nonce, $keyPair)
+	{
+		/* Type checks: */
+		if (!is_string($inputFile)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+		}
+		if (!is_string($outputFile)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+		}
+		if (!is_string($nonce)) {
+			throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+		}
+
+		/* Input validation: */
+		if (!is_string($keyPair)) {
+			throw new TypeError('Argument 4 must be a string, ' . gettype($keyPair) . ' given.');
+		}
+		if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
+			throw new TypeError('Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes');
+		}
+		if (self::strlen($keyPair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+		}
+
+		/** @var int $size */
+		$size = filesize($inputFile);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $ifp */
+		$ifp = fopen($inputFile, 'rb');
+		if (!is_resource($ifp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var resource $ofp */
+		$ofp = fopen($outputFile, 'wb');
+		if (!is_resource($ofp)) {
+			fclose($ifp);
+			throw new Error('Could not open output file for writing');
+		}
+
+		$res = self::box_encrypt($ifp, $ofp, $size, $nonce, $keyPair);
+		fclose($ifp);
+		fclose($ofp);
+		return $res;
+	}
+
+	/**
+	 * Open a boxed file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_box_open(), but produces
+	 * the same result.
+	 *
+	 * Warning: Does not protect against TOCTOU attacks. You should
+	 * just load the file into memory and use crypto_box_open() if
+	 * you are worried about those.
+	 *
+	 * @param string $inputFile
+	 * @param string $outputFile
+	 * @param string $nonce
+	 * @param string $keypair
+	 * @return bool
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function box_open($inputFile, $outputFile, $nonce, $keypair)
+	{
+		/* Type checks: */
+		if (!is_string($inputFile)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+		}
+		if (!is_string($outputFile)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+		}
+		if (!is_string($nonce)) {
+			throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+		}
+		if (!is_string($keypair)) {
+			throw new TypeError('Argument 4 must be a string, ' . gettype($keypair) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
+			throw new TypeError('Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes');
+		}
+		if (self::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+		}
+
+		/** @var int $size */
+		$size = filesize($inputFile);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $ifp */
+		$ifp = fopen($inputFile, 'rb');
+		if (!is_resource($ifp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var resource $ofp */
+		$ofp = fopen($outputFile, 'wb');
+		if (!is_resource($ofp)) {
+			fclose($ifp);
+			throw new Error('Could not open output file for writing');
+		}
+
+		$res = self::box_decrypt($ifp, $ofp, $size, $nonce, $keypair);
+		fclose($ifp);
+		fclose($ofp);
+		try {
+			ParagonIE_Sodium_Compat::memzero($nonce);
+			ParagonIE_Sodium_Compat::memzero($ephKeypair);
+		} catch (Error $ex) {
+			unset($ephKeypair);
+		}
+		return $res;
+	}
+
+	/**
+	 * Seal a file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_box_seal(), but produces
+	 * the same result.
+	 *
+	 * @param string $inputFile  Absolute path to a file on the filesystem
+	 * @param string $outputFile Absolute path to a file on the filesystem
+	 * @param string $publicKey  ECDH public key
+	 *
+	 * @return bool
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function box_seal($inputFile, $outputFile, $publicKey)
+	{
+		/* Type checks: */
+		if (!is_string($inputFile)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+		}
+		if (!is_string($outputFile)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+		}
+		if (!is_string($publicKey)) {
+			throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+			throw new TypeError('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes');
+		}
+
+		/** @var int $size */
+		$size = filesize($inputFile);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $ifp */
+		$ifp = fopen($inputFile, 'rb');
+		if (!is_resource($ifp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var resource $ofp */
+		$ofp = fopen($outputFile, 'wb');
+		if (!is_resource($ofp)) {
+			fclose($ifp);
+			throw new Error('Could not open output file for writing');
+		}
+
+		/** @var string $ephKeypair */
+		$ephKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair();
+
+		/** @var string $msgKeypair */
+		$msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
+			ParagonIE_Sodium_Compat::crypto_box_secretkey($ephKeypair),
+			$publicKey
+		);
+
+		/** @var string $ephemeralPK */
+		$ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey($ephKeypair);
+
+		/** @var string $nonce */
+		$nonce = ParagonIE_Sodium_Compat::crypto_generichash(
+			$ephemeralPK . $publicKey,
+			'',
+			24
+		);
+
+		/** @var int $firstWrite */
+		$firstWrite = fwrite(
+			$ofp,
+			$ephemeralPK,
+			ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES
+		);
+		if (!is_int($firstWrite)) {
+			fclose($ifp);
+			fclose($ofp);
+			ParagonIE_Sodium_Compat::memzero($ephKeypair);
+			throw new Error('Could not write to output file');
+		}
+		if ($firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+			ParagonIE_Sodium_Compat::memzero($ephKeypair);
+			fclose($ifp);
+			fclose($ofp);
+			throw new Error('Error writing public key to output file');
+		}
+
+		$res = self::box_encrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
+		fclose($ifp);
+		fclose($ofp);
+		try {
+			ParagonIE_Sodium_Compat::memzero($nonce);
+			ParagonIE_Sodium_Compat::memzero($ephKeypair);
+		} catch (Error $ex) {
+			unset($ephKeypair);
+		}
+		return $res;
+	}
+
+	/**
+	 * Open a sealed file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_box_seal_open(), but produces
+	 * the same result.
+	 *
+	 * Warning: Does not protect against TOCTOU attacks. You should
+	 * just load the file into memory and use crypto_box_seal_open() if
+	 * you are worried about those.
+	 *
+	 * @param string $inputFile
+	 * @param string $outputFile
+	 * @param string $ecdhKeypair
+	 * @return bool
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair)
+	{
+		/* Type checks: */
+		if (!is_string($inputFile)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+		}
+		if (!is_string($outputFile)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+		}
+		if (!is_string($ecdhKeypair)) {
+			throw new TypeError('Argument 3 must be a string, ' . gettype($ecdhKeypair) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($ecdhKeypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new TypeError('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+		}
+
+		$publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey($ecdhKeypair);
+
+		/** @var int $size */
+		$size = filesize($inputFile);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $ifp */
+		$ifp = fopen($inputFile, 'rb');
+		if (!is_resource($ifp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var resource $ofp */
+		$ofp = fopen($outputFile, 'wb');
+		if (!is_resource($ofp)) {
+			fclose($ifp);
+			throw new Error('Could not open output file for writing');
+		}
+
+		$ephemeralPK = fread($ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES);
+		if (!is_string($ephemeralPK)) {
+			throw new Error('Could not read input file');
+		}
+		if (self::strlen($ephemeralPK) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+			fclose($ifp);
+			fclose($ofp);
+			throw new Error('Could not read public key from sealed file');
+		}
+
+		$nonce = ParagonIE_Sodium_Compat::crypto_generichash(
+			$ephemeralPK . $publicKey,
+			'',
+			24
+		);
+		$msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
+			ParagonIE_Sodium_Compat::crypto_box_secretkey($ecdhKeypair),
+			$ephemeralPK
+		);
+
+		$res = self::box_decrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
+		fclose($ifp);
+		fclose($ofp);
+		try {
+			ParagonIE_Sodium_Compat::memzero($nonce);
+			ParagonIE_Sodium_Compat::memzero($ephKeypair);
+		} catch (Error $ex) {
+			unset($ephKeypair);
+		}
+		return $res;
+	}
+
+	/**
+	 * Calculate the BLAKE2b hash of a file.
+	 *
+	 * @param string      $filePath     Absolute path to a file on the filesystem
+	 * @param string|null $key          BLAKE2b key
+	 * @param int         $outputLength Length of hash output
+	 *
+	 * @return string                   BLAKE2b hash
+	 * @throws Error
+	 * @throws TypeError
+	 * @psalm-suppress FailedTypeResolution
+	 */
+	public static function generichash($filePath, $key = '', $outputLength = 32)
+	{
+		/* Type checks: */
+		if (!is_string($filePath)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+		}
+		if (!is_string($key)) {
+			if (is_null($key)) {
+				$key = '';
+			} else {
+				throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+			}
+		}
+		if (!is_int($outputLength)) {
+			if (!is_numeric($outputLength)) {
+				throw new TypeError('Argument 3 must be an integer, ' . gettype($outputLength) . ' given.');
+			}
+			$outputLength = (int) $outputLength;
+		}
+
+		/* Input validation: */
+		if (!empty($key)) {
+			if (self::strlen($key) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+				throw new TypeError('Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes');
+			}
+			if (self::strlen($key) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+				throw new TypeError('Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes');
+			}
+		}
+		if ($outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN) {
+			throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN');
+		}
+		if ($outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX) {
+			throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX');
+		}
+
+		/** @var int $size */
+		$size = filesize($filePath);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $fp */
+		$fp = fopen($filePath, 'rb');
+		if (!is_resource($fp)) {
+			throw new Error('Could not open input file for reading');
+		}
+		$ctx = ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outputLength);
+		while ($size > 0) {
+			$blockSize = $size > 64
+				? 64
+				: $size;
+			$read = fread($fp, $blockSize);
+			if (!is_string($read)) {
+				throw new Error('Could not read input file');
+			}
+			ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $read);
+			$size -= $blockSize;
+		}
+
+		fclose($fp);
+		return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+	}
+
+	/**
+	 * Encrypt a file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_secretbox(), but produces
+	 * the same result.
+	 *
+	 * @param string $inputFile  Absolute path to a file on the filesystem
+	 * @param string $outputFile Absolute path to a file on the filesystem
+	 * @param string $nonce      Number to be used only once
+	 * @param string $key        Encryption key
+	 *
+	 * @return bool
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function secretbox($inputFile, $outputFile, $nonce, $key)
+	{
+		/* Type checks: */
+		if (!is_string($inputFile)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
+		}
+		if (!is_string($outputFile)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+		}
+		if (!is_string($nonce)) {
+			throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
+			throw new TypeError('Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+		}
+		if (!is_string($key)) {
+			throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+		}
+		if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes');
+		}
+
+		/** @var int $size */
+		$size = filesize($inputFile);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $ifp */
+		$ifp = fopen($inputFile, 'rb');
+		if (!is_resource($ifp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var resource $ofp */
+		$ofp = fopen($outputFile, 'wb');
+		if (!is_resource($ofp)) {
+			fclose($ifp);
+			throw new Error('Could not open output file for writing');
+		}
+
+		$res = self::secretbox_encrypt($ifp, $ofp, $size, $nonce, $key);
+		fclose($ifp);
+		fclose($ofp);
+		return $res;
+	}
+	/**
+	 * Seal a file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_secretbox_open(), but produces
+	 * the same result.
+	 *
+	 * Warning: Does not protect against TOCTOU attacks. You should
+	 * just load the file into memory and use crypto_secretbox_open() if
+	 * you are worried about those.
+	 *
+	 * @param string $inputFile
+	 * @param string $outputFile
+	 * @param string $nonce
+	 * @param string $key
+	 * @return bool
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function secretbox_open($inputFile, $outputFile, $nonce, $key)
+	{
+		/* Type checks: */
+		if (!is_string($inputFile)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+		}
+		if (!is_string($outputFile)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+		}
+		if (!is_string($nonce)) {
+			throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+		}
+		if (!is_string($key)) {
+			throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
+			throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+		}
+		if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new TypeError('Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes');
+		}
+
+		/** @var int $size */
+		$size = filesize($inputFile);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $ifp */
+		$ifp = fopen($inputFile, 'rb');
+		if (!is_resource($ifp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var resource $ofp */
+		$ofp = fopen($outputFile, 'wb');
+		if (!is_resource($ofp)) {
+			fclose($ifp);
+			throw new Error('Could not open output file for writing');
+		}
+
+		$res = self::secretbox_decrypt($ifp, $ofp, $size, $nonce, $key);
+		fclose($ifp);
+		fclose($ofp);
+		try {
+			ParagonIE_Sodium_Compat::memzero($key);
+		} catch (Error $ex) {
+			unset($key);
+		}
+		return $res;
+	}
+
+	/**
+	 * Sign a file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_sign_detached(), but produces
+	 * the same result.
+	 *
+	 * @param string $filePath  Absolute path to a file on the filesystem
+	 * @param string $secretKey Secret signing key
+	 *
+	 * @return string           Ed25519 signature
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function sign($filePath, $secretKey)
+	{
+		/* Type checks: */
+		if (!is_string($filePath)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+		}
+		if (!is_string($secretKey)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($secretKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES) {
+			throw new TypeError('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes');
+		}
+
+		/** @var int $size */
+		$size = filesize($filePath);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $fp */
+		$fp = fopen($filePath, 'rb');
+		if (!is_resource($fp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var string $az */
+		$az = hash('sha512', self::substr($secretKey, 0, 32), true);
+
+		$az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+		$az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+		/** @var resource $hs */
+		$hs = hash_init('sha512');
+		hash_update($hs, self::substr($az, 32, 32));
+		$hs = self::updateHashWithFile($hs, $fp, $size);
+
+		/** @var string $nonceHash */
+		$nonceHash = hash_final($hs, true);
+
+		/** @var string $pk */
+		$pk = self::substr($secretKey, 32, 32);
+
+		/** @var string $nonce */
+		$nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+
+		/** @var string $sig */
+		$sig = ParagonIE_Sodium_Core_Ed25519::ge_p3_tobytes(
+			ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base($nonce)
+		);
+
+		/** @var resource $hs */
+		$hs = hash_init('sha512');
+		hash_update($hs, self::substr($sig, 0, 32));
+		hash_update($hs, self::substr($pk, 0, 32));
+		$hs = self::updateHashWithFile($hs, $fp, $size);
+
+		/** @var string $hramHash */
+		$hramHash = hash_final($hs, true);
+
+		/** @var string $hram */
+		$hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hramHash);
+
+		/** @var string $sigAfter */
+		$sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd($hram, $az, $nonce);
+
+		/** @var string $sig */
+		$sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+		try {
+			ParagonIE_Sodium_Compat::memzero($az);
+		} catch (Error $ex) {
+			$az = null;
+		}
+		fclose($fp);
+		return $sig;
+	}
+
+	/**
+	 * Verify a file (rather than a string). Uses less memory than
+	 * ParagonIE_Sodium_Compat::crypto_sign_verify_detached(), but
+	 * produces the same result.
+	 *
+	 * @param string $sig       Ed25519 signature
+	 * @param string $filePath  Absolute path to a file on the filesystem
+	 * @param string $publicKey Signing public key
+	 *
+	 * @return bool
+	 * @throws Error
+	 * @throws Exception
+	 */
+	public static function verify($sig, $filePath, $publicKey)
+	{
+		/* Type checks: */
+		if (!is_string($sig)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
+		}
+		if (!is_string($filePath)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($filePath) . ' given.');
+		}
+		if (!is_string($publicKey)) {
+			throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($sig) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES) {
+			throw new TypeError('Argument 1 must be CRYPTO_SIGN_BYTES bytes');
+		}
+		if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES) {
+			throw new TypeError('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes');
+		}
+		if (self::strlen($sig) < 64) {
+			throw new Exception('Signature is too short');
+		}
+
+		/* Security checks */
+		if (ParagonIE_Sodium_Core_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
+			throw new Exception('S < L - Invalid signature');
+		}
+		if (ParagonIE_Sodium_Core_Ed25519::small_order($sig)) {
+			throw new Exception('Signature is on too small of an order');
+		}
+		if ((self::chrToInt($sig[63]) & 224) !== 0) {
+			throw new Exception('Invalid signature');
+		}
+		$d = 0;
+		for ($i = 0; $i < 32; ++$i) {
+			$d |= self::chrToInt($publicKey[$i]);
+		}
+		if ($d === 0) {
+			throw new Exception('All zero public key');
+		}
+
+		/** @var int $size */
+		$size = filesize($filePath);
+		if (!is_int($size)) {
+			throw new Error('Could not obtain the file size');
+		}
+
+		/** @var resource $fp */
+		$fp = fopen($filePath, 'rb');
+		if (!is_resource($fp)) {
+			throw new Error('Could not open input file for reading');
+		}
+
+		/** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+		$orig = ParagonIE_Sodium_Compat::$fastMult;
+
+		// Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+		ParagonIE_Sodium_Compat::$fastMult = true;
+
+		/** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
+		$A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime($publicKey);
+
+		/** @var resource $hs */
+		$hs = hash_init('sha512');
+		hash_update($hs, self::substr($sig, 0, 32));
+		hash_update($hs, self::substr($publicKey, 0, 32));
+		$hs = self::updateHashWithFile($hs, $fp, $size);
+		/** @var string $hDigest */
+		$hDigest = hash_final($hs, true);
+
+		/** @var string $h */
+		$h = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+		/** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
+		$R = ParagonIE_Sodium_Core_Ed25519::ge_double_scalarmult_vartime(
+			$h,
+			$A,
+			self::substr($sig, 32)
+		);
+
+		/** @var string $rcheck */
+		$rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes($R);
+
+		// Close the file handle
+		fclose($fp);
+
+		// Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+		ParagonIE_Sodium_Compat::$fastMult = $orig;
+		return self::verify_32($rcheck, self::substr($sig, 0, 32));
+	}
+
+	/**
+	 * @param resource $ifp
+	 * @param resource $ofp
+	 * @param int      $mlen
+	 * @param string   $nonce
+	 * @param string   $boxKeypair
+	 * @return bool
+	 */
+	protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+	{
+		return self::secretbox_encrypt(
+			$ifp,
+			$ofp,
+			$mlen,
+			$nonce,
+			ParagonIE_Sodium_Crypto::box_beforenm(
+				ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
+				ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+			)
+		);
+	}
+
+
+	/**
+	 * @param resource $ifp
+	 * @param resource $ofp
+	 * @param int      $mlen
+	 * @param string   $nonce
+	 * @param string   $boxKeypair
+	 * @return bool
+	 */
+	protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+	{
+		return self::secretbox_decrypt(
+			$ifp,
+			$ofp,
+			$mlen,
+			$nonce,
+			ParagonIE_Sodium_Crypto::box_beforenm(
+				ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
+				ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+			)
+		);
+	}
+
+	/**
+	 * Encrypt a file
+	 *
+	 * @param resource $ifp
+	 * @param resource $ofp
+	 * @param int $mlen
+	 * @param string $nonce
+	 * @param string $key
+	 * @return bool
+	 * @throws Error
+	 */
+	protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
+	{
+		$plaintext = fread($ifp, 32);
+		if (!is_string($plaintext)) {
+			throw new Error('Could not read input file');
+		}
+		$first32 = ftell($ifp);
+
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+		/** @var string $realNonce */
+		$realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+		/** @var string $block0 */
+		$block0 = str_repeat("\x00", 32);
+
+		/** @var int $mlen - Length of the plaintext message */
+		$mlen0 = $mlen;
+		if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
+			$mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
+		}
+		$block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
+			$block0,
+			$realNonce,
+			$subkey
+		);
+
+		$state = new ParagonIE_Sodium_Core_Poly1305_State(
+			ParagonIE_Sodium_Core_Util::substr(
+				$block0,
+				0,
+				ParagonIE_Sodium_Crypto::onetimeauth_poly1305_KEYBYTES
+			)
+		);
+
+		// Pre-write 16 blank bytes for the Poly1305 tag
+		$start = ftell($ofp);
+		fwrite($ofp, str_repeat("\x00", 16));
+
+		/** @var string $c */
+		$cBlock = ParagonIE_Sodium_Core_Util::substr(
+			$block0,
+			ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
+		);
+		$state->update($cBlock);
+		fwrite($ofp, $cBlock);
+		$mlen -= 32;
+
+		/** @var int $iter */
+		$iter = 1;
+
+		/** @var int $incr */
+		$incr = self::BUFFER_SIZE >> 6;
+
+		/*
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        fseek($ifp, $first32, SEEK_SET);
-
-        while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
-            $plaintext = fread($ifp, $blockSize);
-            if (!is_string($plaintext)) {
-                throw new Error('Could not read input file');
-            }
-            $cBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
-                $plaintext,
-                $realNonce,
-                $iter,
-                $subkey
-            );
-            fwrite($ofp, $cBlock, $blockSize);
-            $state->update($cBlock);
-
-            $mlen -= $blockSize;
-            $iter += $incr;
-        }
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (Error $ex) {
-            $block0 = null;
-            $subkey = null;
-        }
-        $end = ftell($ofp);
-
-        /*
+		fseek($ifp, $first32, SEEK_SET);
+
+		while ($mlen > 0) {
+			$blockSize = $mlen > self::BUFFER_SIZE
+				? self::BUFFER_SIZE
+				: $mlen;
+			$plaintext = fread($ifp, $blockSize);
+			if (!is_string($plaintext)) {
+				throw new Error('Could not read input file');
+			}
+			$cBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+				$plaintext,
+				$realNonce,
+				$iter,
+				$subkey
+			);
+			fwrite($ofp, $cBlock, $blockSize);
+			$state->update($cBlock);
+
+			$mlen -= $blockSize;
+			$iter += $incr;
+		}
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+			ParagonIE_Sodium_Compat::memzero($subkey);
+		} catch (Error $ex) {
+			$block0 = null;
+			$subkey = null;
+		}
+		$end = ftell($ofp);
+
+		/*
          * Write the Poly1305 authentication tag that provides integrity
          * over the ciphertext (encrypt-then-MAC)
          */
-        fseek($ofp, $start, SEEK_SET);
-        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
-        fseek($ofp, $end, SEEK_SET);
-        unset($state);
-
-        return true;
-    }
-
-    /**
-     * Decrypt a file
-     *
-     * @param resource $ifp
-     * @param resource $ofp
-     * @param int $mlen
-     * @param string $nonce
-     * @param string $key
-     * @return bool
-     * @throws Error
-     * @throws Exception
-     */
-    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
-    {
-        $tag = fread($ifp, 16);
-        if (!is_string($tag)) {
-            throw new Error('Could not read input file');
-        }
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
-            64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-
-        /* Verify the Poly1305 MAC -before- attempting to decrypt! */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State(self::substr($block0, 0, 32));
-        if (!self::onetimeauth_verify($state, $ifp, $tag, $mlen)) {
-            throw new Exception('Invalid MAC');
-        }
-
-        /*
+		fseek($ofp, $start, SEEK_SET);
+		fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
+		fseek($ofp, $end, SEEK_SET);
+		unset($state);
+
+		return true;
+	}
+
+	/**
+	 * Decrypt a file
+	 *
+	 * @param resource $ifp
+	 * @param resource $ofp
+	 * @param int $mlen
+	 * @param string $nonce
+	 * @param string $key
+	 * @return bool
+	 * @throws Error
+	 * @throws Exception
+	 */
+	protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
+	{
+		$tag = fread($ifp, 16);
+		if (!is_string($tag)) {
+			throw new Error('Could not read input file');
+		}
+
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+		/** @var string $realNonce */
+		$realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
+			64,
+			ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+			$subkey
+		);
+
+		/* Verify the Poly1305 MAC -before- attempting to decrypt! */
+		$state = new ParagonIE_Sodium_Core_Poly1305_State(self::substr($block0, 0, 32));
+		if (!self::onetimeauth_verify($state, $ifp, $tag, $mlen)) {
+			throw new Exception('Invalid MAC');
+		}
+
+		/*
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        $first32 = fread($ifp, 32);
-        if (!is_string($first32)) {
-            throw new Error('Could not read input file');
-        }
-        $first32len = self::strlen($first32);
-        fwrite(
-            $ofp,
-            self::xorStrings(
-                self::substr($block0, 32, $first32len),
-                self::substr($first32, 0, $first32len)
-            )
-        );
-        $mlen -= 32;
-
-        /** @var int $iter */
-        $iter = 1;
-
-        /** @var int $incr */
-        $incr = self::BUFFER_SIZE >> 6;
-
-        /* Decrypts ciphertext, writes to output file. */
-        while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new Error('Could not read input file');
-            }
-            $pBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
-                $ciphertext,
-                $realNonce,
-                $iter,
-                $subkey
-            );
-            fwrite($ofp, $pBlock, $blockSize);
-            $mlen -= $blockSize;
-            $iter += $incr;
-        }
-        return true;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core_Poly1305_State $state
-     * @param resource $ifp
-     * @param string $tag
-     * @param int $mlen
-     * @return bool
-     * @throws Error
-     */
-    protected static function onetimeauth_verify(ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0)
-    {
-        /** @var int $pos */
-        $pos = ftell($ifp);
-
-        /** @var int $iter */
-        $iter = 1;
-
-        /** @var int $incr */
-        $incr = self::BUFFER_SIZE >> 6;
-
-        while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new Error('Could not read input file');
-            }
-            $state->update($ciphertext);
-            $mlen -= $blockSize;
-            $iter += $incr;
-        }
-        $res = ParagonIE_Sodium_Core_Util::verify_16($tag, $state->finish());
-
-        fseek($ifp, $pos, SEEK_SET);
-        return $res;
-    }
-
-    /**
-     * Update a hash context with the contents of a file, without
-     * loading the entire file into memory.
-     *
-     * @param resource|object $hash
-     * @param resource $fp
-     * @param int $size
-     * @return mixed (resource on PHP < 7.2, object on PHP >= 7.2)
-     * @throws Error
-     * @throws TypeError
-     * @psalm-suppress PossiblyInvalidArgument
-     *                 PHP 7.2 changes from a resource to an object,
-     *                 which causes Psalm to complain about an error.
-     */
-    public static function updateHashWithFile($hash, $fp, $size = 0)
-    {
-        /* Type checks: */
-        if (PHP_VERSION_ID < 70200) {
-            if (!is_resource($hash)) {
-                throw new TypeError('Argument 1 must be a resource, ' . gettype($hash) . ' given.');
-            }
-
-        } else {
-            if (!is_object($hash)) {
-                throw new TypeError('Argument 1 must be an object (PHP 7.2+), ' . gettype($hash) . ' given.');
-            }
-        }
-        if (!is_resource($fp)) {
-            throw new TypeError('Argument 2 must be a resource, ' . gettype($fp) . ' given.');
-        }
-        if (!is_int($size)) {
-            throw new TypeError('Argument 3 must be an integer, ' . gettype($size) . ' given.');
-        }
-
-        /** @var int $originalPosition */
-        $originalPosition = ftell($fp);
-
-        // Move file pointer to beginning of file
-        fseek($fp, 0, SEEK_SET);
-        for ($i = 0; $i < $size; $i += self::BUFFER_SIZE) {
-            /** @var string $message */
-            $message = fread(
-                $fp,
-                ($size - $i) > self::BUFFER_SIZE
-                    ? $size - $i
-                    : self::BUFFER_SIZE
-            );
-            if (!is_string($message)) {
-                throw new Error('Unexpected error reading from file.');
-            }
-            /** @psalm-suppress InvalidArgument */
-            hash_update($hash, $message);
-        }
-        // Reset file pointer's position
-        fseek($fp, $originalPosition, SEEK_SET);
-        return $hash;
-    }
+		$first32 = fread($ifp, 32);
+		if (!is_string($first32)) {
+			throw new Error('Could not read input file');
+		}
+		$first32len = self::strlen($first32);
+		fwrite(
+			$ofp,
+			self::xorStrings(
+				self::substr($block0, 32, $first32len),
+				self::substr($first32, 0, $first32len)
+			)
+		);
+		$mlen -= 32;
+
+		/** @var int $iter */
+		$iter = 1;
+
+		/** @var int $incr */
+		$incr = self::BUFFER_SIZE >> 6;
+
+		/* Decrypts ciphertext, writes to output file. */
+		while ($mlen > 0) {
+			$blockSize = $mlen > self::BUFFER_SIZE
+				? self::BUFFER_SIZE
+				: $mlen;
+			$ciphertext = fread($ifp, $blockSize);
+			if (!is_string($ciphertext)) {
+				throw new Error('Could not read input file');
+			}
+			$pBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+				$ciphertext,
+				$realNonce,
+				$iter,
+				$subkey
+			);
+			fwrite($ofp, $pBlock, $blockSize);
+			$mlen -= $blockSize;
+			$iter += $incr;
+		}
+		return true;
+	}
+
+	/**
+	 * @param ParagonIE_Sodium_Core_Poly1305_State $state
+	 * @param resource $ifp
+	 * @param string $tag
+	 * @param int $mlen
+	 * @return bool
+	 * @throws Error
+	 */
+	protected static function onetimeauth_verify(ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0)
+	{
+		/** @var int $pos */
+		$pos = ftell($ifp);
+
+		/** @var int $iter */
+		$iter = 1;
+
+		/** @var int $incr */
+		$incr = self::BUFFER_SIZE >> 6;
+
+		while ($mlen > 0) {
+			$blockSize = $mlen > self::BUFFER_SIZE
+				? self::BUFFER_SIZE
+				: $mlen;
+			$ciphertext = fread($ifp, $blockSize);
+			if (!is_string($ciphertext)) {
+				throw new Error('Could not read input file');
+			}
+			$state->update($ciphertext);
+			$mlen -= $blockSize;
+			$iter += $incr;
+		}
+		$res = ParagonIE_Sodium_Core_Util::verify_16($tag, $state->finish());
+
+		fseek($ifp, $pos, SEEK_SET);
+		return $res;
+	}
+
+	/**
+	 * Update a hash context with the contents of a file, without
+	 * loading the entire file into memory.
+	 *
+	 * @param resource|object $hash
+	 * @param resource $fp
+	 * @param int $size
+	 * @return mixed (resource on PHP < 7.2, object on PHP >= 7.2)
+	 * @throws Error
+	 * @throws TypeError
+	 * @psalm-suppress PossiblyInvalidArgument
+	 *                 PHP 7.2 changes from a resource to an object,
+	 *                 which causes Psalm to complain about an error.
+	 */
+	public static function updateHashWithFile($hash, $fp, $size = 0)
+	{
+		/* Type checks: */
+		if (PHP_VERSION_ID < 70200) {
+			if (!is_resource($hash)) {
+				throw new TypeError('Argument 1 must be a resource, ' . gettype($hash) . ' given.');
+			}
+
+		} else {
+			if (!is_object($hash)) {
+				throw new TypeError('Argument 1 must be an object (PHP 7.2+), ' . gettype($hash) . ' given.');
+			}
+		}
+		if (!is_resource($fp)) {
+			throw new TypeError('Argument 2 must be a resource, ' . gettype($fp) . ' given.');
+		}
+		if (!is_int($size)) {
+			throw new TypeError('Argument 3 must be an integer, ' . gettype($size) . ' given.');
+		}
+
+		/** @var int $originalPosition */
+		$originalPosition = ftell($fp);
+
+		// Move file pointer to beginning of file
+		fseek($fp, 0, SEEK_SET);
+		for ($i = 0; $i < $size; $i += self::BUFFER_SIZE) {
+			/** @var string $message */
+			$message = fread(
+				$fp,
+				($size - $i) > self::BUFFER_SIZE
+					? $size - $i
+					: self::BUFFER_SIZE
+			);
+			if (!is_string($message)) {
+				throw new Error('Unexpected error reading from file.');
+			}
+			/** @psalm-suppress InvalidArgument */
+			hash_update($hash, $message);
+		}
+		// Reset file pointer's position
+		fseek($fp, $originalPosition, SEEK_SET);
+		return $hash;
+	}
 }

Spacing +377 added lines, -377 removed lines

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

Braces +16 added lines, -32 removed lines

@@ -6,8 +6,7 @@ 
 /**
  * Class ParagonIE_Sodium_File
  */
-class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
-{
+class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util {
     /* PHP's default buffer size is 8192 for fread()/fwrite(). */
     const BUFFER_SIZE = 8192;
 
@@ -25,8 +24,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box($inputFile, $outputFile, $nonce, $keyPair)
-    {
+    public static function box($inputFile, $outputFile, $nonce, $keyPair) {
         /* Type checks: */
         if (!is_string($inputFile)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
@@ -91,8 +89,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box_open($inputFile, $outputFile, $nonce, $keypair)
-    {
+    public static function box_open($inputFile, $outputFile, $nonce, $keypair) {
         /* Type checks: */
         if (!is_string($inputFile)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
@@ -159,8 +156,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box_seal($inputFile, $outputFile, $publicKey)
-    {
+    public static function box_seal($inputFile, $outputFile, $publicKey) {
         /* Type checks: */
         if (!is_string($inputFile)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
@@ -262,8 +258,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair)
-    {
+    public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair) {
         /* Type checks: */
         if (!is_string($inputFile)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
@@ -345,8 +340,7 @@ 
      * @throws TypeError
      * @psalm-suppress FailedTypeResolution
      */
-    public static function generichash($filePath, $key = '', $outputLength = 32)
-    {
+    public static function generichash($filePath, $key = '', $outputLength = 32) {
         /* Type checks: */
         if (!is_string($filePath)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
@@ -423,8 +417,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function secretbox($inputFile, $outputFile, $nonce, $key)
-    {
+    public static function secretbox($inputFile, $outputFile, $nonce, $key) {
         /* Type checks: */
         if (!is_string($inputFile)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
@@ -488,8 +481,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function secretbox_open($inputFile, $outputFile, $nonce, $key)
-    {
+    public static function secretbox_open($inputFile, $outputFile, $nonce, $key) {
         /* Type checks: */
         if (!is_string($inputFile)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
@@ -554,8 +546,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function sign($filePath, $secretKey)
-    {
+    public static function sign($filePath, $secretKey) {
         /* Type checks: */
         if (!is_string($filePath)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
@@ -646,8 +637,7 @@ 
      * @throws Error
      * @throws Exception
      */
-    public static function verify($sig, $filePath, $publicKey)
-    {
+    public static function verify($sig, $filePath, $publicKey) {
         /* Type checks: */
         if (!is_string($sig)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
@@ -746,8 +736,7 @@ 
      * @param string   $boxKeypair
      * @return bool
      */
-    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
-    {
+    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair) {
         return self::secretbox_encrypt(
             $ifp,
             $ofp,
@@ -769,8 +758,7 @@ 
      * @param string   $boxKeypair
      * @return bool
      */
-    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
-    {
+    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair) {
         return self::secretbox_decrypt(
             $ifp,
             $ofp,
@@ -794,8 +782,7 @@ 
      * @return bool
      * @throws Error
      */
-    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
-    {
+    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key) {
         $plaintext = fread($ifp, 32);
         if (!is_string($plaintext)) {
             throw new Error('Could not read input file');
@@ -911,8 +898,7 @@ 
      * @throws Error
      * @throws Exception
      */
-    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
-    {
+    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key) {
         $tag = fread($ifp, 16);
         if (!is_string($tag)) {
             throw new Error('Could not read input file');
@@ -991,8 +977,7 @@ 
      * @return bool
      * @throws Error
      */
-    protected static function onetimeauth_verify(ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0)
-    {
+    protected static function onetimeauth_verify(ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0) {
         /** @var int $pos */
         $pos = ftell($ifp);
 
@@ -1034,8 +1019,7 @@ 
      *                 PHP 7.2 changes from a resource to an object,
      *                 which causes Psalm to complain about an error.
      */
-    public static function updateHashWithFile($hash, $fp, $size = 0)
-    {
+    public static function updateHashWithFile($hash, $fp, $size = 0) {
         /* Type checks: */
         if (PHP_VERSION_ID < 70200) {
             if (!is_resource($hash)) {

src/library/sodium_compat/namespaced/File.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace ParagonIE\Sodium;
 
-class File extends \ParagonIE_Sodium_File
-{
+class File extends \ParagonIE_Sodium_File {
 
 }

src/library/sodium_compat/namespaced/Crypto.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace ParagonIE\Sodium;
 
-class Crypto extends \ParagonIE_Sodium_Crypto
-{
+class Crypto extends \ParagonIE_Sodium_Crypto {
 
 }

src/library/sodium_compat/namespaced/Compat.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace ParagonIE\Sodium;
 
-class Compat extends \ParagonIE_Sodium_Compat
-{
+class Compat extends \ParagonIE_Sodium_Compat {
 
 }

src/library/sodium_compat/namespaced/Core/Util.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace ParagonIE\Sodium\Core;
 
-class Util extends \ParagonIE_Sodium_Core_Util
-{
+class Util extends \ParagonIE_Sodium_Core_Util {
 
 }

src/library/sodium_compat/namespaced/Core/Poly1305.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace ParagonIE\Sodium\Core;
 
-class Poly1305 extends \ParagonIE_Sodium_Core_Poly1305
-{
+class Poly1305 extends \ParagonIE_Sodium_Core_Poly1305 {
 
 }

src/library/sodium_compat/namespaced/Core/Ed25519.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace ParagonIE\Sodium\Core;
 
-class Ed25519 extends \ParagonIE_Sodium_Core_Ed25519
-{
+class Ed25519 extends \ParagonIE_Sodium_Core_Ed25519 {
 
 }

src/library/sodium_compat/namespaced/Core/Poly1305/State.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace ParagonIE\Sodium\Core\Poly1305;
 
-class State extends \ParagonIE_Sodium_Core_Poly1305_State
-{
+class State extends \ParagonIE_Sodium_Core_Poly1305_State {
 
 }