gravityview / GravityView

vendor/paragonie/sodium_compat/src/Core32/X25519.php

Indentation +334 added lines, -334 removed lines

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

Spacing +137 added lines, -137 removed lines

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

Braces +4 added lines, -8 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_X25519
  */
-abstract class ParagonIE_Sodium_Core32_X25519 extends ParagonIE_Sodium_Core32_Curve25519
-{
+abstract class ParagonIE_Sodium_Core32_X25519 extends ParagonIE_Sodium_Core32_Curve25519 {
     /**
      * Alters the objects passed to this method in place.
      *
@@ -100,8 +99,7 @@ 
      * @psalm-suppress MixedAssignment
      * @psalm-suppress MixedMethodCall
      */
-    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         /** @var array<int, ParagonIE_Sodium_Core32_Int64> $h */
         $h = array();
         for ($i = 0; $i < 10; ++$i) {
@@ -167,8 +165,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10($n, $p)
-    {
+    public static function crypto_scalarmult_curve25519_ref10($n, $p) {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;
         # e[0] &= 248;
@@ -315,8 +312,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10_base($n)
-    {
+    public static function crypto_scalarmult_curve25519_ref10_base($n) {
         # for (i = 0;i < 32;++i) e[i] = n[i];
         $e = '' . $n;
 

vendor/paragonie/sodium_compat/src/Core32/Int32.php

Indentation +859 added lines, -859 removed lines

@@ -9,863 +9,863 @@
  */
 class ParagonIE_Sodium_Core32_Int32
 {
-    /**
-     * @var array<int, int> - two 16-bit integers
-     *
-     * 0 is the higher 16 bits
-     * 1 is the lower 16 bits
-     */
-    public $limbs = array(0, 0);
-
-    /**
-     * @var int
-     */
-    public $overflow = 0;
-
-    /**
-     * @var bool
-     */
-    public $unsignedInt = false;
-
-    /**
-     * ParagonIE_Sodium_Core32_Int32 constructor.
-     * @param array $array
-     * @param bool $unsignedInt
-     */
-    public function __construct($array = array(0, 0), $unsignedInt = false)
-    {
-        $this->limbs = array(
-            (int) $array[0],
-            (int) $array[1]
-        );
-        $this->overflow = 0;
-        $this->unsignedInt = $unsignedInt;
-    }
-
-    /**
-     * Adds two int32 objects
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $addend
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend)
-    {
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
-        $j0 = $addend->limbs[0];
-        $j1 = $addend->limbs[1];
-
-        $r1 = $i1 + ($j1 & 0xffff);
-        $carry = $r1 >> 16;
-
-        $r0 = $i0 + ($j0 & 0xffff) + $carry;
-        $carry = $r0 >> 16;
-
-        $r0 &= 0xffff;
-        $r1 &= 0xffff;
-
-        $return = new ParagonIE_Sodium_Core32_Int32(
-            array($r0, $r1)
-        );
-        $return->overflow = $carry;
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * Adds a normal integer to an int32 object
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function addInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        /** @var int $int */
-        $int = (int) $int;
-
-        $int = (int) $int;
-
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
-
-        $r1 = $i1 + ($int & 0xffff);
-        $carry = $r1 >> 16;
-
-        $r0 = $i0 + (($int >> 16) & 0xffff) + $carry;
-        $carry = $r0 >> 16;
-        $r0 &= 0xffff;
-        $r1 &= 0xffff;
-        $return = new ParagonIE_Sodium_Core32_Int32(
-            array($r0, $r1)
-        );
-        $return->overflow = $carry;
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * @param int $b
-     * @return int
-     */
-    public function compareInt($b = 0)
-    {
-        $gt = 0;
-        $eq = 1;
-
-        $i = 2;
-        $j = 0;
-        while ($i > 0) {
-            --$i;
-            /** @var int $x1 */
-            $x1 = $this->limbs[$i];
-            /** @var int $x2 */
-            $x2 = ($b >> ($j << 4)) & 0xffff;
-            /** @var int $gt */
-            $gt |= (($x2 - $x1) >> 8) & $eq;
-            /** @var int $eq */
-            $eq &= (($x2 ^ $x1) - 1) >> 8;
-        }
-        return ($gt + $gt - $eq) + 1;
-    }
-
-    /**
-     * @param int $m
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function mask($m = 0)
-    {
-        /** @var int $hi */
-        $hi = ($m >> 16) & 0xffff;
-        /** @var int $lo */
-        $lo = ($m & 0xffff);
-        return new ParagonIE_Sodium_Core32_Int32(
-            array(
-                (int) ($this->limbs[0] & $hi),
-                (int) ($this->limbs[1] & $lo)
-            ),
-            $this->unsignedInt
-        );
-    }
-
-    /**
-     * @param array<int, int> $a
-     * @param array<int, int> $b
-     * @param int $baseLog2
-     * @return array<int, int>
-     */
-    public function multiplyLong(array $a, array $b, $baseLog2 = 16)
-    {
-        $a_l = count($a);
-        $b_l = count($b);
-        /** @var array<int, int> $r */
-        $r = array_fill(0, $a_l + $b_l + 1, 0);
-        $base = 1 << $baseLog2;
-        for ($i = 0; $i < $a_l; ++$i) {
-            $a_i = $a[$i];
-            for ($j = 0; $j < $a_l; ++$j) {
-                $b_j = $b[$j];
-                $product = ($a_i * $b_j) + $r[$i + $j];
-                $carry = ($product >> $baseLog2 & 0xffff);
-                $r[$i + $j] = ($product - (int) ($carry * $base)) & 0xffff;
-                $r[$i + $j + 1] += $carry;
-            }
-        }
-        return array_slice($r, 0, 5);
-    }
-
-    /**
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function mulIntFast($int)
-    {
-        // Handle negative numbers
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($int >> 31) & 1;
-        $a = array_reverse($this->limbs);
-        $b = array(
-            $int & 0xffff,
-            ($int >> 16) & 0xffff
-        );
-        if ($aNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$a[0];
-        }
-        if ($bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$b[0];
-        }
-        // Multiply
-        $res = $this->multiplyLong($a, $b);
-
-        // Re-apply negation to results
-        if ($aNeg !== $bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $res[$i] = (0xffff ^ $res[$i]) & 0xffff;
-            }
-            // Handle integer overflow
-            $c = 1;
-            for ($i = 0; $i < 2; ++$i) {
-                $res[$i] += $c;
-                $c = $res[$i] >> 16;
-                $res[$i] &= 0xffff;
-            }
-        }
-
-        // Return our values
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs = array(
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
-        );
-        if (count($res) > 2) {
-            $return->overflow = $res[2] & 0xffff;
-        }
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int32 $right
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function mulInt32Fast(ParagonIE_Sodium_Core32_Int32 $right)
-    {
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($right->limbs[0] >> 15) & 1;
-
-        $a = array_reverse($this->limbs);
-        $b = array_reverse($right->limbs);
-        if ($aNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$a[0];
-        }
-        if ($bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$b[0];
-        }
-        $res = $this->multiplyLong($a, $b);
-        if ($aNeg !== $bNeg) {
-            if ($aNeg !== $bNeg) {
-                for ($i = 0; $i < 2; ++$i) {
-                    $res[$i] = ($res[$i] ^ 0xffff) & 0xffff;
-                }
-                $c = 1;
-                for ($i = 0; $i < 2; ++$i) {
-                    $res[$i] += $c;
-                    $c = $res[$i] >> 16;
-                    $res[$i] &= 0xffff;
-                }
-            }
-        }
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs = array(
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
-        );
-        if (count($res) > 2) {
-            $return->overflow = $res[2];
-        }
-        return $return;
-    }
-
-    /**
-     * @param int $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function mulInt($int = 0, $size = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulIntFast((int) $int);
-        }
-        /** @var int $int */
-        $int = (int) $int;
-        /** @var int $size */
-        $size = (int) $size;
-
-        if (!$size) {
-            $size = 31;
-        }
-        /** @var int $size */
-
-        $a = clone $this;
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        // Initialize:
-        $ret0 = 0;
-        $ret1 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
-
-        /** @var int $size */
-        /** @var int $i */
-        for ($i = $size; $i >= 0; --$i) {
-            $m = (int) (-($int & 1));
-            $x0 = $a0 & $m;
-            $x1 = $a1 & $m;
-
-            $ret1 += $x1;
-            $c = $ret1 >> 16;
-
-            $ret0 += $x0 + $c;
-
-            $ret0 &= 0xffff;
-            $ret1 &= 0xffff;
-
-            $a1 = ($a1 << 1);
-            $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
-            $a0 &= 0xffff;
-            $a1 &= 0xffff;
-            $int >>= 1;
-        }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int32 $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulInt32Fast($int);
-        }
-        if (!$size) {
-            $size = 31;
-        }
-        /** @var int $size */
-
-        $a = clone $this;
-        $b = clone $int;
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        // Initialize:
-        $ret0 = 0;
-        $ret1 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
-        $b0 = $b->limbs[0];
-        $b1 = $b->limbs[1];
-
-        /** @var int $size */
-        /** @var int $i */
-        for ($i = $size; $i >= 0; --$i) {
-            $m = (int) (-($b1 & 1));
-            $x0 = $a0 & $m;
-            $x1 = $a1 & $m;
-
-            $ret1 += $x1;
-            $c = $ret1 >> 16;
-
-            $ret0 += $x0 + $c;
-
-            $ret0 &= 0xffff;
-            $ret1 &= 0xffff;
-
-            $a1 = ($a1 << 1);
-            $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
-            $a0 &= 0xffff;
-            $a1 &= 0xffff;
-
-            $x0 = ($b0 & 1) << 16;
-            $b0 = ($b0 >> 1);
-            $b1 = (($b1 | $x0) >> 1);
-
-            $b0 &= 0xffff;
-            $b1 &= 0xffff;
-
-        }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
-
-        return $return;
-    }
-
-    /**
-     * OR this 32-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function orInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $return->limbs = array(
-            (int) ($this->limbs[0] | $b->limbs[0]),
-            (int) ($this->limbs[1] | $b->limbs[1])
-        );
-        /** @var int overflow */
-        $return->overflow = $this->overflow | $b->overflow;
-        return $return;
-    }
-
-    /**
-     * @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 $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     */
-    public function rotateLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 31;
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            /** @var int $c */
-
-            /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 1;
-
-            /** @var int $sub_shift */
-            $sub_shift = $c & 15;
-
-            /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
-
-            /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
-
-            for ($i = 1; $i >= 0; --$i) {
-                /** @var int $j */
-                $j = ($i + $idx_shift) & 1;
-                /** @var int $k */
-                $k = ($i + $idx_shift + 1) & 1;
-                $limbs[$i] = (int) (
-                    (
-                        ((int) ($myLimbs[$j]) << $sub_shift)
-                            |
-                        ((int) ($myLimbs[$k]) >> (16 - $sub_shift))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Rotate to the right
-     *
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     */
-    public function rotateRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 31;
-        /** @var int $c */
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            /** @var int $c */
-
-            /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 1;
-
-            /** @var int $sub_shift */
-            $sub_shift = $c & 15;
-
-            /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
-
-            /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
-
-            for ($i = 1; $i >= 0; --$i) {
-                /** @var int $j */
-                $j = ($i - $idx_shift) & 1;
-                /** @var int $k */
-                $k = ($i - $idx_shift - 1) & 1;
-                $limbs[$i] = (int) (
-                    (
-                        ((int) ($myLimbs[$j]) >> (int) ($sub_shift))
-                            |
-                        ((int) ($myLimbs[$k]) << (16 - (int) ($sub_shift)))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * @param bool $bool
-     * @return self
-     */
-    public function setUnsignedInt($bool = false)
-    {
-        $this->unsignedInt = !empty($bool);
-        return $this;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function shiftLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-        /** @var int $c */
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            /** @var int $c */
-            return $this->shiftRight(-$c);
-        } else {
-            /** @var int $c */
-            /** @var int $tmp */
-            $tmp = $this->limbs[1] << $c;
-            $return->limbs[1] = (int)($tmp & 0xffff);
-            /** @var int $carry */
-            $carry = $tmp >> 16;
-
-            /** @var int $tmp */
-            $tmp = ($this->limbs[0] << $c) | ($carry & 0xffff);
-            $return->limbs[0] = (int) ($tmp & 0xffff);
-        }
-        return $return;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
-     */
-    public function shiftRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-        /** @var int $c */
-        if ($c >= 16) {
-            $return->limbs = array(
-                (int) ($this->overflow & 0xffff),
-                (int) ($this->limbs[0])
-            );
-            $return->overflow = $this->overflow >> 16;
-            return $return->shiftRight($c & 15);
-        }
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            /** @var int $c */
-            return $this->shiftLeft(-$c);
-        } else {
-            if (!is_int($c)) {
-                throw new TypeError();
-            }
-            /** @var int $c */
-            // $return->limbs[0] = (int) (($this->limbs[0] >> $c) & 0xffff);
-            $carryLeft = (int) ($this->overflow & ((1 << ($c + 1)) - 1));
-            $return->limbs[0] = (int) ((($this->limbs[0] >> $c) | ($carryLeft << (16 - $c))) & 0xffff);
-            $carryRight = (int) ($this->limbs[0] & ((1 << ($c + 1)) - 1));
-            $return->limbs[1] = (int) ((($this->limbs[1] >> $c) | ($carryRight << (16 - $c))) & 0xffff);
-            $return->overflow >>= $c;
-        }
-        return $return;
-    }
-
-    /**
-     * Subtract a normal integer from an int32 object.
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function subInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        /** @var int $int */
-        $int = (int) $int;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[1] - ($int & 0xffff);
-        /** @var int $carry */
-        $carry = $tmp >> 16;
-        $return->limbs[1] = (int) ($tmp & 0xffff);
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[0] - (($int >> 16) & 0xffff) + $carry;
-        $return->limbs[0] = (int) ($tmp & 0xffff);
-        return $return;
-    }
-
-    /**
-     * Subtract two int32 objects from each other
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function subInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[1] - ($b->limbs[1] & 0xffff);
-        /** @var int $carry */
-        $carry = $tmp >> 16;
-        $return->limbs[1] = (int) ($tmp & 0xffff);
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[0] - ($b->limbs[0] & 0xffff) + $carry;
-        $return->limbs[0] = (int) ($tmp & 0xffff);
-        return $return;
-    }
-
-    /**
-     * XOR this 32-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $return->limbs = array(
-            (int) ($this->limbs[0] ^ $b->limbs[0]),
-            (int) ($this->limbs[1] ^ $b->limbs[1])
-        );
-        return $return;
-    }
-
-    /**
-     * @param int $signed
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromInt($signed)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($signed, 'int', 1);;
-        /** @var int $signed */
-        $signed = (int) $signed;
-
-        return new ParagonIE_Sodium_Core32_Int32(
-            array(
-                (int) (($signed >> 16) & 0xffff),
-                (int) ($signed & 0xffff)
-            )
-        );
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
-            throw new RangeException(
-                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int32();
-
-        $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 $return;
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromReverseString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
-            throw new RangeException(
-                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int32();
-
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
-        return $return;
-    }
-
-    /**
-     * @return array<int, int>
-     */
-    public function toArray()
-    {
-        return array((int) ($this->limbs[0] << 16 | $this->limbs[1]));
-    }
-
-    /**
-     * @return string
-     * @throws TypeError
-     */
-    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);
-    }
-
-    /**
-     * @return int
-     */
-    public function toInt()
-    {
-        return (int) (
-            (($this->limbs[0] & 0xffff) << 16)
-                |
-            ($this->limbs[1] & 0xffff)
-        );
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function toInt32()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs[0] = (int) ($this->limbs[0] & 0xffff);
-        $return->limbs[1] = (int) ($this->limbs[1] & 0xffff);
-        $return->unsignedInt = $this->unsignedInt;
-        $return->overflow = (int) ($this->overflow & 0x7fffffff);
-        return $return;
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function toInt64()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        if ($this->unsignedInt) {
-            $return->limbs[0] += (($this->overflow >> 16) & 0xffff);
-            $return->limbs[1] += (($this->overflow) & 0xffff);
-        } else {
-            $neg = -(($this->limbs[0] >> 15) & 1);
-            $return->limbs[0] = (int)($neg & 0xffff);
-            $return->limbs[1] = (int)($neg & 0xffff);
-        }
-        $return->limbs[2] = (int) ($this->limbs[0] & 0xffff);
-        $return->limbs[3] = (int) ($this->limbs[1] & 0xffff);
-        return $return;
-    }
-
-    /**
-     * @return string
-     * @throws TypeError
-     */
-    public function toReverseString()
-    {
-        return 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()
-    {
-        try {
-            return $this->toString();
-        } catch (TypeError $ex) {
-            // PHP engine can't handle exceptions from __toString()
-            return '';
-        }
-    }
+	/**
+	 * @var array<int, int> - two 16-bit integers
+	 *
+	 * 0 is the higher 16 bits
+	 * 1 is the lower 16 bits
+	 */
+	public $limbs = array(0, 0);
+
+	/**
+	 * @var int
+	 */
+	public $overflow = 0;
+
+	/**
+	 * @var bool
+	 */
+	public $unsignedInt = false;
+
+	/**
+	 * ParagonIE_Sodium_Core32_Int32 constructor.
+	 * @param array $array
+	 * @param bool $unsignedInt
+	 */
+	public function __construct($array = array(0, 0), $unsignedInt = false)
+	{
+		$this->limbs = array(
+			(int) $array[0],
+			(int) $array[1]
+		);
+		$this->overflow = 0;
+		$this->unsignedInt = $unsignedInt;
+	}
+
+	/**
+	 * Adds two int32 objects
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int32 $addend
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend)
+	{
+		$i0 = $this->limbs[0];
+		$i1 = $this->limbs[1];
+		$j0 = $addend->limbs[0];
+		$j1 = $addend->limbs[1];
+
+		$r1 = $i1 + ($j1 & 0xffff);
+		$carry = $r1 >> 16;
+
+		$r0 = $i0 + ($j0 & 0xffff) + $carry;
+		$carry = $r0 >> 16;
+
+		$r0 &= 0xffff;
+		$r1 &= 0xffff;
+
+		$return = new ParagonIE_Sodium_Core32_Int32(
+			array($r0, $r1)
+		);
+		$return->overflow = $carry;
+		$return->unsignedInt = $this->unsignedInt;
+		return $return;
+	}
+
+	/**
+	 * Adds a normal integer to an int32 object
+	 *
+	 * @param int $int
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public function addInt($int)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+		/** @var int $int */
+		$int = (int) $int;
+
+		$int = (int) $int;
+
+		$i0 = $this->limbs[0];
+		$i1 = $this->limbs[1];
+
+		$r1 = $i1 + ($int & 0xffff);
+		$carry = $r1 >> 16;
+
+		$r0 = $i0 + (($int >> 16) & 0xffff) + $carry;
+		$carry = $r0 >> 16;
+		$r0 &= 0xffff;
+		$r1 &= 0xffff;
+		$return = new ParagonIE_Sodium_Core32_Int32(
+			array($r0, $r1)
+		);
+		$return->overflow = $carry;
+		$return->unsignedInt = $this->unsignedInt;
+		return $return;
+	}
+
+	/**
+	 * @param int $b
+	 * @return int
+	 */
+	public function compareInt($b = 0)
+	{
+		$gt = 0;
+		$eq = 1;
+
+		$i = 2;
+		$j = 0;
+		while ($i > 0) {
+			--$i;
+			/** @var int $x1 */
+			$x1 = $this->limbs[$i];
+			/** @var int $x2 */
+			$x2 = ($b >> ($j << 4)) & 0xffff;
+			/** @var int $gt */
+			$gt |= (($x2 - $x1) >> 8) & $eq;
+			/** @var int $eq */
+			$eq &= (($x2 ^ $x1) - 1) >> 8;
+		}
+		return ($gt + $gt - $eq) + 1;
+	}
+
+	/**
+	 * @param int $m
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function mask($m = 0)
+	{
+		/** @var int $hi */
+		$hi = ($m >> 16) & 0xffff;
+		/** @var int $lo */
+		$lo = ($m & 0xffff);
+		return new ParagonIE_Sodium_Core32_Int32(
+			array(
+				(int) ($this->limbs[0] & $hi),
+				(int) ($this->limbs[1] & $lo)
+			),
+			$this->unsignedInt
+		);
+	}
+
+	/**
+	 * @param array<int, int> $a
+	 * @param array<int, int> $b
+	 * @param int $baseLog2
+	 * @return array<int, int>
+	 */
+	public function multiplyLong(array $a, array $b, $baseLog2 = 16)
+	{
+		$a_l = count($a);
+		$b_l = count($b);
+		/** @var array<int, int> $r */
+		$r = array_fill(0, $a_l + $b_l + 1, 0);
+		$base = 1 << $baseLog2;
+		for ($i = 0; $i < $a_l; ++$i) {
+			$a_i = $a[$i];
+			for ($j = 0; $j < $a_l; ++$j) {
+				$b_j = $b[$j];
+				$product = ($a_i * $b_j) + $r[$i + $j];
+				$carry = ($product >> $baseLog2 & 0xffff);
+				$r[$i + $j] = ($product - (int) ($carry * $base)) & 0xffff;
+				$r[$i + $j + 1] += $carry;
+			}
+		}
+		return array_slice($r, 0, 5);
+	}
+
+	/**
+	 * @param int $int
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function mulIntFast($int)
+	{
+		// Handle negative numbers
+		$aNeg = ($this->limbs[0] >> 15) & 1;
+		$bNeg = ($int >> 31) & 1;
+		$a = array_reverse($this->limbs);
+		$b = array(
+			$int & 0xffff,
+			($int >> 16) & 0xffff
+		);
+		if ($aNeg) {
+			for ($i = 0; $i < 2; ++$i) {
+				$a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
+			}
+			++$a[0];
+		}
+		if ($bNeg) {
+			for ($i = 0; $i < 2; ++$i) {
+				$b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
+			}
+			++$b[0];
+		}
+		// Multiply
+		$res = $this->multiplyLong($a, $b);
+
+		// Re-apply negation to results
+		if ($aNeg !== $bNeg) {
+			for ($i = 0; $i < 2; ++$i) {
+				$res[$i] = (0xffff ^ $res[$i]) & 0xffff;
+			}
+			// Handle integer overflow
+			$c = 1;
+			for ($i = 0; $i < 2; ++$i) {
+				$res[$i] += $c;
+				$c = $res[$i] >> 16;
+				$res[$i] &= 0xffff;
+			}
+		}
+
+		// Return our values
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->limbs = array(
+			$res[1] & 0xffff,
+			$res[0] & 0xffff
+		);
+		if (count($res) > 2) {
+			$return->overflow = $res[2] & 0xffff;
+		}
+		$return->unsignedInt = $this->unsignedInt;
+		return $return;
+	}
+
+	/**
+	 * @param ParagonIE_Sodium_Core32_Int32 $right
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function mulInt32Fast(ParagonIE_Sodium_Core32_Int32 $right)
+	{
+		$aNeg = ($this->limbs[0] >> 15) & 1;
+		$bNeg = ($right->limbs[0] >> 15) & 1;
+
+		$a = array_reverse($this->limbs);
+		$b = array_reverse($right->limbs);
+		if ($aNeg) {
+			for ($i = 0; $i < 2; ++$i) {
+				$a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
+			}
+			++$a[0];
+		}
+		if ($bNeg) {
+			for ($i = 0; $i < 2; ++$i) {
+				$b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
+			}
+			++$b[0];
+		}
+		$res = $this->multiplyLong($a, $b);
+		if ($aNeg !== $bNeg) {
+			if ($aNeg !== $bNeg) {
+				for ($i = 0; $i < 2; ++$i) {
+					$res[$i] = ($res[$i] ^ 0xffff) & 0xffff;
+				}
+				$c = 1;
+				for ($i = 0; $i < 2; ++$i) {
+					$res[$i] += $c;
+					$c = $res[$i] >> 16;
+					$res[$i] &= 0xffff;
+				}
+			}
+		}
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->limbs = array(
+			$res[1] & 0xffff,
+			$res[0] & 0xffff
+		);
+		if (count($res) > 2) {
+			$return->overflow = $res[2];
+		}
+		return $return;
+	}
+
+	/**
+	 * @param int $int
+	 * @param int $size
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public function mulInt($int = 0, $size = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+		ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+		if (ParagonIE_Sodium_Compat::$fastMult) {
+			return $this->mulIntFast((int) $int);
+		}
+		/** @var int $int */
+		$int = (int) $int;
+		/** @var int $size */
+		$size = (int) $size;
+
+		if (!$size) {
+			$size = 31;
+		}
+		/** @var int $size */
+
+		$a = clone $this;
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+
+		// Initialize:
+		$ret0 = 0;
+		$ret1 = 0;
+		$a0 = $a->limbs[0];
+		$a1 = $a->limbs[1];
+
+		/** @var int $size */
+		/** @var int $i */
+		for ($i = $size; $i >= 0; --$i) {
+			$m = (int) (-($int & 1));
+			$x0 = $a0 & $m;
+			$x1 = $a1 & $m;
+
+			$ret1 += $x1;
+			$c = $ret1 >> 16;
+
+			$ret0 += $x0 + $c;
+
+			$ret0 &= 0xffff;
+			$ret1 &= 0xffff;
+
+			$a1 = ($a1 << 1);
+			$x1 = $a1 >> 16;
+			$a0 = ($a0 << 1) | $x1;
+			$a0 &= 0xffff;
+			$a1 &= 0xffff;
+			$int >>= 1;
+		}
+		$return->limbs[0] = $ret0;
+		$return->limbs[1] = $ret1;
+		return $return;
+	}
+
+	/**
+	 * @param ParagonIE_Sodium_Core32_Int32 $int
+	 * @param int $size
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+		if (ParagonIE_Sodium_Compat::$fastMult) {
+			return $this->mulInt32Fast($int);
+		}
+		if (!$size) {
+			$size = 31;
+		}
+		/** @var int $size */
+
+		$a = clone $this;
+		$b = clone $int;
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+
+		// Initialize:
+		$ret0 = 0;
+		$ret1 = 0;
+		$a0 = $a->limbs[0];
+		$a1 = $a->limbs[1];
+		$b0 = $b->limbs[0];
+		$b1 = $b->limbs[1];
+
+		/** @var int $size */
+		/** @var int $i */
+		for ($i = $size; $i >= 0; --$i) {
+			$m = (int) (-($b1 & 1));
+			$x0 = $a0 & $m;
+			$x1 = $a1 & $m;
+
+			$ret1 += $x1;
+			$c = $ret1 >> 16;
+
+			$ret0 += $x0 + $c;
+
+			$ret0 &= 0xffff;
+			$ret1 &= 0xffff;
+
+			$a1 = ($a1 << 1);
+			$x1 = $a1 >> 16;
+			$a0 = ($a0 << 1) | $x1;
+			$a0 &= 0xffff;
+			$a1 &= 0xffff;
+
+			$x0 = ($b0 & 1) << 16;
+			$b0 = ($b0 >> 1);
+			$b1 = (($b1 | $x0) >> 1);
+
+			$b0 &= 0xffff;
+			$b1 &= 0xffff;
+
+		}
+		$return->limbs[0] = $ret0;
+		$return->limbs[1] = $ret1;
+
+		return $return;
+	}
+
+	/**
+	 * OR this 32-bit integer with another.
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int32 $b
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function orInt32(ParagonIE_Sodium_Core32_Int32 $b)
+	{
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+		$return->limbs = array(
+			(int) ($this->limbs[0] | $b->limbs[0]),
+			(int) ($this->limbs[1] | $b->limbs[1])
+		);
+		/** @var int overflow */
+		$return->overflow = $this->overflow | $b->overflow;
+		return $return;
+	}
+
+	/**
+	 * @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 $c
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArrayAccess
+	 */
+	public function rotateLeft($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+		/** @var int $c */
+		$c = (int) $c;
+
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+		$c &= 31;
+		if ($c === 0) {
+			// NOP, but we want a copy.
+			$return->limbs = $this->limbs;
+		} else {
+			/** @var int $c */
+
+			/** @var int $idx_shift */
+			$idx_shift = ($c >> 4) & 1;
+
+			/** @var int $sub_shift */
+			$sub_shift = $c & 15;
+
+			/** @var array<int, int> $limbs */
+			$limbs =& $return->limbs;
+
+			/** @var array<int, int> $myLimbs */
+			$myLimbs =& $this->limbs;
+
+			for ($i = 1; $i >= 0; --$i) {
+				/** @var int $j */
+				$j = ($i + $idx_shift) & 1;
+				/** @var int $k */
+				$k = ($i + $idx_shift + 1) & 1;
+				$limbs[$i] = (int) (
+					(
+						((int) ($myLimbs[$j]) << $sub_shift)
+							|
+						((int) ($myLimbs[$k]) >> (16 - $sub_shift))
+					) & 0xffff
+				);
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * Rotate to the right
+	 *
+	 * @param int $c
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArrayAccess
+	 */
+	public function rotateRight($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+		/** @var int $c */
+		$c = (int) $c;
+
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+		$c &= 31;
+		/** @var int $c */
+		if ($c === 0) {
+			// NOP, but we want a copy.
+			$return->limbs = $this->limbs;
+		} else {
+			/** @var int $c */
+
+			/** @var int $idx_shift */
+			$idx_shift = ($c >> 4) & 1;
+
+			/** @var int $sub_shift */
+			$sub_shift = $c & 15;
+
+			/** @var array<int, int> $limbs */
+			$limbs =& $return->limbs;
+
+			/** @var array<int, int> $myLimbs */
+			$myLimbs =& $this->limbs;
+
+			for ($i = 1; $i >= 0; --$i) {
+				/** @var int $j */
+				$j = ($i - $idx_shift) & 1;
+				/** @var int $k */
+				$k = ($i - $idx_shift - 1) & 1;
+				$limbs[$i] = (int) (
+					(
+						((int) ($myLimbs[$j]) >> (int) ($sub_shift))
+							|
+						((int) ($myLimbs[$k]) << (16 - (int) ($sub_shift)))
+					) & 0xffff
+				);
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * @param bool $bool
+	 * @return self
+	 */
+	public function setUnsignedInt($bool = false)
+	{
+		$this->unsignedInt = !empty($bool);
+		return $this;
+	}
+
+	/**
+	 * @param int $c
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public function shiftLeft($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+		/** @var int $c */
+		$c = (int) $c;
+
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+		$c &= 63;
+		/** @var int $c */
+		if ($c === 0) {
+			$return->limbs = $this->limbs;
+		} elseif ($c < 0) {
+			/** @var int $c */
+			return $this->shiftRight(-$c);
+		} else {
+			/** @var int $c */
+			/** @var int $tmp */
+			$tmp = $this->limbs[1] << $c;
+			$return->limbs[1] = (int)($tmp & 0xffff);
+			/** @var int $carry */
+			$carry = $tmp >> 16;
+
+			/** @var int $tmp */
+			$tmp = ($this->limbs[0] << $c) | ($carry & 0xffff);
+			$return->limbs[0] = (int) ($tmp & 0xffff);
+		}
+		return $return;
+	}
+
+	/**
+	 * @param int $c
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedOperand
+	 */
+	public function shiftRight($c = 0)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+		/** @var int $c */
+		$c = (int) $c;
+
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+		$c &= 63;
+		/** @var int $c */
+		if ($c >= 16) {
+			$return->limbs = array(
+				(int) ($this->overflow & 0xffff),
+				(int) ($this->limbs[0])
+			);
+			$return->overflow = $this->overflow >> 16;
+			return $return->shiftRight($c & 15);
+		}
+		if ($c === 0) {
+			$return->limbs = $this->limbs;
+		} elseif ($c < 0) {
+			/** @var int $c */
+			return $this->shiftLeft(-$c);
+		} else {
+			if (!is_int($c)) {
+				throw new TypeError();
+			}
+			/** @var int $c */
+			// $return->limbs[0] = (int) (($this->limbs[0] >> $c) & 0xffff);
+			$carryLeft = (int) ($this->overflow & ((1 << ($c + 1)) - 1));
+			$return->limbs[0] = (int) ((($this->limbs[0] >> $c) | ($carryLeft << (16 - $c))) & 0xffff);
+			$carryRight = (int) ($this->limbs[0] & ((1 << ($c + 1)) - 1));
+			$return->limbs[1] = (int) ((($this->limbs[1] >> $c) | ($carryRight << (16 - $c))) & 0xffff);
+			$return->overflow >>= $c;
+		}
+		return $return;
+	}
+
+	/**
+	 * Subtract a normal integer from an int32 object.
+	 *
+	 * @param int $int
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public function subInt($int)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+		/** @var int $int */
+		$int = (int) $int;
+
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+
+		/** @var int $tmp */
+		$tmp = $this->limbs[1] - ($int & 0xffff);
+		/** @var int $carry */
+		$carry = $tmp >> 16;
+		$return->limbs[1] = (int) ($tmp & 0xffff);
+
+		/** @var int $tmp */
+		$tmp = $this->limbs[0] - (($int >> 16) & 0xffff) + $carry;
+		$return->limbs[0] = (int) ($tmp & 0xffff);
+		return $return;
+	}
+
+	/**
+	 * Subtract two int32 objects from each other
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int32 $b
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function subInt32(ParagonIE_Sodium_Core32_Int32 $b)
+	{
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+
+		/** @var int $tmp */
+		$tmp = $this->limbs[1] - ($b->limbs[1] & 0xffff);
+		/** @var int $carry */
+		$carry = $tmp >> 16;
+		$return->limbs[1] = (int) ($tmp & 0xffff);
+
+		/** @var int $tmp */
+		$tmp = $this->limbs[0] - ($b->limbs[0] & 0xffff) + $carry;
+		$return->limbs[0] = (int) ($tmp & 0xffff);
+		return $return;
+	}
+
+	/**
+	 * XOR this 32-bit integer with another.
+	 *
+	 * @param ParagonIE_Sodium_Core32_Int32 $b
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b)
+	{
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->unsignedInt = $this->unsignedInt;
+		$return->limbs = array(
+			(int) ($this->limbs[0] ^ $b->limbs[0]),
+			(int) ($this->limbs[1] ^ $b->limbs[1])
+		);
+		return $return;
+	}
+
+	/**
+	 * @param int $signed
+	 * @return self
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function fromInt($signed)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($signed, 'int', 1);;
+		/** @var int $signed */
+		$signed = (int) $signed;
+
+		return new ParagonIE_Sodium_Core32_Int32(
+			array(
+				(int) (($signed >> 16) & 0xffff),
+				(int) ($signed & 0xffff)
+			)
+		);
+	}
+
+	/**
+	 * @param string $string
+	 * @return self
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function fromString($string)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+		$string = (string) $string;
+		if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
+			throw new RangeException(
+				'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+			);
+		}
+		$return = new ParagonIE_Sodium_Core32_Int32();
+
+		$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 $return;
+	}
+
+	/**
+	 * @param string $string
+	 * @return self
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function fromReverseString($string)
+	{
+		ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+		$string = (string) $string;
+		if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
+			throw new RangeException(
+				'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+			);
+		}
+		$return = new ParagonIE_Sodium_Core32_Int32();
+
+		$return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
+		$return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
+		$return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
+		$return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
+		return $return;
+	}
+
+	/**
+	 * @return array<int, int>
+	 */
+	public function toArray()
+	{
+		return array((int) ($this->limbs[0] << 16 | $this->limbs[1]));
+	}
+
+	/**
+	 * @return string
+	 * @throws TypeError
+	 */
+	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);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function toInt()
+	{
+		return (int) (
+			(($this->limbs[0] & 0xffff) << 16)
+				|
+			($this->limbs[1] & 0xffff)
+		);
+	}
+
+	/**
+	 * @return ParagonIE_Sodium_Core32_Int32
+	 */
+	public function toInt32()
+	{
+		$return = new ParagonIE_Sodium_Core32_Int32();
+		$return->limbs[0] = (int) ($this->limbs[0] & 0xffff);
+		$return->limbs[1] = (int) ($this->limbs[1] & 0xffff);
+		$return->unsignedInt = $this->unsignedInt;
+		$return->overflow = (int) ($this->overflow & 0x7fffffff);
+		return $return;
+	}
+
+	/**
+	 * @return ParagonIE_Sodium_Core32_Int64
+	 */
+	public function toInt64()
+	{
+		$return = new ParagonIE_Sodium_Core32_Int64();
+		$return->unsignedInt = $this->unsignedInt;
+		if ($this->unsignedInt) {
+			$return->limbs[0] += (($this->overflow >> 16) & 0xffff);
+			$return->limbs[1] += (($this->overflow) & 0xffff);
+		} else {
+			$neg = -(($this->limbs[0] >> 15) & 1);
+			$return->limbs[0] = (int)($neg & 0xffff);
+			$return->limbs[1] = (int)($neg & 0xffff);
+		}
+		$return->limbs[2] = (int) ($this->limbs[0] & 0xffff);
+		$return->limbs[3] = (int) ($this->limbs[1] & 0xffff);
+		return $return;
+	}
+
+	/**
+	 * @return string
+	 * @throws TypeError
+	 */
+	public function toReverseString()
+	{
+		return 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()
+	{
+		try {
+			return $this->toString();
+		} catch (TypeError $ex) {
+			// PHP engine can't handle exceptions from __toString()
+			return '';
+		}
+	}
 }

Spacing +252 added lines, -252 removed lines

@@ -15,7 +15,7 @@ 
      * 0 is the higher 16 bits
      * 1 is the lower 16 bits
      */
-    public $limbs = array(0, 0);
+    public $limbs = array( 0, 0 );
 
     /**
      * @var int
@@ -32,11 +32,11 @@ 
      * @param array $array
      * @param bool $unsignedInt
      */
-    public function __construct($array = array(0, 0), $unsignedInt = false)
+    public function __construct( $array = array( 0, 0 ), $unsignedInt = false )
     {
         $this->limbs = array(
-            (int) $array[0],
-            (int) $array[1]
+            (int)$array[ 0 ],
+            (int)$array[ 1 ]
         );
         $this->overflow = 0;
         $this->unsignedInt = $unsignedInt;
@@ -48,24 +48,24 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $addend
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend)
+    public function addInt32( ParagonIE_Sodium_Core32_Int32 $addend )
     {
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
-        $j0 = $addend->limbs[0];
-        $j1 = $addend->limbs[1];
+        $i0 = $this->limbs[ 0 ];
+        $i1 = $this->limbs[ 1 ];
+        $j0 = $addend->limbs[ 0 ];
+        $j1 = $addend->limbs[ 1 ];
 
-        $r1 = $i1 + ($j1 & 0xffff);
+        $r1 = $i1 + ( $j1 & 0xffff );
         $carry = $r1 >> 16;
 
-        $r0 = $i0 + ($j0 & 0xffff) + $carry;
+        $r0 = $i0 + ( $j0 & 0xffff ) + $carry;
         $carry = $r0 >> 16;
 
         $r0 &= 0xffff;
         $r1 &= 0xffff;
 
         $return = new ParagonIE_Sodium_Core32_Int32(
-            array($r0, $r1)
+            array( $r0, $r1 )
         );
         $return->overflow = $carry;
         $return->unsignedInt = $this->unsignedInt;
@@ -80,26 +80,26 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function addInt($int)
+    public function addInt( $int )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 );
         /** @var int $int */
-        $int = (int) $int;
+        $int = (int)$int;
 
-        $int = (int) $int;
+        $int = (int)$int;
 
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
+        $i0 = $this->limbs[ 0 ];
+        $i1 = $this->limbs[ 1 ];
 
-        $r1 = $i1 + ($int & 0xffff);
+        $r1 = $i1 + ( $int & 0xffff );
         $carry = $r1 >> 16;
 
-        $r0 = $i0 + (($int >> 16) & 0xffff) + $carry;
+        $r0 = $i0 + ( ( $int >> 16 ) & 0xffff ) + $carry;
         $carry = $r0 >> 16;
         $r0 &= 0xffff;
         $r1 &= 0xffff;
         $return = new ParagonIE_Sodium_Core32_Int32(
-            array($r0, $r1)
+            array( $r0, $r1 )
         );
         $return->overflow = $carry;
         $return->unsignedInt = $this->unsignedInt;
@@ -110,41 +110,41 @@ 
      * @param int $b
      * @return int
      */
-    public function compareInt($b = 0)
+    public function compareInt( $b = 0 )
     {
         $gt = 0;
         $eq = 1;
 
         $i = 2;
         $j = 0;
-        while ($i > 0) {
+        while ( $i > 0 ) {
             --$i;
             /** @var int $x1 */
-            $x1 = $this->limbs[$i];
+            $x1 = $this->limbs[ $i ];
             /** @var int $x2 */
-            $x2 = ($b >> ($j << 4)) & 0xffff;
+            $x2 = ( $b >> ( $j << 4 ) ) & 0xffff;
             /** @var int $gt */
-            $gt |= (($x2 - $x1) >> 8) & $eq;
+            $gt |= ( ( $x2 - $x1 ) >> 8 ) & $eq;
             /** @var int $eq */
-            $eq &= (($x2 ^ $x1) - 1) >> 8;
+            $eq &= ( ( $x2 ^ $x1 ) - 1 ) >> 8;
         }
-        return ($gt + $gt - $eq) + 1;
+        return ( $gt + $gt - $eq ) + 1;
     }
 
     /**
      * @param int $m
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function mask($m = 0)
+    public function mask( $m = 0 )
     {
         /** @var int $hi */
-        $hi = ($m >> 16) & 0xffff;
+        $hi = ( $m >> 16 ) & 0xffff;
         /** @var int $lo */
-        $lo = ($m & 0xffff);
+        $lo = ( $m & 0xffff );
         return new ParagonIE_Sodium_Core32_Int32(
             array(
-                (int) ($this->limbs[0] & $hi),
-                (int) ($this->limbs[1] & $lo)
+                (int)( $this->limbs[ 0 ] & $hi ),
+                (int)( $this->limbs[ 1 ] & $lo )
             ),
             $this->unsignedInt
         );
@@ -156,77 +156,77 @@ 
      * @param int $baseLog2
      * @return array<int, int>
      */
-    public function multiplyLong(array $a, array $b, $baseLog2 = 16)
+    public function multiplyLong( array $a, array $b, $baseLog2 = 16 )
     {
-        $a_l = count($a);
-        $b_l = count($b);
+        $a_l = count( $a );
+        $b_l = count( $b );
         /** @var array<int, int> $r */
-        $r = array_fill(0, $a_l + $b_l + 1, 0);
+        $r = array_fill( 0, $a_l + $b_l + 1, 0 );
         $base = 1 << $baseLog2;
-        for ($i = 0; $i < $a_l; ++$i) {
-            $a_i = $a[$i];
-            for ($j = 0; $j < $a_l; ++$j) {
-                $b_j = $b[$j];
-                $product = ($a_i * $b_j) + $r[$i + $j];
-                $carry = ($product >> $baseLog2 & 0xffff);
-                $r[$i + $j] = ($product - (int) ($carry * $base)) & 0xffff;
-                $r[$i + $j + 1] += $carry;
+        for ( $i = 0; $i < $a_l; ++$i ) {
+            $a_i = $a[ $i ];
+            for ( $j = 0; $j < $a_l; ++$j ) {
+                $b_j = $b[ $j ];
+                $product = ( $a_i * $b_j ) + $r[ $i + $j ];
+                $carry = ( $product >> $baseLog2 & 0xffff );
+                $r[ $i + $j ] = ( $product - (int)( $carry * $base ) ) & 0xffff;
+                $r[ $i + $j + 1 ] += $carry;
             }
         }
-        return array_slice($r, 0, 5);
+        return array_slice( $r, 0, 5 );
     }
 
     /**
      * @param int $int
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function mulIntFast($int)
+    public function mulIntFast( $int )
     {
         // Handle negative numbers
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($int >> 31) & 1;
-        $a = array_reverse($this->limbs);
+        $aNeg = ( $this->limbs[ 0 ] >> 15 ) & 1;
+        $bNeg = ( $int >> 31 ) & 1;
+        $a = array_reverse( $this->limbs );
         $b = array(
             $int & 0xffff,
-            ($int >> 16) & 0xffff
+            ( $int >> 16 ) & 0xffff
         );
-        if ($aNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
+        if ( $aNeg ) {
+            for ( $i = 0; $i < 2; ++$i ) {
+                $a[ $i ] = ( $a[ $i ] ^ 0xffff ) & 0xffff;
             }
-            ++$a[0];
+            ++$a[ 0 ];
         }
-        if ($bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
+        if ( $bNeg ) {
+            for ( $i = 0; $i < 2; ++$i ) {
+                $b[ $i ] = ( $b[ $i ] ^ 0xffff ) & 0xffff;
             }
-            ++$b[0];
+            ++$b[ 0 ];
         }
         // Multiply
-        $res = $this->multiplyLong($a, $b);
+        $res = $this->multiplyLong( $a, $b );
 
         // Re-apply negation to results
-        if ($aNeg !== $bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $res[$i] = (0xffff ^ $res[$i]) & 0xffff;
+        if ( $aNeg !== $bNeg ) {
+            for ( $i = 0; $i < 2; ++$i ) {
+                $res[ $i ] = ( 0xffff ^ $res[ $i ] ) & 0xffff;
             }
             // Handle integer overflow
             $c = 1;
-            for ($i = 0; $i < 2; ++$i) {
-                $res[$i] += $c;
-                $c = $res[$i] >> 16;
-                $res[$i] &= 0xffff;
+            for ( $i = 0; $i < 2; ++$i ) {
+                $res[ $i ] += $c;
+                $c = $res[ $i ] >> 16;
+                $res[ $i ] &= 0xffff;
             }
         }
 
         // Return our values
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->limbs = array(
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
+            $res[ 1 ] & 0xffff,
+            $res[ 0 ] & 0xffff
         );
-        if (count($res) > 2) {
-            $return->overflow = $res[2] & 0xffff;
+        if ( count( $res ) > 2 ) {
+            $return->overflow = $res[ 2 ] & 0xffff;
         }
         $return->unsignedInt = $this->unsignedInt;
         return $return;
@@ -236,46 +236,46 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $right
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function mulInt32Fast(ParagonIE_Sodium_Core32_Int32 $right)
+    public function mulInt32Fast( ParagonIE_Sodium_Core32_Int32 $right )
     {
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($right->limbs[0] >> 15) & 1;
-
-        $a = array_reverse($this->limbs);
-        $b = array_reverse($right->limbs);
-        if ($aNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
+        $aNeg = ( $this->limbs[ 0 ] >> 15 ) & 1;
+        $bNeg = ( $right->limbs[ 0 ] >> 15 ) & 1;
+
+        $a = array_reverse( $this->limbs );
+        $b = array_reverse( $right->limbs );
+        if ( $aNeg ) {
+            for ( $i = 0; $i < 2; ++$i ) {
+                $a[ $i ] = ( $a[ $i ] ^ 0xffff ) & 0xffff;
             }
-            ++$a[0];
+            ++$a[ 0 ];
         }
-        if ($bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
+        if ( $bNeg ) {
+            for ( $i = 0; $i < 2; ++$i ) {
+                $b[ $i ] = ( $b[ $i ] ^ 0xffff ) & 0xffff;
             }
-            ++$b[0];
+            ++$b[ 0 ];
         }
-        $res = $this->multiplyLong($a, $b);
-        if ($aNeg !== $bNeg) {
-            if ($aNeg !== $bNeg) {
-                for ($i = 0; $i < 2; ++$i) {
-                    $res[$i] = ($res[$i] ^ 0xffff) & 0xffff;
+        $res = $this->multiplyLong( $a, $b );
+        if ( $aNeg !== $bNeg ) {
+            if ( $aNeg !== $bNeg ) {
+                for ( $i = 0; $i < 2; ++$i ) {
+                    $res[ $i ] = ( $res[ $i ] ^ 0xffff ) & 0xffff;
                 }
                 $c = 1;
-                for ($i = 0; $i < 2; ++$i) {
-                    $res[$i] += $c;
-                    $c = $res[$i] >> 16;
-                    $res[$i] &= 0xffff;
+                for ( $i = 0; $i < 2; ++$i ) {
+                    $res[ $i ] += $c;
+                    $c = $res[ $i ] >> 16;
+                    $res[ $i ] &= 0xffff;
                 }
             }
         }
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->limbs = array(
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
+            $res[ 1 ] & 0xffff,
+            $res[ 0 ] & 0xffff
         );
-        if (count($res) > 2) {
-            $return->overflow = $res[2];
+        if ( count( $res ) > 2 ) {
+            $return->overflow = $res[ 2 ];
         }
         return $return;
     }
@@ -287,19 +287,19 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    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 (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulIntFast((int) $int);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 );
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $size, 'int', 2 );
+        if ( ParagonIE_Sodium_Compat::$fastMult ) {
+            return $this->mulIntFast( (int)$int );
         }
         /** @var int $int */
-        $int = (int) $int;
+        $int = (int)$int;
         /** @var int $size */
-        $size = (int) $size;
+        $size = (int)$size;
 
-        if (!$size) {
+        if ( ! $size ) {
             $size = 31;
         }
         /** @var int $size */
@@ -311,13 +311,13 @@ 
         // Initialize:
         $ret0 = 0;
         $ret1 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
+        $a0 = $a->limbs[ 0 ];
+        $a1 = $a->limbs[ 1 ];
 
         /** @var int $size */
         /** @var int $i */
-        for ($i = $size; $i >= 0; --$i) {
-            $m = (int) (-($int & 1));
+        for ( $i = $size; $i >= 0; --$i ) {
+            $m = (int)(-( $int & 1 ));
             $x0 = $a0 & $m;
             $x1 = $a1 & $m;
 
@@ -329,15 +329,15 @@ 
             $ret0 &= 0xffff;
             $ret1 &= 0xffff;
 
-            $a1 = ($a1 << 1);
+            $a1 = ( $a1 << 1 );
             $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
+            $a0 = ( $a0 << 1 ) | $x1;
             $a0 &= 0xffff;
             $a1 &= 0xffff;
             $int >>= 1;
         }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
+        $return->limbs[ 0 ] = $ret0;
+        $return->limbs[ 1 ] = $ret1;
         return $return;
     }
 
@@ -348,13 +348,13 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0)
+    public function mulInt32( ParagonIE_Sodium_Core32_Int32 $int, $size = 0 )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulInt32Fast($int);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $size, 'int', 2 );
+        if ( ParagonIE_Sodium_Compat::$fastMult ) {
+            return $this->mulInt32Fast( $int );
         }
-        if (!$size) {
+        if ( ! $size ) {
             $size = 31;
         }
         /** @var int $size */
@@ -367,15 +367,15 @@ 
         // Initialize:
         $ret0 = 0;
         $ret1 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
-        $b0 = $b->limbs[0];
-        $b1 = $b->limbs[1];
+        $a0 = $a->limbs[ 0 ];
+        $a1 = $a->limbs[ 1 ];
+        $b0 = $b->limbs[ 0 ];
+        $b1 = $b->limbs[ 1 ];
 
         /** @var int $size */
         /** @var int $i */
-        for ($i = $size; $i >= 0; --$i) {
-            $m = (int) (-($b1 & 1));
+        for ( $i = $size; $i >= 0; --$i ) {
+            $m = (int)(-( $b1 & 1 ));
             $x0 = $a0 & $m;
             $x1 = $a1 & $m;
 
@@ -387,22 +387,22 @@ 
             $ret0 &= 0xffff;
             $ret1 &= 0xffff;
 
-            $a1 = ($a1 << 1);
+            $a1 = ( $a1 << 1 );
             $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
+            $a0 = ( $a0 << 1 ) | $x1;
             $a0 &= 0xffff;
             $a1 &= 0xffff;
 
-            $x0 = ($b0 & 1) << 16;
-            $b0 = ($b0 >> 1);
-            $b1 = (($b1 | $x0) >> 1);
+            $x0 = ( $b0 & 1 ) << 16;
+            $b0 = ( $b0 >> 1 );
+            $b1 = ( ( $b1 | $x0 ) >> 1 );
 
             $b0 &= 0xffff;
             $b1 &= 0xffff;
 
         }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
+        $return->limbs[ 0 ] = $ret0;
+        $return->limbs[ 1 ] = $ret1;
 
         return $return;
     }
@@ -413,13 +413,13 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $b
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function orInt32(ParagonIE_Sodium_Core32_Int32 $b)
+    public function orInt32( ParagonIE_Sodium_Core32_Int32 $b )
     {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $return->limbs = array(
-            (int) ($this->limbs[0] | $b->limbs[0]),
-            (int) ($this->limbs[1] | $b->limbs[1])
+            (int)( $this->limbs[ 0 ] | $b->limbs[ 0 ] ),
+            (int)( $this->limbs[ 1 ] | $b->limbs[ 1 ] )
         );
         /** @var int overflow */
         $return->overflow = $this->overflow | $b->overflow;
@@ -430,18 +430,18 @@ 
      * @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;
     }
 
     /**
@@ -451,43 +451,43 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArrayAccess
      */
-    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 );
         /** @var int $c */
-        $c = (int) $c;
+        $c = (int)$c;
 
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $c &= 31;
-        if ($c === 0) {
+        if ( $c === 0 ) {
             // NOP, but we want a copy.
             $return->limbs = $this->limbs;
         } else {
             /** @var int $c */
 
             /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 1;
+            $idx_shift = ( $c >> 4 ) & 1;
 
             /** @var int $sub_shift */
             $sub_shift = $c & 15;
 
             /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
+            $limbs = & $return->limbs;
 
             /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
+            $myLimbs = & $this->limbs;
 
-            for ($i = 1; $i >= 0; --$i) {
+            for ( $i = 1; $i >= 0; --$i ) {
                 /** @var int $j */
-                $j = ($i + $idx_shift) & 1;
+                $j = ( $i + $idx_shift ) & 1;
                 /** @var int $k */
-                $k = ($i + $idx_shift + 1) & 1;
-                $limbs[$i] = (int) (
+                $k = ( $i + $idx_shift + 1 ) & 1;
+                $limbs[ $i ] = (int)(
                     (
-                        ((int) ($myLimbs[$j]) << $sub_shift)
+                        ( (int)( $myLimbs[ $j ] ) << $sub_shift )
                             |
-                        ((int) ($myLimbs[$k]) >> (16 - $sub_shift))
+                        ( (int)( $myLimbs[ $k ] ) >> ( 16 - $sub_shift ) )
                     ) & 0xffff
                 );
             }
@@ -504,44 +504,44 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArrayAccess
      */
-    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 );
         /** @var int $c */
-        $c = (int) $c;
+        $c = (int)$c;
 
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $c &= 31;
         /** @var int $c */
-        if ($c === 0) {
+        if ( $c === 0 ) {
             // NOP, but we want a copy.
             $return->limbs = $this->limbs;
         } else {
             /** @var int $c */
 
             /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 1;
+            $idx_shift = ( $c >> 4 ) & 1;
 
             /** @var int $sub_shift */
             $sub_shift = $c & 15;
 
             /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
+            $limbs = & $return->limbs;
 
             /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
+            $myLimbs = & $this->limbs;
 
-            for ($i = 1; $i >= 0; --$i) {
+            for ( $i = 1; $i >= 0; --$i ) {
                 /** @var int $j */
-                $j = ($i - $idx_shift) & 1;
+                $j = ( $i - $idx_shift ) & 1;
                 /** @var int $k */
-                $k = ($i - $idx_shift - 1) & 1;
-                $limbs[$i] = (int) (
+                $k = ( $i - $idx_shift - 1 ) & 1;
+                $limbs[ $i ] = (int)(
                     (
-                        ((int) ($myLimbs[$j]) >> (int) ($sub_shift))
+                        ( (int)( $myLimbs[ $j ] ) >> (int)( $sub_shift ) )
                             |
-                        ((int) ($myLimbs[$k]) << (16 - (int) ($sub_shift)))
+                        ( (int)( $myLimbs[ $k ] ) << ( 16 - (int)( $sub_shift ) ) )
                     ) & 0xffff
                 );
             }
@@ -553,9 +553,9 @@ 
      * @param bool $bool
      * @return self
      */
-    public function setUnsignedInt($bool = false)
+    public function setUnsignedInt( $bool = false )
     {
-        $this->unsignedInt = !empty($bool);
+        $this->unsignedInt = ! empty( $bool );
         return $this;
     }
 
@@ -565,32 +565,32 @@ 
      * @throws SodiumException
      * @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 );
         /** @var int $c */
-        $c = (int) $c;
+        $c = (int)$c;
 
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $c &= 63;
         /** @var int $c */
-        if ($c === 0) {
+        if ( $c === 0 ) {
             $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
+        } elseif ( $c < 0 ) {
             /** @var int $c */
             return $this->shiftRight(-$c);
         } else {
             /** @var int $c */
             /** @var int $tmp */
-            $tmp = $this->limbs[1] << $c;
-            $return->limbs[1] = (int)($tmp & 0xffff);
+            $tmp = $this->limbs[ 1 ] << $c;
+            $return->limbs[ 1 ] = (int)( $tmp & 0xffff );
             /** @var int $carry */
             $carry = $tmp >> 16;
 
             /** @var int $tmp */
-            $tmp = ($this->limbs[0] << $c) | ($carry & 0xffff);
-            $return->limbs[0] = (int) ($tmp & 0xffff);
+            $tmp = ( $this->limbs[ 0 ] << $c ) | ( $carry & 0xffff );
+            $return->limbs[ 0 ] = (int)( $tmp & 0xffff );
         }
         return $return;
     }
@@ -603,39 +603,39 @@ 
      * @psalm-suppress MixedAssignment
      * @psalm-suppress MixedOperand
      */
-    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 );
         /** @var int $c */
-        $c = (int) $c;
+        $c = (int)$c;
 
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $c &= 63;
         /** @var int $c */
-        if ($c >= 16) {
+        if ( $c >= 16 ) {
             $return->limbs = array(
-                (int) ($this->overflow & 0xffff),
-                (int) ($this->limbs[0])
+                (int)( $this->overflow & 0xffff ),
+                (int)( $this->limbs[ 0 ] )
             );
             $return->overflow = $this->overflow >> 16;
-            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 ) {
             /** @var int $c */
             return $this->shiftLeft(-$c);
         } else {
-            if (!is_int($c)) {
+            if ( ! is_int( $c ) ) {
                 throw new TypeError();
             }
             /** @var int $c */
             // $return->limbs[0] = (int) (($this->limbs[0] >> $c) & 0xffff);
-            $carryLeft = (int) ($this->overflow & ((1 << ($c + 1)) - 1));
-            $return->limbs[0] = (int) ((($this->limbs[0] >> $c) | ($carryLeft << (16 - $c))) & 0xffff);
-            $carryRight = (int) ($this->limbs[0] & ((1 << ($c + 1)) - 1));
-            $return->limbs[1] = (int) ((($this->limbs[1] >> $c) | ($carryRight << (16 - $c))) & 0xffff);
+            $carryLeft = (int)( $this->overflow & ( ( 1 << ( $c + 1 ) ) - 1 ) );
+            $return->limbs[ 0 ] = (int)( ( ( $this->limbs[ 0 ] >> $c ) | ( $carryLeft << ( 16 - $c ) ) ) & 0xffff );
+            $carryRight = (int)( $this->limbs[ 0 ] & ( ( 1 << ( $c + 1 ) ) - 1 ) );
+            $return->limbs[ 1 ] = (int)( ( ( $this->limbs[ 1 ] >> $c ) | ( $carryRight << ( 16 - $c ) ) ) & 0xffff );
             $return->overflow >>= $c;
         }
         return $return;
@@ -649,24 +649,24 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function subInt($int)
+    public function subInt( $int )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 );
         /** @var int $int */
-        $int = (int) $int;
+        $int = (int)$int;
 
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
 
         /** @var int $tmp */
-        $tmp = $this->limbs[1] - ($int & 0xffff);
+        $tmp = $this->limbs[ 1 ] - ( $int & 0xffff );
         /** @var int $carry */
         $carry = $tmp >> 16;
-        $return->limbs[1] = (int) ($tmp & 0xffff);
+        $return->limbs[ 1 ] = (int)( $tmp & 0xffff );
 
         /** @var int $tmp */
-        $tmp = $this->limbs[0] - (($int >> 16) & 0xffff) + $carry;
-        $return->limbs[0] = (int) ($tmp & 0xffff);
+        $tmp = $this->limbs[ 0 ] - ( ( $int >> 16 ) & 0xffff ) + $carry;
+        $return->limbs[ 0 ] = (int)( $tmp & 0xffff );
         return $return;
     }
 
@@ -676,20 +676,20 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $b
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function subInt32(ParagonIE_Sodium_Core32_Int32 $b)
+    public function subInt32( ParagonIE_Sodium_Core32_Int32 $b )
     {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
 
         /** @var int $tmp */
-        $tmp = $this->limbs[1] - ($b->limbs[1] & 0xffff);
+        $tmp = $this->limbs[ 1 ] - ( $b->limbs[ 1 ] & 0xffff );
         /** @var int $carry */
         $carry = $tmp >> 16;
-        $return->limbs[1] = (int) ($tmp & 0xffff);
+        $return->limbs[ 1 ] = (int)( $tmp & 0xffff );
 
         /** @var int $tmp */
-        $tmp = $this->limbs[0] - ($b->limbs[0] & 0xffff) + $carry;
-        $return->limbs[0] = (int) ($tmp & 0xffff);
+        $tmp = $this->limbs[ 0 ] - ( $b->limbs[ 0 ] & 0xffff ) + $carry;
+        $return->limbs[ 0 ] = (int)( $tmp & 0xffff );
         return $return;
     }
 
@@ -699,13 +699,13 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $b
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b)
+    public function xorInt32( ParagonIE_Sodium_Core32_Int32 $b )
     {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $return->limbs = array(
-            (int) ($this->limbs[0] ^ $b->limbs[0]),
-            (int) ($this->limbs[1] ^ $b->limbs[1])
+            (int)( $this->limbs[ 0 ] ^ $b->limbs[ 0 ] ),
+            (int)( $this->limbs[ 1 ] ^ $b->limbs[ 1 ] )
         );
         return $return;
     }
@@ -716,16 +716,16 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fromInt($signed)
+    public static function fromInt( $signed )
     {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($signed, 'int', 1);;
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $signed, 'int', 1 ); ;
         /** @var int $signed */
-        $signed = (int) $signed;
+        $signed = (int)$signed;
 
         return new ParagonIE_Sodium_Core32_Int32(
             array(
-                (int) (($signed >> 16) & 0xffff),
-                (int) ($signed & 0xffff)
+                (int)( ( $signed >> 16 ) & 0xffff ),
+                (int)( $signed & 0xffff )
             )
         );
     }
@@ -736,21 +736,21 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    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) !== 4) {
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $string, 'string', 1 );
+        $string = (string)$string;
+        if ( ParagonIE_Sodium_Core32_Util::strlen( $string ) !== 4 ) {
             throw new RangeException(
-                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen( $string ) . ' given.'
             );
         }
         $return = new ParagonIE_Sodium_Core32_Int32();
 
-        $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[ 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 $return;
     }
 
@@ -760,21 +760,21 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    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) !== 4) {
+        ParagonIE_Sodium_Core32_Util::declareScalarType( $string, 'string', 1 );
+        $string = (string)$string;
+        if ( ParagonIE_Sodium_Core32_Util::strlen( $string ) !== 4 ) {
             throw new RangeException(
-                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen( $string ) . ' given.'
             );
         }
         $return = new ParagonIE_Sodium_Core32_Int32();
 
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
+        $return->limbs[ 0 ]  = (int)( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 3 ] ) & 0xff ) << 8 );
+        $return->limbs[ 0 ] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 2 ] ) & 0xff );
+        $return->limbs[ 1 ]  = (int)( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 1 ] ) & 0xff ) << 8 );
+        $return->limbs[ 1 ] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 0 ] ) & 0xff );
         return $return;
     }
 
