WordPoints / wordpoints

src/library/sodium_compat/src/Core32/Poly1305.php

Indentation +46 added lines, -46 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Poly1305', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,51 +9,51 @@ 
  */
 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
-     */
-    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
+	 */
+	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
-     */
-    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
+	 */
+	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;
 }
 
@@ -18,18 +18,18 @@ 
      * @param string $key
      * @return string
      */
-    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();
     }
 
@@ -41,19 +41,19 @@ 
      * @param string $key
      * @return bool
      */
-    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;
 
     /**
@@ -18,8 +17,7 @@ 
      * @param string $key
      * @return string
      */
-    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.'
@@ -41,8 +39,7 @@ 
      * @param string $key
      * @return bool
      */
-    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.'

src/library/sodium_compat/src/Core32/Ed25519.php

Indentation +407 added lines, -407 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Ed25519', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,410 +9,410 @@ 
  */
 abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_Curve25519
 {
-    const KEYPAIR_BYTES = 96;
-    const SEED_BYTES = 32;
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return string (96 bytes)
-     */
-    public static function keypair()
-    {
-        $seed = random_bytes(self::SEED_BYTES);
-        $pk = '';
-        $sk = '';
-        self::seed_keypair($pk, $sk, $seed);
-        return $sk . $pk;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $pk
-     * @param string $sk
-     * @param string $seed
-     * @return string
-     */
-    public static function seed_keypair(&$pk, &$sk, $seed)
-    {
-        if (self::strlen($seed) !== self::SEED_BYTES) {
-            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
-        }
-
-        /** @var string $pk */
-        $pk = self::publickey_from_secretkey($seed);
-        $sk = $seed . $pk;
-        return $sk;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $keypair
-     * @return string
-     */
-    public static function secretkey($keypair)
-    {
-        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
-            throw new RangeException('crypto_sign keypair must be 96 bytes long');
-        }
-        return self::substr($keypair, 0, 64);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $keypair
-     * @return string
-     */
-    public static function publickey($keypair)
-    {
-        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
-            throw new RangeException('crypto_sign keypair must be 96 bytes long');
-        }
-        return self::substr($keypair, 64, 32);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $sk
-     * @return string
-     */
-    public static function publickey_from_secretkey($sk)
-    {
-        /** @var string $sk */
-        $sk = hash('sha512', self::substr($sk, 0, 32), true);
-        $sk[0] = self::intToChr(
-            self::chrToInt($sk[0]) & 248
-        );
-        $sk[31] = self::intToChr(
-            (self::chrToInt($sk[31]) & 63) | 64
-        );
-        return self::sk_to_pk($sk);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $sk
-     * @return string
-     */
-    public static function sk_to_pk($sk)
-    {
-        return self::ge_p3_tobytes(
-            self::ge_scalarmult_base(
-                self::substr($sk, 0, 32)
-            )
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    public static function sign($message, $sk)
-    {
-        /** @var string $signature */
-        $signature = self::sign_detached($message, $sk);
-        return $signature . $message;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message A signed message
-     * @param string $pk      Public key
-     * @return string         Message (without signature)
-     * @throws Exception
-     */
-    public static function sign_open($message, $pk)
-    {
-        /** @var string $signature */
-        $signature = self::substr($message, 0, 64);
-
-        /** @var string $message */
-        $message = self::substr($message, 64);
-
-        if (self::verify_detached($signature, $message, $pk)) {
-            return $message;
-        }
-        throw new Exception('Invalid signature');
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    public static function sign_detached($message, $sk)
-    {
-        # crypto_hash_sha512(az, sk, 32);
-        $az =  hash('sha512', self::substr($sk, 0, 32), true);
-
-        # az[0] &= 248;
-        # az[31] &= 63;
-        # az[31] |= 64;
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
-
-        # crypto_hash_sha512_init(&hs);
-        # crypto_hash_sha512_update(&hs, az + 32, 32);
-        # crypto_hash_sha512_update(&hs, m, mlen);
-        # crypto_hash_sha512_final(&hs, nonce);
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($az, 32, 32));
-        hash_update($hs, $message);
-        $nonceHash = hash_final($hs, true);
-
-        # memmove(sig + 32, sk + 32, 32);
-        $pk = self::substr($sk, 32, 32);
-
-        # sc_reduce(nonce);
-        # ge_scalarmult_base(&R, nonce);
-        # ge_p3_tobytes(sig, &R);
-        $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
-        $sig = self::ge_p3_tobytes(
-            self::ge_scalarmult_base($nonce)
-        );
-
-        # crypto_hash_sha512_init(&hs);
-        # crypto_hash_sha512_update(&hs, sig, 64);
-        # crypto_hash_sha512_update(&hs, m, mlen);
-        # crypto_hash_sha512_final(&hs, hram);
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($sig, 0, 32));
-        hash_update($hs, self::substr($pk, 0, 32));
-        hash_update($hs, $message);
-        $hramHash = hash_final($hs, true);
-
-        # sc_reduce(hram);
-        # sc_muladd(sig + 32, hram, az, nonce);
-        $hram = self::sc_reduce($hramHash);
-        $sigAfter = self::sc_muladd($hram, $az, $nonce);
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
-
-        try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (Error $ex) {
-            $az = null;
-        }
-        return $sig;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $sig
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     * @throws Exception
-     */
-    public static function verify_detached($sig, $message, $pk)
-    {
-        if (self::strlen($sig) < 64) {
-            throw new Exception('Signature is too short');
-        }
-        if (self::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new Exception('S < L - Invalid signature');
-        }
-        if (self::small_order($sig)) {
-            throw new Exception('Signature is on too small of an order');
-        }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new Exception('Invalid signature');
-        }
-        $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($pk[$i]);
-        }
-        if ($d === 0) {
-            throw new Exception('All zero public key');
-        }
-
-        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
-        $orig = ParagonIE_Sodium_Compat::$fastMult;
-
-        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
-        ParagonIE_Sodium_Compat::$fastMult = true;
-
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
-        $A = self::ge_frombytes_negate_vartime($pk);
-
-        /** @var string $hDigest */
-        $hDigest = hash(
-            'sha512',
-            self::substr($sig, 0, 32) .
-            self::substr($pk, 0, 32) .
-            $message,
-            true
-        );
-
-        /** @var string $h */
-        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
-
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
-        $R = self::ge_double_scalarmult_vartime(
-            $h,
-            $A,
-            self::substr($sig, 32)
-        );
-
-        /** @var string $rcheck */
-        $rcheck = self::ge_tobytes($R);
-
-        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
-        ParagonIE_Sodium_Compat::$fastMult = $orig;
-
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $S
-     * @return bool
-     * @throws Exception
-     */
-    public static function check_S_lt_L($S)
-    {
-        if (self::strlen($S) < 32) {
-            throw new Exception('Signature must be 32 bytes');
-        }
-        static $L = array(
-            0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
-            0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
-        );
-        $c = 0;
-        $n = 1;
-        $i = 32;
-
-        do {
-            --$i;
-            $x = self::chrToInt($S[$i]);
-            $c |= (
-                (($x - $L[$i]) >> 8) & $n
-            );
-            $n &= (
-                (($x ^ $L[$i]) - 1) >> 8
-            );
-        } while ($i !== 0);
-
-        return $c === 0;
-    }
-
-    /**
-     * @param string $R
-     * @return bool
-     */
-    public static function small_order($R)
-    {
-        static $blacklist = array(
-            /* 0 (order 4) */
-            array(
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            ),
-            /* 1 (order 1) */
-            array(
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            ),
-            /* 2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
-            array(
-                0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
-                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
-                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
-                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05
-            ),
-            /* 55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
-            array(
-                0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
-                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
-                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
-                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a
-            ),
-            /* p-1 (order 2) */
-            array(
-                0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
-                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
-                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
-                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85
-            ),
-            /* p (order 4) */
-            array(
-                0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
-                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
-                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
-                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa
-            ),
-            /* p+1 (order 1) */
-            array(
-                0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
-            ),
-            /* p+2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
-            array(
-                0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
-            ),
-            /* p+55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
-            array(
-                0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
-            ),
-            /* 2p-1 (order 2) */
-            array(
-                0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            ),
-            /* 2p (order 4) */
-            array(
-                0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            ),
-            /* 2p+1 (order 1) */
-            array(
-                0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            )
-        );
-        $countBlacklist = count($blacklist);
-
-        for ($i = 0; $i < $countBlacklist; ++$i) {
-            $c = 0;
-            for ($j = 0; $j < 32; ++$j) {
-                $c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
-            }
-            if ($c === 0) {
-                return true;
-            }
-        }
-        return false;
-    }
+	const KEYPAIR_BYTES = 96;
+	const SEED_BYTES = 32;
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return string (96 bytes)
+	 */
+	public static function keypair()
+	{
+		$seed = random_bytes(self::SEED_BYTES);
+		$pk = '';
+		$sk = '';
+		self::seed_keypair($pk, $sk, $seed);
+		return $sk . $pk;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $pk
+	 * @param string $sk
+	 * @param string $seed
+	 * @return string
+	 */
+	public static function seed_keypair(&$pk, &$sk, $seed)
+	{
+		if (self::strlen($seed) !== self::SEED_BYTES) {
+			throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
+		}
+
+		/** @var string $pk */
+		$pk = self::publickey_from_secretkey($seed);
+		$sk = $seed . $pk;
+		return $sk;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $keypair
+	 * @return string
+	 */
+	public static function secretkey($keypair)
+	{
+		if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+			throw new RangeException('crypto_sign keypair must be 96 bytes long');
+		}
+		return self::substr($keypair, 0, 64);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $keypair
+	 * @return string
+	 */
+	public static function publickey($keypair)
+	{
+		if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+			throw new RangeException('crypto_sign keypair must be 96 bytes long');
+		}
+		return self::substr($keypair, 64, 32);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $sk
+	 * @return string
+	 */
+	public static function publickey_from_secretkey($sk)
+	{
+		/** @var string $sk */
+		$sk = hash('sha512', self::substr($sk, 0, 32), true);
+		$sk[0] = self::intToChr(
+			self::chrToInt($sk[0]) & 248
+		);
+		$sk[31] = self::intToChr(
+			(self::chrToInt($sk[31]) & 63) | 64
+		);
+		return self::sk_to_pk($sk);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $sk
+	 * @return string
+	 */
+	public static function sk_to_pk($sk)
+	{
+		return self::ge_p3_tobytes(
+			self::ge_scalarmult_base(
+				self::substr($sk, 0, 32)
+			)
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	public static function sign($message, $sk)
+	{
+		/** @var string $signature */
+		$signature = self::sign_detached($message, $sk);
+		return $signature . $message;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message A signed message
+	 * @param string $pk      Public key
+	 * @return string         Message (without signature)
+	 * @throws Exception
+	 */
+	public static function sign_open($message, $pk)
+	{
+		/** @var string $signature */
+		$signature = self::substr($message, 0, 64);
+
+		/** @var string $message */
+		$message = self::substr($message, 64);
+
+		if (self::verify_detached($signature, $message, $pk)) {
+			return $message;
+		}
+		throw new Exception('Invalid signature');
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	public static function sign_detached($message, $sk)
+	{
+		# crypto_hash_sha512(az, sk, 32);
+		$az =  hash('sha512', self::substr($sk, 0, 32), true);
+
+		# az[0] &= 248;
+		# az[31] &= 63;
+		# az[31] |= 64;
+		$az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+		$az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+		# crypto_hash_sha512_init(&hs);
+		# crypto_hash_sha512_update(&hs, az + 32, 32);
+		# crypto_hash_sha512_update(&hs, m, mlen);
+		# crypto_hash_sha512_final(&hs, nonce);
+		$hs = hash_init('sha512');
+		hash_update($hs, self::substr($az, 32, 32));
+		hash_update($hs, $message);
+		$nonceHash = hash_final($hs, true);
+
+		# memmove(sig + 32, sk + 32, 32);
+		$pk = self::substr($sk, 32, 32);
+
+		# sc_reduce(nonce);
+		# ge_scalarmult_base(&R, nonce);
+		# ge_p3_tobytes(sig, &R);
+		$nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+		$sig = self::ge_p3_tobytes(
+			self::ge_scalarmult_base($nonce)
+		);
+
+		# crypto_hash_sha512_init(&hs);
+		# crypto_hash_sha512_update(&hs, sig, 64);
+		# crypto_hash_sha512_update(&hs, m, mlen);
+		# crypto_hash_sha512_final(&hs, hram);
+		$hs = hash_init('sha512');
+		hash_update($hs, self::substr($sig, 0, 32));
+		hash_update($hs, self::substr($pk, 0, 32));
+		hash_update($hs, $message);
+		$hramHash = hash_final($hs, true);
+
+		# sc_reduce(hram);
+		# sc_muladd(sig + 32, hram, az, nonce);
+		$hram = self::sc_reduce($hramHash);
+		$sigAfter = self::sc_muladd($hram, $az, $nonce);
+		$sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+		try {
+			ParagonIE_Sodium_Compat::memzero($az);
+		} catch (Error $ex) {
+			$az = null;
+		}
+		return $sig;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $sig
+	 * @param string $message
+	 * @param string $pk
+	 * @return bool
+	 * @throws Exception
+	 */
+	public static function verify_detached($sig, $message, $pk)
+	{
+		if (self::strlen($sig) < 64) {
+			throw new Exception('Signature is too short');
+		}
+		if (self::check_S_lt_L(self::substr($sig, 32, 32))) {
+			throw new Exception('S < L - Invalid signature');
+		}
+		if (self::small_order($sig)) {
+			throw new Exception('Signature is on too small of an order');
+		}
+		if ((self::chrToInt($sig[63]) & 224) !== 0) {
+			throw new Exception('Invalid signature');
+		}
+		$d = 0;
+		for ($i = 0; $i < 32; ++$i) {
+			$d |= self::chrToInt($pk[$i]);
+		}
+		if ($d === 0) {
+			throw new Exception('All zero public key');
+		}
+
+		/** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+		$orig = ParagonIE_Sodium_Compat::$fastMult;
+
+		// Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+		ParagonIE_Sodium_Compat::$fastMult = true;
+
+		/** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
+		$A = self::ge_frombytes_negate_vartime($pk);
+
+		/** @var string $hDigest */
+		$hDigest = hash(
+			'sha512',
+			self::substr($sig, 0, 32) .
+			self::substr($pk, 0, 32) .
+			$message,
+			true
+		);
+
+		/** @var string $h */
+		$h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+		/** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
+		$R = self::ge_double_scalarmult_vartime(
+			$h,
+			$A,
+			self::substr($sig, 32)
+		);
+
+		/** @var string $rcheck */
+		$rcheck = self::ge_tobytes($R);
+
+		// Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+		ParagonIE_Sodium_Compat::$fastMult = $orig;
+
+		return self::verify_32($rcheck, self::substr($sig, 0, 32));
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $S
+	 * @return bool
+	 * @throws Exception
+	 */
+	public static function check_S_lt_L($S)
+	{
+		if (self::strlen($S) < 32) {
+			throw new Exception('Signature must be 32 bytes');
+		}
+		static $L = array(
+			0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
+			0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
+		);
+		$c = 0;
+		$n = 1;
+		$i = 32;
+
+		do {
+			--$i;
+			$x = self::chrToInt($S[$i]);
+			$c |= (
+				(($x - $L[$i]) >> 8) & $n
+			);
+			$n &= (
+				(($x ^ $L[$i]) - 1) >> 8
+			);
+		} while ($i !== 0);
+
+		return $c === 0;
+	}
+
+	/**
+	 * @param string $R
+	 * @return bool
+	 */
+	public static function small_order($R)
+	{
+		static $blacklist = array(
+			/* 0 (order 4) */
+			array(
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+			),
+			/* 1 (order 1) */
+			array(
+				0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+			),
+			/* 2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+			array(
+				0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+				0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+				0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+				0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05
+			),
+			/* 55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+			array(
+				0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+				0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+				0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+				0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a
+			),
+			/* p-1 (order 2) */
+			array(
+				0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+				0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+				0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+				0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85
+			),
+			/* p (order 4) */
+			array(
+				0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+				0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+				0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+				0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa
+			),
+			/* p+1 (order 1) */
+			array(
+				0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+			),
+			/* p+2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+			array(
+				0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+			),
+			/* p+55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+			array(
+				0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+			),
+			/* 2p-1 (order 2) */
+			array(
+				0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+			),
+			/* 2p (order 4) */
+			array(
+				0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+			),
+			/* 2p+1 (order 1) */
+			array(
+				0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+			)
+		);
+		$countBlacklist = count($blacklist);
+
+		for ($i = 0; $i < $countBlacklist; ++$i) {
+			$c = 0;
+			for ($j = 0; $j < 32; ++$j) {
+				$c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
+			}
+			if ($c === 0) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

Spacing +83 added lines, -83 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Ed25519', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Ed25519', false ) ) {
     return;
 }
 
@@ -19,10 +19,10 @@ 
      */
     public static function keypair()
     {
-        $seed = random_bytes(self::SEED_BYTES);
+        $seed = random_bytes( self::SEED_BYTES );
         $pk = '';
         $sk = '';
-        self::seed_keypair($pk, $sk, $seed);
+        self::seed_keypair( $pk, $sk, $seed );
         return $sk . $pk;
     }
 
@@ -34,14 +34,14 @@ 
      * @param string $seed
      * @return string
      */
-    public static function seed_keypair(&$pk, &$sk, $seed)
+    public static function seed_keypair( &$pk, &$sk, $seed )
     {
-        if (self::strlen($seed) !== self::SEED_BYTES) {
-            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
+        if ( self::strlen( $seed ) !== self::SEED_BYTES ) {
+            throw new RangeException( 'crypto_sign keypair seed must be 32 bytes long' );
         }
 
         /** @var string $pk */
-        $pk = self::publickey_from_secretkey($seed);
+        $pk = self::publickey_from_secretkey( $seed );
         $sk = $seed . $pk;
         return $sk;
     }
@@ -52,12 +52,12 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function secretkey($keypair)
+    public static function secretkey( $keypair )
     {
-        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
-            throw new RangeException('crypto_sign keypair must be 96 bytes long');
+        if ( self::strlen( $keypair ) !== self::KEYPAIR_BYTES ) {
+            throw new RangeException( 'crypto_sign keypair must be 96 bytes long' );
         }
-        return self::substr($keypair, 0, 64);
+        return self::substr( $keypair, 0, 64 );
     }
 
     /**
@@ -66,12 +66,12 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function publickey($keypair)
+    public static function publickey( $keypair )
     {
-        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
-            throw new RangeException('crypto_sign keypair must be 96 bytes long');
+        if ( self::strlen( $keypair ) !== self::KEYPAIR_BYTES ) {
+            throw new RangeException( 'crypto_sign keypair must be 96 bytes long' );
         }
-        return self::substr($keypair, 64, 32);
+        return self::substr( $keypair, 64, 32 );
     }
 
     /**
@@ -80,17 +80,17 @@ 
      * @param string $sk
      * @return string
      */
-    public static function publickey_from_secretkey($sk)
+    public static function publickey_from_secretkey( $sk )
     {
         /** @var string $sk */
-        $sk = hash('sha512', self::substr($sk, 0, 32), true);
+        $sk = hash( 'sha512', self::substr( $sk, 0, 32 ), true );
         $sk[0] = self::intToChr(
-            self::chrToInt($sk[0]) & 248
+            self::chrToInt( $sk[0] ) & 248
         );
         $sk[31] = self::intToChr(
-            (self::chrToInt($sk[31]) & 63) | 64
+            ( self::chrToInt( $sk[31] ) & 63 ) | 64
         );
-        return self::sk_to_pk($sk);
+        return self::sk_to_pk( $sk );
     }
 
     /**
@@ -99,11 +99,11 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sk_to_pk($sk)
+    public static function sk_to_pk( $sk )
     {
         return self::ge_p3_tobytes(
             self::ge_scalarmult_base(
-                self::substr($sk, 0, 32)
+                self::substr( $sk, 0, 32 )
             )
         );
     }
@@ -115,10 +115,10 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign($message, $sk)
+    public static function sign( $message, $sk )
     {
         /** @var string $signature */
-        $signature = self::sign_detached($message, $sk);
+        $signature = self::sign_detached( $message, $sk );
         return $signature . $message;
     }
 
@@ -130,18 +130,18 @@ 
      * @return string         Message (without signature)
      * @throws Exception
      */
-    public static function sign_open($message, $pk)
+    public static function sign_open( $message, $pk )
     {
         /** @var string $signature */
-        $signature = self::substr($message, 0, 64);
+        $signature = self::substr( $message, 0, 64 );
 
         /** @var string $message */
-        $message = self::substr($message, 64);
+        $message = self::substr( $message, 64 );
 
-        if (self::verify_detached($signature, $message, $pk)) {
+        if ( self::verify_detached( $signature, $message, $pk ) ) {
             return $message;
         }
-        throw new Exception('Invalid signature');
+        throw new Exception( 'Invalid signature' );
     }
 
     /**
@@ -151,56 +151,56 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign_detached($message, $sk)
+    public static function sign_detached( $message, $sk )
     {
         # crypto_hash_sha512(az, sk, 32);
-        $az =  hash('sha512', self::substr($sk, 0, 32), true);
+        $az = hash( 'sha512', self::substr( $sk, 0, 32 ), true );
 
         # az[0] &= 248;
         # az[31] &= 63;
         # az[31] |= 64;
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+        $az[0] = self::intToChr( self::chrToInt( $az[0] ) & 248 );
+        $az[31] = self::intToChr( ( self::chrToInt( $az[31] ) & 63 ) | 64 );
 
         # crypto_hash_sha512_init(&hs);
         # crypto_hash_sha512_update(&hs, az + 32, 32);
         # crypto_hash_sha512_update(&hs, m, mlen);
         # crypto_hash_sha512_final(&hs, nonce);
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($az, 32, 32));
-        hash_update($hs, $message);
-        $nonceHash = hash_final($hs, true);
+        $hs = hash_init( 'sha512' );
+        hash_update( $hs, self::substr( $az, 32, 32 ) );
+        hash_update( $hs, $message );
+        $nonceHash = hash_final( $hs, true );
 
         # memmove(sig + 32, sk + 32, 32);
-        $pk = self::substr($sk, 32, 32);
+        $pk = self::substr( $sk, 32, 32 );
 
         # sc_reduce(nonce);
         # ge_scalarmult_base(&R, nonce);
         # ge_p3_tobytes(sig, &R);
-        $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $nonce = self::sc_reduce( $nonceHash ) . self::substr( $nonceHash, 32 );
         $sig = self::ge_p3_tobytes(
-            self::ge_scalarmult_base($nonce)
+            self::ge_scalarmult_base( $nonce )
         );
 
         # crypto_hash_sha512_init(&hs);
         # crypto_hash_sha512_update(&hs, sig, 64);
         # crypto_hash_sha512_update(&hs, m, mlen);
         # crypto_hash_sha512_final(&hs, hram);
-        $hs = hash_init('sha512');
-        hash_update($hs, self::substr($sig, 0, 32));
-        hash_update($hs, self::substr($pk, 0, 32));
-        hash_update($hs, $message);
-        $hramHash = hash_final($hs, true);
+        $hs = hash_init( 'sha512' );
+        hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        hash_update( $hs, self::substr( $pk, 0, 32 ) );
+        hash_update( $hs, $message );
+        $hramHash = hash_final( $hs, true );
 
         # sc_reduce(hram);
         # sc_muladd(sig + 32, hram, az, nonce);
-        $hram = self::sc_reduce($hramHash);
-        $sigAfter = self::sc_muladd($hram, $az, $nonce);
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+        $hram = self::sc_reduce( $hramHash );
+        $sigAfter = self::sc_muladd( $hram, $az, $nonce );
+        $sig = self::substr( $sig, 0, 32 ) . self::substr( $sigAfter, 0, 32 );
 
         try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $az );
+        } catch ( Error $ex ) {
             $az = null;
         }
         return $sig;
@@ -215,26 +215,26 @@ 
      * @return bool
      * @throws Exception
      */
-    public static function verify_detached($sig, $message, $pk)
+    public static function verify_detached( $sig, $message, $pk )
     {
-        if (self::strlen($sig) < 64) {
-            throw new Exception('Signature is too short');
+        if ( self::strlen( $sig ) < 64 ) {
+            throw new Exception( 'Signature is too short' );
         }
-        if (self::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new Exception('S < L - Invalid signature');
+        if ( self::check_S_lt_L( self::substr( $sig, 32, 32 ) ) ) {
+            throw new Exception( 'S < L - Invalid signature' );
         }
-        if (self::small_order($sig)) {
-            throw new Exception('Signature is on too small of an order');
+        if ( self::small_order( $sig ) ) {
+            throw new Exception( 'Signature is on too small of an order' );
         }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new Exception('Invalid signature');
+        if ( ( self::chrToInt( $sig[63] ) & 224 ) !== 0 ) {
+            throw new Exception( 'Invalid signature' );
         }
         $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($pk[$i]);
+        for ( $i = 0; $i < 32; ++$i ) {
+            $d |= self::chrToInt( $pk[$i] );
         }
-        if ($d === 0) {
-            throw new Exception('All zero public key');
+        if ( $d === 0 ) {
+            throw new Exception( 'All zero public key' );
         }
 
         /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
@@ -244,34 +244,34 @@ 
         ParagonIE_Sodium_Compat::$fastMult = true;
 
         /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
-        $A = self::ge_frombytes_negate_vartime($pk);
+        $A = self::ge_frombytes_negate_vartime( $pk );
 
         /** @var string $hDigest */
         $hDigest = hash(
             'sha512',
-            self::substr($sig, 0, 32) .
-            self::substr($pk, 0, 32) .
+            self::substr( $sig, 0, 32 ) .
+            self::substr( $pk, 0, 32 ) .
             $message,
             true
         );
 
         /** @var string $h */
-        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
+        $h = self::sc_reduce( $hDigest ) . self::substr( $hDigest, 32 );
 
         /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
         $R = self::ge_double_scalarmult_vartime(
             $h,
             $A,
-            self::substr($sig, 32)
+            self::substr( $sig, 32 )
         );
 
         /** @var string $rcheck */
-        $rcheck = self::ge_tobytes($R);
+        $rcheck = self::ge_tobytes( $R );
 
         // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
         ParagonIE_Sodium_Compat::$fastMult = $orig;
 
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+        return self::verify_32( $rcheck, self::substr( $sig, 0, 32 ) );
     }
 
     /**
@@ -281,10 +281,10 @@ 
      * @return bool
      * @throws Exception
      */
-    public static function check_S_lt_L($S)
+    public static function check_S_lt_L( $S )
     {
-        if (self::strlen($S) < 32) {
-            throw new Exception('Signature must be 32 bytes');
+        if ( self::strlen( $S ) < 32 ) {
+            throw new Exception( 'Signature must be 32 bytes' );
         }
         static $L = array(
             0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
@@ -298,14 +298,14 @@ 
 
         do {
             --$i;
-            $x = self::chrToInt($S[$i]);
+            $x = self::chrToInt( $S[$i] );
             $c |= (
-                (($x - $L[$i]) >> 8) & $n
+                ( ( $x - $L[$i] ) >> 8 ) & $n
             );
             $n &= (
-                (($x ^ $L[$i]) - 1) >> 8
+                ( ( $x ^ $L[$i] ) - 1 ) >> 8
             );
-        } while ($i !== 0);
+        } while ( $i !== 0 );
 
         return $c === 0;
     }
@@ -314,7 +314,7 @@ 
      * @param string $R
      * @return bool
      */
-    public static function small_order($R)
+    public static function small_order( $R )
     {
         static $blacklist = array(
             /* 0 (order 4) */
@@ -402,14 +402,14 @@ 
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
             )
         );
-        $countBlacklist = count($blacklist);
+        $countBlacklist = count( $blacklist );
 
-        for ($i = 0; $i < $countBlacklist; ++$i) {
+        for ( $i = 0; $i < $countBlacklist; ++$i ) {
             $c = 0;
-            for ($j = 0; $j < 32; ++$j) {
-                $c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
+            for ( $j = 0; $j < 32; ++$j ) {
+                $c |= self::chrToInt( $R[$j] ) ^ $blacklist[$i][$j];
             }
-            if ($c === 0) {
+            if ( $c === 0 ) {
                 return true;
             }
         }

Braces +13 added lines, -26 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core32_Ed25519
  */
-abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_Curve25519
-{
+abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_Curve25519 {
     const KEYPAIR_BYTES = 96;
     const SEED_BYTES = 32;
 
@@ -17,8 +16,7 @@ 
      *
      * @return string (96 bytes)
      */
-    public static function keypair()
-    {
+    public static function keypair() {
         $seed = random_bytes(self::SEED_BYTES);
         $pk = '';
         $sk = '';
@@ -34,8 +32,7 @@ 
      * @param string $seed
      * @return string
      */
-    public static function seed_keypair(&$pk, &$sk, $seed)
-    {
+    public static function seed_keypair(&$pk, &$sk, $seed) {
         if (self::strlen($seed) !== self::SEED_BYTES) {
             throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
         }
@@ -52,8 +49,7 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function secretkey($keypair)
-    {
+    public static function secretkey($keypair) {
         if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
             throw new RangeException('crypto_sign keypair must be 96 bytes long');
         }
@@ -66,8 +62,7 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function publickey($keypair)
-    {
+    public static function publickey($keypair) {
         if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
             throw new RangeException('crypto_sign keypair must be 96 bytes long');
         }
@@ -80,8 +75,7 @@ 
      * @param string $sk
      * @return string
      */
-    public static function publickey_from_secretkey($sk)
-    {
+    public static function publickey_from_secretkey($sk) {
         /** @var string $sk */
         $sk = hash('sha512', self::substr($sk, 0, 32), true);
         $sk[0] = self::intToChr(
@@ -99,8 +93,7 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sk_to_pk($sk)
-    {
+    public static function sk_to_pk($sk) {
         return self::ge_p3_tobytes(
             self::ge_scalarmult_base(
                 self::substr($sk, 0, 32)
@@ -115,8 +108,7 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign($message, $sk)
-    {
+    public static function sign($message, $sk) {
         /** @var string $signature */
         $signature = self::sign_detached($message, $sk);
         return $signature . $message;
@@ -130,8 +122,7 @@ 
      * @return string         Message (without signature)
      * @throws Exception
      */
-    public static function sign_open($message, $pk)
-    {
+    public static function sign_open($message, $pk) {
         /** @var string $signature */
         $signature = self::substr($message, 0, 64);
 
@@ -151,8 +142,7 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign_detached($message, $sk)
-    {
+    public static function sign_detached($message, $sk) {
         # crypto_hash_sha512(az, sk, 32);
         $az =  hash('sha512', self::substr($sk, 0, 32), true);
 
@@ -215,8 +205,7 @@ 
      * @return bool
      * @throws Exception
      */
-    public static function verify_detached($sig, $message, $pk)
-    {
+    public static function verify_detached($sig, $message, $pk) {
         if (self::strlen($sig) < 64) {
             throw new Exception('Signature is too short');
         }
@@ -281,8 +270,7 @@ 
      * @return bool
      * @throws Exception
      */
-    public static function check_S_lt_L($S)
-    {
+    public static function check_S_lt_L($S) {
         if (self::strlen($S) < 32) {
             throw new Exception('Signature must be 32 bytes');
         }
@@ -314,8 +302,7 @@ 
      * @param string $R
      * @return bool
      */
-    public static function small_order($R)
-    {
+    public static function small_order($R) {
         static $blacklist = array(
             /* 0 (order 4) */
             array(

src/library/sodium_compat/src/Core32/Poly1305/State.php

Indentation +418 added lines, -418 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Poly1305_State', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,421 +9,421 @@ 
  */
 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
-     */
-    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))
-                ->mask(0x3ffffff),
-            // st->r[1] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 3, 4))
-                ->shiftRight(2)
-                ->mask(0x3ffff03),
-            // st->r[2] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 6, 4))
-                ->shiftRight(4)
-                ->mask(0x3ffc0ff),
-            // st->r[3] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 9, 4))
-                ->shiftRight(6)
-                ->mask(0x3f03fff),
-            // st->r[4] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4))
-                ->shiftRight(8)
-                ->mask(0x00fffff)
-        );
-
-        /* h = 0 */
-        $this->h = array(
-            new ParagonIE_Sodium_Core32_Int32(),
-            new ParagonIE_Sodium_Core32_Int32(),
-            new ParagonIE_Sodium_Core32_Int32(),
-            new ParagonIE_Sodium_Core32_Int32(),
-            new ParagonIE_Sodium_Core32_Int32()
-        );
-
-        /* save pad for later */
-        $this->pad = array(
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4))->toInt64(),
-        );
-
-        $this->leftover = 0;
-        $this->final = false;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @return self
-     */
-    public function update($message = '')
-    {
-        $bytes = self::strlen($message);
-
-        /* handle leftover */
-        if ($this->leftover) {
-            $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(
-                static::intArrayToString($this->buffer),
-                ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
-            );
-            $this->leftover = 0;
-        }
-
-        /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-            $want = $bytes & ~(ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-                $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
-     */
-    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($this->final ? 0 : 1 << 24); /* 1 << 128 */
-        $zero = new ParagonIE_Sodium_Core32_Int64();
-        /**
-         * @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);
-        $s2 = $r2->toInt64()->mulInt(5);
-        $s3 = $r3->toInt64()->mulInt(5);
-        $s4 = $r4->toInt64()->mulInt(5);
-
-        $h0 = $this->h[0];
-        $h1 = $this->h[1];
-        $h2 = $this->h[2];
-        $h3 = $this->h[3];
-        $h4 = $this->h[4];
-
-        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-            /* h += m[i] */
-            $h0 = $h0->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 0, 4))
-                    ->mask(0x3ffffff)
-            );
-            $h1 = $h1->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 3, 4))
-                    ->shiftRight(2)
-                    ->mask(0x3ffffff)
-            );
-            $h2 = $h2->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 6, 4))
-                    ->shiftRight(4)
-                    ->mask(0x3ffffff)
-            );
-            $h3 = $h3->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 9, 4))
-                    ->shiftRight(6)
-                    ->mask(0x3ffffff)
-            );
-            $h4 = $h4->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4))
-                    ->shiftRight(8)
-                    ->orInt32($hibit)
-            );
-
-            /* h *= r */
-            $d0 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r0))
-                ->addInt64($h1->toInt64()->mulInt64($s4))
-                ->addInt64($h2->toInt64()->mulInt64($s3))
-                ->addInt64($h3->toInt64()->mulInt64($s2))
-                ->addInt64($h4->toInt64()->mulInt64($s1));
-
-            $d1 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r1))
-                ->addInt64($h1->toInt64()->mulInt64($r0))
-                ->addInt64($h2->toInt64()->mulInt64($s4))
-                ->addInt64($h3->toInt64()->mulInt64($s3))
-                ->addInt64($h4->toInt64()->mulInt64($s2));
-
-            $d2 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r2))
-                ->addInt64($h1->toInt64()->mulInt64($r1))
-                ->addInt64($h2->toInt64()->mulInt64($r0))
-                ->addInt64($h3->toInt64()->mulInt64($s4))
-                ->addInt64($h4->toInt64()->mulInt64($s3));
-
-            $d3 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r3))
-                ->addInt64($h1->toInt64()->mulInt64($r2))
-                ->addInt64($h2->toInt64()->mulInt64($r1))
-                ->addInt64($h3->toInt64()->mulInt64($r0))
-                ->addInt64($h4->toInt64()->mulInt64($s4));
-
-            $d4 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r4))
-                ->addInt64($h1->toInt64()->mulInt64($r3))
-                ->addInt64($h2->toInt64()->mulInt64($r2))
-                ->addInt64($h3->toInt64()->mulInt64($r1))
-                ->addInt64($h4->toInt64()->mulInt64($r0));
-
-            /* (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));
-
-            $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
-     */
-    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(
-                    static::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)); # $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);
-
-        $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
+	 */
+	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))
+				->mask(0x3ffffff),
+			// st->r[1] = ...
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 3, 4))
+				->shiftRight(2)
+				->mask(0x3ffff03),
+			// st->r[2] = ...
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 6, 4))
+				->shiftRight(4)
+				->mask(0x3ffc0ff),
+			// st->r[3] = ...
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 9, 4))
+				->shiftRight(6)
+				->mask(0x3f03fff),
+			// st->r[4] = ...
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4))
+				->shiftRight(8)
+				->mask(0x00fffff)
+		);
+
+		/* h = 0 */
+		$this->h = array(
+			new ParagonIE_Sodium_Core32_Int32(),
+			new ParagonIE_Sodium_Core32_Int32(),
+			new ParagonIE_Sodium_Core32_Int32(),
+			new ParagonIE_Sodium_Core32_Int32(),
+			new ParagonIE_Sodium_Core32_Int32()
+		);
+
+		/* save pad for later */
+		$this->pad = array(
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4))->toInt64(),
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4))->toInt64(),
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4))->toInt64(),
+			ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4))->toInt64(),
+		);
+
+		$this->leftover = 0;
+		$this->final = false;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @return self
+	 */
+	public function update($message = '')
+	{
+		$bytes = self::strlen($message);
+
+		/* handle leftover */
+		if ($this->leftover) {
+			$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(
+				static::intArrayToString($this->buffer),
+				ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
+			);
+			$this->leftover = 0;
+		}
+
+		/* process full blocks */
+		if ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
+			$want = $bytes & ~(ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1);
+			if ($want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
+				$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
+	 */
+	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($this->final ? 0 : 1 << 24); /* 1 << 128 */
+		$zero = new ParagonIE_Sodium_Core32_Int64();
+		/**
+		 * @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);
+		$s2 = $r2->toInt64()->mulInt(5);
+		$s3 = $r3->toInt64()->mulInt(5);
+		$s4 = $r4->toInt64()->mulInt(5);
+
+		$h0 = $this->h[0];
+		$h1 = $this->h[1];
+		$h2 = $this->h[2];
+		$h3 = $this->h[3];
+		$h4 = $this->h[4];
+
+		while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+			/* h += m[i] */
+			$h0 = $h0->addInt32(
+				ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 0, 4))
+					->mask(0x3ffffff)
+			);
+			$h1 = $h1->addInt32(
+				ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 3, 4))
+					->shiftRight(2)
+					->mask(0x3ffffff)
+			);
+			$h2 = $h2->addInt32(
+				ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 6, 4))
+					->shiftRight(4)
+					->mask(0x3ffffff)
+			);
+			$h3 = $h3->addInt32(
+				ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 9, 4))
+					->shiftRight(6)
+					->mask(0x3ffffff)
+			);
+			$h4 = $h4->addInt32(
+				ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4))
+					->shiftRight(8)
+					->orInt32($hibit)
+			);
+
+			/* h *= r */
+			$d0 = $zero
+				->addInt64($h0->toInt64()->mulInt64($r0))
+				->addInt64($h1->toInt64()->mulInt64($s4))
+				->addInt64($h2->toInt64()->mulInt64($s3))
+				->addInt64($h3->toInt64()->mulInt64($s2))
+				->addInt64($h4->toInt64()->mulInt64($s1));
+
+			$d1 = $zero
+				->addInt64($h0->toInt64()->mulInt64($r1))
+				->addInt64($h1->toInt64()->mulInt64($r0))
+				->addInt64($h2->toInt64()->mulInt64($s4))
+				->addInt64($h3->toInt64()->mulInt64($s3))
+				->addInt64($h4->toInt64()->mulInt64($s2));
+
+			$d2 = $zero
+				->addInt64($h0->toInt64()->mulInt64($r2))
+				->addInt64($h1->toInt64()->mulInt64($r1))
+				->addInt64($h2->toInt64()->mulInt64($r0))
+				->addInt64($h3->toInt64()->mulInt64($s4))
+				->addInt64($h4->toInt64()->mulInt64($s3));
+
+			$d3 = $zero
+				->addInt64($h0->toInt64()->mulInt64($r3))
+				->addInt64($h1->toInt64()->mulInt64($r2))
+				->addInt64($h2->toInt64()->mulInt64($r1))
+				->addInt64($h3->toInt64()->mulInt64($r0))
+				->addInt64($h4->toInt64()->mulInt64($s4));
+
+			$d4 = $zero
+				->addInt64($h0->toInt64()->mulInt64($r4))
+				->addInt64($h1->toInt64()->mulInt64($r3))
+				->addInt64($h2->toInt64()->mulInt64($r2))
+				->addInt64($h3->toInt64()->mulInt64($r1))
+				->addInt64($h4->toInt64()->mulInt64($r0));
+
+			/* (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));
+
+			$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
+	 */
+	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(
+					static::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)); # $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);
+
+		$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 +160 added lines, -160 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;
 }
 