@@ -783,7 +783,7 @@ 
      */
     public function toArray()
     {
-        return array((int) ($this->limbs[0] << 16 | $this->limbs[1]));
+        return array( (int)( $this->limbs[ 0 ] << 16 | $this->limbs[ 1 ] ) );
     }
 
     /**
@@ -793,10 +793,10 @@ 
     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[ 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 );
     }
 
     /**
@@ -804,10 +804,10 @@ 
      */
     public function toInt()
     {
-        return (int) (
-            (($this->limbs[0] & 0xffff) << 16)
+        return (int)(
+            ( ( $this->limbs[ 0 ] & 0xffff ) << 16 )
                 |
-            ($this->limbs[1] & 0xffff)
+            ( $this->limbs[ 1 ] & 0xffff )
         );
     }
 
@@ -817,10 +817,10 @@ 
     public function toInt32()
     {
         $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs[0] = (int) ($this->limbs[0] & 0xffff);
-        $return->limbs[1] = (int) ($this->limbs[1] & 0xffff);
+        $return->limbs[ 0 ] = (int)( $this->limbs[ 0 ] & 0xffff );
+        $return->limbs[ 1 ] = (int)( $this->limbs[ 1 ] & 0xffff );
         $return->unsignedInt = $this->unsignedInt;
-        $return->overflow = (int) ($this->overflow & 0x7fffffff);
+        $return->overflow = (int)( $this->overflow & 0x7fffffff );
         return $return;
     }
 
@@ -831,16 +831,16 @@ 
     {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $return->unsignedInt = $this->unsignedInt;
-        if ($this->unsignedInt) {
-            $return->limbs[0] += (($this->overflow >> 16) & 0xffff);
-            $return->limbs[1] += (($this->overflow) & 0xffff);
+        if ( $this->unsignedInt ) {
+            $return->limbs[ 0 ] += ( ( $this->overflow >> 16 ) & 0xffff );
+            $return->limbs[ 1 ] += ( ( $this->overflow ) & 0xffff );
         } else {
-            $neg = -(($this->limbs[0] >> 15) & 1);
-            $return->limbs[0] = (int)($neg & 0xffff);
-            $return->limbs[1] = (int)($neg & 0xffff);
+            $neg = -( ( $this->limbs[ 0 ] >> 15 ) & 1 );
+            $return->limbs[ 0 ] = (int)( $neg & 0xffff );
+            $return->limbs[ 1 ] = (int)( $neg & 0xffff );
         }
-        $return->limbs[2] = (int) ($this->limbs[0] & 0xffff);
-        $return->limbs[3] = (int) ($this->limbs[1] & 0xffff);
+        $return->limbs[ 2 ] = (int)( $this->limbs[ 0 ] & 0xffff );
+        $return->limbs[ 3 ] = (int)( $this->limbs[ 1 ] & 0xffff );
         return $return;
     }
 
@@ -850,10 +850,10 @@ 
      */
     public function toReverseString()
     {
-        return 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[ 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 );
     }
 
     /**
@@ -863,7 +863,7 @@ 
     {
         try {
             return $this->toString();
-        } catch (TypeError $ex) {
+        } catch ( TypeError $ex ) {
             // PHP engine can't handle exceptions from __toString()
             return '';
         }

Braces +32 added lines, -64 removed lines

@@ -7,8 +7,7 @@ 
  *
  * These are immutable. It always returns a new instance.
  */
-class ParagonIE_Sodium_Core32_Int32
-{
+class ParagonIE_Sodium_Core32_Int32 {
     /**
      * @var array<int, int> - two 16-bit integers
      *
@@ -32,8 +31,7 @@ 
      * @param array $array
      * @param bool $unsignedInt
      */
-    public function __construct($array = array(0, 0), $unsignedInt = false)
-    {
+    public function __construct($array = array(0, 0), $unsignedInt = false) {
         $this->limbs = array(
             (int) $array[0],
             (int) $array[1]
@@ -48,8 +46,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $addend
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend)
-    {
+    public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend) {
         $i0 = $this->limbs[0];
         $i1 = $this->limbs[1];
         $j0 = $addend->limbs[0];
@@ -80,8 +77,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function addInt($int)
-    {
+    public function addInt($int) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
         /** @var int $int */
         $int = (int) $int;
@@ -110,8 +106,7 @@ 
      * @param int $b
      * @return int
      */
-    public function compareInt($b = 0)
-    {
+    public function compareInt($b = 0) {
         $gt = 0;
         $eq = 1;
 
@@ -135,8 +130,7 @@ 
      * @param int $m
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function mask($m = 0)
-    {
+    public function mask($m = 0) {
         /** @var int $hi */
         $hi = ($m >> 16) & 0xffff;
         /** @var int $lo */
@@ -156,8 +150,7 @@ 
      * @param int $baseLog2
      * @return array<int, int>
      */
-    public function multiplyLong(array $a, array $b, $baseLog2 = 16)
-    {
+    public function multiplyLong(array $a, array $b, $baseLog2 = 16) {
         $a_l = count($a);
         $b_l = count($b);
         /** @var array<int, int> $r */
@@ -180,8 +173,7 @@ 
      * @param int $int
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function mulIntFast($int)
-    {
+    public function mulIntFast($int) {
         // Handle negative numbers
         $aNeg = ($this->limbs[0] >> 15) & 1;
         $bNeg = ($int >> 31) & 1;
@@ -236,8 +228,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $right
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function mulInt32Fast(ParagonIE_Sodium_Core32_Int32 $right)
-    {
+    public function mulInt32Fast(ParagonIE_Sodium_Core32_Int32 $right) {
         $aNeg = ($this->limbs[0] >> 15) & 1;
         $bNeg = ($right->limbs[0] >> 15) & 1;
 
@@ -287,8 +278,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    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 (ParagonIE_Sodium_Compat::$fastMult) {
@@ -348,8 +338,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0)
-    {
+    public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
         if (ParagonIE_Sodium_Compat::$fastMult) {
             return $this->mulInt32Fast($int);
@@ -413,8 +402,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $b
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function orInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
+    public function orInt32(ParagonIE_Sodium_Core32_Int32 $b) {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $return->limbs = array(
@@ -430,8 +418,7 @@ 
      * @param int $b
      * @return bool
      */
-    public function isGreaterThan($b = 0)
-    {
+    public function isGreaterThan($b = 0) {
         return $this->compareInt($b) > 0;
     }
 
@@ -439,8 +426,7 @@ 
      * @param int $b
      * @return bool
      */
-    public function isLessThanInt($b = 0)
-    {
+    public function isLessThanInt($b = 0) {
         return $this->compareInt($b) < 0;
     }
 
@@ -451,8 +437,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArrayAccess
      */
-    public function rotateLeft($c = 0)
-    {
+    public function rotateLeft($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
         /** @var int $c */
         $c = (int) $c;
@@ -504,8 +489,7 @@ 
      * @throws TypeError
      * @psalm-suppress MixedArrayAccess
      */
-    public function rotateRight($c = 0)
-    {
+    public function rotateRight($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
         /** @var int $c */
         $c = (int) $c;
@@ -553,8 +537,7 @@ 
      * @param bool $bool
      * @return self
      */
-    public function setUnsignedInt($bool = false)
-    {
+    public function setUnsignedInt($bool = false) {
         $this->unsignedInt = !empty($bool);
         return $this;
     }
@@ -565,8 +548,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function shiftLeft($c = 0)
-    {
+    public function shiftLeft($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
         /** @var int $c */
         $c = (int) $c;
@@ -603,8 +585,7 @@ 
      * @psalm-suppress MixedAssignment
      * @psalm-suppress MixedOperand
      */
-    public function shiftRight($c = 0)
-    {
+    public function shiftRight($c = 0) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
         /** @var int $c */
         $c = (int) $c;
@@ -649,8 +630,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function subInt($int)
-    {
+    public function subInt($int) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
         /** @var int $int */
         $int = (int) $int;
@@ -676,8 +656,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $b
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function subInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
+    public function subInt32(ParagonIE_Sodium_Core32_Int32 $b) {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
 
@@ -699,8 +678,7 @@ 
      * @param ParagonIE_Sodium_Core32_Int32 $b
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
+    public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b) {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->unsignedInt = $this->unsignedInt;
         $return->limbs = array(
@@ -716,8 +694,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fromInt($signed)
-    {
+    public static function fromInt($signed) {
         ParagonIE_Sodium_Core32_Util::declareScalarType($signed, 'int', 1);;
         /** @var int $signed */
         $signed = (int) $signed;
@@ -736,8 +713,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    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) !== 4) {
@@ -760,8 +736,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    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) !== 4) {
@@ -781,8 +756,7 @@ 
     /**
      * @return array<int, int>
      */
-    public function toArray()
-    {
+    public function toArray() {
         return array((int) ($this->limbs[0] << 16 | $this->limbs[1]));
     }
 
@@ -790,8 +764,7 @@ 
      * @return string
      * @throws TypeError
      */
-    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) .
@@ -802,8 +775,7 @@ 
     /**
      * @return int
      */
-    public function toInt()
-    {
+    public function toInt() {
         return (int) (
             (($this->limbs[0] & 0xffff) << 16)
                 |
@@ -814,8 +786,7 @@ 
     /**
      * @return ParagonIE_Sodium_Core32_Int32
      */
-    public function toInt32()
-    {
+    public function toInt32() {
         $return = new ParagonIE_Sodium_Core32_Int32();
         $return->limbs[0] = (int) ($this->limbs[0] & 0xffff);
         $return->limbs[1] = (int) ($this->limbs[1] & 0xffff);
@@ -827,8 +798,7 @@ 
     /**
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public function toInt64()
-    {
+    public function toInt64() {
         $return = new ParagonIE_Sodium_Core32_Int64();
         $return->unsignedInt = $this->unsignedInt;
         if ($this->unsignedInt) {
@@ -848,8 +818,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public function toReverseString()
-    {
+    public function toReverseString() {
         return 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) .
@@ -859,8 +828,7 @@ 
     /**
      * @return string
      */
-    public function __toString()
-    {
+    public function __toString() {
         try {
             return $this->toString();
         } catch (TypeError $ex) {

vendor/paragonie/sodium_compat/src/Core32/Poly1305.php

Indentation +50 added lines, -50 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Poly1305', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,55 +9,55 @@ 
  */
 abstract class ParagonIE_Sodium_Core32_Poly1305 extends ParagonIE_Sodium_Core32_Util
 {
-    const BLOCK_SIZE = 16;
+	const BLOCK_SIZE = 16;
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $m
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function onetimeauth($m, $key)
-    {
-        if (self::strlen($key) < 32) {
-            throw new InvalidArgumentException(
-                'Key must be 32 bytes long.'
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            self::substr($key, 0, 32)
-        );
-        return $state
-            ->update($m)
-            ->finish();
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $m
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function onetimeauth($m, $key)
+	{
+		if (self::strlen($key) < 32) {
+			throw new InvalidArgumentException(
+				'Key must be 32 bytes long.'
+			);
+		}
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State(
+			self::substr($key, 0, 32)
+		);
+		return $state
+			->update($m)
+			->finish();
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $mac
-     * @param string $m
-     * @param string $key
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function onetimeauth_verify($mac, $m, $key)
-    {
-        if (self::strlen($key) < 32) {
-            throw new InvalidArgumentException(
-                'Key must be 32 bytes long.'
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            self::substr($key, 0, 32)
-        );
-        $calc = $state
-            ->update($m)
-            ->finish();
-        return self::verify_16($calc, $mac);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $mac
+	 * @param string $m
+	 * @param string $key
+	 * @return bool
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function onetimeauth_verify($mac, $m, $key)
+	{
+		if (self::strlen($key) < 32) {
+			throw new InvalidArgumentException(
+				'Key must be 32 bytes long.'
+			);
+		}
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State(
+			self::substr($key, 0, 32)
+		);
+		$calc = $state
+			->update($m)
+			->finish();
+		return self::verify_16($calc, $mac);
+	}
 }

Spacing +10 added lines, -10 removed lines

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

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_Poly1305
  */
-abstract class ParagonIE_Sodium_Core32_Poly1305 extends ParagonIE_Sodium_Core32_Util
-{
+abstract class ParagonIE_Sodium_Core32_Poly1305 extends ParagonIE_Sodium_Core32_Util {
     const BLOCK_SIZE = 16;
 
     /**
@@ -20,8 +19,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function onetimeauth($m, $key)
-    {
+    public static function onetimeauth($m, $key) {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'
@@ -45,8 +43,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function onetimeauth_verify($mac, $m, $key)
-    {
+    public static function onetimeauth_verify($mac, $m, $key) {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'

vendor/paragonie/sodium_compat/src/Core32/XSalsa20.php

Indentation +45 added lines, -45 removed lines

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

Spacing +6 added lines, -6 removed lines

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

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_XSalsa20
  */
-abstract class ParagonIE_Sodium_Core32_XSalsa20 extends ParagonIE_Sodium_Core32_HSalsa20
-{
+abstract class ParagonIE_Sodium_Core32_XSalsa20 extends ParagonIE_Sodium_Core32_HSalsa20 {
     /**
      * Expand a key and nonce into an xsalsa20 keystream.
      *
@@ -21,8 +20,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function xsalsa20($len, $nonce, $key)
-    {
+    public static function xsalsa20($len, $nonce, $key) {
         $ret = self::salsa20(
             $len,
             self::substr($nonce, 16, 8),
@@ -43,8 +41,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function xsalsa20_xor($message, $nonce, $key)
-    {
+    public static function xsalsa20_xor($message, $nonce, $key) {
         return self::xorStrings(
             $message,
             self::xsalsa20(

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

Indentation +287 added lines, -287 removed lines

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

Spacing +100 added lines, -100 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_ChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_ChaCha20', false ) ) {
     return;
 }
 
@@ -34,22 +34,22 @@ 
         /** @var ParagonIE_Sodium_Core32_Int32 $d */
 
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(16);
+        $a = $a->addInt32( $b );
+        $d = $d->xorInt32( $a )->rotateLeft( 16 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(12);
+        $c = $c->addInt32( $d );
+        $b = $b->xorInt32( $c )->rotateLeft( 12 );
 
         # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(8);
+        $a = $a->addInt32( $b );
+        $d = $d->xorInt32( $a )->rotateLeft( 8 );
 
         # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(7);
+        $c = $c->addInt32( $d );
+        $b = $b->xorInt32( $c )->rotateLeft( 7 );
 
-        return array($a, $b, $c, $d);
+        return array( $a, $b, $c, $d );
     }
 
     /**
@@ -66,7 +66,7 @@ 
         ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx,
         $message = ''
     ) {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
         /** @var ParagonIE_Sodium_Core32_Int32 $x1 */
@@ -104,54 +104,54 @@ 
         j15 = ctx->input[15];
         */
         /** @var ParagonIE_Sodium_Core32_Int32 $j0 */
-        $j0  = $ctx[0];
+        $j0  = $ctx[ 0 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j1 */
-        $j1  = $ctx[1];
+        $j1  = $ctx[ 1 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j2 */
-        $j2  = $ctx[2];
+        $j2  = $ctx[ 2 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j3 */
-        $j3  = $ctx[3];
+        $j3  = $ctx[ 3 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j4 */
-        $j4  = $ctx[4];
+        $j4  = $ctx[ 4 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j5 */
-        $j5  = $ctx[5];
+        $j5  = $ctx[ 5 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j6 */
-        $j6  = $ctx[6];
+        $j6  = $ctx[ 6 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j7 */
-        $j7  = $ctx[7];
+        $j7  = $ctx[ 7 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j8 */
-        $j8  = $ctx[8];
+        $j8  = $ctx[ 8 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j9 */
-        $j9  = $ctx[9];
+        $j9  = $ctx[ 9 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j10 */
-        $j10 = $ctx[10];
+        $j10 = $ctx[ 10 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j11 */
-        $j11 = $ctx[11];
+        $j11 = $ctx[ 11 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
-        $j12 = $ctx[12];
+        $j12 = $ctx[ 12 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j13 */
-        $j13 = $ctx[13];
+        $j13 = $ctx[ 13 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j14 */
-        $j14 = $ctx[14];
+        $j14 = $ctx[ 14 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $j15 */
-        $j15 = $ctx[15];
+        $j15 = $ctx[ 15 ];
 
         $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
+        for ( ;; ) {
+            if ( $bytes < 64 ) {
+                $message .= str_repeat( "\x00", 64 - $bytes );
             }
 
-            $x0 =  clone $j0;
-            $x1 =  clone $j1;
-            $x2 =  clone $j2;
-            $x3 =  clone $j3;
-            $x4 =  clone $j4;
-            $x5 =  clone $j5;
-            $x6 =  clone $j6;
-            $x7 =  clone $j7;
-            $x8 =  clone $j8;
-            $x9 =  clone $j9;
+            $x0 = clone $j0;
+            $x1 = clone $j1;
+            $x2 = clone $j2;
+            $x3 = clone $j3;
+            $x4 = clone $j4;
+            $x5 = clone $j5;
+            $x6 = clone $j6;
+            $x7 = clone $j7;
+            $x8 = clone $j8;
+            $x9 = clone $j9;
             $x10 = clone $j10;
             $x11 = clone $j11;
             $x12 = clone $j12;
@@ -160,30 +160,30 @@ 
             $x15 = clone $j15;
 
             # for (i = 20; i > 0; i -= 2) {
-            for ($i = 20; $i > 0; $i -= 2) {
+            for ( $i = 20; $i > 0; $i -= 2 ) {
                 # QUARTERROUND( x0,  x4,  x8,  x12)
-                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+                list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
 
                 # QUARTERROUND( x1,  x5,  x9,  x13)
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+                list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
 
                 # QUARTERROUND( x2,  x6,  x10,  x14)
-                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+                list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
 
                 # QUARTERROUND( x3,  x7,  x11,  x15)
-                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+                list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
 
                 # QUARTERROUND( x0,  x5,  x10,  x15)
-                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+                list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
 
                 # QUARTERROUND( x1,  x6,  x11,  x12)
-                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+                list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
 
                 # QUARTERROUND( x2,  x7,  x8,  x13)
-                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+                list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
 
                 # QUARTERROUND( x3,  x4,  x9,  x14)
-                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+                list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
             }
             /*
             x0 = PLUS(x0, j0);
@@ -203,22 +203,22 @@ 
             x14 = PLUS(x14, j14);
             x15 = PLUS(x15, j15);
             */
-            $x0 = $x0->addInt32($j0);
-            $x1 = $x1->addInt32($j1);
-            $x2 = $x2->addInt32($j2);
-            $x3 = $x3->addInt32($j3);
-            $x4 = $x4->addInt32($j4);
-            $x5 = $x5->addInt32($j5);
-            $x6 = $x6->addInt32($j6);
-            $x7 = $x7->addInt32($j7);
-            $x8 = $x8->addInt32($j8);
-            $x9 = $x9->addInt32($j9);
-            $x10 = $x10->addInt32($j10);
-            $x11 = $x11->addInt32($j11);
-            $x12 = $x12->addInt32($j12);
-            $x13 = $x13->addInt32($j13);
-            $x14 = $x14->addInt32($j14);
-            $x15 = $x15->addInt32($j15);
+            $x0 = $x0->addInt32( $j0 );
+            $x1 = $x1->addInt32( $j1 );
+            $x2 = $x2->addInt32( $j2 );
+            $x3 = $x3->addInt32( $j3 );
+            $x4 = $x4->addInt32( $j4 );
+            $x5 = $x5->addInt32( $j5 );
+            $x6 = $x6->addInt32( $j6 );
+            $x7 = $x7->addInt32( $j7 );
+            $x8 = $x8->addInt32( $j8 );
+            $x9 = $x9->addInt32( $j9 );
+            $x10 = $x10->addInt32( $j10 );
+            $x11 = $x11->addInt32( $j11 );
+            $x12 = $x12->addInt32( $j12 );
+            $x13 = $x13->addInt32( $j13 );
+            $x14 = $x14->addInt32( $j14 );
+            $x15 = $x15->addInt32( $j15 );
 
             /*
             x0 = XOR(x0, LOAD32_LE(m + 0));
@@ -238,22 +238,22 @@ 
             x14 = XOR(x14, LOAD32_LE(m + 56));
             x15 = XOR(x15, LOAD32_LE(m + 60));
             */
-            $x0  =  $x0->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  0, 4)));
-            $x1  =  $x1->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  4, 4)));
-            $x2  =  $x2->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  8, 4)));
-            $x3  =  $x3->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4)));
-            $x4  =  $x4->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 16, 4)));
-            $x5  =  $x5->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 20, 4)));
-            $x6  =  $x6->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 24, 4)));
-            $x7  =  $x7->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 28, 4)));
-            $x8  =  $x8->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 32, 4)));
-            $x9  =  $x9->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 36, 4)));
-            $x10 = $x10->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 40, 4)));
-            $x11 = $x11->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 44, 4)));
-            $x12 = $x12->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 48, 4)));
-            $x13 = $x13->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 52, 4)));
-            $x14 = $x14->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 56, 4)));
-            $x15 = $x15->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 60, 4)));
+            $x0  = $x0->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 0, 4 ) ) );
+            $x1  = $x1->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 4, 4 ) ) );
+            $x2  = $x2->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 8, 4 ) ) );
+            $x3  = $x3->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 12, 4 ) ) );
+            $x4  = $x4->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 16, 4 ) ) );
+            $x5  = $x5->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 20, 4 ) ) );
+            $x6  = $x6->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 24, 4 ) ) );
+            $x7  = $x7->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 28, 4 ) ) );
+            $x8  = $x8->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 32, 4 ) ) );
+            $x9  = $x9->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 36, 4 ) ) );
+            $x10 = $x10->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 40, 4 ) ) );
+            $x11 = $x11->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 44, 4 ) ) );
+            $x12 = $x12->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 48, 4 ) ) );
+            $x13 = $x13->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 52, 4 ) ) );
+            $x14 = $x14->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 56, 4 ) ) );
+            $x15 = $x15->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 60, 4 ) ) );
 
             /*
                 j12 = PLUSONE(j12);
@@ -262,9 +262,9 @@ 
                 }
              */
             /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