@@ -47,9 +47,9 @@ 
      * @param string $key
      * @throws InvalidArgumentException
      */
-    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'
             );
@@ -57,24 +57,24 @@ 
         /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
         $this->r = array(
             // st->r[0] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4))
-                ->mask(0x3ffffff),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 0, 4 ) )
+                ->mask( 0x3ffffff ),
             // st->r[1] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 3, 4))
-                ->shiftRight(2)
-                ->mask(0x3ffff03),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 3, 4 ) )
+                ->shiftRight( 2 )
+                ->mask( 0x3ffff03 ),
             // st->r[2] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 6, 4))
-                ->shiftRight(4)
-                ->mask(0x3ffc0ff),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 6, 4 ) )
+                ->shiftRight( 4 )
+                ->mask( 0x3ffc0ff ),
             // st->r[3] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 9, 4))
-                ->shiftRight(6)
-                ->mask(0x3f03fff),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 9, 4 ) )
+                ->shiftRight( 6 )
+                ->mask( 0x3f03fff ),
             // st->r[4] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4))
-                ->shiftRight(8)
-                ->mask(0x00fffff)
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 12, 4 ) )
+                ->shiftRight( 8 )
+                ->mask( 0x00fffff )
         );
 
         /* h = 0 */
@@ -88,10 +88,10 @@ 
 
         /* save pad for later */
         $this->pad = array(
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4))->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4))->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 16, 4 ) )->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 20, 4 ) )->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 24, 4 ) )->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 28, 4 ) )->toInt64(),
         );
 
         $this->leftover = 0;
@@ -104,53 +104,53 @@ 
      * @param string $message
      * @return self
      */
-    public function update($message = '')
+    public function update( $message = '' )
     {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /* handle leftover */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $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]);
+            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(
-                static::intArrayToString($this->buffer),
+                static::intArrayToString( $this->buffer ),
                 ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
             );
             $this->leftover = 0;
         }
 
         /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-            $want = $bytes & ~(ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-                $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);
+        if ( $bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) {
+            $want = $bytes & ~( ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1 );
+            if ( $want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) {
+                $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]);
+        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;
@@ -165,12 +165,12 @@ 
      * @param int $bytes
      * @return self
      */
-    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($this->final ? 0 : 1 << 24); /* 1 << 128 */
+        $hibit = ParagonIE_Sodium_Core32_Int32::fromInt( $this->final ? 0 : 1 << 24 ); /* 1 << 128 */
         $zero = new ParagonIE_Sodium_Core32_Int64();
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $d0
@@ -196,10 +196,10 @@ 
         $r3 = $this->r[3]->toInt64();
         $r4 = $this->r[4]->toInt64();
 
-        $s1 = $r1->toInt64()->mulInt(5);
-        $s2 = $r2->toInt64()->mulInt(5);
-        $s3 = $r3->toInt64()->mulInt(5);
-        $s4 = $r4->toInt64()->mulInt(5);
+        $s1 = $r1->toInt64()->mulInt( 5 );
+        $s2 = $r2->toInt64()->mulInt( 5 );
+        $s3 = $r3->toInt64()->mulInt( 5 );
+        $s4 = $r4->toInt64()->mulInt( 5 );
 
         $h0 = $this->h[0];
         $h1 = $this->h[1];