-            $j12 = $j12->addInt(1);
-            if ($j12->limbs[0] === 0 && $j12->limbs[1] === 0) {
-                $j13 = $j13->addInt(1);
+            $j12 = $j12->addInt( 1 );
+            if ( $j12->limbs[ 0 ] === 0 && $j12->limbs[ 1 ] === 0 ) {
+                $j13 = $j13->addInt( 1 );
             }
 
             /*
@@ -304,23 +304,23 @@ 
                 $x15->toReverseString();
 
             /* Partial block */
-            if ($bytes < 64) {
-                $c .= self::substr($block, 0, $bytes);
+            if ( $bytes < 64 ) {
+                $c .= self::substr( $block, 0, $bytes );
                 break;
             }
 
             /* Full block */
             $c .= $block;
             $bytes -= 64;
-            if ($bytes <= 0) {
+            if ( $bytes <= 0 ) {
                 break;
             }
-            $message = self::substr($message, 64);
+            $message = self::substr( $message, 64 );
         }
         /* end for(;;) loop */
 
-        $ctx[12] = $j12;
-        $ctx[13] = $j13;
+        $ctx[ 12 ] = $j12;
+        $ctx[ 13 ] = $j13;
         return $c;
     }
 
@@ -334,11 +334,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
+    public static function stream( $len = 64, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -352,11 +352,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStream($len, $nonce = '', $key = '')
+    public static function ietfStream( $len, $nonce = '', $key = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
-            str_repeat("\x00", $len)
+            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx( $key, $nonce ),
+            str_repeat( "\x00", $len )
         );
     }
 
@@ -371,10 +371,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function ietfStreamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx( $key, $nonce, $ic ),
             $message
         );
     }
@@ -390,10 +390,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' )
     {
         return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx( $key, $nonce, $ic ),
             $message
         );
     }

Braces +5 added lines, -10 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_ChaCha20
  */
-class ParagonIE_Sodium_Core32_ChaCha20 extends ParagonIE_Sodium_Core32_Util
-{
+class ParagonIE_Sodium_Core32_ChaCha20 extends ParagonIE_Sodium_Core32_Util {
     /**
      * The ChaCha20 quarter round function. Works on four 32-bit integers.
      *
@@ -334,8 +333,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
+    public static function stream($len = 64, $nonce = '', $key = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
             str_repeat("\x00", $len)
@@ -352,8 +350,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStream($len, $nonce = '', $key = '')
-    {
+    public static function ietfStream($len, $nonce = '', $key = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
             str_repeat("\x00", $len)
@@ -371,8 +368,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
             $message
@@ -390,8 +386,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '') {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
             $message

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

Indentation +104 added lines, -104 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_HChaCha20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,119 +9,119 @@ 
  */
 class ParagonIE_Sodium_Core32_HChaCha20 extends ParagonIE_Sodium_Core32_ChaCha20
 {
-    /**
-     * @param string $in
-     * @param string $key
-     * @param string|null $c
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function hChaCha20($in = '', $key = '', $c = null)
-    {
-        $ctx = array();
+	/**
+	 * @param string $in
+	 * @param string $key
+	 * @param string|null $c
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function hChaCha20($in = '', $key = '', $c = null)
+	{
+		$ctx = array();
 
-        if ($c === null) {
-            $ctx[0] = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $ctx[1] = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $ctx[2] = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $ctx[3] = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
-        } else {
-            $ctx[0] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $ctx[1] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $ctx[2] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $ctx[3] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
-        }
-        $ctx[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
-        $ctx[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
-        $ctx[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
-        $ctx[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
-        $ctx[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
-        $ctx[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
-        $ctx[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
-        $ctx[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
-        $ctx[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $ctx[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $ctx[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $ctx[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
+		if ($c === null) {
+			$ctx[0] = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+			$ctx[1] = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+			$ctx[2] = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+			$ctx[3] = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+		} else {
+			$ctx[0] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
+			$ctx[1] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
+			$ctx[2] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
+			$ctx[3] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+		}
+		$ctx[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
+		$ctx[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
+		$ctx[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
+		$ctx[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
+		$ctx[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
+		$ctx[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
+		$ctx[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
+		$ctx[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
+		$ctx[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
+		$ctx[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
+		$ctx[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
+		$ctx[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
 
-        return self::hChaCha20Bytes($ctx);
-    }
+		return self::hChaCha20Bytes($ctx);
+	}
 
-    /**
-     * @param array $ctx
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function hChaCha20Bytes(array $ctx)
-    {
-        /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
-        $x0  = $ctx[0];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x1 */
-        $x1  = $ctx[1];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x2 */
-        $x2  = $ctx[2];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x3 */
-        $x3  = $ctx[3];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x4 */
-        $x4  = $ctx[4];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x5 */
-        $x5  = $ctx[5];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x6 */
-        $x6  = $ctx[6];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x7 */
-        $x7  = $ctx[7];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x8 */
-        $x8  = $ctx[8];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x9 */
-        $x9  = $ctx[9];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x10 */
-        $x10 = $ctx[10];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x11 */
-        $x11 = $ctx[11];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x12 */
-        $x12 = $ctx[12];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x13 */
-        $x13 = $ctx[13];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x14 */
-        $x14 = $ctx[14];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x15 */
-        $x15 = $ctx[15];
+	/**
+	 * @param array $ctx
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	protected static function hChaCha20Bytes(array $ctx)
+	{
+		/** @var ParagonIE_Sodium_Core32_Int32 $x0 */
+		$x0  = $ctx[0];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x1 */
+		$x1  = $ctx[1];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x2 */
+		$x2  = $ctx[2];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x3 */
+		$x3  = $ctx[3];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x4 */
+		$x4  = $ctx[4];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x5 */
+		$x5  = $ctx[5];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x6 */
+		$x6  = $ctx[6];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x7 */
+		$x7  = $ctx[7];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x8 */
+		$x8  = $ctx[8];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x9 */
+		$x9  = $ctx[9];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x10 */
+		$x10 = $ctx[10];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x11 */
+		$x11 = $ctx[11];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x12 */
+		$x12 = $ctx[12];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x13 */
+		$x13 = $ctx[13];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x14 */
+		$x14 = $ctx[14];
+		/** @var ParagonIE_Sodium_Core32_Int32 $x15 */
+		$x15 = $ctx[15];
 
-        for ($i = 0; $i < 10; ++$i) {
-            # QUARTERROUND( x0,  x4,  x8,  x12)
-            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+		for ($i = 0; $i < 10; ++$i) {
+			# QUARTERROUND( x0,  x4,  x8,  x12)
+			list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
 
-            # QUARTERROUND( x1,  x5,  x9,  x13)
-            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+			# QUARTERROUND( x1,  x5,  x9,  x13)
+			list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
 
-            # QUARTERROUND( x2,  x6,  x10,  x14)
-            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+			# QUARTERROUND( x2,  x6,  x10,  x14)
+			list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
 
-            # QUARTERROUND( x3,  x7,  x11,  x15)
-            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+			# QUARTERROUND( x3,  x7,  x11,  x15)
+			list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
 
-            # QUARTERROUND( x0,  x5,  x10,  x15)
-            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+			# QUARTERROUND( x0,  x5,  x10,  x15)
+			list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
 
-            # QUARTERROUND( x1,  x6,  x11,  x12)
-            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+			# QUARTERROUND( x1,  x6,  x11,  x12)
+			list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
 
-            # QUARTERROUND( x2,  x7,  x8,  x13)
-            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+			# QUARTERROUND( x2,  x7,  x8,  x13)
+			list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
 
-            # QUARTERROUND( x3,  x4,  x9,  x14)
-            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
-        }
+			# QUARTERROUND( x3,  x4,  x9,  x14)
+			list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+		}
 
-        return $x0->toReverseString() .
-            $x1->toReverseString() .
-            $x2->toReverseString() .
-            $x3->toReverseString() .
-            $x12->toReverseString() .
-            $x13->toReverseString() .
-            $x14->toReverseString() .
-            $x15->toReverseString();
-    }
+		return $x0->toReverseString() .
+			$x1->toReverseString() .
+			$x2->toReverseString() .
+			$x3->toReverseString() .
+			$x12->toReverseString() .
+			$x13->toReverseString() .
+			$x14->toReverseString() .
+			$x15->toReverseString();
+	}
 }