@@ -207,93 +207,93 @@ 
         $h3 = $this->h[3];
         $h4 = $this->h[4];
 
-        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+        while ( $bytes >= ParagonIE_Sodium_Core_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 )
             );
             $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 )
             );
             $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 )
             );
             $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 )
             );
             $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 )
             );
 
             /* h *= r */
             $d0 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r0))
-                ->addInt64($h1->toInt64()->mulInt64($s4))
-                ->addInt64($h2->toInt64()->mulInt64($s3))
-                ->addInt64($h3->toInt64()->mulInt64($s2))
-                ->addInt64($h4->toInt64()->mulInt64($s1));
+                ->addInt64( $h0->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $s4 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $s3 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $s2 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s1 ) );
 
             $d1 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r1))
-                ->addInt64($h1->toInt64()->mulInt64($r0))
-                ->addInt64($h2->toInt64()->mulInt64($s4))
-                ->addInt64($h3->toInt64()->mulInt64($s3))
-                ->addInt64($h4->toInt64()->mulInt64($s2));
+                ->addInt64( $h0->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $s4 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $s3 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s2 ) );
 
             $d2 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r2))
-                ->addInt64($h1->toInt64()->mulInt64($r1))
-                ->addInt64($h2->toInt64()->mulInt64($r0))
-                ->addInt64($h3->toInt64()->mulInt64($s4))
-                ->addInt64($h4->toInt64()->mulInt64($s3));
+                ->addInt64( $h0->toInt64()->mulInt64( $r2 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $s4 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s3 ) );
 
             $d3 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r3))
-                ->addInt64($h1->toInt64()->mulInt64($r2))
-                ->addInt64($h2->toInt64()->mulInt64($r1))
-                ->addInt64($h3->toInt64()->mulInt64($r0))
-                ->addInt64($h4->toInt64()->mulInt64($s4));
+                ->addInt64( $h0->toInt64()->mulInt64( $r3 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r2 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $r0 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $s4 ) );
 
             $d4 = $zero
-                ->addInt64($h0->toInt64()->mulInt64($r4))
-                ->addInt64($h1->toInt64()->mulInt64($r3))
-                ->addInt64($h2->toInt64()->mulInt64($r2))
-                ->addInt64($h3->toInt64()->mulInt64($r1))
-                ->addInt64($h4->toInt64()->mulInt64($r0));
+                ->addInt64( $h0->toInt64()->mulInt64( $r4 ) )
+                ->addInt64( $h1->toInt64()->mulInt64( $r3 ) )
+                ->addInt64( $h2->toInt64()->mulInt64( $r2 ) )
+                ->addInt64( $h3->toInt64()->mulInt64( $r1 ) )
+                ->addInt64( $h4->toInt64()->mulInt64( $r0 ) );
 
             /* (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));
+            $c = $d4->shiftRight( 26 );
+            $h4 = $d4->toInt32()->mask( 0x3ffffff );
+            $h0 = $h0->addInt32( $c->toInt32()->mulInt( 5 ) );
 
-            $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(
@@ -304,7 +304,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;
     }
 
@@ -316,16 +316,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) {
+            for ( ; $i < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE; ++$i ) {
                 $this->buffer[$i] = 0;
             }
             $this->final = true;
             $this->blocks(
                 self::substr(
-                    static::intArrayToString($this->buffer),
+                    static::intArrayToString( $this->buffer ),
                     0,
                     ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
                 ),
@@ -352,73 +352,73 @@ 
         $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)); # $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 ) ); # $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 );
 
-        $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>
      */