Spacing +50 added lines, -50 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_HChaCha20', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_HChaCha20', false ) ) {
     return;
 }
 
@@ -17,35 +17,35 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function hChaCha20($in = '', $key = '', $c = null)
+    public static function hChaCha20( $in = '', $key = '', $c = null )
     {
         $ctx = array();
 
-        if ($c === null) {
-            $ctx[0] = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $ctx[1] = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $ctx[2] = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $ctx[3] = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        if ( $c === null ) {
+            $ctx[ 0 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x6170, 0x7865 ) );
+            $ctx[ 1 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x3320, 0x646e ) );
+            $ctx[ 2 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x7962, 0x2d32 ) );
+            $ctx[ 3 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x6b20, 0x6574 ) );
         } else {
-            $ctx[0] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $ctx[1] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $ctx[2] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $ctx[3] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+            $ctx[ 0 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 0, 4 ) );
+            $ctx[ 1 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 4, 4 ) );
+            $ctx[ 2 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 8, 4 ) );
+            $ctx[ 3 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 12, 4 ) );
         }
-        $ctx[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
-        $ctx[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
-        $ctx[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
-        $ctx[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
-        $ctx[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
-        $ctx[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
-        $ctx[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
-        $ctx[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
-        $ctx[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $ctx[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $ctx[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $ctx[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
+        $ctx[ 4 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 0, 4 ) );
+        $ctx[ 5 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 4, 4 ) );
+        $ctx[ 6 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 8, 4 ) );
+        $ctx[ 7 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 12, 4 ) );
+        $ctx[ 8 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 16, 4 ) );
+        $ctx[ 9 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 20, 4 ) );
+        $ctx[ 10 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 24, 4 ) );
+        $ctx[ 11 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 28, 4 ) );
+        $ctx[ 12 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 0, 4 ) );
+        $ctx[ 13 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 4, 4 ) );
+        $ctx[ 14 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 8, 4 ) );
+        $ctx[ 15 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 12, 4 ) );
 
-        return self::hChaCha20Bytes($ctx);
+        return self::hChaCha20Bytes( $ctx );
     }
 
     /**
@@ -54,65 +54,65 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function hChaCha20Bytes(array $ctx)
+    protected static function hChaCha20Bytes( array $ctx )
     {
         /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
-        $x0  = $ctx[0];
+        $x0  = $ctx[ 0 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x1 */
-        $x1  = $ctx[1];
+        $x1  = $ctx[ 1 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x2 */
-        $x2  = $ctx[2];
+        $x2  = $ctx[ 2 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x3 */
-        $x3  = $ctx[3];
+        $x3  = $ctx[ 3 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x4 */
-        $x4  = $ctx[4];
+        $x4  = $ctx[ 4 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x5 */
-        $x5  = $ctx[5];
+        $x5  = $ctx[ 5 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x6 */
-        $x6  = $ctx[6];
+        $x6  = $ctx[ 6 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x7 */
-        $x7  = $ctx[7];
+        $x7  = $ctx[ 7 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x8 */
-        $x8  = $ctx[8];
+        $x8  = $ctx[ 8 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x9 */
-        $x9  = $ctx[9];
+        $x9  = $ctx[ 9 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x10 */
-        $x10 = $ctx[10];
+        $x10 = $ctx[ 10 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x11 */
-        $x11 = $ctx[11];
+        $x11 = $ctx[ 11 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x12 */
-        $x12 = $ctx[12];
+        $x12 = $ctx[ 12 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x13 */
-        $x13 = $ctx[13];
+        $x13 = $ctx[ 13 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x14 */
-        $x14 = $ctx[14];
+        $x14 = $ctx[ 14 ];
         /** @var ParagonIE_Sodium_Core32_Int32 $x15 */
-        $x15 = $ctx[15];
+        $x15 = $ctx[ 15 ];
 
-        for ($i = 0; $i < 10; ++$i) {
+        for ( $i = 0; $i < 10; ++$i ) {
             # QUARTERROUND( x0,  x4,  x8,  x12)
-            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+            list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
 
             # QUARTERROUND( x1,  x5,  x9,  x13)
-            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+            list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
 
             # QUARTERROUND( x2,  x6,  x10,  x14)
-            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+            list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
 
             # QUARTERROUND( x3,  x7,  x11,  x15)
-            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+            list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
 
             # QUARTERROUND( x0,  x5,  x10,  x15)
-            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+            list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
 
             # QUARTERROUND( x1,  x6,  x11,  x12)
-            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+            list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
 
             # QUARTERROUND( x2,  x7,  x8,  x13)
-            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+            list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
 
             # QUARTERROUND( x3,  x4,  x9,  x14)
-            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+            list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
         }
 
         return $x0->toReverseString() .

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_HChaCha20
  */
-class ParagonIE_Sodium_Core32_HChaCha20 extends ParagonIE_Sodium_Core32_ChaCha20
-{
+class ParagonIE_Sodium_Core32_HChaCha20 extends ParagonIE_Sodium_Core32_ChaCha20 {
     /**
      * @param string $in
      * @param string $key
@@ -17,8 +16,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function hChaCha20($in = '', $key = '', $c = null)
-    {
+    public static function hChaCha20($in = '', $key = '', $c = null) {
         $ctx = array();
 
         if ($c === null) {
@@ -54,8 +52,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function hChaCha20Bytes(array $ctx)
-    {
+    protected static function hChaCha20Bytes(array $ctx) {
         /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
         $x0  = $ctx[0];
         /** @var ParagonIE_Sodium_Core32_Int32 $x1 */

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

Indentation +121 added lines, -121 removed lines

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

Spacing +58 added lines, -58 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_HSalsa20
  */
-abstract class ParagonIE_Sodium_Core32_HSalsa20 extends ParagonIE_Sodium_Core32_Salsa20
-{
+abstract class ParagonIE_Sodium_Core32_HSalsa20 extends ParagonIE_Sodium_Core32_Salsa20 {
     /**
      * Calculate an hsalsa20 hash of a single block
      *
@@ -24,8 +23,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function hsalsa20($in, $k, $c = null)
-    {
+    public static function hsalsa20($in, $k, $c = null) {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $x0
          * @var ParagonIE_Sodium_Core32_Int32 $x1

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

Indentation +440 added lines, -440 removed lines

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

Spacing +199 added lines, -199 removed lines

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

Braces +5 added lines, -10 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_Poly1305_State
  */
-class ParagonIE_Sodium_Core32_Poly1305_State extends ParagonIE_Sodium_Core32_Util
-{
+class ParagonIE_Sodium_Core32_Poly1305_State extends ParagonIE_Sodium_Core32_Util {
     /**
      * @var array<int, int>
      */
@@ -49,8 +48,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function __construct($key = '')
-    {
+    public function __construct($key = '') {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Poly1305 requires a 32-byte key'
@@ -117,8 +115,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function update($message = '')
-    {
+    public function update($message = '') {
         $bytes = self::strlen($message);
 
         /* handle leftover */
@@ -183,8 +180,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function blocks($message, $bytes)
-    {
+    public function blocks($message, $bytes) {
         if (self::strlen($message) < 16) {
             $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
         }
@@ -334,8 +330,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function finish()
-    {
+    public function finish() {
         /* process the remaining block */
         if ($this->leftover) {
             $i = $this->leftover;

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

Indentation +155 added lines, -155 removed lines

@@ -5,159 +5,159 @@
  */
 class ParagonIE_Sodium_Core32_SecretStream_State
 {
-    /** @var string $key */
-    protected $key;
-
-    /** @var int $counter */
-    protected $counter;
-
-    /** @var string $nonce */
-    protected $nonce;
-
-    /** @var string $_pad */
-    protected $_pad;
-
-    /**
-     * ParagonIE_Sodium_Core32_SecretStream_State constructor.
-     * @param string $key
-     * @param string|null $nonce
-     */
-    public function __construct($key, $nonce = null)
-    {
-        $this->key = $key;
-        $this->counter = 1;
-        if (is_null($nonce)) {
-            $nonce = str_repeat("\0", 12);
-        }
-        $this->nonce = str_pad($nonce, 12, "\0", STR_PAD_RIGHT);;
-        $this->_pad = str_repeat("\0", 4);
-    }
-
-    /**
-     * @return self
-     */
-    public function counterReset()
-    {
-        $this->counter = 1;
-        $this->_pad = str_repeat("\0", 4);
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCounter()
-    {
-        return ParagonIE_Sodium_Core32_Util::store32_le($this->counter);
-    }
-
-    /**
-     * @return string
-     */
-    public function getNonce()
-    {
-        if (!is_string($this->nonce)) {
-            $this->nonce = str_repeat("\0", 12);
-        }
-        if (ParagonIE_Sodium_Core32_Util::strlen($this->nonce) !== 12) {
-            $this->nonce = str_pad($this->nonce, 12, "\0", STR_PAD_RIGHT);
-        }
-        return $this->nonce;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCombinedNonce()
-    {
-        return $this->getCounter() .
-            ParagonIE_Sodium_Core32_Util::substr($this->getNonce(), 0, 8);
-    }
-
-    /**
-     * @return self
-     */
-    public function incrementCounter()
-    {
-        ++$this->counter;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function needsRekey()
-    {
-        return ($this->counter & 0xffff) === 0;
-    }
-
-    /**
-     * @param string $newKeyAndNonce
-     * @return self
-     */
-    public function rekey($newKeyAndNonce)
-    {
-        $this->key = ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 0, 32);
-        $this->nonce = str_pad(
-            ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 32),
-            12,
-            "\0",
-            STR_PAD_RIGHT
-        );
-        return $this;
-    }
-
-    /**
-     * @param string $str
-     * @return self
-     */
-    public function xorNonce($str)
-    {
-        $this->nonce = ParagonIE_Sodium_Core32_Util::xorStrings(
-            $this->getNonce(),
-            str_pad(
-                ParagonIE_Sodium_Core32_Util::substr($str, 0, 8),
-                12,
-                "\0",
-                STR_PAD_RIGHT
-            )
-        );
-        return $this;
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     */
-    public static function fromString($string)
-    {
-        $state = new ParagonIE_Sodium_Core32_SecretStream_State(
-            ParagonIE_Sodium_Core32_Util::substr($string, 0, 32)
-        );
-        $state->counter = ParagonIE_Sodium_Core32_Util::load_4(
-            ParagonIE_Sodium_Core32_Util::substr($string, 32, 4)
-        );
-        $state->nonce = ParagonIE_Sodium_Core32_Util::substr($string, 36, 12);
-        $state->_pad = ParagonIE_Sodium_Core32_Util::substr($string, 48, 8);
-        return $state;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->key .
-            $this->getCounter() .
-            $this->nonce .
-            $this->_pad;
-    }
+	/** @var string $key */
+	protected $key;
+
+	/** @var int $counter */
+	protected $counter;
+
+	/** @var string $nonce */
+	protected $nonce;
+
+	/** @var string $_pad */
+	protected $_pad;
+
+	/**
+	 * ParagonIE_Sodium_Core32_SecretStream_State constructor.
+	 * @param string $key
+	 * @param string|null $nonce
+	 */
+	public function __construct($key, $nonce = null)
+	{
+		$this->key = $key;
+		$this->counter = 1;
+		if (is_null($nonce)) {
+			$nonce = str_repeat("\0", 12);
+		}
+		$this->nonce = str_pad($nonce, 12, "\0", STR_PAD_RIGHT);;
+		$this->_pad = str_repeat("\0", 4);
+	}
+
+	/**
+	 * @return self
+	 */
+	public function counterReset()
+	{
+		$this->counter = 1;
+		$this->_pad = str_repeat("\0", 4);
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getKey()
+	{
+		return $this->key;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCounter()
+	{
+		return ParagonIE_Sodium_Core32_Util::store32_le($this->counter);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getNonce()
+	{
+		if (!is_string($this->nonce)) {
+			$this->nonce = str_repeat("\0", 12);
+		}
+		if (ParagonIE_Sodium_Core32_Util::strlen($this->nonce) !== 12) {
+			$this->nonce = str_pad($this->nonce, 12, "\0", STR_PAD_RIGHT);
+		}
+		return $this->nonce;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCombinedNonce()
+	{
+		return $this->getCounter() .
+			ParagonIE_Sodium_Core32_Util::substr($this->getNonce(), 0, 8);
+	}
+
+	/**
+	 * @return self
+	 */
+	public function incrementCounter()
+	{
+		++$this->counter;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function needsRekey()
+	{
+		return ($this->counter & 0xffff) === 0;
+	}
+
+	/**
+	 * @param string $newKeyAndNonce
+	 * @return self
+	 */
+	public function rekey($newKeyAndNonce)
+	{
+		$this->key = ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 0, 32);
+		$this->nonce = str_pad(
+			ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 32),
+			12,
+			"\0",
+			STR_PAD_RIGHT
+		);
+		return $this;
+	}
+
+	/**
+	 * @param string $str
+	 * @return self
+	 */
+	public function xorNonce($str)
+	{
+		$this->nonce = ParagonIE_Sodium_Core32_Util::xorStrings(
+			$this->getNonce(),
+			str_pad(
+				ParagonIE_Sodium_Core32_Util::substr($str, 0, 8),
+				12,
+				"\0",
+				STR_PAD_RIGHT
+			)
+		);
+		return $this;
+	}
+
+	/**
+	 * @param string $string
+	 * @return self
+	 */
+	public static function fromString($string)
+	{
+		$state = new ParagonIE_Sodium_Core32_SecretStream_State(
+			ParagonIE_Sodium_Core32_Util::substr($string, 0, 32)
+		);
+		$state->counter = ParagonIE_Sodium_Core32_Util::load_4(
+			ParagonIE_Sodium_Core32_Util::substr($string, 32, 4)
+		);
+		$state->nonce = ParagonIE_Sodium_Core32_Util::substr($string, 36, 12);
+		$state->_pad = ParagonIE_Sodium_Core32_Util::substr($string, 48, 8);
+		return $state;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function toString()
+	{
+		return $this->key .
+			$this->getCounter() .
+			$this->nonce .
+			$this->_pad;
+	}
 }

Spacing +23 added lines, -23 removed lines

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

Braces +13 added lines, -26 removed lines

@@ -3,8 +3,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_SecretStream_State
  */
-class ParagonIE_Sodium_Core32_SecretStream_State
-{
+class ParagonIE_Sodium_Core32_SecretStream_State {
     /** @var string $key */
     protected $key;
 
@@ -22,8 +21,7 @@ 
      * @param string $key
      * @param string|null $nonce
      */
-    public function __construct($key, $nonce = null)
-    {
+    public function __construct($key, $nonce = null) {
         $this->key = $key;
         $this->counter = 1;
         if (is_null($nonce)) {
@@ -36,8 +34,7 @@ 
     /**
      * @return self
      */
-    public function counterReset()
-    {
+    public function counterReset() {
         $this->counter = 1;
         $this->_pad = str_repeat("\0", 4);
         return $this;
@@ -46,24 +43,21 @@ 
     /**
      * @return string
      */
-    public function getKey()
-    {
+    public function getKey() {
         return $this->key;
     }
 
     /**
      * @return string
      */
-    public function getCounter()
-    {
+    public function getCounter() {
         return ParagonIE_Sodium_Core32_Util::store32_le($this->counter);
     }
 
     /**
      * @return string
      */
-    public function getNonce()
-    {
+    public function getNonce() {
         if (!is_string($this->nonce)) {
             $this->nonce = str_repeat("\0", 12);
         }
@@ -76,8 +70,7 @@ 
     /**
      * @return string
      */
-    public function getCombinedNonce()
-    {
+    public function getCombinedNonce() {
         return $this->getCounter() .
             ParagonIE_Sodium_Core32_Util::substr($this->getNonce(), 0, 8);
     }
@@ -85,8 +78,7 @@ 
     /**
      * @return self
      */
-    public function incrementCounter()
-    {
+    public function incrementCounter() {
         ++$this->counter;
         return $this;
     }
@@ -94,8 +86,7 @@ 
     /**
      * @return bool
      */
-    public function needsRekey()
-    {
+    public function needsRekey() {
         return ($this->counter & 0xffff) === 0;
     }
 
@@ -103,8 +94,7 @@ 
      * @param string $newKeyAndNonce
      * @return self
      */
-    public function rekey($newKeyAndNonce)
-    {
+    public function rekey($newKeyAndNonce) {
         $this->key = ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 0, 32);
         $this->nonce = str_pad(
             ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 32),
@@ -119,8 +109,7 @@ 
      * @param string $str
      * @return self
      */
-    public function xorNonce($str)
-    {
+    public function xorNonce($str) {
         $this->nonce = ParagonIE_Sodium_Core32_Util::xorStrings(
             $this->getNonce(),
             str_pad(
@@ -137,8 +126,7 @@ 
      * @param string $string
      * @return self
      */
-    public static function fromString($string)
-    {
+    public static function fromString($string) {
         $state = new ParagonIE_Sodium_Core32_SecretStream_State(
             ParagonIE_Sodium_Core32_Util::substr($string, 0, 32)
         );
@@ -153,8 +141,7 @@ 
     /**
      * @return string
      */
-    public function toString()
-    {
+    public function toString() {
         return $this->key .
             $this->getCounter() .
             $this->nonce .