@@ -47,8 +46,7 @@ 
      * @param string $key
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '')
-    {
+    public function __construct($key = '') {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Poly1305 requires a 32-byte key'
@@ -104,8 +102,7 @@ 
      * @param string $message
      * @return self
      */
-    public function update($message = '')
-    {
+    public function update($message = '') {
         $bytes = self::strlen($message);
 
         /* handle leftover */
@@ -165,8 +162,7 @@ 
      * @param int $bytes
      * @return self
      */
-    public function blocks($message, $bytes)
-    {
+    public function blocks($message, $bytes) {
         if (self::strlen($message) < 16) {
             $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
         }
@@ -313,8 +309,7 @@ 
      *
      * @return string
      */
-    public function finish()
-    {
+    public function finish() {
         /* process the remaining block */
         if ($this->leftover) {
             $i = $this->leftover;

src/library/sodium_compat/src/Core32/Curve25519/Ge/P3.php

Indentation +50 added lines, -50 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P3', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,57 +9,57 @@ 
  */
 class ParagonIE_Sodium_Core32_Curve25519_Ge_P3
 {
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $X;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $X;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Y;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $Y;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $Z;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $T;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $T;
 
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_P3 constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
-    ) {
-        if ($x === null) {
-            $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->X = $x;
-        if ($y === null) {
-            $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Y = $y;
-        if ($z === null) {
-            $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Z = $z;
-        if ($t === null) {
-            $t = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->T = $t;
-    }
+	/**
+	 * ParagonIE_Sodium_Core32_Curve25519_Ge_P3 constructor.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
+	 */
+	public function __construct(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
+	) {
+		if ($x === null) {
+			$x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->X = $x;
+		if ($y === null) {
+			$y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->Y = $y;
+		if ($z === null) {
+			$z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->Z = $z;
+		if ($t === null) {
+			$t = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->T = $t;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P3', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Ge_P3', false ) ) {
     return;
 }
 
@@ -45,19 +45,19 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
         ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
     ) {
-        if ($x === null) {
+        if ( $x === null ) {
             $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->X = $x;
-        if ($y === null) {
+        if ( $y === null ) {
             $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Y = $y;
-        if ($z === null) {
+        if ( $z === null ) {
             $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Z = $z;
-        if ($t === null) {
+        if ( $t === null ) {
             $t = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->T = $t;

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P3
  */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-{
+class ParagonIE_Sodium_Core32_Curve25519_Ge_P3 {
     /**
      * @var ParagonIE_Sodium_Core32_Curve25519_Fe
      */

src/library/sodium_compat/src/Core32/Curve25519/Ge/Cached.php

Indentation +50 added lines, -50 removed lines

@@ -2,64 +2,64 @@
 
 
 if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Cached', false)) {
-    return;
+	return;
 }
 /**
  * Class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
  */
 class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
 {
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $YplusX;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $YplusX;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $YminusX;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $YminusX;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $Z;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $T2d;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $T2d;
 
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_Cached constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YplusX
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YminusX
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $Z
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $T2d
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $YplusX = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $YminusX = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $Z = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $T2d = null
-    ) {
-        if ($YplusX === null) {
-            $YplusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->YplusX = $YplusX;
-        if ($YminusX === null) {
-            $YminusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->YminusX = $YminusX;
-        if ($Z === null) {
-            $Z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Z = $Z;
-        if ($T2d === null) {
-            $T2d = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->T2d = $T2d;
-    }
+	/**
+	 * ParagonIE_Sodium_Core32_Curve25519_Ge_Cached constructor.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YplusX
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YminusX
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $Z
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $T2d
+	 */
+	public function __construct(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $YplusX = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $YminusX = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $Z = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $T2d = null
+	) {
+		if ($YplusX === null) {
+			$YplusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->YplusX = $YplusX;
+		if ($YminusX === null) {
+			$YminusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->YminusX = $YminusX;
+		if ($Z === null) {
+			$Z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->Z = $Z;
+		if ($T2d === null) {
+			$T2d = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->T2d = $T2d;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Cached', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Ge_Cached', false ) ) {
     return;
 }
 /**
@@ -45,19 +45,19 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $Z = null,
         ParagonIE_Sodium_Core32_Curve25519_Fe $T2d = null
     ) {
-        if ($YplusX === null) {
+        if ( $YplusX === null ) {
             $YplusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->YplusX = $YplusX;
-        if ($YminusX === null) {
+        if ( $YminusX === null ) {
             $YminusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->YminusX = $YminusX;
-        if ($Z === null) {
+        if ( $Z === null ) {
             $Z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Z = $Z;
-        if ($T2d === null) {
+        if ( $T2d === null ) {
             $T2d = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->T2d = $T2d;

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
  */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
-{
+class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached {
     /**
      * @var ParagonIE_Sodium_Core32_Curve25519_Fe
      */

src/library/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php

Indentation +50 added lines, -50 removed lines

@@ -1,64 +1,64 @@
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1', false)) {
-    return;
+	return;
 }
 /**
  * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
  */
 class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
 {
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $X;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $X;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Y;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $Y;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $Z;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $T;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $T;
 
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
-    ) {
-        if ($x === null) {
-            $x = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->X = $x;
-        if ($y === null) {
-            $y = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->Y = $y;
-        if ($z === null) {
-            $z = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->Z = $z;
-        if ($t === null) {
-            $t = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->T = $t;
-    }
+	/**
+	 * ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 constructor.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
+	 */
+	public function __construct(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
+	) {
+		if ($x === null) {
+			$x = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+		}
+		$this->X = $x;
+		if ($y === null) {
+			$y = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+		}
+		$this->Y = $y;
+		if ($z === null) {
+			$z = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+		}
+		$this->Z = $z;
+		if ($t === null) {
+			$t = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+		}
+		$this->T = $t;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1', false ) ) {
     return;
 }
 /**
@@ -44,19 +44,19 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
         ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
     ) {
-        if ($x === null) {
+        if ( $x === null ) {
             $x = ParagonIE_Sodium_Core32_Curve25519::fe_0();
         }
         $this->X = $x;
-        if ($y === null) {
+        if ( $y === null ) {
             $y = ParagonIE_Sodium_Core32_Curve25519::fe_0();
         }
         $this->Y = $y;
-        if ($z === null) {
+        if ( $z === null ) {
             $z = ParagonIE_Sodium_Core32_Curve25519::fe_0();
         }
         $this->Z = $z;
-        if ($t === null) {
+        if ( $t === null ) {
             $t = ParagonIE_Sodium_Core32_Curve25519::fe_0();
         }
         $this->T = $t;

Braces +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
 /**
  * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
  */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-{
+class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 {
     /**
      * @var ParagonIE_Sodium_Core32_Curve25519_Fe
      */

src/library/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php

Indentation +40 added lines, -40 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,46 +9,46 @@ 
  */
 class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
 {
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $yplusx;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $yplusx;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $yminusx;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $yminusx;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $xy2d;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $xy2d;
 
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d = null
-    ) {
-        if ($yplusx === null) {
-            $yplusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->yplusx = $yplusx;
-        if ($yminusx === null) {
-            $yminusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->yminusx = $yminusx;
-        if ($xy2d === null) {
-            $xy2d = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->xy2d = $xy2d;
-    }
+	/**
+	 * ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp constructor.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d
+	 */
+	public function __construct(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d = null
+	) {
+		if ($yplusx === null) {
+			$yplusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+		}
+		$this->yplusx = $yplusx;
+		if ($yminusx === null) {
+			$yminusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+		}
+		$this->yminusx = $yminusx;
+		if ($xy2d === null) {
+			$xy2d = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+		}
+		$this->xy2d = $xy2d;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp', false ) ) {
     return;
 }
 
@@ -38,15 +38,15 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx = null,
         ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d = null
     ) {
-        if ($yplusx === null) {
+        if ( $yplusx === null ) {
             $yplusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
         }
         $this->yplusx = $yplusx;
-        if ($yminusx === null) {
+        if ( $yminusx === null ) {
             $yminusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
         }
         $this->yminusx = $yminusx;
-        if ($xy2d === null) {
+        if ( $xy2d === null ) {
             $xy2d = ParagonIE_Sodium_Core32_Curve25519::fe_0();
         }
         $this->xy2d = $xy2d;

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
  */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-{
+class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp {
     /**
      * @var ParagonIE_Sodium_Core32_Curve25519_Fe
      */

src/library/sodium_compat/src/Core32/Curve25519/Ge/P2.php

Indentation +40 added lines, -40 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P2', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,46 +9,46 @@ 
  */
 class ParagonIE_Sodium_Core32_Curve25519_Ge_P2
 {
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $X;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $X;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Y;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $Y;
 
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
+	/**
+	 * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public $Z;
 
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_P2 constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null
-    ) {
-        if ($x === null) {
-            $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->X = $x;
-        if ($y === null) {
-            $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Y = $y;
-        if ($z === null) {
-            $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Z = $z;
-    }
+	/**
+	 * ParagonIE_Sodium_Core32_Curve25519_Ge_P2 constructor.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
+	 */
+	public function __construct(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $z = null
+	) {
+		if ($x === null) {
+			$x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->X = $x;
+		if ($y === null) {
+			$y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->Y = $y;
+		if ($z === null) {
+			$z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		}
+		$this->Z = $z;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P2', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Ge_P2', false ) ) {
     return;
 }
 
@@ -38,15 +38,15 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
         ParagonIE_Sodium_Core32_Curve25519_Fe $z = null
     ) {
-        if ($x === null) {
+        if ( $x === null ) {
             $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->X = $x;
-        if ($y === null) {
+        if ( $y === null ) {
             $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Y = $y;
-        if ($z === null) {
+        if ( $z === null ) {
             $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         }
         $this->Z = $z;

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P2
  */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-{
+class ParagonIE_Sodium_Core32_Curve25519_Ge_P2 {
     /**
      * @var ParagonIE_Sodium_Core32_Curve25519_Fe
      */

src/library/sodium_compat/src/Core32/Curve25519/Fe.php

Indentation +158 added lines, -158 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Fe', false)) {
-    return;
+	return;
 }
 
 /**
@@ -11,173 +11,173 @@ 
  */
 class ParagonIE_Sodium_Core32_Curve25519_Fe implements ArrayAccess
 {
-    /**
-     * @var array<int, ParagonIE_Sodium_Core32_Int32>
-     */
-    protected $container = array();
+	/**
+	 * @var array<int, ParagonIE_Sodium_Core32_Int32>
+	 */
+	protected $container = array();
 
-    /**
-     * @var int
-     */
-    protected $size = 10;
+	/**
+	 * @var int
+	 */
+	protected $size = 10;
 
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Fe constructor.
-     * @param int $size
-     */
-    public function __construct($size = 10)
-    {
-        $this->size = 10;
-    }
+	/**
+	 * ParagonIE_Sodium_Core32_Curve25519_Fe constructor.
+	 * @param int $size
+	 */
+	public function __construct($size = 10)
+	{
+		$this->size = 10;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param array $array
-     * @param bool $save_indexes
-     * @return self
-     */
-    public static function fromArray($array, $save_indexes = null)
-    {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
-        } else {
-            $keys = range(0, $count - 1);
-        }
-        $array = array_values($array);
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param array $array
+	 * @param bool $save_indexes
+	 * @return self
+	 */
+	public static function fromArray($array, $save_indexes = null)
+	{
+		$count = count($array);
+		if ($save_indexes) {
+			$keys = array_keys($array);
+		} else {
+			$keys = range(0, $count - 1);
+		}
+		$array = array_values($array);
 
-        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $array[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $array[$i]);
-            }
-        } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $array[$i]->overflow = 0;
-                $obj->offsetSet($i, $array[$i]);
-            }
-        }
-        return $obj;
-    }
+		$obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
+		if ($save_indexes) {
+			for ($i = 0; $i < $count; ++$i) {
+				$array[$i]->overflow = 0;
+				$obj->offsetSet($keys[$i], $array[$i]);
+			}
+		} else {
+			for ($i = 0; $i < $count; ++$i) {
+				$array[$i]->overflow = 0;
+				$obj->offsetSet($i, $array[$i]);
+			}
+		}
+		return $obj;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param array $array
-     * @param bool $save_indexes
-     * @return self
-     */
-    public static function fromIntArray($array, $save_indexes = null)
-    {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
-        } else {
-            $keys = range(0, $count - 1);
-        }
-        $array = array_values($array);
-        $set = array();
-        foreach ($array as $i => $v) {
-            $set[$i] = ParagonIE_Sodium_Core32_Int32::fromInt($v);
-        }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param array $array
+	 * @param bool $save_indexes
+	 * @return self
+	 */
+	public static function fromIntArray($array, $save_indexes = null)
+	{
+		$count = count($array);
+		if ($save_indexes) {
+			$keys = array_keys($array);
+		} else {
+			$keys = range(0, $count - 1);
+		}
+		$array = array_values($array);
+		$set = array();
+		foreach ($array as $i => $v) {
+			$set[$i] = ParagonIE_Sodium_Core32_Int32::fromInt($v);
+		}
 
-        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $set[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $set[$i]);
-            }
-        } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $set[$i]->overflow = 0;
-                $obj->offsetSet($i, $set[$i]);
-            }
-        }
-        return $obj;
-    }
+		$obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
+		if ($save_indexes) {
+			for ($i = 0; $i < $count; ++$i) {
+				$set[$i]->overflow = 0;
+				$obj->offsetSet($keys[$i], $set[$i]);
+			}
+		} else {
+			for ($i = 0; $i < $count; ++$i) {
+				$set[$i]->overflow = 0;
+				$obj->offsetSet($i, $set[$i]);
+			}
+		}
+		return $obj;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (!($value instanceof ParagonIE_Sodium_Core32_Int32)) {
-            throw new InvalidArgumentException('Expected an instance of ParagonIE_Sodium_Core32_Int32');
-        }
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            ParagonIE_Sodium_Core32_Util::declareScalarType($offset, 'int', 1);
-            $this->container[(int) $offset] = $value;
-        }
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		if (!($value instanceof ParagonIE_Sodium_Core32_Int32)) {
+			throw new InvalidArgumentException('Expected an instance of ParagonIE_Sodium_Core32_Int32');
+		}
+		if (is_null($offset)) {
+			$this->container[] = $value;
+		} else {
+			ParagonIE_Sodium_Core32_Util::declareScalarType($offset, 'int', 1);
+			$this->container[(int) $offset] = $value;
+		}
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->container[$offset]);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->container[$offset]);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        if (!isset($this->container[$offset])) {
-            $this->container[(int) $offset] = new ParagonIE_Sodium_Core32_Int32();
-        }
-        return $this->container[$offset];
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return mixed|null
+	 */
+	public function offsetGet($offset)
+	{
+		if (!isset($this->container[$offset])) {
+			$this->container[(int) $offset] = new ParagonIE_Sodium_Core32_Int32();
+		}
+		return $this->container[$offset];
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return array
-     */
-    public function __debugInfo()
-    {
-        if (empty($this->container)) {
-            return array();
-        }
-        $c = array(
-            (int) ($this->container[0]->toInt()),
-            (int) ($this->container[1]->toInt()),
-            (int) ($this->container[2]->toInt()),
-            (int) ($this->container[3]->toInt()),
-            (int) ($this->container[4]->toInt()),
-            (int) ($this->container[5]->toInt()),
-            (int) ($this->container[6]->toInt()),
-            (int) ($this->container[7]->toInt()),
-            (int) ($this->container[8]->toInt()),
-            (int) ($this->container[9]->toInt())
-        );
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return array
+	 */
+	public function __debugInfo()
+	{
+		if (empty($this->container)) {
+			return array();
+		}
+		$c = array(
+			(int) ($this->container[0]->toInt()),
+			(int) ($this->container[1]->toInt()),
+			(int) ($this->container[2]->toInt()),
+			(int) ($this->container[3]->toInt()),
+			(int) ($this->container[4]->toInt()),
+			(int) ($this->container[5]->toInt()),
+			(int) ($this->container[6]->toInt()),
+			(int) ($this->container[7]->toInt()),
+			(int) ($this->container[8]->toInt()),
+			(int) ($this->container[9]->toInt())
+		);
         
-        /* 
+		/* 
         $c = array(
             ParagonIE_Sodium_Core_Util::bin2hex($this->container[0]->toReverseString()),
             ParagonIE_Sodium_Core_Util::bin2hex($this->container[1]->toReverseString()),
@@ -203,6 +203,6 @@ 
             json_encode($this->container[9]->limbs)
         );
         */
-        return array(implode(', ', $c));
-    }
+		return array(implode(', ', $c));
+	}
 }

Spacing +51 added lines, -51 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Fe', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Fe', false ) ) {
     return;
 }
 
@@ -25,7 +25,7 @@ 
      * ParagonIE_Sodium_Core32_Curve25519_Fe constructor.
      * @param int $size
      */
-    public function __construct($size = 10)
+    public function __construct( $size = 10 )
     {
         $this->size = 10;
     }
@@ -37,26 +37,26 @@ 
      * @param bool $save_indexes
      * @return self
      */
-    public static function fromArray($array, $save_indexes = null)
+    public static function fromArray( $array, $save_indexes = null )
     {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
+        $count = count( $array );
+        if ( $save_indexes ) {
+            $keys = array_keys( $array );
         } else {
-            $keys = range(0, $count - 1);
+            $keys = range( 0, $count - 1 );
         }
-        $array = array_values($array);
+        $array = array_values( $array );
 
-        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
+        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe( $count );
+        if ( $save_indexes ) {
+            for ( $i = 0; $i < $count; ++$i ) {
                 $array[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $array[$i]);
+                $obj->offsetSet( $keys[$i], $array[$i] );
             }
         } else {
-            for ($i = 0; $i < $count; ++$i) {
+            for ( $i = 0; $i < $count; ++$i ) {
                 $array[$i]->overflow = 0;
-                $obj->offsetSet($i, $array[$i]);
+                $obj->offsetSet( $i, $array[$i] );
             }
         }
         return $obj;
@@ -69,30 +69,30 @@ 
      * @param bool $save_indexes
      * @return self
      */
-    public static function fromIntArray($array, $save_indexes = null)
+    public static function fromIntArray( $array, $save_indexes = null )
     {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
+        $count = count( $array );
+        if ( $save_indexes ) {
+            $keys = array_keys( $array );
         } else {
-            $keys = range(0, $count - 1);
+            $keys = range( 0, $count - 1 );
         }
-        $array = array_values($array);
+        $array = array_values( $array );
         $set = array();
-        foreach ($array as $i => $v) {
-            $set[$i] = ParagonIE_Sodium_Core32_Int32::fromInt($v);
+        foreach ( $array as $i => $v ) {
+            $set[$i] = ParagonIE_Sodium_Core32_Int32::fromInt( $v );
         }
 
-        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
+        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe( $count );
+        if ( $save_indexes ) {
+            for ( $i = 0; $i < $count; ++$i ) {
                 $set[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $set[$i]);
+                $obj->offsetSet( $keys[$i], $set[$i] );
             }
         } else {
-            for ($i = 0; $i < $count; ++$i) {
+            for ( $i = 0; $i < $count; ++$i ) {
                 $set[$i]->overflow = 0;
-                $obj->offsetSet($i, $set[$i]);
+                $obj->offsetSet( $i, $set[$i] );
             }
         }
         return $obj;
@@ -105,15 +105,15 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        if (!($value instanceof ParagonIE_Sodium_Core32_Int32)) {
-            throw new InvalidArgumentException('Expected an instance of ParagonIE_Sodium_Core32_Int32');
+        if ( ! ( $value instanceof ParagonIE_Sodium_Core32_Int32 ) ) {
+            throw new InvalidArgumentException( 'Expected an instance of ParagonIE_Sodium_Core32_Int32' );
         }
-        if (is_null($offset)) {
+        if ( is_null( $offset ) ) {
             $this->container[] = $value;
         } else {
-            ParagonIE_Sodium_Core32_Util::declareScalarType($offset, 'int', 1);
+            ParagonIE_Sodium_Core32_Util::declareScalarType( $offset, 'int', 1 );
             $this->container[(int) $offset] = $value;
         }
     }
@@ -124,9 +124,9 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[$offset] );
     }
 
     /**
@@ -135,9 +135,9 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[$offset] );
     }
 
     /**
@@ -146,9 +146,9 @@ 
      * @param mixed $offset
      * @return mixed|null
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        if (!isset($this->container[$offset])) {
+        if ( ! isset( $this->container[$offset] ) ) {
             $this->container[(int) $offset] = new ParagonIE_Sodium_Core32_Int32();
         }
         return $this->container[$offset];
@@ -161,20 +161,20 @@ 
      */
     public function __debugInfo()
     {
-        if (empty($this->container)) {
+        if ( empty( $this->container ) ) {
             return array();
         }
         $c = array(
-            (int) ($this->container[0]->toInt()),
-            (int) ($this->container[1]->toInt()),
-            (int) ($this->container[2]->toInt()),
-            (int) ($this->container[3]->toInt()),
-            (int) ($this->container[4]->toInt()),
-            (int) ($this->container[5]->toInt()),
-            (int) ($this->container[6]->toInt()),
-            (int) ($this->container[7]->toInt()),
-            (int) ($this->container[8]->toInt()),
-            (int) ($this->container[9]->toInt())
+            (int) ( $this->container[0]->toInt() ),
+            (int) ( $this->container[1]->toInt() ),
+            (int) ( $this->container[2]->toInt() ),
+            (int) ( $this->container[3]->toInt() ),
+            (int) ( $this->container[4]->toInt() ),
+            (int) ( $this->container[5]->toInt() ),
+            (int) ( $this->container[6]->toInt() ),
+            (int) ( $this->container[7]->toInt() ),
+            (int) ( $this->container[8]->toInt() ),
+            (int) ( $this->container[9]->toInt() )
         );
         
         /* 
@@ -203,6 +203,6 @@ 
             json_encode($this->container[9]->limbs)
         );
         */
-        return array(implode(', ', $c));
+        return array( implode( ', ', $c ) );
     }
 }

Braces +9 added lines, -18 removed lines

@@ -9,8 +9,7 @@ 
  *
  * This represents a Field Element
  */
-class ParagonIE_Sodium_Core32_Curve25519_Fe implements ArrayAccess
-{
+class ParagonIE_Sodium_Core32_Curve25519_Fe implements ArrayAccess {
     /**
      * @var array<int, ParagonIE_Sodium_Core32_Int32>
      */
@@ -25,8 +24,7 @@ 
      * ParagonIE_Sodium_Core32_Curve25519_Fe constructor.
      * @param int $size
      */
-    public function __construct($size = 10)
-    {
+    public function __construct($size = 10) {
         $this->size = 10;
     }
 
@@ -37,8 +35,7 @@ 
      * @param bool $save_indexes
      * @return self
      */
-    public static function fromArray($array, $save_indexes = null)
-    {
+    public static function fromArray($array, $save_indexes = null) {
         $count = count($array);
         if ($save_indexes) {
             $keys = array_keys($array);
@@ -69,8 +66,7 @@ 
      * @param bool $save_indexes
      * @return self
      */
-    public static function fromIntArray($array, $save_indexes = null)
-    {
+    public static function fromIntArray($array, $save_indexes = null) {
         $count = count($array);
         if ($save_indexes) {
             $keys = array_keys($array);
@@ -105,8 +101,7 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         if (!($value instanceof ParagonIE_Sodium_Core32_Int32)) {
             throw new InvalidArgumentException('Expected an instance of ParagonIE_Sodium_Core32_Int32');
         }
@@ -124,8 +119,7 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         return isset($this->container[$offset]);
     }
 
@@ -135,8 +129,7 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         unset($this->container[$offset]);
     }
 
@@ -146,8 +139,7 @@ 
      * @param mixed $offset
      * @return mixed|null
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         if (!isset($this->container[$offset])) {
             $this->container[(int) $offset] = new ParagonIE_Sodium_Core32_Int32();
         }
@@ -159,8 +151,7 @@ 
      *
      * @return array
      */
-    public function __debugInfo()
-    {
+    public function __debugInfo() {
         if (empty($this->container)) {
             return array();
         }