WordPoints / wordpoints

src/library/sodium_compat/lib/php72compat.php

Doc Comments +4 added lines, -4 removed lines

@@ -240,7 +240,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_box_open($message, $nonce, $kp)
     {
@@ -288,7 +288,7 @@ 
     /**
      * @param string $message
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_box_seal_open($message, $kp)
     {
@@ -496,7 +496,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_secretbox_open($message, $nonce, $key)
     {
@@ -555,7 +555,7 @@ 
     /**
      * @param string $signedMessage
      * @param string $pk
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_sign_open($signedMessage, $pk)
     {

Indentation +616 added lines, -616 removed lines

@@ -8,738 +8,738 @@
  * ParagonIE_Sodium_Compat method or class constant, respectively.
  */
 foreach (array(
-    'CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_ABYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES',
-    'CRYPTO_AUTH_BYTES',
-    'CRYPTO_AUTH_KEYBYTES',
-    'CRYPTO_BOX_SEALBYTES',
-    'CRYPTO_BOX_SECRETKEYBYTES',
-    'CRYPTO_BOX_PUBLICKEYBYTES',
-    'CRYPTO_BOX_KEYPAIRBYTES',
-    'CRYPTO_BOX_MACBYTES',
-    'CRYPTO_BOX_NONCEBYTES',
-    'CRYPTO_BOX_SEEDBYTES',
-    'CRYPTO_KX_BYTES',
-    'CRYPTO_KX_PUBLICKEYBYTES',
-    'CRYPTO_KX_SECRETKEYBYTES',
-    'CRYPTO_GENERICHASH_BYTES',
-    'CRYPTO_GENERICHASH_BYTES_MIN',
-    'CRYPTO_GENERICHASH_BYTES_MAX',
-    'CRYPTO_GENERICHASH_KEYBYTES',
-    'CRYPTO_GENERICHASH_KEYBYTES_MIN',
-    'CRYPTO_GENERICHASH_KEYBYTES_MAX',
-    'CRYPTO_PWHASH_SALTBYTES',
-    'CRYPTO_PWHASH_STRPREFIX',
-    'CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE',
-    'CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE',
-    'CRYPTO_PWHASH_MEMLIMIT_MODERATE',
-    'CRYPTO_PWHASH_OPSLIMIT_MODERATE',
-    'CRYPTO_PWHASH_MEMLIMIT_SENSITIVE',
-    'CRYPTO_PWHASH_OPSLIMIT_SENSITIVE',
-    'CRYPTO_SCALARMULT_BYTES',
-    'CRYPTO_SCALARMULT_SCALARBYTES',
-    'CRYPTO_SHORTHASH_BYTES',
-    'CRYPTO_SHORTHASH_KEYBYTES',
-    'CRYPTO_SECRETBOX_KEYBYTES',
-    'CRYPTO_SECRETBOX_MACBYTES',
-    'CRYPTO_SECRETBOX_NONCEBYTES',
-    'CRYPTO_SIGN_BYTES',
-    'CRYPTO_SIGN_SEEDBYTES',
-    'CRYPTO_SIGN_PUBLICKEYBYTES',
-    'CRYPTO_SIGN_SECRETKEYBYTES',
-    'CRYPTO_SIGN_KEYPAIRBYTES',
-    'CRYPTO_STREAM_KEYBYTES',
-    'CRYPTO_STREAM_NONCEBYTES',
-    ) as $constant
+	'CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_ABYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES',
+	'CRYPTO_AUTH_BYTES',
+	'CRYPTO_AUTH_KEYBYTES',
+	'CRYPTO_BOX_SEALBYTES',
+	'CRYPTO_BOX_SECRETKEYBYTES',
+	'CRYPTO_BOX_PUBLICKEYBYTES',
+	'CRYPTO_BOX_KEYPAIRBYTES',
+	'CRYPTO_BOX_MACBYTES',
+	'CRYPTO_BOX_NONCEBYTES',
+	'CRYPTO_BOX_SEEDBYTES',
+	'CRYPTO_KX_BYTES',
+	'CRYPTO_KX_PUBLICKEYBYTES',
+	'CRYPTO_KX_SECRETKEYBYTES',
+	'CRYPTO_GENERICHASH_BYTES',
+	'CRYPTO_GENERICHASH_BYTES_MIN',
+	'CRYPTO_GENERICHASH_BYTES_MAX',
+	'CRYPTO_GENERICHASH_KEYBYTES',
+	'CRYPTO_GENERICHASH_KEYBYTES_MIN',
+	'CRYPTO_GENERICHASH_KEYBYTES_MAX',
+	'CRYPTO_PWHASH_SALTBYTES',
+	'CRYPTO_PWHASH_STRPREFIX',
+	'CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE',
+	'CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE',
+	'CRYPTO_PWHASH_MEMLIMIT_MODERATE',
+	'CRYPTO_PWHASH_OPSLIMIT_MODERATE',
+	'CRYPTO_PWHASH_MEMLIMIT_SENSITIVE',
+	'CRYPTO_PWHASH_OPSLIMIT_SENSITIVE',
+	'CRYPTO_SCALARMULT_BYTES',
+	'CRYPTO_SCALARMULT_SCALARBYTES',
+	'CRYPTO_SHORTHASH_BYTES',
+	'CRYPTO_SHORTHASH_KEYBYTES',
+	'CRYPTO_SECRETBOX_KEYBYTES',
+	'CRYPTO_SECRETBOX_MACBYTES',
+	'CRYPTO_SECRETBOX_NONCEBYTES',
+	'CRYPTO_SIGN_BYTES',
+	'CRYPTO_SIGN_SEEDBYTES',
+	'CRYPTO_SIGN_PUBLICKEYBYTES',
+	'CRYPTO_SIGN_SECRETKEYBYTES',
+	'CRYPTO_SIGN_KEYPAIRBYTES',
+	'CRYPTO_STREAM_KEYBYTES',
+	'CRYPTO_STREAM_NONCEBYTES',
+	) as $constant
 ) {
-    if (!defined("SODIUM_$constant")) {
-        define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
-    }
+	if (!defined("SODIUM_$constant")) {
+		define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
+	}
 }
 
 if (!is_callable('sodium_bin2hex')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function sodium_bin2hex($string)
-    {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function sodium_bin2hex($string)
+	{
+		return ParagonIE_Sodium_Compat::bin2hex($string);
+	}
 }
 if (!is_callable('sodium_compare')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function sodium_compare($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function sodium_compare($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::compare($a, $b);
+	}
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_auth')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_auth($message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_auth($message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+	}
 }
 if (!is_callable('sodium_crypto_auth_verify')) {
-    /**
-     * @param string $mac
-     * @param string $message
-     * @param string $key
-     * @return bool
-     */
-    function sodium_crypto_auth_verify($mac, $message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
-    }
+	/**
+	 * @param string $mac
+	 * @param string $message
+	 * @param string $key
+	 * @return bool
+	 */
+	function sodium_crypto_auth_verify($mac, $message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+	}
 }
 if (!is_callable('sodium_crypto_box')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string
-     */
-    function sodium_crypto_box($message, $nonce, $kp)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string
+	 */
+	function sodium_crypto_box($message, $nonce, $kp)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+	}
 }
 if (!is_callable('sodium_crypto_box_keypair')) {
-    /**
-     * @return string
-     */
-    function sodium_crypto_box_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function sodium_crypto_box_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_keypair();
+	}
 }
 if (!is_callable('sodium_crypto_box_keypair_from_secretkey_and_publickey')) {
-    /**
-     * @param string $sk
-     * @param string $pk
-     * @return string
-     */
-    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
-    }
+	/**
+	 * @param string $sk
+	 * @param string $pk
+	 * @return string
+	 */
+	function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+	}
 }
 if (!is_callable('sodium_crypto_box_open')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string|bool
-     */
-    function sodium_crypto_box_open($message, $nonce, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function sodium_crypto_box_open($message, $nonce, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_box_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_box_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_box_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_box_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_box_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_box_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('sodium_crypto_box_seal')) {
-    /**
-     * @param string $message
-     * @param string $publicKey
-     * @return string
-     */
-    function sodium_crypto_box_seal($message, $publicKey)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
-    }
+	/**
+	 * @param string $message
+	 * @param string $publicKey
+	 * @return string
+	 */
+	function sodium_crypto_box_seal($message, $publicKey)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+	}
 }
 if (!is_callable('sodium_crypto_box_seal_open')) {
-    /**
-     * @param string $message
-     * @param string $kp
-     * @return string|bool
-     */
-    function sodium_crypto_box_seal_open($message, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function sodium_crypto_box_seal_open($message, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_box_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_box_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_box_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_box_seed_keypair')) {
-    /**
-     * @param string $seed
-     * @return string
-     */
-    function sodium_crypto_box_seed_keypair($seed)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
-    }
+	/**
+	 * @param string $seed
+	 * @return string
+	 */
+	function sodium_crypto_box_seed_keypair($seed)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
+	}
 }
 if (!is_callable('sodium_crypto_generichash')) {
-    /**
-     * @param string $message
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function sodium_crypto_generichash($message, $key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
-    }
+	/**
+	 * @param string $message
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function sodium_crypto_generichash($message, $key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+	}
 }
 if (!is_callable('sodium_crypto_generichash_final')) {
-    /**
-     * @param string|null $ctx
-     * @param int $outputLength
-     * @return string
-     */
-    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param int $outputLength
+	 * @return string
+	 */
+	function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+	}
 }
 if (!is_callable('sodium_crypto_generichash_init')) {
-    /**
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function sodium_crypto_generichash_init($key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
-    }
+	/**
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function sodium_crypto_generichash_init($key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+	}
 }
 if (!is_callable('sodium_crypto_generichash_update')) {
-    /**
-     * @param string|null $ctx
-     * @param string $message
-     * @return void
-     */
-    function sodium_crypto_generichash_update(&$ctx, $message = '')
-    {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param string $message
+	 * @return void
+	 */
+	function sodium_crypto_generichash_update(&$ctx, $message = '')
+	{
+		ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+	}
 }
 if (!is_callable('sodium_crypto_kx')) {
-    /**
-     * @param string $my_secret
-     * @param string $their_public
-     * @param string $client_public
-     * @param string $server_public
-     * @return string
-     */
-    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
-        return ParagonIE_Sodium_Compat::crypto_kx(
-            $my_secret,
-            $their_public,
-            $client_public,
-            $server_public
-        );
-    }
+	/**
+	 * @param string $my_secret
+	 * @param string $their_public
+	 * @param string $client_public
+	 * @param string $server_public
+	 * @return string
+	 */
+	function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
+	{
+		return ParagonIE_Sodium_Compat::crypto_kx(
+			$my_secret,
+			$their_public,
+			$client_public,
+			$server_public
+		);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_str')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_str_verify')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function sodium_crypto_pwhash_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function sodium_crypto_pwhash_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str_verify')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('sodium_crypto_scalarmult')) {
-    /**
-     * @param string $n
-     * @param string $p
-     * @return string
-     */
-    function sodium_crypto_scalarmult($n, $p)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
-    }
+	/**
+	 * @param string $n
+	 * @param string $p
+	 * @return string
+	 */
+	function sodium_crypto_scalarmult($n, $p)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+	}
 }
 if (!is_callable('sodium_crypto_scalarmult_base')) {
-    /**
-     * @param string $n
-     * @return string
-     */
-    function sodium_crypto_scalarmult_base($n)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
-    }
+	/**
+	 * @param string $n
+	 * @return string
+	 */
+	function sodium_crypto_scalarmult_base($n)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+	}
 }
 if (!is_callable('sodium_crypto_secretbox')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_secretbox($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_secretbox($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_secretbox_open')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function sodium_crypto_secretbox_open($message, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function sodium_crypto_secretbox_open($message, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_shorthash')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_shorthash($message, $key = '')
-    {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_shorthash($message, $key = '')
+	{
+		return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+	}
 }
 if (!is_callable('sodium_crypto_sign')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_sign($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_sign($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+	}
 }
 if (!is_callable('sodium_crypto_sign_detached')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_sign_detached($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_sign_detached($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+	}
 }
 if (!is_callable('sodium_crypto_sign_keypair')) {
-    /**
-     * @return string
-     */
-    function sodium_crypto_sign_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function sodium_crypto_sign_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+	}
 }
 if (!is_callable('sodium_crypto_sign_open')) {
-    /**
-     * @param string $signedMessage
-     * @param string $pk
-     * @return string|bool
-     */
-    function sodium_crypto_sign_open($signedMessage, $pk)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $signedMessage
+	 * @param string $pk
+	 * @return string|bool
+	 */
+	function sodium_crypto_sign_open($signedMessage, $pk)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_sign_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_sign_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_sign_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_sign_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_sign_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_sign_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('sodium_crypto_sign_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_sign_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_sign_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_sign_seed_keypair')) {
-    /**
-     * @param string $seed
-     * @return string
-     */
-    function sodium_crypto_sign_seed_keypair($seed)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
-    }
+	/**
+	 * @param string $seed
+	 * @return string
+	 */
+	function sodium_crypto_sign_seed_keypair($seed)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+	}
 }
 if (!is_callable('sodium_crypto_sign_verify_detached')) {
-    /**
-     * @param string $signature
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     */
-    function sodium_crypto_sign_verify_detached($signature, $message, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
-    }
+	/**
+	 * @param string $signature
+	 * @param string $message
+	 * @param string $pk
+	 * @return bool
+	 */
+	function sodium_crypto_sign_verify_detached($signature, $message, $pk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+	}
 }
 if (!is_callable('sodium_crypto_stream')) {
-    /**
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_stream($len, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
-    }
+	/**
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_stream($len, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_stream_xor')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_stream_xor($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_stream_xor($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_hex2bin')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function sodium_hex2bin($string)
-    {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function sodium_hex2bin($string)
+	{
+		return ParagonIE_Sodium_Compat::hex2bin($string);
+	}
 }
 if (!is_callable('sodium_increment')) {
-    /**
-     * @param &string $string
-     * @return void
-     */
-    function sodium_increment(&$string)
-    {
-        ParagonIE_Sodium_Compat::increment($string);
-    }
+	/**
+	 * @param &string $string
+	 * @return void
+	 */
+	function sodium_increment(&$string)
+	{
+		ParagonIE_Sodium_Compat::increment($string);
+	}
 }
 if (!is_callable('sodium_library_version_major')) {
-    /**
-     * @return int
-     */
-    function sodium_library_version_major()
-    {
-        return ParagonIE_Sodium_Compat::library_version_major();
-    }
+	/**
+	 * @return int
+	 */
+	function sodium_library_version_major()
+	{
+		return ParagonIE_Sodium_Compat::library_version_major();
+	}
 }
 if (!is_callable('sodium_library_version_minor')) {
-    /**
-     * @return int
-     */
-    function sodium_library_version_minor()
-    {
-        return ParagonIE_Sodium_Compat::library_version_minor();
-    }
+	/**
+	 * @return int
+	 */
+	function sodium_library_version_minor()
+	{
+		return ParagonIE_Sodium_Compat::library_version_minor();
+	}
 }
 if (!is_callable('sodium_version_string')) {
-    /**
-     * @return string
-     */
-    function sodium_version_string()
-    {
-        return ParagonIE_Sodium_Compat::version_string();
-    }
+	/**
+	 * @return string
+	 */
+	function sodium_version_string()
+	{
+		return ParagonIE_Sodium_Compat::version_string();
+	}
 }
 if (!is_callable('sodium_memcmp')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function sodium_memcmp($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function sodium_memcmp($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::memcmp($a, $b);
+	}
 }
 if (!is_callable('sodium_memzero')) {
-    /**
-     * @param string &$str
-     * @return void
-     */
-    function sodium_memzero(&$str)
-    {
-        ParagonIE_Sodium_Compat::memzero($str);
-    }
+	/**
+	 * @param string &$str
+	 * @return void
+	 */
+	function sodium_memzero(&$str)
+	{
+		ParagonIE_Sodium_Compat::memzero($str);
+	}
 }
 if (!is_callable('sodium_randombytes_buf')) {
-    /**
-     * @param int $amount
-     * @return string
-     */
-    function sodium_randombytes_buf($amount)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
-    }
+	/**
+	 * @param int $amount
+	 * @return string
+	 */
+	function sodium_randombytes_buf($amount)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+	}
 }
 
 if (!is_callable('sodium_randombytes_uniform')) {
-    /**
-     * @param int $upperLimit
-     * @return int
-     */
-    function sodium_randombytes_uniform($upperLimit)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
-    }
+	/**
+	 * @param int $upperLimit
+	 * @return int
+	 */
+	function sodium_randombytes_uniform($upperLimit)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+	}
 }
 
 if (!is_callable('sodium_randombytes_random16')) {
-    /**
-     * @return int
-     */
-    function sodium_randombytes_random16()
-    {
-        return ParagonIE_Sodium_Compat::randombytes_random16();
-    }
+	/**
+	 * @return int
+	 */
+	function sodium_randombytes_random16()
+	{
+		return ParagonIE_Sodium_Compat::randombytes_random16();
+	}
 }

Spacing +175 added lines, -175 removed lines

@@ -7,7 +7,7 @@ 
  * Thus, the functions or constants just proxy to the appropriate
  * ParagonIE_Sodium_Compat method or class constant, respectively.
  */
-foreach (array(
+foreach ( array(
     'CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES',
     'CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES',
     'CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES',
@@ -58,33 +58,33 @@ 
     'CRYPTO_STREAM_NONCEBYTES',
     ) as $constant
 ) {
-    if (!defined("SODIUM_$constant")) {
-        define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
+    if ( ! defined( "SODIUM_$constant" ) ) {
+        define( "SODIUM_$constant", constant( "ParagonIE_Sodium_Compat::$constant" ) );
     }
 }
 
-if (!is_callable('sodium_bin2hex')) {
+if ( ! is_callable( 'sodium_bin2hex' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    function sodium_bin2hex($string)
+    function sodium_bin2hex( $string )
     {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
+        return ParagonIE_Sodium_Compat::bin2hex( $string );
     }
 }
-if (!is_callable('sodium_compare')) {
+if ( ! is_callable( 'sodium_compare' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    function sodium_compare($a, $b)
+    function sodium_compare( $a, $b )
     {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
+        return ParagonIE_Sodium_Compat::compare( $a, $b );
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -92,18 +92,18 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_encrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -111,12 +111,12 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -124,18 +124,18 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_ietf_encrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -143,12 +143,12 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_xchacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -156,18 +156,18 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_xchacha20poly1305_ietf_encrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -175,47 +175,47 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_auth')) {
+if ( ! is_callable( 'sodium_crypto_auth' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    function sodium_crypto_auth($message, $key)
+    function sodium_crypto_auth( $message, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+        return ParagonIE_Sodium_Compat::crypto_auth( $message, $key );
     }
 }
-if (!is_callable('sodium_crypto_auth_verify')) {
+if ( ! is_callable( 'sodium_crypto_auth_verify' ) ) {
     /**
      * @param string $mac
      * @param string $message
      * @param string $key
      * @return bool
      */
-    function sodium_crypto_auth_verify($mac, $message, $key)
+    function sodium_crypto_auth_verify( $mac, $message, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+        return ParagonIE_Sodium_Compat::crypto_auth_verify( $mac, $message, $key );
     }
 }
-if (!is_callable('sodium_crypto_box')) {
+if ( ! is_callable( 'sodium_crypto_box' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $kp
      * @return string
      */
-    function sodium_crypto_box($message, $nonce, $kp)
+    function sodium_crypto_box( $message, $nonce, $kp )
     {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+        return ParagonIE_Sodium_Compat::crypto_box( $message, $nonce, $kp );
     }
 }
-if (!is_callable('sodium_crypto_box_keypair')) {
+if ( ! is_callable( 'sodium_crypto_box_keypair' ) ) {
     /**
      * @return string
      */
@@ -224,149 +224,149 @@ 
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
 }
-if (!is_callable('sodium_crypto_box_keypair_from_secretkey_and_publickey')) {
+if ( ! is_callable( 'sodium_crypto_box_keypair_from_secretkey_and_publickey' ) ) {
     /**
      * @param string $sk
      * @param string $pk
      * @return string
      */
-    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    function sodium_crypto_box_keypair_from_secretkey_and_publickey( $sk, $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey( $sk, $pk );
     }
 }
-if (!is_callable('sodium_crypto_box_open')) {
+if ( ! is_callable( 'sodium_crypto_box_open' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $kp
      * @return string|bool
      */
-    function sodium_crypto_box_open($message, $nonce, $kp)
+    function sodium_crypto_box_open( $message, $nonce, $kp )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_box_open( $message, $nonce, $kp );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_box_publickey')) {
+if ( ! is_callable( 'sodium_crypto_box_publickey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_box_publickey($keypair)
+    function sodium_crypto_box_publickey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_box_publickey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_box_publickey_from_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_box_publickey_from_secretkey' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_box_publickey_from_secretkey($sk)
+    function sodium_crypto_box_publickey_from_secretkey( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey( $sk );
     }
 }
-if (!is_callable('sodium_crypto_box_seal')) {
+if ( ! is_callable( 'sodium_crypto_box_seal' ) ) {
     /**
      * @param string $message
      * @param string $publicKey
      * @return string
      */
-    function sodium_crypto_box_seal($message, $publicKey)
+    function sodium_crypto_box_seal( $message, $publicKey )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+        return ParagonIE_Sodium_Compat::crypto_box_seal( $message, $publicKey );
     }
 }
-if (!is_callable('sodium_crypto_box_seal_open')) {
+if ( ! is_callable( 'sodium_crypto_box_seal_open' ) ) {
     /**
      * @param string $message
      * @param string $kp
      * @return string|bool
      */
-    function sodium_crypto_box_seal_open($message, $kp)
+    function sodium_crypto_box_seal_open( $message, $kp )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_box_seal_open( $message, $kp );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_box_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_box_secretkey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_box_secretkey($keypair)
+    function sodium_crypto_box_secretkey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_box_secretkey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_box_seed_keypair')) {
+if ( ! is_callable( 'sodium_crypto_box_seed_keypair' ) ) {
     /**
      * @param string $seed
      * @return string
      */
-    function sodium_crypto_box_seed_keypair($seed)
+    function sodium_crypto_box_seed_keypair( $seed )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
+        return ParagonIE_Sodium_Compat::crypto_box_seed_keypair( $seed );
     }
 }
-if (!is_callable('sodium_crypto_generichash')) {
+if ( ! is_callable( 'sodium_crypto_generichash' ) ) {
     /**
      * @param string $message
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    function sodium_crypto_generichash($message, $key = null, $outLen = 32)
+    function sodium_crypto_generichash( $message, $key = null, $outLen = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+        return ParagonIE_Sodium_Compat::crypto_generichash( $message, $key, $outLen );
     }
 }
-if (!is_callable('sodium_crypto_generichash_final')) {
+if ( ! is_callable( 'sodium_crypto_generichash_final' ) ) {
     /**
      * @param string|null $ctx
      * @param int $outputLength
      * @return string
      */
-    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
+    function sodium_crypto_generichash_final( &$ctx, $outputLength = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+        return ParagonIE_Sodium_Compat::crypto_generichash_final( $ctx, $outputLength );
     }
 }
-if (!is_callable('sodium_crypto_generichash_init')) {
+if ( ! is_callable( 'sodium_crypto_generichash_init' ) ) {
     /**
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    function sodium_crypto_generichash_init($key = null, $outLen = 32)
+    function sodium_crypto_generichash_init( $key = null, $outLen = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+        return ParagonIE_Sodium_Compat::crypto_generichash_init( $key, $outLen );
     }
 }
-if (!is_callable('sodium_crypto_generichash_update')) {
+if ( ! is_callable( 'sodium_crypto_generichash_update' ) ) {
     /**
      * @param string|null $ctx
      * @param string $message
      * @return void
      */
-    function sodium_crypto_generichash_update(&$ctx, $message = '')
+    function sodium_crypto_generichash_update( &$ctx, $message = '' )
     {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+        ParagonIE_Sodium_Compat::crypto_generichash_update( $ctx, $message );
     }
 }
-if (!is_callable('sodium_crypto_kx')) {
+if ( ! is_callable( 'sodium_crypto_kx' ) ) {
     /**
      * @param string $my_secret
      * @param string $their_public
@@ -374,7 +374,7 @@ 
      * @param string $server_public
      * @return string
      */
-    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    function sodium_crypto_kx( $my_secret, $their_public, $client_public, $server_public )
     {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
@@ -384,7 +384,7 @@ 
         );
     }
 }
-if (!is_callable('sodium_crypto_pwhash')) {
+if ( ! is_callable( 'sodium_crypto_pwhash' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -393,35 +393,35 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function sodium_crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_str')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_str' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    function sodium_crypto_pwhash_str( $passwd, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str( $passwd, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_str_verify')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_str_verify' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    function sodium_crypto_pwhash_str_verify($passwd, $hash)
+    function sodium_crypto_pwhash_str_verify( $passwd, $hash )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify( $passwd, $hash );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_scryptsalsa208sha256' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -430,119 +430,119 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function sodium_crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_scryptsalsa208sha256_str' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_scryptsalsa208sha256_str_verify' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash );
     }
 }
-if (!is_callable('sodium_crypto_scalarmult')) {
+if ( ! is_callable( 'sodium_crypto_scalarmult' ) ) {
     /**
      * @param string $n
      * @param string $p
      * @return string
      */
-    function sodium_crypto_scalarmult($n, $p)
+    function sodium_crypto_scalarmult( $n, $p )
     {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+        return ParagonIE_Sodium_Compat::crypto_scalarmult( $n, $p );
     }
 }
-if (!is_callable('sodium_crypto_scalarmult_base')) {
+if ( ! is_callable( 'sodium_crypto_scalarmult_base' ) ) {
     /**
      * @param string $n
      * @return string
      */
-    function sodium_crypto_scalarmult_base($n)
+    function sodium_crypto_scalarmult_base( $n )
     {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+        return ParagonIE_Sodium_Compat::crypto_scalarmult_base( $n );
     }
 }
-if (!is_callable('sodium_crypto_secretbox')) {
+if ( ! is_callable( 'sodium_crypto_secretbox' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function sodium_crypto_secretbox($message, $nonce, $key)
+    function sodium_crypto_secretbox( $message, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_secretbox( $message, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_secretbox_open')) {
+if ( ! is_callable( 'sodium_crypto_secretbox_open' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string|bool
      */
-    function sodium_crypto_secretbox_open($message, $nonce, $key)
+    function sodium_crypto_secretbox_open( $message, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_secretbox_open( $message, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_shorthash')) {
+if ( ! is_callable( 'sodium_crypto_shorthash' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    function sodium_crypto_shorthash($message, $key = '')
+    function sodium_crypto_shorthash( $message, $key = '' )
     {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+        return ParagonIE_Sodium_Compat::crypto_shorthash( $message, $key );
     }
 }
-if (!is_callable('sodium_crypto_sign')) {
+if ( ! is_callable( 'sodium_crypto_sign' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign($message, $sk)
+    function sodium_crypto_sign( $message, $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+        return ParagonIE_Sodium_Compat::crypto_sign( $message, $sk );
     }
 }
-if (!is_callable('sodium_crypto_sign_detached')) {
+if ( ! is_callable( 'sodium_crypto_sign_detached' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign_detached($message, $sk)
+    function sodium_crypto_sign_detached( $message, $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_detached( $message, $sk );
     }
 }
-if (!is_callable('sodium_crypto_sign_keypair')) {
+if ( ! is_callable( 'sodium_crypto_sign_keypair' ) ) {
     /**
      * @return string
      */
@@ -551,120 +551,120 @@ 
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
-if (!is_callable('sodium_crypto_sign_open')) {
+if ( ! is_callable( 'sodium_crypto_sign_open' ) ) {
     /**
      * @param string $signedMessage
      * @param string $pk
      * @return string|bool
      */
-    function sodium_crypto_sign_open($signedMessage, $pk)
+    function sodium_crypto_sign_open( $signedMessage, $pk )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_sign_open( $signedMessage, $pk );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_sign_publickey')) {
+if ( ! is_callable( 'sodium_crypto_sign_publickey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_sign_publickey($keypair)
+    function sodium_crypto_sign_publickey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_sign_publickey_from_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_sign_publickey_from_secretkey' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign_publickey_from_secretkey($sk)
+    function sodium_crypto_sign_publickey_from_secretkey( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey( $sk );
     }
 }
-if (!is_callable('sodium_crypto_sign_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_sign_secretkey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_sign_secretkey($keypair)
+    function sodium_crypto_sign_secretkey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_sign_secretkey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_sign_seed_keypair')) {
+if ( ! is_callable( 'sodium_crypto_sign_seed_keypair' ) ) {
     /**
      * @param string $seed
      * @return string
      */
-    function sodium_crypto_sign_seed_keypair($seed)
+    function sodium_crypto_sign_seed_keypair( $seed )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair( $seed );
     }
 }
-if (!is_callable('sodium_crypto_sign_verify_detached')) {
+if ( ! is_callable( 'sodium_crypto_sign_verify_detached' ) ) {
     /**
      * @param string $signature
      * @param string $message
      * @param string $pk
      * @return bool
      */
-    function sodium_crypto_sign_verify_detached($signature, $message, $pk)
+    function sodium_crypto_sign_verify_detached( $signature, $message, $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached( $signature, $message, $pk );
     }
 }
-if (!is_callable('sodium_crypto_stream')) {
+if ( ! is_callable( 'sodium_crypto_stream' ) ) {
     /**
      * @param int $len
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function sodium_crypto_stream($len, $nonce, $key)
+    function sodium_crypto_stream( $len, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_stream( $len, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_stream_xor')) {
+if ( ! is_callable( 'sodium_crypto_stream_xor' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function sodium_crypto_stream_xor($message, $nonce, $key)
+    function sodium_crypto_stream_xor( $message, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_stream_xor( $message, $nonce, $key );
     }
 }
-if (!is_callable('sodium_hex2bin')) {
+if ( ! is_callable( 'sodium_hex2bin' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    function sodium_hex2bin($string)
+    function sodium_hex2bin( $string )
     {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
+        return ParagonIE_Sodium_Compat::hex2bin( $string );
     }
 }
-if (!is_callable('sodium_increment')) {
+if ( ! is_callable( 'sodium_increment' ) ) {
     /**
      * @param &string $string
      * @return void
      */
-    function sodium_increment(&$string)
+    function sodium_increment( &$string )
     {
-        ParagonIE_Sodium_Compat::increment($string);
+        ParagonIE_Sodium_Compat::increment( $string );
     }
 }
-if (!is_callable('sodium_library_version_major')) {
+if ( ! is_callable( 'sodium_library_version_major' ) ) {
     /**
      * @return int
      */
@@ -673,7 +673,7 @@ 
         return ParagonIE_Sodium_Compat::library_version_major();
     }
 }
-if (!is_callable('sodium_library_version_minor')) {
+if ( ! is_callable( 'sodium_library_version_minor' ) ) {
     /**
      * @return int
      */
@@ -682,7 +682,7 @@ 
         return ParagonIE_Sodium_Compat::library_version_minor();
     }
 }
-if (!is_callable('sodium_version_string')) {
+if ( ! is_callable( 'sodium_version_string' ) ) {
     /**
      * @return string
      */
@@ -691,50 +691,50 @@ 
         return ParagonIE_Sodium_Compat::version_string();
     }
 }
-if (!is_callable('sodium_memcmp')) {
+if ( ! is_callable( 'sodium_memcmp' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    function sodium_memcmp($a, $b)
+    function sodium_memcmp( $a, $b )
     {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
+        return ParagonIE_Sodium_Compat::memcmp( $a, $b );
     }
 }
-if (!is_callable('sodium_memzero')) {
+if ( ! is_callable( 'sodium_memzero' ) ) {
     /**
      * @param string &$str
      * @return void
      */
-    function sodium_memzero(&$str)
+    function sodium_memzero( &$str )
     {
-        ParagonIE_Sodium_Compat::memzero($str);
+        ParagonIE_Sodium_Compat::memzero( $str );
     }
 }
-if (!is_callable('sodium_randombytes_buf')) {
+if ( ! is_callable( 'sodium_randombytes_buf' ) ) {
     /**
      * @param int $amount
      * @return string
      */
-    function sodium_randombytes_buf($amount)
+    function sodium_randombytes_buf( $amount )
     {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+        return ParagonIE_Sodium_Compat::randombytes_buf( $amount );
     }
 }
 
-if (!is_callable('sodium_randombytes_uniform')) {
+if ( ! is_callable( 'sodium_randombytes_uniform' ) ) {
     /**
      * @param int $upperLimit
      * @return int
      */
-    function sodium_randombytes_uniform($upperLimit)
+    function sodium_randombytes_uniform( $upperLimit )
     {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+        return ParagonIE_Sodium_Compat::randombytes_uniform( $upperLimit );
     }
 }
 
-if (!is_callable('sodium_randombytes_random16')) {
+if ( ! is_callable( 'sodium_randombytes_random16' ) ) {
     /**
      * @return int
      */

Braces +57 added lines, -114 removed lines

@@ -68,8 +68,7 @@ 
      * @param string $string
      * @return string
      */
-    function sodium_bin2hex($string)
-    {
+    function sodium_bin2hex($string) {
         return ParagonIE_Sodium_Compat::bin2hex($string);
     }
 }
@@ -79,8 +78,7 @@ 
      * @param string $b
      * @return int
      */
-    function sodium_compare($a, $b)
-    {
+    function sodium_compare($a, $b) {
         return ParagonIE_Sodium_Compat::compare($a, $b);
     }
 }
@@ -92,8 +90,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
-    {
+    function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
         } catch (Error $ex) {
@@ -111,8 +108,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
-    {
+    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
     }
 }
@@ -124,8 +120,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
-    {
+    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
         } catch (Error $ex) {
@@ -143,8 +138,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
+    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
     }
 }
@@ -156,8 +150,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
-    {
+    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
         } catch (Error $ex) {
@@ -175,8 +168,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
+    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
     }
 }
@@ -186,8 +178,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_auth($message, $key)
-    {
+    function sodium_crypto_auth($message, $key) {
         return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
     }
 }
@@ -198,8 +189,7 @@ 
      * @param string $key
      * @return bool
      */
-    function sodium_crypto_auth_verify($mac, $message, $key)
-    {
+    function sodium_crypto_auth_verify($mac, $message, $key) {
         return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
     }
 }
@@ -210,8 +200,7 @@ 
      * @param string $kp
      * @return string
      */
-    function sodium_crypto_box($message, $nonce, $kp)
-    {
+    function sodium_crypto_box($message, $nonce, $kp) {
         return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
     }
 }
@@ -219,8 +208,7 @@ 
     /**
      * @return string
      */
-    function sodium_crypto_box_keypair()
-    {
+    function sodium_crypto_box_keypair() {
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
 }
@@ -230,8 +218,7 @@ 
      * @param string $pk
      * @return string
      */
-    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
+    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk) {
         return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
     }
 }
@@ -242,8 +229,7 @@ 
      * @param string $kp
      * @return string|bool
      */
-    function sodium_crypto_box_open($message, $nonce, $kp)
-    {
+    function sodium_crypto_box_open($message, $nonce, $kp) {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
         } catch (Error $ex) {
@@ -258,8 +244,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_box_publickey($keypair)
-    {
+    function sodium_crypto_box_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
     }
 }
@@ -268,8 +253,7 @@ 
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_box_publickey_from_secretkey($sk)
-    {
+    function sodium_crypto_box_publickey_from_secretkey($sk) {
         return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
     }
 }
@@ -279,8 +263,7 @@ 
      * @param string $publicKey
      * @return string
      */
-    function sodium_crypto_box_seal($message, $publicKey)
-    {
+    function sodium_crypto_box_seal($message, $publicKey) {
         return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
     }
 }
@@ -290,8 +273,7 @@ 
      * @param string $kp
      * @return string|bool
      */
-    function sodium_crypto_box_seal_open($message, $kp)
-    {
+    function sodium_crypto_box_seal_open($message, $kp) {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
         } catch (Error $ex) {
@@ -306,8 +288,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_box_secretkey($keypair)
-    {
+    function sodium_crypto_box_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
     }
 }
@@ -316,8 +297,7 @@ 
      * @param string $seed
      * @return string
      */
-    function sodium_crypto_box_seed_keypair($seed)
-    {
+    function sodium_crypto_box_seed_keypair($seed) {
         return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
     }
 }
@@ -328,8 +308,7 @@ 
      * @param int $outLen
      * @return string
      */
-    function sodium_crypto_generichash($message, $key = null, $outLen = 32)
-    {
+    function sodium_crypto_generichash($message, $key = null, $outLen = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
     }
 }
@@ -339,8 +318,7 @@ 
      * @param int $outputLength
      * @return string
      */
-    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
-    {
+    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
     }
 }
@@ -350,8 +328,7 @@ 
      * @param int $outLen
      * @return string
      */
-    function sodium_crypto_generichash_init($key = null, $outLen = 32)
-    {
+    function sodium_crypto_generichash_init($key = null, $outLen = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
     }
 }
@@ -361,8 +338,7 @@ 
      * @param string $message
      * @return void
      */
-    function sodium_crypto_generichash_update(&$ctx, $message = '')
-    {
+    function sodium_crypto_generichash_update(&$ctx, $message = '') {
         ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
     }
 }
@@ -374,8 +350,7 @@ 
      * @param string $server_public
      * @return string
      */
-    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
+    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public) {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
             $their_public,
@@ -393,8 +368,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
     }
 }
@@ -405,8 +379,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
+    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -416,8 +389,7 @@ 
      * @param string $hash
      * @return bool
      */
-    function sodium_crypto_pwhash_str_verify($passwd, $hash)
-    {
+    function sodium_crypto_pwhash_str_verify($passwd, $hash) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
     }
 }
@@ -430,8 +402,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
     }
 }
@@ -442,8 +413,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -453,8 +423,7 @@ 
      * @param string $hash
      * @return bool
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
     }
 }
@@ -464,8 +433,7 @@ 
      * @param string $p
      * @return string
      */
-    function sodium_crypto_scalarmult($n, $p)
-    {
+    function sodium_crypto_scalarmult($n, $p) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
     }
 }
@@ -474,8 +442,7 @@ 
      * @param string $n
      * @return string
      */
-    function sodium_crypto_scalarmult_base($n)
-    {
+    function sodium_crypto_scalarmult_base($n) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
     }
 }
@@ -486,8 +453,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_secretbox($message, $nonce, $key)
-    {
+    function sodium_crypto_secretbox($message, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
     }
 }
@@ -498,8 +464,7 @@ 
      * @param string $key
      * @return string|bool
      */
-    function sodium_crypto_secretbox_open($message, $nonce, $key)
-    {
+    function sodium_crypto_secretbox_open($message, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
         } catch (Error $ex) {
@@ -515,8 +480,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_shorthash($message, $key = '')
-    {
+    function sodium_crypto_shorthash($message, $key = '') {
         return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
     }
 }
@@ -526,8 +490,7 @@ 
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign($message, $sk)
-    {
+    function sodium_crypto_sign($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
     }
 }
@@ -537,8 +500,7 @@ 
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign_detached($message, $sk)
-    {
+    function sodium_crypto_sign_detached($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
     }
 }
@@ -546,8 +508,7 @@ 
     /**
      * @return string
      */
-    function sodium_crypto_sign_keypair()
-    {
+    function sodium_crypto_sign_keypair() {
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
@@ -557,8 +518,7 @@ 
      * @param string $pk
      * @return string|bool
      */
-    function sodium_crypto_sign_open($signedMessage, $pk)
-    {
+    function sodium_crypto_sign_open($signedMessage, $pk) {
         try {
             return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
         } catch (Error $ex) {
@@ -573,8 +533,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_sign_publickey($keypair)
-    {
+    function sodium_crypto_sign_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
     }
 }
@@ -583,8 +542,7 @@ 
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign_publickey_from_secretkey($sk)
-    {
+    function sodium_crypto_sign_publickey_from_secretkey($sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
     }
 }
@@ -593,8 +551,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_sign_secretkey($keypair)
-    {
+    function sodium_crypto_sign_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
     }
 }
@@ -603,8 +560,7 @@ 
      * @param string $seed
      * @return string
      */
-    function sodium_crypto_sign_seed_keypair($seed)
-    {
+    function sodium_crypto_sign_seed_keypair($seed) {
         return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
     }
 }
@@ -615,8 +571,7 @@ 
      * @param string $pk
      * @return bool
      */
-    function sodium_crypto_sign_verify_detached($signature, $message, $pk)
-    {
+    function sodium_crypto_sign_verify_detached($signature, $message, $pk) {
         return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
     }
 }
@@ -627,8 +582,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_stream($len, $nonce, $key)
-    {
+    function sodium_crypto_stream($len, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
     }
 }
@@ -639,8 +593,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_stream_xor($message, $nonce, $key)
-    {
+    function sodium_crypto_stream_xor($message, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
     }
 }
@@ -649,8 +602,7 @@ 
      * @param string $string
      * @return string
      */
-    function sodium_hex2bin($string)
-    {
+    function sodium_hex2bin($string) {
         return ParagonIE_Sodium_Compat::hex2bin($string);
     }
 }
@@ -659,8 +611,7 @@ 
      * @param &string $string
      * @return void
      */
-    function sodium_increment(&$string)
-    {
+    function sodium_increment(&$string) {
         ParagonIE_Sodium_Compat::increment($string);
     }
 }
@@ -668,8 +619,7 @@ 
     /**
      * @return int
      */
-    function sodium_library_version_major()
-    {
+    function sodium_library_version_major() {
         return ParagonIE_Sodium_Compat::library_version_major();
     }
 }
@@ -677,8 +627,7 @@ 
     /**
      * @return int
      */
-    function sodium_library_version_minor()
-    {
+    function sodium_library_version_minor() {
         return ParagonIE_Sodium_Compat::library_version_minor();
     }
 }
@@ -686,8 +635,7 @@ 
     /**
      * @return string
      */
-    function sodium_version_string()
-    {
+    function sodium_version_string() {
         return ParagonIE_Sodium_Compat::version_string();
     }
 }
@@ -697,8 +645,7 @@ 
      * @param string $b
      * @return int
      */
-    function sodium_memcmp($a, $b)
-    {
+    function sodium_memcmp($a, $b) {
         return ParagonIE_Sodium_Compat::memcmp($a, $b);
     }
 }
@@ -707,8 +654,7 @@ 
      * @param string &$str
      * @return void
      */
-    function sodium_memzero(&$str)
-    {
+    function sodium_memzero(&$str) {
         ParagonIE_Sodium_Compat::memzero($str);
     }
 }
@@ -717,8 +663,7 @@ 
      * @param int $amount
      * @return string
      */
-    function sodium_randombytes_buf($amount)
-    {
+    function sodium_randombytes_buf($amount) {
         return ParagonIE_Sodium_Compat::randombytes_buf($amount);
     }
 }
@@ -728,8 +673,7 @@ 
      * @param int $upperLimit
      * @return int
      */
-    function sodium_randombytes_uniform($upperLimit)
-    {
+    function sodium_randombytes_uniform($upperLimit) {
         return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
     }
 }
@@ -738,8 +682,7 @@ 
     /**
      * @return int
      */
-    function sodium_randombytes_random16()
-    {
+    function sodium_randombytes_random16() {
         return ParagonIE_Sodium_Compat::randombytes_random16();
     }
 }

src/library/sodium_compat/lib/sodium_compat.php

Doc Comments +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
      * @param string $assocData
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
     {
@@ -69,7 +69,7 @@ 
      * @param string $assocData
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
     {
@@ -155,7 +155,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function crypto_box_open($message, $nonce, $kp)
     {
@@ -203,7 +203,7 @@ 
     /**
      * @param string $message
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function crypto_box_seal_open($message, $kp)
     {
@@ -401,7 +401,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function crypto_secretbox_open($message, $nonce, $key)
     {
@@ -460,7 +460,7 @@ 
     /**
      * @param string $signedMessage
      * @param string $pk
-     * @return string|bool
+     * @return string|false
      */
     function crypto_sign_open($signedMessage, $pk)
     {

Indentation +508 added lines, -508 removed lines

@@ -11,617 +11,617 @@
  * method.
  */
 if (!is_callable('\\Sodium\\bin2hex')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function bin2hex($string)
-    {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function bin2hex($string)
+	{
+		return ParagonIE_Sodium_Compat::bin2hex($string);
+	}
 }
 if (!is_callable('\\Sodium\\compare')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function compare($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function compare($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::compare($a, $b);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_auth')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function crypto_auth($message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_auth($message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_auth_verify')) {
-    /**
-     * @param string $mac
-     * @param string $message
-     * @param string $key
-     * @return bool
-     */
-    function crypto_auth_verify($mac, $message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
-    }
+	/**
+	 * @param string $mac
+	 * @param string $message
+	 * @param string $key
+	 * @return bool
+	 */
+	function crypto_auth_verify($mac, $message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string
-     */
-    function crypto_box($message, $nonce, $kp)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string
+	 */
+	function crypto_box($message, $nonce, $kp)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_keypair')) {
-    /**
-     * @return string
-     */
-    function crypto_box_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function crypto_box_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_keypair();
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey')) {
-    /**
-     * @param string $sk
-     * @param string $pk
-     * @return string
-     */
-    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
-    }
+	/**
+	 * @param string $sk
+	 * @param string $pk
+	 * @return string
+	 */
+	function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_open')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string|bool
-     */
-    function crypto_box_open($message, $nonce, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function crypto_box_open($message, $nonce, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_box_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_box_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function crypto_box_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_box_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_seal')) {
-    /**
-     * @param string $message
-     * @param string $publicKey
-     * @return string
-     */
-    function crypto_box_seal($message, $publicKey)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
-    }
+	/**
+	 * @param string $message
+	 * @param string $publicKey
+	 * @return string
+	 */
+	function crypto_box_seal($message, $publicKey)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_seal_open')) {
-    /**
-     * @param string $message
-     * @param string $kp
-     * @return string|bool
-     */
-    function crypto_box_seal_open($message, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (\Error $ex) {
-            return false;
-        } catch (\Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function crypto_box_seal_open($message, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+		} catch (\Error $ex) {
+			return false;
+		} catch (\Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_box_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_box_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash')) {
-    /**
-     * @param string $message
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function crypto_generichash($message, $key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
-    }
+	/**
+	 * @param string $message
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function crypto_generichash($message, $key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash_final')) {
-    /**
-     * @param string|null $ctx
-     * @param int $outputLength
-     * @return string
-     */
-    function crypto_generichash_final(&$ctx, $outputLength = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param int $outputLength
+	 * @return string
+	 */
+	function crypto_generichash_final(&$ctx, $outputLength = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash_init')) {
-    /**
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function crypto_generichash_init($key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
-    }
+	/**
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function crypto_generichash_init($key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash_update')) {
-    /**
-     * @param string|null $ctx
-     * @param string $message
-     * @return void
-     */
-    function crypto_generichash_update(&$ctx, $message = '')
-    {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param string $message
+	 * @return void
+	 */
+	function crypto_generichash_update(&$ctx, $message = '')
+	{
+		ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_kx')) {
-    /**
-     * @param string $my_secret
-     * @param string $their_public
-     * @param string $client_public
-     * @param string $server_public
-     * @return string
-     */
-    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
-        return ParagonIE_Sodium_Compat::crypto_kx(
-            $my_secret,
-            $their_public,
-            $client_public,
-            $server_public
-        );
-    }
+	/**
+	 * @param string $my_secret
+	 * @param string $their_public
+	 * @param string $client_public
+	 * @param string $server_public
+	 * @return string
+	 */
+	function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+	{
+		return ParagonIE_Sodium_Compat::crypto_kx(
+			$my_secret,
+			$their_public,
+			$client_public,
+			$server_public
+		);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_str')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_str_verify')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function crypto_pwhash_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function crypto_pwhash_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_scalarmult')) {
-    /**
-     * @param string $n
-     * @param string $p
-     * @return string
-     */
-    function crypto_scalarmult($n, $p)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
-    }
+	/**
+	 * @param string $n
+	 * @param string $p
+	 * @return string
+	 */
+	function crypto_scalarmult($n, $p)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_scalarmult_base')) {
-    /**
-     * @param string $n
-     * @return string
-     */
-    function crypto_scalarmult_base($n)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
-    }
+	/**
+	 * @param string $n
+	 * @return string
+	 */
+	function crypto_scalarmult_base($n)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_secretbox')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_secretbox($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_secretbox($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_secretbox_open')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_secretbox_open($message, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function crypto_secretbox_open($message, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_shorthash')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function crypto_shorthash($message, $key = '')
-    {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_shorthash($message, $key = '')
+	{
+		return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_detached')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign_detached($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign_detached($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_keypair')) {
-    /**
-     * @return string
-     */
-    function crypto_sign_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function crypto_sign_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_open')) {
-    /**
-     * @param string $signedMessage
-     * @param string $pk
-     * @return string|bool
-     */
-    function crypto_sign_open($signedMessage, $pk)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (\Error $ex) {
-            return false;
-        } catch (\Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $signedMessage
+	 * @param string $pk
+	 * @return string|bool
+	 */
+	function crypto_sign_open($signedMessage, $pk)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+		} catch (\Error $ex) {
+			return false;
+		} catch (\Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_sign_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_sign_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_sign_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_sign_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_seed_keypair')) {
-    /**
-     * @param string $seed
-     * @return string
-     */
-    function crypto_sign_seed_keypair($seed)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
-    }
+	/**
+	 * @param string $seed
+	 * @return string
+	 */
+	function crypto_sign_seed_keypair($seed)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_verify_detached')) {
-    /**
-     * @param string $signature
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     */
-    function crypto_sign_verify_detached($signature, $message, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
-    }
+	/**
+	 * @param string $signature
+	 * @param string $message
+	 * @param string $pk
+	 * @return bool
+	 */
+	function crypto_sign_verify_detached($signature, $message, $pk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign_ed25519_sk_to_curve25519($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign_ed25519_sk_to_curve25519($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_stream')) {
-    /**
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_stream($len, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
-    }
+	/**
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_stream($len, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_stream_xor')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_stream_xor($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_stream_xor($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\hex2bin')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function hex2bin($string)
-    {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function hex2bin($string)
+	{
+		return ParagonIE_Sodium_Compat::hex2bin($string);
+	}
 }
 if (!is_callable('\\Sodium\\memcmp')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function memcmp($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function memcmp($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::memcmp($a, $b);
+	}
 }
 if (!is_callable('\\Sodium\\memzero')) {
-    /**
-     * @param string $str
-     * @return void
-     */
-    function memzero(&$str)
-    {
-        ParagonIE_Sodium_Compat::memzero($str);
-    }
+	/**
+	 * @param string $str
+	 * @return void
+	 */
+	function memzero(&$str)
+	{
+		ParagonIE_Sodium_Compat::memzero($str);
+	}
 }
 if (!is_callable('\\Sodium\\randombytes_buf')) {
-    /**
-     * @param int $amount
-     * @return string
-     */
-    function randombytes_buf($amount)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
-    }
+	/**
+	 * @param int $amount
+	 * @return string
+	 */
+	function randombytes_buf($amount)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+	}
 }
 
 if (!is_callable('\\Sodium\\randombytes_uniform')) {
-    /**
-     * @param int $upperLimit
-     * @return int
-     */
-    function randombytes_uniform($upperLimit)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
-    }
+	/**
+	 * @param int $upperLimit
+	 * @return int
+	 */
+	function randombytes_uniform($upperLimit)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+	}
 }
 
 if (!is_callable('\\Sodium\\randombytes_random16')) {
-    /**
-     * @return int
-     */
-    function randombytes_random16()
-    {
-        return ParagonIE_Sodium_Compat::randombytes_random16();
-    }
+	/**
+	 * @return int
+	 */
+	function randombytes_random16()
+	{
+		return ParagonIE_Sodium_Compat::randombytes_random16();
+	}
 }
 
 if (!defined('\\Sodium\\CRYPTO_AUTH_BYTES')) {
-    require_once dirname(__FILE__) . '/constants.php';
+	require_once dirname(__FILE__) . '/constants.php';
 }

Spacing +160 added lines, -160 removed lines

@@ -10,28 +10,28 @@ 
  * Thus, the functions just proxy to the appropriate ParagonIE_Sodium_Compat
  * method.
  */
-if (!is_callable('\\Sodium\\bin2hex')) {
+if ( ! is_callable( '\\Sodium\\bin2hex' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    function bin2hex($string)
+    function bin2hex( $string )
     {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
+        return ParagonIE_Sodium_Compat::bin2hex( $string );
     }
 }
-if (!is_callable('\\Sodium\\compare')) {
+if ( ! is_callable( '\\Sodium\\compare' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    function compare($a, $b)
+    function compare( $a, $b )
     {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
+        return ParagonIE_Sodium_Compat::compare( $a, $b );
     }
 }
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_decrypt')) {
+if ( ! is_callable( '\\Sodium\\crypto_aead_chacha20poly1305_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -39,18 +39,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    function crypto_aead_chacha20poly1305_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_encrypt')) {
+if ( ! is_callable( '\\Sodium\\crypto_aead_chacha20poly1305_encrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -58,12 +58,12 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    function crypto_aead_chacha20poly1305_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt')) {
+if ( ! is_callable( '\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -71,18 +71,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    function crypto_aead_chacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt')) {
+if ( ! is_callable( '\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -90,47 +90,47 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    function crypto_aead_chacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('\\Sodium\\crypto_auth')) {
+if ( ! is_callable( '\\Sodium\\crypto_auth' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    function crypto_auth($message, $key)
+    function crypto_auth( $message, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+        return ParagonIE_Sodium_Compat::crypto_auth( $message, $key );
     }
 }
-if (!is_callable('\\Sodium\\crypto_auth_verify')) {
+if ( ! is_callable( '\\Sodium\\crypto_auth_verify' ) ) {
     /**
      * @param string $mac
      * @param string $message
      * @param string $key
      * @return bool
      */
-    function crypto_auth_verify($mac, $message, $key)
+    function crypto_auth_verify( $mac, $message, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+        return ParagonIE_Sodium_Compat::crypto_auth_verify( $mac, $message, $key );
     }
 }
-if (!is_callable('\\Sodium\\crypto_box')) {
+if ( ! is_callable( '\\Sodium\\crypto_box' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $kp
      * @return string
      */
-    function crypto_box($message, $nonce, $kp)
+    function crypto_box( $message, $nonce, $kp )
     {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+        return ParagonIE_Sodium_Compat::crypto_box( $message, $nonce, $kp );
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_keypair')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_keypair' ) ) {
     /**
      * @return string
      */
@@ -139,139 +139,139 @@ 
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey' ) ) {
     /**
      * @param string $sk
      * @param string $pk
      * @return string
      */
-    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    function crypto_box_keypair_from_secretkey_and_publickey( $sk, $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey( $sk, $pk );
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_open')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_open' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_open($message, $nonce, $kp)
+    function crypto_box_open( $message, $nonce, $kp )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_box_open( $message, $nonce, $kp );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_publickey')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_publickey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_box_publickey($keypair)
+    function crypto_box_publickey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_box_publickey( $keypair );
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_publickey_from_secretkey')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_publickey_from_secretkey' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function crypto_box_publickey_from_secretkey($sk)
+    function crypto_box_publickey_from_secretkey( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey( $sk );
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_seal')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_seal' ) ) {
     /**
      * @param string $message
      * @param string $publicKey
      * @return string
      */
-    function crypto_box_seal($message, $publicKey)
+    function crypto_box_seal( $message, $publicKey )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+        return ParagonIE_Sodium_Compat::crypto_box_seal( $message, $publicKey );
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_seal_open')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_seal_open' ) ) {
     /**
      * @param string $message
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_seal_open($message, $kp)
+    function crypto_box_seal_open( $message, $kp )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (\Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_box_seal_open( $message, $kp );
+        } catch ( \Error $ex ) {
             return false;
-        } catch (\Exception $ex) {
+        } catch ( \Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_secretkey')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_secretkey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_box_secretkey($keypair)
+    function crypto_box_secretkey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_box_secretkey( $keypair );
     }
 }
-if (!is_callable('\\Sodium\\crypto_generichash')) {
+if ( ! is_callable( '\\Sodium\\crypto_generichash' ) ) {
     /**
      * @param string $message
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash($message, $key = null, $outLen = 32)
+    function crypto_generichash( $message, $key = null, $outLen = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+        return ParagonIE_Sodium_Compat::crypto_generichash( $message, $key, $outLen );
     }
 }
-if (!is_callable('\\Sodium\\crypto_generichash_final')) {
+if ( ! is_callable( '\\Sodium\\crypto_generichash_final' ) ) {
     /**
      * @param string|null $ctx
      * @param int $outputLength
      * @return string
      */
-    function crypto_generichash_final(&$ctx, $outputLength = 32)
+    function crypto_generichash_final( &$ctx, $outputLength = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+        return ParagonIE_Sodium_Compat::crypto_generichash_final( $ctx, $outputLength );
     }
 }
-if (!is_callable('\\Sodium\\crypto_generichash_init')) {
+if ( ! is_callable( '\\Sodium\\crypto_generichash_init' ) ) {
     /**
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash_init($key = null, $outLen = 32)
+    function crypto_generichash_init( $key = null, $outLen = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+        return ParagonIE_Sodium_Compat::crypto_generichash_init( $key, $outLen );
     }
 }
-if (!is_callable('\\Sodium\\crypto_generichash_update')) {
+if ( ! is_callable( '\\Sodium\\crypto_generichash_update' ) ) {
     /**
      * @param string|null $ctx
      * @param string $message
      * @return void
      */
-    function crypto_generichash_update(&$ctx, $message = '')
+    function crypto_generichash_update( &$ctx, $message = '' )
     {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+        ParagonIE_Sodium_Compat::crypto_generichash_update( $ctx, $message );
     }
 }
-if (!is_callable('\\Sodium\\crypto_kx')) {
+if ( ! is_callable( '\\Sodium\\crypto_kx' ) ) {
     /**
      * @param string $my_secret
      * @param string $their_public
@@ -279,7 +279,7 @@ 
      * @param string $server_public
      * @return string
      */
-    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    function crypto_kx( $my_secret, $their_public, $client_public, $server_public )
     {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
@@ -289,7 +289,7 @@ 
         );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -298,35 +298,35 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash_str')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash_str' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    function crypto_pwhash_str( $passwd, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str( $passwd, $opslimit, $memlimit );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash_str_verify')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash_str_verify' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_str_verify($passwd, $hash)
+    function crypto_pwhash_str_verify( $passwd, $hash )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify( $passwd, $hash );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash_scryptsalsa208sha256' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -335,119 +335,119 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    function crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    function crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash );
     }
 }
-if (!is_callable('\\Sodium\\crypto_scalarmult')) {
+if ( ! is_callable( '\\Sodium\\crypto_scalarmult' ) ) {
     /**
      * @param string $n
      * @param string $p
      * @return string
      */
-    function crypto_scalarmult($n, $p)
+    function crypto_scalarmult( $n, $p )
     {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+        return ParagonIE_Sodium_Compat::crypto_scalarmult( $n, $p );
     }
 }
-if (!is_callable('\\Sodium\\crypto_scalarmult_base')) {
+if ( ! is_callable( '\\Sodium\\crypto_scalarmult_base' ) ) {
     /**
      * @param string $n
      * @return string
      */
-    function crypto_scalarmult_base($n)
+    function crypto_scalarmult_base( $n )
     {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+        return ParagonIE_Sodium_Compat::crypto_scalarmult_base( $n );
     }
 }
-if (!is_callable('\\Sodium\\crypto_secretbox')) {
+if ( ! is_callable( '\\Sodium\\crypto_secretbox' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function crypto_secretbox($message, $nonce, $key)
+    function crypto_secretbox( $message, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_secretbox( $message, $nonce, $key );
     }
 }
-if (!is_callable('\\Sodium\\crypto_secretbox_open')) {
+if ( ! is_callable( '\\Sodium\\crypto_secretbox_open' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string|bool
      */
-    function crypto_secretbox_open($message, $nonce, $key)
+    function crypto_secretbox_open( $message, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_secretbox_open( $message, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('\\Sodium\\crypto_shorthash')) {
+if ( ! is_callable( '\\Sodium\\crypto_shorthash' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    function crypto_shorthash($message, $key = '')
+    function crypto_shorthash( $message, $key = '' )
     {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+        return ParagonIE_Sodium_Compat::crypto_shorthash( $message, $key );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    function crypto_sign($message, $sk)
+    function crypto_sign( $message, $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+        return ParagonIE_Sodium_Compat::crypto_sign( $message, $sk );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_detached')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_detached' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    function crypto_sign_detached($message, $sk)
+    function crypto_sign_detached( $message, $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_detached( $message, $sk );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_keypair')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_keypair' ) ) {
     /**
      * @return string
      */
@@ -456,163 +456,163 @@ 
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_open')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_open' ) ) {
     /**
      * @param string $signedMessage
      * @param string $pk
      * @return string|bool
      */
-    function crypto_sign_open($signedMessage, $pk)
+    function crypto_sign_open( $signedMessage, $pk )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (\Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_sign_open( $signedMessage, $pk );
+        } catch ( \Error $ex ) {
             return false;
-        } catch (\Exception $ex) {
+        } catch ( \Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_publickey')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_publickey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_publickey($keypair)
+    function crypto_sign_publickey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey( $keypair );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_publickey_from_secretkey')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_publickey_from_secretkey' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function crypto_sign_publickey_from_secretkey($sk)
+    function crypto_sign_publickey_from_secretkey( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey( $sk );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_secretkey')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_secretkey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_secretkey($keypair)
+    function crypto_sign_secretkey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_sign_secretkey( $keypair );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_seed_keypair')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_seed_keypair' ) ) {
     /**
      * @param string $seed
      * @return string
      */
-    function crypto_sign_seed_keypair($seed)
+    function crypto_sign_seed_keypair( $seed )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair( $seed );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_verify_detached')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_verify_detached' ) ) {
     /**
      * @param string $signature
      * @param string $message
      * @param string $pk
      * @return bool
      */
-    function crypto_sign_verify_detached($signature, $message, $pk)
+    function crypto_sign_verify_detached( $signature, $message, $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached( $signature, $message, $pk );
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_ed25519_sk_to_curve25519' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function crypto_sign_ed25519_sk_to_curve25519($sk)
+    function crypto_sign_ed25519_sk_to_curve25519( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519( $sk );
     }
 }
-if (!is_callable('\\Sodium\\crypto_stream')) {
+if ( ! is_callable( '\\Sodium\\crypto_stream' ) ) {
     /**
      * @param int $len
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function crypto_stream($len, $nonce, $key)
+    function crypto_stream( $len, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_stream( $len, $nonce, $key );
     }
 }
-if (!is_callable('\\Sodium\\crypto_stream_xor')) {
+if ( ! is_callable( '\\Sodium\\crypto_stream_xor' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function crypto_stream_xor($message, $nonce, $key)
+    function crypto_stream_xor( $message, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_stream_xor( $message, $nonce, $key );
     }
 }
-if (!is_callable('\\Sodium\\hex2bin')) {
+if ( ! is_callable( '\\Sodium\\hex2bin' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    function hex2bin($string)
+    function hex2bin( $string )
     {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
+        return ParagonIE_Sodium_Compat::hex2bin( $string );
     }
 }
-if (!is_callable('\\Sodium\\memcmp')) {
+if ( ! is_callable( '\\Sodium\\memcmp' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    function memcmp($a, $b)
+    function memcmp( $a, $b )
     {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
+        return ParagonIE_Sodium_Compat::memcmp( $a, $b );
     }
 }
-if (!is_callable('\\Sodium\\memzero')) {
+if ( ! is_callable( '\\Sodium\\memzero' ) ) {
     /**
      * @param string $str
      * @return void
      */
-    function memzero(&$str)
+    function memzero( &$str )
     {
-        ParagonIE_Sodium_Compat::memzero($str);
+        ParagonIE_Sodium_Compat::memzero( $str );
     }
 }
-if (!is_callable('\\Sodium\\randombytes_buf')) {
+if ( ! is_callable( '\\Sodium\\randombytes_buf' ) ) {
     /**
      * @param int $amount
      * @return string
      */
-    function randombytes_buf($amount)
+    function randombytes_buf( $amount )
     {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+        return ParagonIE_Sodium_Compat::randombytes_buf( $amount );
     }
 }
 
-if (!is_callable('\\Sodium\\randombytes_uniform')) {
+if ( ! is_callable( '\\Sodium\\randombytes_uniform' ) ) {
     /**
      * @param int $upperLimit
      * @return int
      */
-    function randombytes_uniform($upperLimit)
+    function randombytes_uniform( $upperLimit )
     {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+        return ParagonIE_Sodium_Compat::randombytes_uniform( $upperLimit );
     }
 }
 
-if (!is_callable('\\Sodium\\randombytes_random16')) {
+if ( ! is_callable( '\\Sodium\\randombytes_random16' ) ) {
     /**
      * @return int
      */
@@ -622,6 +622,6 @@ 
     }
 }
 
-if (!defined('\\Sodium\\CRYPTO_AUTH_BYTES')) {
-    require_once dirname(__FILE__) . '/constants.php';
+if ( ! defined( '\\Sodium\\CRYPTO_AUTH_BYTES' ) ) {
+    require_once dirname( __FILE__ ) . '/constants.php';
 }

Braces +51 added lines, -102 removed lines

@@ -15,8 +15,7 @@ 
      * @param string $string
      * @return string
      */
-    function bin2hex($string)
-    {
+    function bin2hex($string) {
         return ParagonIE_Sodium_Compat::bin2hex($string);
     }
 }
@@ -26,8 +25,7 @@ 
      * @param string $b
      * @return int
      */
-    function compare($a, $b)
-    {
+    function compare($a, $b) {
         return ParagonIE_Sodium_Compat::compare($a, $b);
     }
 }
@@ -39,8 +37,7 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
-    {
+    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
         } catch (Error $ex) {
@@ -58,8 +55,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
-    {
+    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
     }
 }
@@ -71,8 +67,7 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
-    {
+    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
         } catch (Error $ex) {
@@ -90,8 +85,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
+    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
     }
 }
@@ -101,8 +95,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_auth($message, $key)
-    {
+    function crypto_auth($message, $key) {
         return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
     }
 }
@@ -113,8 +106,7 @@ 
      * @param string $key
      * @return bool
      */
-    function crypto_auth_verify($mac, $message, $key)
-    {
+    function crypto_auth_verify($mac, $message, $key) {
         return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
     }
 }
@@ -125,8 +117,7 @@ 
      * @param string $kp
      * @return string
      */
-    function crypto_box($message, $nonce, $kp)
-    {
+    function crypto_box($message, $nonce, $kp) {
         return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
     }
 }
@@ -134,8 +125,7 @@ 
     /**
      * @return string
      */
-    function crypto_box_keypair()
-    {
+    function crypto_box_keypair() {
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
 }
@@ -145,8 +135,7 @@ 
      * @param string $pk
      * @return string
      */
-    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
+    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk) {
         return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
     }
 }
@@ -157,8 +146,7 @@ 
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_open($message, $nonce, $kp)
-    {
+    function crypto_box_open($message, $nonce, $kp) {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
         } catch (Error $ex) {
@@ -173,8 +161,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_box_publickey($keypair)
-    {
+    function crypto_box_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
     }
 }
@@ -183,8 +170,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_box_publickey_from_secretkey($sk)
-    {
+    function crypto_box_publickey_from_secretkey($sk) {
         return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
     }
 }
@@ -194,8 +180,7 @@ 
      * @param string $publicKey
      * @return string
      */
-    function crypto_box_seal($message, $publicKey)
-    {
+    function crypto_box_seal($message, $publicKey) {
         return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
     }
 }
@@ -205,8 +190,7 @@ 
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_seal_open($message, $kp)
-    {
+    function crypto_box_seal_open($message, $kp) {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
         } catch (\Error $ex) {
@@ -221,8 +205,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_box_secretkey($keypair)
-    {
+    function crypto_box_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
     }
 }
@@ -233,8 +216,7 @@ 
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash($message, $key = null, $outLen = 32)
-    {
+    function crypto_generichash($message, $key = null, $outLen = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
     }
 }
@@ -244,8 +226,7 @@ 
      * @param int $outputLength
      * @return string
      */
-    function crypto_generichash_final(&$ctx, $outputLength = 32)
-    {
+    function crypto_generichash_final(&$ctx, $outputLength = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
     }
 }
@@ -255,8 +236,7 @@ 
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash_init($key = null, $outLen = 32)
-    {
+    function crypto_generichash_init($key = null, $outLen = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
     }
 }
@@ -266,8 +246,7 @@ 
      * @param string $message
      * @return void
      */
-    function crypto_generichash_update(&$ctx, $message = '')
-    {
+    function crypto_generichash_update(&$ctx, $message = '') {
         ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
     }
 }
@@ -279,8 +258,7 @@ 
      * @param string $server_public
      * @return string
      */
-    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
+    function crypto_kx($my_secret, $their_public, $client_public, $server_public) {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
             $their_public,
@@ -298,8 +276,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
     }
 }
@@ -310,8 +287,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
+    function crypto_pwhash_str($passwd, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -321,8 +297,7 @@ 
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_str_verify($passwd, $hash)
-    {
+    function crypto_pwhash_str_verify($passwd, $hash) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
     }
 }
@@ -335,8 +310,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
     }
 }
@@ -347,8 +321,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
+    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -358,8 +331,7 @@ 
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
+    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
     }
 }
@@ -369,8 +341,7 @@ 
      * @param string $p
      * @return string
      */
-    function crypto_scalarmult($n, $p)
-    {
+    function crypto_scalarmult($n, $p) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
     }
 }
@@ -379,8 +350,7 @@ 
      * @param string $n
      * @return string
      */
-    function crypto_scalarmult_base($n)
-    {
+    function crypto_scalarmult_base($n) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
     }
 }
@@ -391,8 +361,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_secretbox($message, $nonce, $key)
-    {
+    function crypto_secretbox($message, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
     }
 }
@@ -403,8 +372,7 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_secretbox_open($message, $nonce, $key)
-    {
+    function crypto_secretbox_open($message, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
         } catch (Error $ex) {
@@ -420,8 +388,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_shorthash($message, $key = '')
-    {
+    function crypto_shorthash($message, $key = '') {
         return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
     }
 }
@@ -431,8 +398,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign($message, $sk)
-    {
+    function crypto_sign($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
     }
 }
@@ -442,8 +408,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign_detached($message, $sk)
-    {
+    function crypto_sign_detached($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
     }
 }
@@ -451,8 +416,7 @@ 
     /**
      * @return string
      */
-    function crypto_sign_keypair()
-    {
+    function crypto_sign_keypair() {
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
@@ -462,8 +426,7 @@ 
      * @param string $pk
      * @return string|bool
      */
-    function crypto_sign_open($signedMessage, $pk)
-    {
+    function crypto_sign_open($signedMessage, $pk) {
         try {
             return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
         } catch (\Error $ex) {
@@ -478,8 +441,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_publickey($keypair)
-    {
+    function crypto_sign_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
     }
 }
@@ -488,8 +450,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign_publickey_from_secretkey($sk)
-    {
+    function crypto_sign_publickey_from_secretkey($sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
     }
 }
@@ -498,8 +459,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_secretkey($keypair)
-    {
+    function crypto_sign_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
     }
 }
@@ -508,8 +468,7 @@ 
      * @param string $seed
      * @return string
      */
-    function crypto_sign_seed_keypair($seed)
-    {
+    function crypto_sign_seed_keypair($seed) {
         return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
     }
 }
@@ -520,8 +479,7 @@ 
      * @param string $pk
      * @return bool
      */
-    function crypto_sign_verify_detached($signature, $message, $pk)
-    {
+    function crypto_sign_verify_detached($signature, $message, $pk) {
         return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
     }
 }
@@ -530,8 +488,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign_ed25519_sk_to_curve25519($sk)
-    {
+    function crypto_sign_ed25519_sk_to_curve25519($sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
     }
 }
@@ -542,8 +499,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_stream($len, $nonce, $key)
-    {
+    function crypto_stream($len, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
     }
 }
@@ -554,8 +510,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_stream_xor($message, $nonce, $key)
-    {
+    function crypto_stream_xor($message, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
     }
 }
@@ -564,8 +519,7 @@ 
      * @param string $string
      * @return string
      */
-    function hex2bin($string)
-    {
+    function hex2bin($string) {
         return ParagonIE_Sodium_Compat::hex2bin($string);
     }
 }
@@ -575,8 +529,7 @@ 
      * @param string $b
      * @return int
      */
-    function memcmp($a, $b)
-    {
+    function memcmp($a, $b) {
         return ParagonIE_Sodium_Compat::memcmp($a, $b);
     }
 }
@@ -585,8 +538,7 @@ 
      * @param string $str
      * @return void
      */
-    function memzero(&$str)
-    {
+    function memzero(&$str) {
         ParagonIE_Sodium_Compat::memzero($str);
     }
 }
@@ -595,8 +547,7 @@ 
      * @param int $amount
      * @return string
      */
-    function randombytes_buf($amount)
-    {
+    function randombytes_buf($amount) {
         return ParagonIE_Sodium_Compat::randombytes_buf($amount);
     }
 }
@@ -606,8 +557,7 @@ 
      * @param int $upperLimit
      * @return int
      */
-    function randombytes_uniform($upperLimit)
-    {
+    function randombytes_uniform($upperLimit) {
         return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
     }
 }
@@ -616,8 +566,7 @@ 
     /**
      * @return int
      */
-    function randombytes_random16()
-    {
+    function randombytes_random16() {
         return ParagonIE_Sodium_Compat::randombytes_random16();
     }
 }

src/library/sodium_compat/src/Compat.php

Doc Comments +1 added lines, -1 removed lines

@@ -2266,7 +2266,7 @@
      * Libsodium as implemented in PHP 7.2
      *
      * @ref https://wiki.php.net/rfc/libsodium
-     * @return bool
+     * @return boolean|null
      */
     protected static function isPhp72OrGreater()
     {

Indentation +2244 added lines, -2244 removed lines

@@ -22,2221 +22,2221 @@ 
  */
 
 if (class_exists('ParagonIE_Sodium_Compat', false)) {
-    return;
+	return;
 }
 
 class ParagonIE_Sodium_Compat
 {
-    /**
-     * This parameter prevents the use of the PECL extension.
-     * It should only be used for unit testing.
-     *
-     * @var bool
-     */
-    public static $disableFallbackForUnitTests = false;
-
-    /**
-     * Use fast multiplication rather than our constant-time multiplication
-     * implementation. Can be enabled at runtime. Only enable this if you
-     * are absolutely certain that there is no timing leak on your platform.
-     *
-     * @var bool
-     */
-    public static $fastMult = false;
-
-    const LIBRARY_VERSION_MAJOR = 9;
-    const LIBRARY_VERSION_MINOR = 1;
-    const VERSION_STRING = 'polyfill-1.0.8';
-
-    // From libsodium
-    const CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = 32;
-    const CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = 0;
-    const CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = 8;
-    const CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = 16;
-    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = 32;
-    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = 0;
-    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = 12;
-    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = 16;
-    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES = 32;
-    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NSECBYTES = 0;
-    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES = 24;
-    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES = 16;
-    const CRYPTO_AUTH_BYTES = 32;
-    const CRYPTO_AUTH_KEYBYTES = 32;
-    const CRYPTO_BOX_SEALBYTES = 16;
-    const CRYPTO_BOX_SECRETKEYBYTES = 32;
-    const CRYPTO_BOX_PUBLICKEYBYTES = 32;
-    const CRYPTO_BOX_KEYPAIRBYTES = 64;
-    const CRYPTO_BOX_MACBYTES = 16;
-    const CRYPTO_BOX_NONCEBYTES = 24;
-    const CRYPTO_BOX_SEEDBYTES = 32;
-    const CRYPTO_KX_BYTES = 32;
-    const CRYPTO_KX_PUBLICKEYBYTES = 32;
-    const CRYPTO_KX_SECRETKEYBYTES = 32;
-    const CRYPTO_GENERICHASH_BYTES = 32;
-    const CRYPTO_GENERICHASH_BYTES_MIN = 16;
-    const CRYPTO_GENERICHASH_BYTES_MAX = 64;
-    const CRYPTO_GENERICHASH_KEYBYTES = 32;
-    const CRYPTO_GENERICHASH_KEYBYTES_MIN = 16;
-    const CRYPTO_GENERICHASH_KEYBYTES_MAX = 64;
-    const CRYPTO_PWHASH_SALTBYTES = 16;
-    const CRYPTO_PWHASH_STRPREFIX = '$argon2i$';
-    const CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE = 33554432;
-    const CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE = 4;
-    const CRYPTO_PWHASH_MEMLIMIT_MODERATE = 134217728;
-    const CRYPTO_PWHASH_OPSLIMIT_MODERATE = 6;
-    const CRYPTO_PWHASH_MEMLIMIT_SENSITIVE = 536870912;
-    const CRYPTO_PWHASH_OPSLIMIT_SENSITIVE = 8;
-    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES = 32;
-    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_STRPREFIX = '$7$';
-    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE = 534288;
-    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE = 16777216;
-    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE = 33554432;
-    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE = 1073741824;
-    const CRYPTO_SCALARMULT_BYTES = 32;
-    const CRYPTO_SCALARMULT_SCALARBYTES = 32;
-    const CRYPTO_SHORTHASH_BYTES = 8;
-    const CRYPTO_SHORTHASH_KEYBYTES = 16;
-    const CRYPTO_SECRETBOX_KEYBYTES = 32;
-    const CRYPTO_SECRETBOX_MACBYTES = 16;
-    const CRYPTO_SECRETBOX_NONCEBYTES = 24;
-    const CRYPTO_SIGN_BYTES = 64;
-    const CRYPTO_SIGN_SEEDBYTES = 32;
-    const CRYPTO_SIGN_PUBLICKEYBYTES = 32;
-    const CRYPTO_SIGN_SECRETKEYBYTES = 64;
-    const CRYPTO_SIGN_KEYPAIRBYTES = 96;
-    const CRYPTO_STREAM_KEYBYTES = 32;
-    const CRYPTO_STREAM_NONCEBYTES = 24;
-
-    /**
-     * Cache-timing-safe implementation of bin2hex().
-     *
-     * @param string $string A string (probably raw binary)
-     * @return string        A hexadecimal-encoded string
-     * @throws TypeError
-     */
-    public static function bin2hex($string)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
-
-        if (self::isPhp72OrGreater()) {
-            return bin2hex($string);
-        }
-        if (self::use_fallback('bin2hex')) {
-            return call_user_func('\\Sodium\\bin2hex', $string);
-        }
-        return ParagonIE_Sodium_Core_Util::bin2hex($string);
-    }
-
-    /**
-     * Compare two strings, in constant-time.
-     * Compared to memcmp(), compare() is more useful for sorting.
-     *
-     * @param string $left The left operand; must be a string
-     * @param string $right The right operand; must be a string
-     * @return int          < 0 if the left operand is less than the right
-     *                      0 if both strings are equal
-     *                      > 0 if the right operand is less than the left
-     * @throws TypeError
-     */
-    public static function compare($left, $right)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_compare($left, $right);
-        }
-        if (self::use_fallback('compare')) {
-            return call_user_func('\\Sodium\\compare', $left, $right);
-        }
-        return ParagonIE_Sodium_Core_Util::compare($left, $right);
-    }
-
-    /**
-     * Authenticated Encryption with Associated Data: Decryption
-     *
-     * Algorithm:
-     *     ChaCha20-Poly1305
-     *
-     * This mode uses a 64-bit random nonce with a 64-bit counter.
-     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
-     *
-     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
-     * @param string $assocData Authenticated Associated Data (unencrypted)
-     * @param string $nonce Number to be used only Once; must be 8 bytes
-     * @param string $key Encryption key
-     *
-     * @return string            The original plaintext message
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_aead_chacha20poly1305_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
-            throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_aead_chacha20poly1305_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_decrypt')) {
-            return call_user_func(
-                '\\Sodium\\crypto_aead_chacha20poly1305_decrypt',
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_decrypt(
-            $ciphertext,
-            $assocData,
-            $nonce,
-            $key
-        );
-    }
-
-    /**
-     * Authenticated Encryption with Associated Data
-     *
-     * Algorithm:
-     *     ChaCha20-Poly1305
-     *
-     * This mode uses a 64-bit random nonce with a 64-bit counter.
-     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
-     *
-     * @param string $plaintext Message to be encrypted
-     * @param string $assocData Authenticated Associated Data (unencrypted)
-     * @param string $nonce Number to be used only Once; must be 8 bytes
-     * @param string $key Encryption key
-     *
-     * @return string           Ciphertext with a 16-byte Poly1305 message
-     *                          authentication code appended
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_aead_chacha20poly1305_encrypt(
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_aead_chacha20poly1305_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_encrypt')) {
-            return call_user_func(
-                '\\Sodium\\crypto_aead_chacha20poly1305_encrypt',
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_encrypt(
-            $plaintext,
-            $assocData,
-            $nonce,
-            $key
-        );
-    }
-
-    /**
-     * Authenticated Encryption with Associated Data: Decryption
-     *
-     * Algorithm:
-     *     ChaCha20-Poly1305
-     *
-     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
-     * Regular mode uses a 64-bit random nonce with a 64-bit counter.
-     *
-     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
-     * @param string $assocData Authenticated Associated Data (unencrypted)
-     * @param string $nonce Number to be used only Once; must be 12 bytes
-     * @param string $key Encryption key
-     *
-     * @return string            The original plaintext message
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_aead_chacha20poly1305_ietf_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
-            throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_decrypt')) {
-            return call_user_func(
-                '\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt',
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_decrypt(
-            $ciphertext,
-            $assocData,
-            $nonce,
-            $key
-        );
-    }
-
-    /**
-     * Authenticated Encryption with Associated Data
-     *
-     * Algorithm:
-     *     ChaCha20-Poly1305
-     *
-     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
-     * Regular mode uses a 64-bit random nonce with a 64-bit counter.
-     *
-     * @param string $plaintext Message to be encrypted
-     * @param string $assocData Authenticated Associated Data (unencrypted)
-     * @param string $nonce Number to be used only Once; must be 8 bytes
-     * @param string $key Encryption key
-     *
-     * @return string           Ciphertext with a 16-byte Poly1305 message
-     *                          authentication code appended
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_aead_chacha20poly1305_ietf_encrypt(
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_encrypt')) {
-            return call_user_func(
-                '\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt',
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_encrypt(
-            $plaintext,
-            $assocData,
-            $nonce,
-            $key
-        );
-    }
-
-    /**
-     * Authenticated Encryption with Associated Data: Decryption
-     *
-     * Algorithm:
-     *     XChaCha20-Poly1305
-     *
-     * This mode uses a 64-bit random nonce with a 64-bit counter.
-     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
-     *
-     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
-     * @param string $assocData Authenticated Associated Data (unencrypted)
-     * @param string $nonce Number to be used only Once; must be 8 bytes
-     * @param string $key Encryption key
-     *
-     * @return string            The original plaintext message
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_aead_xchacha20poly1305_ietf_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES) {
-            throw new Error('Message must be at least CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES long');
-        }
-
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_decrypt(
-            $ciphertext,
-            $assocData,
-            $nonce,
-            $key
-        );
-    }
-
-    /**
-     * Authenticated Encryption with Associated Data
-     *
-     * Algorithm:
-     *     XChaCha20-Poly1305
-     *
-     * This mode uses a 64-bit random nonce with a 64-bit counter.
-     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
-     *
-     * @param string $plaintext Message to be encrypted
-     * @param string $assocData Authenticated Associated Data (unencrypted)
-     * @param string $nonce Number to be used only Once; must be 8 bytes
-     * @param string $key Encryption key
-     *
-     * @return string           Ciphertext with a 16-byte Poly1305 message
-     *                          authentication code appended
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_aead_xchacha20poly1305_ietf_encrypt(
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_NPUBBYTES long');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_KEYBYTES long');
-        }
-
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
-        return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_encrypt(
-            $plaintext,
-            $assocData,
-            $nonce,
-            $key
-        );
-    }
-
-    /**
-     * Authenticate a message. Uses symmetric-key cryptography.
-     *
-     * Algorithm:
-     *     HMAC-SHA512-256. Which is HMAC-SHA-512 truncated to 256 bits.
-     *     Not to be confused with HMAC-SHA-512/256 which would use the
-     *     SHA-512/256 hash function (uses different initial parameters
-     *     but still truncates to 256 bits to sidestep length-extension
-     *     attacks).
-     *
-     * @param string $message Message to be authenticated
-     * @param string $key Symmetric authentication key
-     * @return string         Message authentication code
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_auth($message, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_AUTH_KEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_auth($message, $key);
-        }
-        if (self::use_fallback('crypto_auth')) {
-            return call_user_func('\\Sodium\\crypto_auth', $message, $key);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::auth($message, $key);
-        }
-        return ParagonIE_Sodium_Crypto::auth($message, $key);
-    }
-
-    /**
-     * Verify the MAC of a message previously authenticated with crypto_auth.
-     *
-     * @param string $mac Message authentication code
-     * @param string $message Message whose authenticity you are attempting to
-     *                        verify (with a given MAC and key)
-     * @param string $key Symmetric authentication key
-     * @return bool           TRUE if authenticated, FALSE otherwise
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_auth_verify($mac, $message, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($mac, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($mac) !== self::CRYPTO_AUTH_BYTES) {
-            throw new Error('Argument 1 must be CRYPTO_AUTH_BYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_AUTH_KEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_auth_verify($mac, $message, $key);
-        }
-        if (self::use_fallback('crypto_auth_verify')) {
-            return call_user_func('\\Sodium\\crypto_auth_verify', $mac, $message, $key);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::auth_verify($mac, $message, $key);
-        }
-        return ParagonIE_Sodium_Crypto::auth_verify($mac, $message, $key);
-    }
-
-    /**
-     * Authenticated asymmetric-key encryption. Both the sender and recipient
-     * may decrypt messages.
-     *
-     * Algorithm: X25519-XSalsa20-Poly1305.
-     *     X25519: Elliptic-Curve Diffie Hellman over Curve25519.
-     *     XSalsa20: Extended-nonce variant of salsa20.
-     *     Poyl1305: Polynomial MAC for one-time message authentication.
-     *
-     * @param string $plaintext The message to be encrypted
-     * @param string $nonce A Number to only be used Once; must be 24 bytes
-     * @param string $keypair Your secret key and your recipient's public key
-     * @return string           Ciphertext with 16-byte Poly1305 MAC
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box($plaintext, $nonce, $keypair)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box($plaintext, $nonce, $keypair);
-        }
-        if (self::use_fallback('crypto_box')) {
-            return call_user_func('\\Sodium\\crypto_box', $plaintext, $nonce, $keypair);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box($plaintext, $nonce, $keypair);
-        }
-        return ParagonIE_Sodium_Crypto::box($plaintext, $nonce, $keypair);
-    }
-
-    /**
-     * Anonymous public-key encryption. Only the recipient may decrypt messages.
-     *
-     * Algorithm: X25519-XSalsa20-Poly1305, as with crypto_box.
-     *     The sender's X25519 keypair is ephemeral.
-     *     Nonce is generated from the BLAKE2b hash of both public keys.
-     *
-     * This provides ciphertext integrity.
-     *
-     * @param string $plaintext Message to be sealed
-     * @param string $publicKey Your recipient's public key
-     * @return string           Sealed message that only your recipient can
-     *                          decrypt
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box_seal($plaintext, $publicKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_seal($plaintext, $publicKey);
-        }
-        if (self::use_fallback('crypto_box_seal')) {
-            return call_user_func('\\Sodium\\crypto_box_seal', $plaintext, $publicKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_seal($plaintext, $publicKey);
-        }
-        return ParagonIE_Sodium_Crypto::box_seal($plaintext, $publicKey);
-    }
-
-    /**
-     * Opens a message encrypted with crypto_box_seal(). Requires
-     * the recipient's keypair (sk || pk) to decrypt successfully.
-     *
-     * This validates ciphertext integrity.
-     *
-     * @param string $ciphertext Sealed message to be opened
-     * @param string $keypair    Your crypto_box keypair
-     * @return string            The original plaintext message
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box_seal_open($ciphertext, $keypair)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_seal_open($ciphertext, $keypair);
-        }
-        if (self::use_fallback('crypto_box_seal_open')) {
-            return call_user_func('\\Sodium\\crypto_box_seal_open', $ciphertext, $keypair);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_seal_open($ciphertext, $keypair);
-        }
-        return ParagonIE_Sodium_Crypto::box_seal_open($ciphertext, $keypair);
-    }
-
-    /**
-     * Generate a new random X25519 keypair.
-     *
-     * @return string A 64-byte string; the first 32 are your secret key, while
-     *                the last 32 are your public key. crypto_box_secretkey()
-     *                and crypto_box_publickey() exist to separate them so you
-     *                don't accidentally get them mixed up!
-     */
-    public static function crypto_box_keypair()
-    {
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_keypair();
-        }
-        if (self::use_fallback('crypto_box_keypair')) {
-            return call_user_func('\\Sodium\\crypto_box_keypair');
-        }
-        return ParagonIE_Sodium_Crypto::box_keypair();
-    }
-
-    /**
-     * Combine two keys into a keypair for use in library methods that expect
-     * a keypair. This doesn't necessarily have to be the same person's keys.
-     *
-     * @param string $secretKey Secret key
-     * @param string $publicKey Public key
-     * @return string    Keypair
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
-        }
-        if (self::use_fallback('crypto_box_keypair_from_secretkey_and_publickey')) {
-            return call_user_func('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey', $secretKey, $publicKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
-        }
-        return ParagonIE_Sodium_Crypto::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
-    }
-
-    /**
-     * Decrypt a message previously encrypted with crypto_box().
-     *
-     * @param string $ciphertext Encrypted message
-     * @param string $nonce      Number to only be used Once; must be 24 bytes
-     * @param string $keypair    Your secret key and the sender's public key
-     * @return string            The original plaintext message
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box_open($ciphertext, $nonce, $keypair)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_BOX_MACBYTES) {
-            throw new Error('Argument 1 must be at least CRYPTO_BOX_MACBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_open($ciphertext, $nonce, $keypair);
-        }
-        if (self::use_fallback('crypto_box_open')) {
-            return call_user_func('\\Sodium\\crypto_box_open', $ciphertext, $nonce, $keypair);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_open($ciphertext, $nonce, $keypair);
-        }
-        return ParagonIE_Sodium_Crypto::box_open($ciphertext, $nonce, $keypair);
-    }
-
-    /**
-     * Extract the public key from a crypto_box keypair.
-     *
-     * @param string $keypair
-     * @return string         Your crypto_box public key
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box_publickey($keypair)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_publickey($keypair);
-        }
-        if (self::use_fallback('crypto_box_publickey')) {
-            return call_user_func('\\Sodium\\crypto_box_publickey', $keypair);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_publickey($keypair);
-        }
-        return ParagonIE_Sodium_Crypto::box_publickey($keypair);
-    }
-
-    /**
-     * Calculate the X25519 public key from a given X25519 secret key.
-     *
-     * @param string $secretKey Any X25519 secret key
-     * @return string      The corresponding X25519 public key
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box_publickey_from_secretkey($secretKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_publickey_from_secretkey($secretKey);
-        }
-        if (self::use_fallback('crypto_box_publickey_from_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_box_publickey_from_secretkey', $secretKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_publickey_from_secretkey($secretKey);
-        }
-        return ParagonIE_Sodium_Crypto::box_publickey_from_secretkey($secretKey);
-    }
-
-    /**
-     * Extract the secret key from a crypto_box keypair.
-     *
-     * @param string $keypair
-     * @return string         Your crypto_box secret key
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_box_secretkey($keypair)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_secretkey($keypair);
-        }
-        if (self::use_fallback('crypto_box_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_box_secretkey', $keypair);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_secretkey($keypair);
-        }
-        return ParagonIE_Sodium_Crypto::box_secretkey($keypair);
-    }
-
-    /**
-     * Generate an X25519 keypair from a seed.
-     *
-     * @param string $seed
-     * @return string
-     */
-    public static function crypto_box_seed_keypair($seed)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_seed_keypair($seed);
-        }
-        if (self::use_fallback('crypto_box_seed_keypair')) {
-            return call_user_func('\\Sodium\\crypto_box_seed_keypair', $seed);
-        }
-        return ParagonIE_Sodium_Crypto::box_seed_keypair($seed);
-    }
-
-    /**
-     * Calculates a BLAKE2b hash, with an optional key.
-     *
-     * @param string $message The message to be hashed
-     * @param string $key If specified, must be a string between 16 and 64
-     *                        bytes long
-     * @param int $length Output length in bytes; must be between 16 and 64
-     *                        (default = 32)
-     * @return string         Raw binary
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        if (is_null($key)) {
-            $key = '';
-        }
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 3);
-
-        /* Input validation: */
-        if (!empty($key)) {
-            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
-            }
-            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
-                throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
-            }
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_generichash($message, $key, $length);
-        }
-        if (self::use_fallback('crypto_generichash')) {
-            return call_user_func('\\Sodium\\crypto_generichash', $message, $key, $length);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::generichash($message, $key, $length);
-        }
-        return ParagonIE_Sodium_Crypto::generichash($message, $key, $length);
-    }
-
-    /**
-     * Get the final BLAKE2b hash output for a given context.
-     *
-     * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
-     * @param int $length Hash output size.
-     * @return string      Final BLAKE2b hash.
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_generichash_final($ctx, $length);
-        }
-        if (self::use_fallback('crypto_generichash_final')) {
-            $func = '\\Sodium\\crypto_generichash_final';
-            return $func($ctx, $length);
-        }
-        if (PHP_INT_SIZE === 4) {
-            $result = ParagonIE_Sodium_Crypto32::generichash_final($ctx, $length);
-        } else {
-            $result = ParagonIE_Sodium_Crypto::generichash_final($ctx, $length);
-        }
-        try {
-            self::memzero($ctx);
-        } catch (Error $ex) {
-            unset($ctx);
-        }
-        return $result;
-    }
-
-    /**
-     * Initialize a BLAKE2b hashing context, for use in a streaming interface.
-     *
-     * @param string $key If specified must be a string between 16 and 64 bytes
-     * @param int $length The size of the desired hash output
-     * @return string     A BLAKE2 hashing context, encoded as a string
-     *                    (To be 100% compatible with ext/libsodium)
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
-        /* Type checks: */
-        if (is_null($key)) {
-            $key = '';
-        }
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
-
-        /* Input validation: */
-        if (!empty($key)) {
-            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
-            }
-            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
-                throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
-            }
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_generichash_init($key, $length);
-        }
-        if (self::use_fallback('crypto_generichash_init')) {
-            return call_user_func('\\Sodium\\crypto_generichash_init', $key, $length);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::generichash_init($key, $length);
-        }
-        return ParagonIE_Sodium_Crypto::generichash_init($key, $length);
-    }
-
-    /**
-     * Update a BLAKE2b hashing context with additional data.
-     *
-     * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
-     *                        $ctx is passed by reference and gets updated in-place.
-     * @param string $message The message to append to the existing hash state.
-     * @return void
-     * @throws TypeError
-     */
-    public static function crypto_generichash_update(&$ctx, $message)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-
-        if (self::isPhp72OrGreater()) {
-            sodium_crypto_generichash_update($ctx, $message);
-            return;
-        }
-        if (self::use_fallback('crypto_generichash_update')) {
-            $func = '\\Sodium\\crypto_generichash_update';
-            $func($ctx, $message);
-            return;
-        }
-        if (PHP_INT_SIZE === 4) {
-            $ctx = ParagonIE_Sodium_Crypto32::generichash_update($ctx, $message);
-        } else {
-            $ctx = ParagonIE_Sodium_Crypto::generichash_update($ctx, $message);
-        }
-    }
-
-    /**
-     * Perform a key exchange, between a designated client and a server.
-     *
-     * Typically, you would designate one machine to be the client and the
-     * other to be the server. The first two keys are what you'd expect for
-     * scalarmult() below, but the latter two public keys don't swap places.
-     *
-     * | ALICE                          | BOB                                 |
-     * | Client                         | Server                              |
-     * |--------------------------------|-------------------------------------|
-     * | shared = crypto_kx(            | shared = crypto_kx(                 |
-     * |     alice_sk,                  |     bob_sk,                         | <- contextual
-     * |     bob_pk,                    |     alice_pk,                       | <- contextual
-     * |     alice_pk,                  |     alice_pk,                       | <----- static
-     * |     bob_pk                     |     bob_pk                          | <----- static
-     * | )                              | )                                   |
-     *
-     * They are used along with the scalarmult product to generate a 256-bit
-     * BLAKE2b hash unique to the client and server keys.
-     *
-     * @param string $my_secret
-     * @param string $their_public
-     * @param string $client_public
-     * @param string $server_public
-     * @return string
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($my_secret, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($their_public, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($client_public, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($server_public, 'string', 4);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($my_secret) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($their_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($client_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($server_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 4 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            if (is_callable('sodium_crypto_kx')) {
-                return sodium_crypto_kx(
-                    $my_secret,
-                    $their_public,
-                    $client_public,
-                    $server_public
-                );
-            }
-        }
-        if (self::use_fallback('crypto_kx')) {
-            return call_user_func(
-                '\\Sodium\\crypto_kx',
-                $my_secret,
-                $their_public,
-                $client_public,
-                $server_public
-            );
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::keyExchange(
-                $my_secret,
-                $their_public,
-                $client_public,
-                $server_public
-            );
-        }
-        return ParagonIE_Sodium_Crypto::keyExchange(
-            $my_secret,
-            $their_public,
-            $client_public,
-            $server_public
-        );
-    }
-
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws Error
-     */
-    public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
-        }
-        if (self::use_fallback('crypto_pwhash')) {
-            return call_user_func('\\Sodium\\crypto_pwhash', $outlen, $passwd, $salt, $opslimit, $memlimit);
-        }
-        // This is the best we can do.
-        throw new Error(
-            'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
-        );
-    }
-
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws Error
-     */
-    public static function crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit);
-        }
-        if (self::use_fallback('crypto_pwhash_str')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_str', $passwd, $opslimit, $memlimit);
-        }
-        // This is the best we can do.
-        throw new Error(
-            'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
-        );
-    }
-
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     * @throws Error
-     */
-    public static function crypto_pwhash_str_verify($passwd, $hash)
-    {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_str_verify($passwd, $hash);
-        }
-        if (self::use_fallback('crypto_pwhash_str_verify')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_str_verify', $passwd, $hash);
-        }
-        // This is the best we can do.
-        throw new Error(
-            'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
-        );
-    }
-
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws Error
-     */
-    public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
-        }
-        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256', $outlen, $passwd, $salt, $opslimit, $memlimit);
-        }
-        // This is the best we can do.
-        throw new Error(
-            'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
-        );
-    }
-
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws Error
-     */
-    public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
-        }
-        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str', $passwd, $opslimit, $memlimit);
-        }
-        // This is the best we can do.
-        throw new Error(
-            'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
-        );
-    }
-
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     * @throws Error
-     */
-    public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
-        }
-        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str_verify')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify', $passwd, $hash);
-        }
-        // This is the best we can do.
-        throw new Error(
-            'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
-        );
-    }
-
-    /**
-     * Calculate the shared secret between your secret key and your
-     * recipient's public key.
-     *
-     * Algorithm: X25519 (ECDH over Curve25519)
-     *
-     * @param string $secretKey
-     * @param string $publicKey
-     * @return string
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_scalarmult($secretKey, $publicKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_scalarmult($secretKey, $publicKey);
-        }
-        if (self::use_fallback('crypto_scalarmult')) {
-            return call_user_func('\\Sodium\\crypto_scalarmult', $secretKey, $publicKey);
-        }
-
-        /* Output validation: Forbid all-zero keys */
-        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
-            throw new Error('Zero secret key is not allowed');
-        }
-        if (ParagonIE_Sodium_Core_Util::hashEquals($publicKey, str_repeat("\0", self::CRYPTO_BOX_PUBLICKEYBYTES))) {
-            throw new Error('Zero public key is not allowed');
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::scalarmult($secretKey, $publicKey);
-        }
-        return ParagonIE_Sodium_Crypto::scalarmult($secretKey, $publicKey);
-    }
-
-    /**
-     * Calculate an X25519 public key from an X25519 secret key.
-     *
-     * @param string $secretKey
-     * @return string
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_scalarmult_base($secretKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_scalarmult_base($secretKey);
-        }
-        if (self::use_fallback('crypto_scalarmult_base')) {
-            return call_user_func('\\Sodium\\crypto_scalarmult_base', $secretKey);
-        }
-        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
-            throw new Error('Zero secret key is not allowed');
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::scalarmult_base($secretKey);
-        }
-        return ParagonIE_Sodium_Crypto::scalarmult_base($secretKey);
-    }
-
-    /**
-     * Authenticated symmetric-key encryption.
-     *
-     * Algorithm: XSalsa20-Poly1305
-     *
-     * @param string $plaintext The message you're encrypting
-     * @param string $nonce A Number to be used Once; must be 24 bytes
-     * @param string $key Symmetric encryption key
-     * @return string           Ciphertext with Poly1305 MAC
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_secretbox($plaintext, $nonce, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_secretbox($plaintext, $nonce, $key);
-        }
-        if (self::use_fallback('crypto_secretbox')) {
-            return call_user_func('\\Sodium\\crypto_secretbox', $plaintext, $nonce, $key);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox($plaintext, $nonce, $key);
-        }
-        return ParagonIE_Sodium_Crypto::secretbox($plaintext, $nonce, $key);
-    }
-
-    /**
-     * Decrypts a message previously encrypted with crypto_secretbox().
-     *
-     * @param string $ciphertext Ciphertext with Poly1305 MAC
-     * @param string $nonce      A Number to be used Once; must be 24 bytes
-     * @param string $key        Symmetric encryption key
-     * @return string            Original plaintext message
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_secretbox_open($ciphertext, $nonce, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
-        }
-        if (self::use_fallback('crypto_secretbox_open')) {
-            return call_user_func('\\Sodium\\crypto_secretbox_open', $ciphertext, $nonce, $key);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_open($ciphertext, $nonce, $key);
-        }
-        return ParagonIE_Sodium_Crypto::secretbox_open($ciphertext, $nonce, $key);
-    }
-
-    /**
-     * Authenticated symmetric-key encryption.
-     *
-     * Algorithm: XChaCha20-Poly1305
-     *
-     * @param string $plaintext The message you're encrypting
-     * @param string $nonce     A Number to be used Once; must be 24 bytes
-     * @param string $key       Symmetric encryption key
-     * @return string           Ciphertext with Poly1305 MAC
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
-        }
-        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
-    }
-    /**
-     * Decrypts a message previously encrypted with crypto_secretbox_xchacha20poly1305().
-     *
-     * @param string $ciphertext Ciphertext with Poly1305 MAC
-     * @param string $nonce      A Number to be used Once; must be 24 bytes
-     * @param string $key        Symmetric encryption key
-     * @return string            Original plaintext message
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
-        }
-
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
-        }
-        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
-    }
-
-    /**
-     * Calculates a SipHash-2-4 hash of a message for a given key.
-     *
-     * @param string $message Input message
-     * @param string $key SipHash-2-4 key
-     * @return string         Hash
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_shorthash($message, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SHORTHASH_KEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SHORTHASH_KEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_shorthash($message, $key);
-        }
-        if (self::use_fallback('crypto_shorthash')) {
-            return call_user_func('\\Sodium\\crypto_shorthash', $message, $key);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_SipHash::sipHash24($message, $key);
-        }
-        return ParagonIE_Sodium_Core_SipHash::sipHash24($message, $key);
-    }
-
-    /**
-     * Expand a key and nonce into a keystream of pseudorandom bytes.
-     *
-     * @param int $len Number of bytes desired
-     * @param string $nonce Number to be used Once; must be 24 bytes
-     * @param string $key XSalsa20 key
-     * @return string       Pseudorandom stream that can be XORed with messages
-     *                      to provide encryption (but not authentication; see
-     *                      Poly1305 or crypto_auth() for that, which is not
-     *                      optional for security)
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_stream($len, $nonce, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_STREAM_KEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_stream($len, $nonce, $key);
-        }
-        if (self::use_fallback('crypto_stream')) {
-            return call_user_func('\\Sodium\\crypto_stream', $len, $nonce, $key);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20($len, $nonce, $key);
-        }
-        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20($len, $nonce, $key);
-    }
-
-    /**
-     * DANGER! UNAUTHENTICATED ENCRYPTION!
-     *
-     * Unless you are following expert advice, do not used this feature.
-     *
-     * Algorithm: XSalsa20
-     *
-     * This DOES NOT provide ciphertext integrity.
-     *
-     * @param string $message Plaintext message
-     * @param string $nonce Number to be used Once; must be 24 bytes
-     * @param string $key Encryption key
-     * @return string         Encrypted text which is vulnerable to chosen-
-     *                        ciphertext attacks unless you implement some
-     *                        other mitigation to the ciphertext (i.e.
-     *                        Encrypt then MAC)
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_stream_xor($message, $nonce, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_stream_xor($message, $nonce, $key);
-        }
-        if (self::use_fallback('crypto_stream_xor')) {
-            return call_user_func('\\Sodium\\crypto_stream_xor', $message, $nonce, $key);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20_xor($message, $nonce, $key);
-        }
-        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20_xor($message, $nonce, $key);
-    }
-
-    /**
-     * Returns a signed message. You probably want crypto_sign_detached()
-     * instead, which only returns the signature.
-     *
-     * Algorithm: Ed25519 (EdDSA over Curve25519)
-     *
-     * @param string $message Message to be signed.
-     * @param string $secretKey Secret signing key.
-     * @return string           Signed message (signature is prefixed).
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_sign($message, $secretKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign($message, $secretKey);
-        }
-        if (self::use_fallback('crypto_sign')) {
-            return call_user_func('\\Sodium\\crypto_sign', $message, $secretKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign($message, $secretKey);
-        }
-        return ParagonIE_Sodium_Crypto::sign($message, $secretKey);
-    }
-
-    /**
-     * Validates a signed message then returns the message.
-     *
-     * @param string $signedMessage A signed message
-     * @param string $publicKey A public key
-     * @return string               The original message (if the signature is
-     *                              valid for this public key)
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_sign_open($signedMessage, $publicKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($signedMessage, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($signedMessage) < self::CRYPTO_SIGN_BYTES) {
-            throw new Error('Argument 1 must be at least CRYPTO_SIGN_BYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_open($signedMessage, $publicKey);
-        }
-        if (self::use_fallback('crypto_sign_open')) {
-            return call_user_func('\\Sodium\\crypto_sign_open', $signedMessage, $publicKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_open($signedMessage, $publicKey);
-        }
-        return ParagonIE_Sodium_Crypto::sign_open($signedMessage, $publicKey);
-    }
-
-    /**
-     * Generate a new random Ed25519 keypair.
-     *
-     * @return string
-     */
-    public static function crypto_sign_keypair()
-    {
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_keypair();
-        }
-        if (self::use_fallback('crypto_sign_keypair')) {
-            return call_user_func(
-                '\\Sodium\\crypto_sign_keypair'
-            );
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::keypair();
-        }
-        return ParagonIE_Sodium_Core_Ed25519::keypair();
-    }
-
-    /**
-     * Generate an Ed25519 keypair from a seed.
-     *
-     * @param string $seed Input seed
-     * @return string      Keypair
-     */
-    public static function crypto_sign_seed_keypair($seed)
-    {
-        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_seed_keypair($seed);
-        }
-        if (self::use_fallback('crypto_sign_keypair')) {
-            return call_user_func('\\Sodium\\crypto_sign_seed_keypair', $seed);
-        }
-        $publicKey = '';
-        $secretKey = '';
-        if (PHP_INT_SIZE === 4) {
-            ParagonIE_Sodium_Core32_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
-        } else {
-            ParagonIE_Sodium_Core_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
-        }
-        return $secretKey . $publicKey;
-    }
-
-    /**
-     * Extract an Ed25519 public key from an Ed25519 keypair.
-     *
-     * @param string $keypair Keypair
-     * @return string         Public key
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_sign_publickey($keypair)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_publickey($keypair);
-        }
-        if (self::use_fallback('crypto_sign_publickey')) {
-            return call_user_func('\\Sodium\\crypto_sign_publickey', $keypair);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::publickey($keypair);
-        }
-        return ParagonIE_Sodium_Core_Ed25519::publickey($keypair);
-    }
-
-    /**
-     * Calculate an Ed25519 public key from an Ed25519 secret key.
-     *
-     * @param string $secretKey Your Ed25519 secret key
-     * @return string           The corresponding Ed25519 public key
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_sign_publickey_from_secretkey($secretKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_publickey_from_secretkey($secretKey);
-        }
-        if (self::use_fallback('crypto_sign_publickey_from_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_sign_publickey_from_secretkey', $secretKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::publickey_from_secretkey($secretKey);
-        }
-        return ParagonIE_Sodium_Core_Ed25519::publickey_from_secretkey($secretKey);
-    }
-
-    /**
-     * Extract an Ed25519 secret key from an Ed25519 keypair.
-     *
-     * @param string $keypair Keypair
-     * @return string         Secret key
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_sign_secretkey($keypair)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_secretkey($keypair);
-        }
-        if (self::use_fallback('crypto_sign_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_sign_secretkey', $keypair);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::secretkey($keypair);
-        }
-        return ParagonIE_Sodium_Core_Ed25519::secretkey($keypair);
-    }
-
-    /**
-     * Calculate the Ed25519 signature of a message and return ONLY the signature.
-     *
-     * Algorithm: Ed25519 (EdDSA over Curve25519)
-     *
-     * @param string $message Message to be signed
-     * @param string $secretKey Secret signing key
-     * @return string           Digital signature
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_sign_detached($message, $secretKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_detached($message, $secretKey);
-        }
-        if (self::use_fallback('crypto_sign_detached')) {
-            return call_user_func('\\Sodium\\crypto_sign_detached', $message, $secretKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_detached($message, $secretKey);
-        }
-        return ParagonIE_Sodium_Crypto::sign_detached($message, $secretKey);
-    }
-
-    /**
-     * Verify the Ed25519 signature of a message.
-     *
-     * @param string $signature Digital sginature
-     * @param string $message Message to be verified
-     * @param string $publicKey Public key
-     * @return bool             TRUE if this signature is good for this public key;
-     *                          FALSE otherwise
-     * @throws Error
-     * @throws TypeError
-     */
-    public static function crypto_sign_verify_detached($signature, $message, $publicKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($signature, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 3);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($signature) !== self::CRYPTO_SIGN_BYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_BYTES long.');
-        }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
-        }
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_verify_detached($signature, $message, $publicKey);
-        }
-        if (self::use_fallback('crypto_sign_verify_detached')) {
-            return call_user_func('\\Sodium\\crypto_sign_verify_detached', $signature, $message, $publicKey);
-        }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_verify_detached($signature, $message, $publicKey);
-        }
-        return ParagonIE_Sodium_Crypto::sign_verify_detached($signature, $message, $publicKey);
-    }
-
-    /**
-     * Convert an Ed25519 secret key to a Curve25519 secret key
-     *
-     * @param string $sk
-     * @return string
-     * @throws Error
-     */
-    public static function crypto_sign_ed25519_sk_to_curve25519($sk)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
-
-        /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($sk) < self::CRYPTO_SIGN_SEEDBYTES) {
-            throw new Error('Argument 1 must be at least CRYPTO_SIGN_SEEDBYTES long.');
-        }
-        if (self::isPhp72OrGreater()) {
-            if (is_callable('crypto_sign_ed25519_sk_to_curve25519')) {
-                return sodium_crypto_sign_ed25519_sk_to_curve25519($sk);
-            }
-        }
-        if (self::use_fallback('crypto_sign_ed25519_sk_to_curve25519')) {
-            return call_user_func('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519', $sk);
-        }
-
-        $h = hash('sha512', ParagonIE_Sodium_Core_Util::substr($sk, 0, 32), true);
-        $h[0] = ParagonIE_Sodium_Core_Util::intToChr(
-            ParagonIE_Sodium_Core_Util::chrToInt($h[0]) & 248
-        );
-        $h[31] = ParagonIE_Sodium_Core_Util::intToChr(
-            (ParagonIE_Sodium_Core_Util::chrToInt($h[31]) & 127) | 64
-        );
-        return ParagonIE_Sodium_Core_Util::substr($h, 0, 32);
-    }
-
-    /**
-     * Cache-timing-safe implementation of hex2bin().
-     *
-     * @param string $string Hexadecimal string
-     * @return string        Raw binary string
-     * @throws TypeError
-     */
-    public static function hex2bin($string)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
-
-        if (self::isPhp72OrGreater()) {
-            return sodium_hex2bin($string);
-        }
-        if (self::use_fallback('hex2bin')) {
-            return call_user_func('\\Sodium\\hex2bin', $string);
-        }
-        return ParagonIE_Sodium_Core_Util::hex2bin($string);
-    }
-
-    /**
-     * Increase a string (little endian)
-     *
-     * @param string $var
-     *
-     * @return void
-     * @throws Error (Unless libsodium is installed)
-     */
-    public static function increment(&$var)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
-
-        if (self::isPhp72OrGreater()) {
-            sodium_increment($var);
-            return;
-        }
-        if (self::use_fallback('increment')) {
-            @call_user_func('\\Sodium\\increment', $var);
-            return;
-        }
-
-        $len = ParagonIE_Sodium_Core_Util::strlen($var);
-        $c = 1;
-        $copy = '';
-        for ($i = 0; $i < $len; ++$i) {
-            $c += ParagonIE_Sodium_Core_Util::chrToInt(
-                ParagonIE_Sodium_Core_Util::substr($var, $i, 1)
-            );
-            $copy .= ParagonIE_Sodium_Core_Util::intToChr($c);
-            $c >>= 8;
-        }
-        $var = $copy;
-    }
-
-    /**
-     * The equivalent to the libsodium minor version we aim to be compatible
-     * with (sans pwhash and memzero).
-     *
-     * @return int
-     */
-    public static function library_version_major()
-    {
-        if (self::isPhp72OrGreater()) {
-            return sodium_library_version_major();
-        }
-        if (self::use_fallback('library_version_major')) {
-            return (int) call_user_func('\\Sodium\\library_version_major');
-        }
-        return self::LIBRARY_VERSION_MAJOR;
-    }
-
-    /**
-     * The equivalent to the libsodium minor version we aim to be compatible
-     * with (sans pwhash and memzero).
-     *
-     * @return int
-     */
-    public static function library_version_minor()
-    {
-        if (self::isPhp72OrGreater()) {
-            return sodium_library_version_minor();
-        }
-        if (self::use_fallback('library_version_minor')) {
-            return (int) call_user_func('\\Sodium\\library_version_minor');
-        }
-        return self::LIBRARY_VERSION_MINOR;
-    }
-
-    /**
-     * Compare two strings.
-     *
-     * @param string $left
-     * @param string $right
-     * @return int
-     * @throws TypeError
-     */
-    public static function memcmp($left, $right)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
-
-        if (self::use_fallback('memcmp')) {
-            return call_user_func('\\Sodium\\memcmp', $left, $right);
-        }
-        return ParagonIE_Sodium_Core_Util::memcmp($left, $right);
-    }
-
-    /**
-     * It's actually not possible to zero memory buffers in PHP. You need the
-     * native library for that.
-     *
-     * @param string|null $var
-     *
-     * @return void
-     * @throws Error (Unless libsodium is installed)
-     */
-    public static function memzero(&$var)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
-
-        if (self::isPhp72OrGreater()) {
-            sodium_memzero($var);
-            return;
-        }
-        if (self::use_fallback('memzero')) {
-            @call_user_func('\\Sodium\\memzero', $var);
-            return;
-        }
-        // This is the best we can do.
-        throw new Error(
-            'This is not implemented, as it is not possible to securely wipe memory from PHP'
-        );
-    }
-
-    /**
-     * Generate a string of bytes from the kernel's CSPRNG.
-     * Proudly uses /dev/urandom (if getrandom(2) is not available).
-     *
-     * @param int $numBytes
-     * @return string
-     * @throws TypeError
-     */
-    public static function randombytes_buf($numBytes)
-    {
-        /* Type checks: */
-        if (!is_int($numBytes)) {
-            if (is_numeric($numBytes)) {
-                $numBytes = (int)$numBytes;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($numBytes) . ' given.');
-            }
-        }
-        if (self::use_fallback('randombytes_buf')) {
-            return call_user_func('\\Sodium\\randombytes_buf', $numBytes);
-        }
-        return random_bytes($numBytes);
-    }
-
-    /**
-     * Generate an integer between 0 and $range (non-inclusive).
-     *
-     * @param int $range
-     * @return int
-     * @throws TypeError
-     */
-    public static function randombytes_uniform($range)
-    {
-        /* Type checks: */
-        if (!is_int($range)) {
-            if (is_numeric($range)) {
-                $range = (int)$range;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($range) . ' given.');
-            }
-        }
-        if (self::use_fallback('randombytes_uniform')) {
-            return (int) call_user_func('\\Sodium\\randombytes_uniform', $range);
-        }
-        return random_int(0, $range - 1);
-    }
-
-    /**
-     * Generate a random 16-bit integer.
-     *
-     * @return int
-     */
-    public static function randombytes_random16()
-    {
-        if (self::use_fallback('randombytes_random16')) {
-            return (int) call_user_func('\\Sodium\\randombytes_random16');
-        }
-        return random_int(0, 65535);
-    }
-
-    /**
-     * This emulates libsodium's version_string() function, except ours is
-     * prefixed with 'polyfill-'.
-     *
-     * @return string
-     */
-    public static function version_string()
-    {
-        if (self::isPhp72OrGreater()) {
-            return sodium_version_string();
-        }
-        if (self::use_fallback('version_string')) {
-            return (string) call_user_func('\\Sodium\\version_string');
-        }
-        return self::VERSION_STRING;
-    }
-
-    /**
-     * Should we use the libsodium core function instead?
-     * This is always a good idea, if it's available. (Unless we're in the
-     * middle of running our unit test suite.)
-     *
-     * If ext/libsodium is available, use it. Return TRUE.
-     * Otherwise, we have to use the code provided herein. Return FALSE.
-     *
-     * @param string $sodium_func_name
-     *
-     * @return bool
-     */
-    protected static function use_fallback($sodium_func_name = '')
-    {
-        static $res = null;
-        if ($res === null) {
-            $res = extension_loaded('libsodium') && PHP_VERSION_ID >= 50300;
-        }
-        if (PHP_INT_SIZE === 4) {
-            if ($res && is_callable('\\Sodium\\' . $sodium_func_name)) {
-                // We can safely just offload to the PECL extension
-                return true;
-            }
-            /*
+	/**
+	 * This parameter prevents the use of the PECL extension.
+	 * It should only be used for unit testing.
+	 *
+	 * @var bool
+	 */
+	public static $disableFallbackForUnitTests = false;
+
+	/**
+	 * Use fast multiplication rather than our constant-time multiplication
+	 * implementation. Can be enabled at runtime. Only enable this if you
+	 * are absolutely certain that there is no timing leak on your platform.
+	 *
+	 * @var bool
+	 */
+	public static $fastMult = false;
+
+	const LIBRARY_VERSION_MAJOR = 9;
+	const LIBRARY_VERSION_MINOR = 1;
+	const VERSION_STRING = 'polyfill-1.0.8';
+
+	// From libsodium
+	const CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = 32;
+	const CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = 0;
+	const CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = 8;
+	const CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = 16;
+	const CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = 32;
+	const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = 0;
+	const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = 12;
+	const CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = 16;
+	const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES = 32;
+	const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NSECBYTES = 0;
+	const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES = 24;
+	const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES = 16;
+	const CRYPTO_AUTH_BYTES = 32;
+	const CRYPTO_AUTH_KEYBYTES = 32;
+	const CRYPTO_BOX_SEALBYTES = 16;
+	const CRYPTO_BOX_SECRETKEYBYTES = 32;
+	const CRYPTO_BOX_PUBLICKEYBYTES = 32;
+	const CRYPTO_BOX_KEYPAIRBYTES = 64;
+	const CRYPTO_BOX_MACBYTES = 16;
+	const CRYPTO_BOX_NONCEBYTES = 24;
+	const CRYPTO_BOX_SEEDBYTES = 32;
+	const CRYPTO_KX_BYTES = 32;
+	const CRYPTO_KX_PUBLICKEYBYTES = 32;
+	const CRYPTO_KX_SECRETKEYBYTES = 32;
+	const CRYPTO_GENERICHASH_BYTES = 32;
+	const CRYPTO_GENERICHASH_BYTES_MIN = 16;
+	const CRYPTO_GENERICHASH_BYTES_MAX = 64;
+	const CRYPTO_GENERICHASH_KEYBYTES = 32;
+	const CRYPTO_GENERICHASH_KEYBYTES_MIN = 16;
+	const CRYPTO_GENERICHASH_KEYBYTES_MAX = 64;
+	const CRYPTO_PWHASH_SALTBYTES = 16;
+	const CRYPTO_PWHASH_STRPREFIX = '$argon2i$';
+	const CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE = 33554432;
+	const CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE = 4;
+	const CRYPTO_PWHASH_MEMLIMIT_MODERATE = 134217728;
+	const CRYPTO_PWHASH_OPSLIMIT_MODERATE = 6;
+	const CRYPTO_PWHASH_MEMLIMIT_SENSITIVE = 536870912;
+	const CRYPTO_PWHASH_OPSLIMIT_SENSITIVE = 8;
+	const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES = 32;
+	const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_STRPREFIX = '$7$';
+	const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE = 534288;
+	const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE = 16777216;
+	const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE = 33554432;
+	const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE = 1073741824;
+	const CRYPTO_SCALARMULT_BYTES = 32;
+	const CRYPTO_SCALARMULT_SCALARBYTES = 32;
+	const CRYPTO_SHORTHASH_BYTES = 8;
+	const CRYPTO_SHORTHASH_KEYBYTES = 16;
+	const CRYPTO_SECRETBOX_KEYBYTES = 32;
+	const CRYPTO_SECRETBOX_MACBYTES = 16;
+	const CRYPTO_SECRETBOX_NONCEBYTES = 24;
+	const CRYPTO_SIGN_BYTES = 64;
+	const CRYPTO_SIGN_SEEDBYTES = 32;
+	const CRYPTO_SIGN_PUBLICKEYBYTES = 32;
+	const CRYPTO_SIGN_SECRETKEYBYTES = 64;
+	const CRYPTO_SIGN_KEYPAIRBYTES = 96;
+	const CRYPTO_STREAM_KEYBYTES = 32;
+	const CRYPTO_STREAM_NONCEBYTES = 24;
+
+	/**
+	 * Cache-timing-safe implementation of bin2hex().
+	 *
+	 * @param string $string A string (probably raw binary)
+	 * @return string        A hexadecimal-encoded string
+	 * @throws TypeError
+	 */
+	public static function bin2hex($string)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
+
+		if (self::isPhp72OrGreater()) {
+			return bin2hex($string);
+		}
+		if (self::use_fallback('bin2hex')) {
+			return call_user_func('\\Sodium\\bin2hex', $string);
+		}
+		return ParagonIE_Sodium_Core_Util::bin2hex($string);
+	}
+
+	/**
+	 * Compare two strings, in constant-time.
+	 * Compared to memcmp(), compare() is more useful for sorting.
+	 *
+	 * @param string $left The left operand; must be a string
+	 * @param string $right The right operand; must be a string
+	 * @return int          < 0 if the left operand is less than the right
+	 *                      0 if both strings are equal
+	 *                      > 0 if the right operand is less than the left
+	 * @throws TypeError
+	 */
+	public static function compare($left, $right)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_compare($left, $right);
+		}
+		if (self::use_fallback('compare')) {
+			return call_user_func('\\Sodium\\compare', $left, $right);
+		}
+		return ParagonIE_Sodium_Core_Util::compare($left, $right);
+	}
+
+	/**
+	 * Authenticated Encryption with Associated Data: Decryption
+	 *
+	 * Algorithm:
+	 *     ChaCha20-Poly1305
+	 *
+	 * This mode uses a 64-bit random nonce with a 64-bit counter.
+	 * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+	 *
+	 * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+	 * @param string $assocData Authenticated Associated Data (unencrypted)
+	 * @param string $nonce Number to be used only Once; must be 8 bytes
+	 * @param string $key Encryption key
+	 *
+	 * @return string            The original plaintext message
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_aead_chacha20poly1305_decrypt(
+		$ciphertext = '',
+		$assocData = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
+			throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+			throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
+			throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_aead_chacha20poly1305_decrypt(
+				$ciphertext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (self::use_fallback('crypto_aead_chacha20poly1305_decrypt')) {
+			return call_user_func(
+				'\\Sodium\\crypto_aead_chacha20poly1305_decrypt',
+				$ciphertext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_decrypt(
+				$ciphertext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_decrypt(
+			$ciphertext,
+			$assocData,
+			$nonce,
+			$key
+		);
+	}
+
+	/**
+	 * Authenticated Encryption with Associated Data
+	 *
+	 * Algorithm:
+	 *     ChaCha20-Poly1305
+	 *
+	 * This mode uses a 64-bit random nonce with a 64-bit counter.
+	 * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+	 *
+	 * @param string $plaintext Message to be encrypted
+	 * @param string $assocData Authenticated Associated Data (unencrypted)
+	 * @param string $nonce Number to be used only Once; must be 8 bytes
+	 * @param string $key Encryption key
+	 *
+	 * @return string           Ciphertext with a 16-byte Poly1305 message
+	 *                          authentication code appended
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_aead_chacha20poly1305_encrypt(
+		$plaintext = '',
+		$assocData = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
+			throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+			throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_aead_chacha20poly1305_encrypt(
+				$plaintext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (self::use_fallback('crypto_aead_chacha20poly1305_encrypt')) {
+			return call_user_func(
+				'\\Sodium\\crypto_aead_chacha20poly1305_encrypt',
+				$plaintext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_encrypt(
+				$plaintext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_encrypt(
+			$plaintext,
+			$assocData,
+			$nonce,
+			$key
+		);
+	}
+
+	/**
+	 * Authenticated Encryption with Associated Data: Decryption
+	 *
+	 * Algorithm:
+	 *     ChaCha20-Poly1305
+	 *
+	 * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+	 * Regular mode uses a 64-bit random nonce with a 64-bit counter.
+	 *
+	 * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+	 * @param string $assocData Authenticated Associated Data (unencrypted)
+	 * @param string $nonce Number to be used only Once; must be 12 bytes
+	 * @param string $key Encryption key
+	 *
+	 * @return string            The original plaintext message
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_aead_chacha20poly1305_ietf_decrypt(
+		$ciphertext = '',
+		$assocData = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
+			throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+			throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
+			throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
+				$ciphertext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_decrypt')) {
+			return call_user_func(
+				'\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt',
+				$ciphertext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_decrypt(
+				$ciphertext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_decrypt(
+			$ciphertext,
+			$assocData,
+			$nonce,
+			$key
+		);
+	}
+
+	/**
+	 * Authenticated Encryption with Associated Data
+	 *
+	 * Algorithm:
+	 *     ChaCha20-Poly1305
+	 *
+	 * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+	 * Regular mode uses a 64-bit random nonce with a 64-bit counter.
+	 *
+	 * @param string $plaintext Message to be encrypted
+	 * @param string $assocData Authenticated Associated Data (unencrypted)
+	 * @param string $nonce Number to be used only Once; must be 8 bytes
+	 * @param string $key Encryption key
+	 *
+	 * @return string           Ciphertext with a 16-byte Poly1305 message
+	 *                          authentication code appended
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_aead_chacha20poly1305_ietf_encrypt(
+		$plaintext = '',
+		$assocData = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
+			throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+			throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
+				$plaintext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_encrypt')) {
+			return call_user_func(
+				'\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt',
+				$plaintext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_encrypt(
+				$plaintext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_encrypt(
+			$plaintext,
+			$assocData,
+			$nonce,
+			$key
+		);
+	}
+
+	/**
+	 * Authenticated Encryption with Associated Data: Decryption
+	 *
+	 * Algorithm:
+	 *     XChaCha20-Poly1305
+	 *
+	 * This mode uses a 64-bit random nonce with a 64-bit counter.
+	 * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+	 *
+	 * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+	 * @param string $assocData Authenticated Associated Data (unencrypted)
+	 * @param string $nonce Number to be used only Once; must be 8 bytes
+	 * @param string $key Encryption key
+	 *
+	 * @return string            The original plaintext message
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_aead_xchacha20poly1305_ietf_decrypt(
+		$ciphertext = '',
+		$assocData = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
+			throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
+			throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES) {
+			throw new Error('Message must be at least CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES long');
+		}
+
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_decrypt(
+				$ciphertext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_decrypt(
+			$ciphertext,
+			$assocData,
+			$nonce,
+			$key
+		);
+	}
+
+	/**
+	 * Authenticated Encryption with Associated Data
+	 *
+	 * Algorithm:
+	 *     XChaCha20-Poly1305
+	 *
+	 * This mode uses a 64-bit random nonce with a 64-bit counter.
+	 * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+	 *
+	 * @param string $plaintext Message to be encrypted
+	 * @param string $assocData Authenticated Associated Data (unencrypted)
+	 * @param string $nonce Number to be used only Once; must be 8 bytes
+	 * @param string $key Encryption key
+	 *
+	 * @return string           Ciphertext with a 16-byte Poly1305 message
+	 *                          authentication code appended
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_aead_xchacha20poly1305_ietf_encrypt(
+		$plaintext = '',
+		$assocData = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
+			throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_NPUBBYTES long');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
+			throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_KEYBYTES long');
+		}
+
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_encrypt(
+				$plaintext,
+				$assocData,
+				$nonce,
+				$key
+			);
+		}
+		return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_encrypt(
+			$plaintext,
+			$assocData,
+			$nonce,
+			$key
+		);
+	}
+
+	/**
+	 * Authenticate a message. Uses symmetric-key cryptography.
+	 *
+	 * Algorithm:
+	 *     HMAC-SHA512-256. Which is HMAC-SHA-512 truncated to 256 bits.
+	 *     Not to be confused with HMAC-SHA-512/256 which would use the
+	 *     SHA-512/256 hash function (uses different initial parameters
+	 *     but still truncates to 256 bits to sidestep length-extension
+	 *     attacks).
+	 *
+	 * @param string $message Message to be authenticated
+	 * @param string $key Symmetric authentication key
+	 * @return string         Message authentication code
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_auth($message, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_AUTH_KEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_auth($message, $key);
+		}
+		if (self::use_fallback('crypto_auth')) {
+			return call_user_func('\\Sodium\\crypto_auth', $message, $key);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::auth($message, $key);
+		}
+		return ParagonIE_Sodium_Crypto::auth($message, $key);
+	}
+
+	/**
+	 * Verify the MAC of a message previously authenticated with crypto_auth.
+	 *
+	 * @param string $mac Message authentication code
+	 * @param string $message Message whose authenticity you are attempting to
+	 *                        verify (with a given MAC and key)
+	 * @param string $key Symmetric authentication key
+	 * @return bool           TRUE if authenticated, FALSE otherwise
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_auth_verify($mac, $message, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($mac, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($mac) !== self::CRYPTO_AUTH_BYTES) {
+			throw new Error('Argument 1 must be CRYPTO_AUTH_BYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_AUTH_KEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_auth_verify($mac, $message, $key);
+		}
+		if (self::use_fallback('crypto_auth_verify')) {
+			return call_user_func('\\Sodium\\crypto_auth_verify', $mac, $message, $key);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::auth_verify($mac, $message, $key);
+		}
+		return ParagonIE_Sodium_Crypto::auth_verify($mac, $message, $key);
+	}
+
+	/**
+	 * Authenticated asymmetric-key encryption. Both the sender and recipient
+	 * may decrypt messages.
+	 *
+	 * Algorithm: X25519-XSalsa20-Poly1305.
+	 *     X25519: Elliptic-Curve Diffie Hellman over Curve25519.
+	 *     XSalsa20: Extended-nonce variant of salsa20.
+	 *     Poyl1305: Polynomial MAC for one-time message authentication.
+	 *
+	 * @param string $plaintext The message to be encrypted
+	 * @param string $nonce A Number to only be used Once; must be 24 bytes
+	 * @param string $keypair Your secret key and your recipient's public key
+	 * @return string           Ciphertext with 16-byte Poly1305 MAC
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box($plaintext, $nonce, $keypair)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box($plaintext, $nonce, $keypair);
+		}
+		if (self::use_fallback('crypto_box')) {
+			return call_user_func('\\Sodium\\crypto_box', $plaintext, $nonce, $keypair);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box($plaintext, $nonce, $keypair);
+		}
+		return ParagonIE_Sodium_Crypto::box($plaintext, $nonce, $keypair);
+	}
+
+	/**
+	 * Anonymous public-key encryption. Only the recipient may decrypt messages.
+	 *
+	 * Algorithm: X25519-XSalsa20-Poly1305, as with crypto_box.
+	 *     The sender's X25519 keypair is ephemeral.
+	 *     Nonce is generated from the BLAKE2b hash of both public keys.
+	 *
+	 * This provides ciphertext integrity.
+	 *
+	 * @param string $plaintext Message to be sealed
+	 * @param string $publicKey Your recipient's public key
+	 * @return string           Sealed message that only your recipient can
+	 *                          decrypt
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box_seal($plaintext, $publicKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_seal($plaintext, $publicKey);
+		}
+		if (self::use_fallback('crypto_box_seal')) {
+			return call_user_func('\\Sodium\\crypto_box_seal', $plaintext, $publicKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box_seal($plaintext, $publicKey);
+		}
+		return ParagonIE_Sodium_Crypto::box_seal($plaintext, $publicKey);
+	}
+
+	/**
+	 * Opens a message encrypted with crypto_box_seal(). Requires
+	 * the recipient's keypair (sk || pk) to decrypt successfully.
+	 *
+	 * This validates ciphertext integrity.
+	 *
+	 * @param string $ciphertext Sealed message to be opened
+	 * @param string $keypair    Your crypto_box keypair
+	 * @return string            The original plaintext message
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box_seal_open($ciphertext, $keypair)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_seal_open($ciphertext, $keypair);
+		}
+		if (self::use_fallback('crypto_box_seal_open')) {
+			return call_user_func('\\Sodium\\crypto_box_seal_open', $ciphertext, $keypair);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box_seal_open($ciphertext, $keypair);
+		}
+		return ParagonIE_Sodium_Crypto::box_seal_open($ciphertext, $keypair);
+	}
+
+	/**
+	 * Generate a new random X25519 keypair.
+	 *
+	 * @return string A 64-byte string; the first 32 are your secret key, while
+	 *                the last 32 are your public key. crypto_box_secretkey()
+	 *                and crypto_box_publickey() exist to separate them so you
+	 *                don't accidentally get them mixed up!
+	 */
+	public static function crypto_box_keypair()
+	{
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_keypair();
+		}
+		if (self::use_fallback('crypto_box_keypair')) {
+			return call_user_func('\\Sodium\\crypto_box_keypair');
+		}
+		return ParagonIE_Sodium_Crypto::box_keypair();
+	}
+
+	/**
+	 * Combine two keys into a keypair for use in library methods that expect
+	 * a keypair. This doesn't necessarily have to be the same person's keys.
+	 *
+	 * @param string $secretKey Secret key
+	 * @param string $publicKey Public key
+	 * @return string    Keypair
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+		}
+		if (self::use_fallback('crypto_box_keypair_from_secretkey_and_publickey')) {
+			return call_user_func('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey', $secretKey, $publicKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+		}
+		return ParagonIE_Sodium_Crypto::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+	}
+
+	/**
+	 * Decrypt a message previously encrypted with crypto_box().
+	 *
+	 * @param string $ciphertext Encrypted message
+	 * @param string $nonce      Number to only be used Once; must be 24 bytes
+	 * @param string $keypair    Your secret key and the sender's public key
+	 * @return string            The original plaintext message
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box_open($ciphertext, $nonce, $keypair)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_BOX_MACBYTES) {
+			throw new Error('Argument 1 must be at least CRYPTO_BOX_MACBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_open($ciphertext, $nonce, $keypair);
+		}
+		if (self::use_fallback('crypto_box_open')) {
+			return call_user_func('\\Sodium\\crypto_box_open', $ciphertext, $nonce, $keypair);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box_open($ciphertext, $nonce, $keypair);
+		}
+		return ParagonIE_Sodium_Crypto::box_open($ciphertext, $nonce, $keypair);
+	}
+
+	/**
+	 * Extract the public key from a crypto_box keypair.
+	 *
+	 * @param string $keypair
+	 * @return string         Your crypto_box public key
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box_publickey($keypair)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_publickey($keypair);
+		}
+		if (self::use_fallback('crypto_box_publickey')) {
+			return call_user_func('\\Sodium\\crypto_box_publickey', $keypair);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box_publickey($keypair);
+		}
+		return ParagonIE_Sodium_Crypto::box_publickey($keypair);
+	}
+
+	/**
+	 * Calculate the X25519 public key from a given X25519 secret key.
+	 *
+	 * @param string $secretKey Any X25519 secret key
+	 * @return string      The corresponding X25519 public key
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box_publickey_from_secretkey($secretKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_publickey_from_secretkey($secretKey);
+		}
+		if (self::use_fallback('crypto_box_publickey_from_secretkey')) {
+			return call_user_func('\\Sodium\\crypto_box_publickey_from_secretkey', $secretKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box_publickey_from_secretkey($secretKey);
+		}
+		return ParagonIE_Sodium_Crypto::box_publickey_from_secretkey($secretKey);
+	}
+
+	/**
+	 * Extract the secret key from a crypto_box keypair.
+	 *
+	 * @param string $keypair
+	 * @return string         Your crypto_box secret key
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_box_secretkey($keypair)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_secretkey($keypair);
+		}
+		if (self::use_fallback('crypto_box_secretkey')) {
+			return call_user_func('\\Sodium\\crypto_box_secretkey', $keypair);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::box_secretkey($keypair);
+		}
+		return ParagonIE_Sodium_Crypto::box_secretkey($keypair);
+	}
+
+	/**
+	 * Generate an X25519 keypair from a seed.
+	 *
+	 * @param string $seed
+	 * @return string
+	 */
+	public static function crypto_box_seed_keypair($seed)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_box_seed_keypair($seed);
+		}
+		if (self::use_fallback('crypto_box_seed_keypair')) {
+			return call_user_func('\\Sodium\\crypto_box_seed_keypair', $seed);
+		}
+		return ParagonIE_Sodium_Crypto::box_seed_keypair($seed);
+	}
+
+	/**
+	 * Calculates a BLAKE2b hash, with an optional key.
+	 *
+	 * @param string $message The message to be hashed
+	 * @param string $key If specified, must be a string between 16 and 64
+	 *                        bytes long
+	 * @param int $length Output length in bytes; must be between 16 and 64
+	 *                        (default = 32)
+	 * @return string         Raw binary
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+		if (is_null($key)) {
+			$key = '';
+		}
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 3);
+
+		/* Input validation: */
+		if (!empty($key)) {
+			if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+				throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+			}
+			if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+				throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+			}
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_generichash($message, $key, $length);
+		}
+		if (self::use_fallback('crypto_generichash')) {
+			return call_user_func('\\Sodium\\crypto_generichash', $message, $key, $length);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::generichash($message, $key, $length);
+		}
+		return ParagonIE_Sodium_Crypto::generichash($message, $key, $length);
+	}
+
+	/**
+	 * Get the final BLAKE2b hash output for a given context.
+	 *
+	 * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
+	 * @param int $length Hash output size.
+	 * @return string      Final BLAKE2b hash.
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_generichash_final($ctx, $length);
+		}
+		if (self::use_fallback('crypto_generichash_final')) {
+			$func = '\\Sodium\\crypto_generichash_final';
+			return $func($ctx, $length);
+		}
+		if (PHP_INT_SIZE === 4) {
+			$result = ParagonIE_Sodium_Crypto32::generichash_final($ctx, $length);
+		} else {
+			$result = ParagonIE_Sodium_Crypto::generichash_final($ctx, $length);
+		}
+		try {
+			self::memzero($ctx);
+		} catch (Error $ex) {
+			unset($ctx);
+		}
+		return $result;
+	}
+
+	/**
+	 * Initialize a BLAKE2b hashing context, for use in a streaming interface.
+	 *
+	 * @param string $key If specified must be a string between 16 and 64 bytes
+	 * @param int $length The size of the desired hash output
+	 * @return string     A BLAKE2 hashing context, encoded as a string
+	 *                    (To be 100% compatible with ext/libsodium)
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+	{
+		/* Type checks: */
+		if (is_null($key)) {
+			$key = '';
+		}
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
+
+		/* Input validation: */
+		if (!empty($key)) {
+			if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+				throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+			}
+			if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+				throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+			}
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_generichash_init($key, $length);
+		}
+		if (self::use_fallback('crypto_generichash_init')) {
+			return call_user_func('\\Sodium\\crypto_generichash_init', $key, $length);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::generichash_init($key, $length);
+		}
+		return ParagonIE_Sodium_Crypto::generichash_init($key, $length);
+	}
+
+	/**
+	 * Update a BLAKE2b hashing context with additional data.
+	 *
+	 * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
+	 *                        $ctx is passed by reference and gets updated in-place.
+	 * @param string $message The message to append to the existing hash state.
+	 * @return void
+	 * @throws TypeError
+	 */
+	public static function crypto_generichash_update(&$ctx, $message)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
+
+		if (self::isPhp72OrGreater()) {
+			sodium_crypto_generichash_update($ctx, $message);
+			return;
+		}
+		if (self::use_fallback('crypto_generichash_update')) {
+			$func = '\\Sodium\\crypto_generichash_update';
+			$func($ctx, $message);
+			return;
+		}
+		if (PHP_INT_SIZE === 4) {
+			$ctx = ParagonIE_Sodium_Crypto32::generichash_update($ctx, $message);
+		} else {
+			$ctx = ParagonIE_Sodium_Crypto::generichash_update($ctx, $message);
+		}
+	}
+
+	/**
+	 * Perform a key exchange, between a designated client and a server.
+	 *
+	 * Typically, you would designate one machine to be the client and the
+	 * other to be the server. The first two keys are what you'd expect for
+	 * scalarmult() below, but the latter two public keys don't swap places.
+	 *
+	 * | ALICE                          | BOB                                 |
+	 * | Client                         | Server                              |
+	 * |--------------------------------|-------------------------------------|
+	 * | shared = crypto_kx(            | shared = crypto_kx(                 |
+	 * |     alice_sk,                  |     bob_sk,                         | <- contextual
+	 * |     bob_pk,                    |     alice_pk,                       | <- contextual
+	 * |     alice_pk,                  |     alice_pk,                       | <----- static
+	 * |     bob_pk                     |     bob_pk                          | <----- static
+	 * | )                              | )                                   |
+	 *
+	 * They are used along with the scalarmult product to generate a 256-bit
+	 * BLAKE2b hash unique to the client and server keys.
+	 *
+	 * @param string $my_secret
+	 * @param string $their_public
+	 * @param string $client_public
+	 * @param string $server_public
+	 * @return string
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($my_secret, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($their_public, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($client_public, 'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($server_public, 'string', 4);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($my_secret) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($their_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($client_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($server_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+			throw new Error('Argument 4 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			if (is_callable('sodium_crypto_kx')) {
+				return sodium_crypto_kx(
+					$my_secret,
+					$their_public,
+					$client_public,
+					$server_public
+				);
+			}
+		}
+		if (self::use_fallback('crypto_kx')) {
+			return call_user_func(
+				'\\Sodium\\crypto_kx',
+				$my_secret,
+				$their_public,
+				$client_public,
+				$server_public
+			);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::keyExchange(
+				$my_secret,
+				$their_public,
+				$client_public,
+				$server_public
+			);
+		}
+		return ParagonIE_Sodium_Crypto::keyExchange(
+			$my_secret,
+			$their_public,
+			$client_public,
+			$server_public
+		);
+	}
+
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 * @throws Error
+	 */
+	public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
+		ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+		}
+		if (self::use_fallback('crypto_pwhash')) {
+			return call_user_func('\\Sodium\\crypto_pwhash', $outlen, $passwd, $salt, $opslimit, $memlimit);
+		}
+		// This is the best we can do.
+		throw new Error(
+			'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
+		);
+	}
+
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 * @throws Error
+	 */
+	public static function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+	{
+		ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit);
+		}
+		if (self::use_fallback('crypto_pwhash_str')) {
+			return call_user_func('\\Sodium\\crypto_pwhash_str', $passwd, $opslimit, $memlimit);
+		}
+		// This is the best we can do.
+		throw new Error(
+			'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
+		);
+	}
+
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 * @throws Error
+	 */
+	public static function crypto_pwhash_str_verify($passwd, $hash)
+	{
+		ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_pwhash_str_verify($passwd, $hash);
+		}
+		if (self::use_fallback('crypto_pwhash_str_verify')) {
+			return call_user_func('\\Sodium\\crypto_pwhash_str_verify', $passwd, $hash);
+		}
+		// This is the best we can do.
+		throw new Error(
+			'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
+		);
+	}
+
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 * @throws Error
+	 */
+	public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
+		ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
+		ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+		}
+		if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256')) {
+			return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256', $outlen, $passwd, $salt, $opslimit, $memlimit);
+		}
+		// This is the best we can do.
+		throw new Error(
+			'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
+		);
+	}
+
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 * @throws Error
+	 */
+	public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+	{
+		ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+		}
+		if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str')) {
+			return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str', $passwd, $opslimit, $memlimit);
+		}
+		// This is the best we can do.
+		throw new Error(
+			'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
+		);
+	}
+
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 * @throws Error
+	 */
+	public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+	{
+		ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+		}
+		if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+			return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify', $passwd, $hash);
+		}
+		// This is the best we can do.
+		throw new Error(
+			'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
+		);
+	}
+
+	/**
+	 * Calculate the shared secret between your secret key and your
+	 * recipient's public key.
+	 *
+	 * Algorithm: X25519 (ECDH over Curve25519)
+	 *
+	 * @param string $secretKey
+	 * @param string $publicKey
+	 * @return string
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_scalarmult($secretKey, $publicKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_scalarmult($secretKey, $publicKey);
+		}
+		if (self::use_fallback('crypto_scalarmult')) {
+			return call_user_func('\\Sodium\\crypto_scalarmult', $secretKey, $publicKey);
+		}
+
+		/* Output validation: Forbid all-zero keys */
+		if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
+			throw new Error('Zero secret key is not allowed');
+		}
+		if (ParagonIE_Sodium_Core_Util::hashEquals($publicKey, str_repeat("\0", self::CRYPTO_BOX_PUBLICKEYBYTES))) {
+			throw new Error('Zero public key is not allowed');
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::scalarmult($secretKey, $publicKey);
+		}
+		return ParagonIE_Sodium_Crypto::scalarmult($secretKey, $publicKey);
+	}
+
+	/**
+	 * Calculate an X25519 public key from an X25519 secret key.
+	 *
+	 * @param string $secretKey
+	 * @return string
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_scalarmult_base($secretKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_scalarmult_base($secretKey);
+		}
+		if (self::use_fallback('crypto_scalarmult_base')) {
+			return call_user_func('\\Sodium\\crypto_scalarmult_base', $secretKey);
+		}
+		if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
+			throw new Error('Zero secret key is not allowed');
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::scalarmult_base($secretKey);
+		}
+		return ParagonIE_Sodium_Crypto::scalarmult_base($secretKey);
+	}
+
+	/**
+	 * Authenticated symmetric-key encryption.
+	 *
+	 * Algorithm: XSalsa20-Poly1305
+	 *
+	 * @param string $plaintext The message you're encrypting
+	 * @param string $nonce A Number to be used Once; must be 24 bytes
+	 * @param string $key Symmetric encryption key
+	 * @return string           Ciphertext with Poly1305 MAC
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_secretbox($plaintext, $nonce, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_secretbox($plaintext, $nonce, $key);
+		}
+		if (self::use_fallback('crypto_secretbox')) {
+			return call_user_func('\\Sodium\\crypto_secretbox', $plaintext, $nonce, $key);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::secretbox($plaintext, $nonce, $key);
+		}
+		return ParagonIE_Sodium_Crypto::secretbox($plaintext, $nonce, $key);
+	}
+
+	/**
+	 * Decrypts a message previously encrypted with crypto_secretbox().
+	 *
+	 * @param string $ciphertext Ciphertext with Poly1305 MAC
+	 * @param string $nonce      A Number to be used Once; must be 24 bytes
+	 * @param string $key        Symmetric encryption key
+	 * @return string            Original plaintext message
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_secretbox_open($ciphertext, $nonce, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
+		}
+		if (self::use_fallback('crypto_secretbox_open')) {
+			return call_user_func('\\Sodium\\crypto_secretbox_open', $ciphertext, $nonce, $key);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::secretbox_open($ciphertext, $nonce, $key);
+		}
+		return ParagonIE_Sodium_Crypto::secretbox_open($ciphertext, $nonce, $key);
+	}
+
+	/**
+	 * Authenticated symmetric-key encryption.
+	 *
+	 * Algorithm: XChaCha20-Poly1305
+	 *
+	 * @param string $plaintext The message you're encrypting
+	 * @param string $nonce     A Number to be used Once; must be 24 bytes
+	 * @param string $key       Symmetric encryption key
+	 * @return string           Ciphertext with Poly1305 MAC
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
+		}
+		return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
+	}
+	/**
+	 * Decrypts a message previously encrypted with crypto_secretbox_xchacha20poly1305().
+	 *
+	 * @param string $ciphertext Ciphertext with Poly1305 MAC
+	 * @param string $nonce      A Number to be used Once; must be 24 bytes
+	 * @param string $key        Symmetric encryption key
+	 * @return string            Original plaintext message
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+		}
+
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
+		}
+		return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
+	}
+
+	/**
+	 * Calculates a SipHash-2-4 hash of a message for a given key.
+	 *
+	 * @param string $message Input message
+	 * @param string $key SipHash-2-4 key
+	 * @return string         Hash
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_shorthash($message, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SHORTHASH_KEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SHORTHASH_KEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_shorthash($message, $key);
+		}
+		if (self::use_fallback('crypto_shorthash')) {
+			return call_user_func('\\Sodium\\crypto_shorthash', $message, $key);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Core32_SipHash::sipHash24($message, $key);
+		}
+		return ParagonIE_Sodium_Core_SipHash::sipHash24($message, $key);
+	}
+
+	/**
+	 * Expand a key and nonce into a keystream of pseudorandom bytes.
+	 *
+	 * @param int $len Number of bytes desired
+	 * @param string $nonce Number to be used Once; must be 24 bytes
+	 * @param string $key XSalsa20 key
+	 * @return string       Pseudorandom stream that can be XORed with messages
+	 *                      to provide encryption (but not authentication; see
+	 *                      Poly1305 or crypto_auth() for that, which is not
+	 *                      optional for security)
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_stream($len, $nonce, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_STREAM_KEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_stream($len, $nonce, $key);
+		}
+		if (self::use_fallback('crypto_stream')) {
+			return call_user_func('\\Sodium\\crypto_stream', $len, $nonce, $key);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20($len, $nonce, $key);
+		}
+		return ParagonIE_Sodium_Core_XSalsa20::xsalsa20($len, $nonce, $key);
+	}
+
+	/**
+	 * DANGER! UNAUTHENTICATED ENCRYPTION!
+	 *
+	 * Unless you are following expert advice, do not used this feature.
+	 *
+	 * Algorithm: XSalsa20
+	 *
+	 * This DOES NOT provide ciphertext integrity.
+	 *
+	 * @param string $message Plaintext message
+	 * @param string $nonce Number to be used Once; must be 24 bytes
+	 * @param string $key Encryption key
+	 * @return string         Encrypted text which is vulnerable to chosen-
+	 *                        ciphertext attacks unless you implement some
+	 *                        other mitigation to the ciphertext (i.e.
+	 *                        Encrypt then MAC)
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_stream_xor($message, $nonce, $key)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_stream_xor($message, $nonce, $key);
+		}
+		if (self::use_fallback('crypto_stream_xor')) {
+			return call_user_func('\\Sodium\\crypto_stream_xor', $message, $nonce, $key);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20_xor($message, $nonce, $key);
+		}
+		return ParagonIE_Sodium_Core_XSalsa20::xsalsa20_xor($message, $nonce, $key);
+	}
+
+	/**
+	 * Returns a signed message. You probably want crypto_sign_detached()
+	 * instead, which only returns the signature.
+	 *
+	 * Algorithm: Ed25519 (EdDSA over Curve25519)
+	 *
+	 * @param string $message Message to be signed.
+	 * @param string $secretKey Secret signing key.
+	 * @return string           Signed message (signature is prefixed).
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_sign($message, $secretKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign($message, $secretKey);
+		}
+		if (self::use_fallback('crypto_sign')) {
+			return call_user_func('\\Sodium\\crypto_sign', $message, $secretKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::sign($message, $secretKey);
+		}
+		return ParagonIE_Sodium_Crypto::sign($message, $secretKey);
+	}
+
+	/**
+	 * Validates a signed message then returns the message.
+	 *
+	 * @param string $signedMessage A signed message
+	 * @param string $publicKey A public key
+	 * @return string               The original message (if the signature is
+	 *                              valid for this public key)
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_sign_open($signedMessage, $publicKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($signedMessage, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($signedMessage) < self::CRYPTO_SIGN_BYTES) {
+			throw new Error('Argument 1 must be at least CRYPTO_SIGN_BYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_open($signedMessage, $publicKey);
+		}
+		if (self::use_fallback('crypto_sign_open')) {
+			return call_user_func('\\Sodium\\crypto_sign_open', $signedMessage, $publicKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::sign_open($signedMessage, $publicKey);
+		}
+		return ParagonIE_Sodium_Crypto::sign_open($signedMessage, $publicKey);
+	}
+
+	/**
+	 * Generate a new random Ed25519 keypair.
+	 *
+	 * @return string
+	 */
+	public static function crypto_sign_keypair()
+	{
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_keypair();
+		}
+		if (self::use_fallback('crypto_sign_keypair')) {
+			return call_user_func(
+				'\\Sodium\\crypto_sign_keypair'
+			);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Core32_Ed25519::keypair();
+		}
+		return ParagonIE_Sodium_Core_Ed25519::keypair();
+	}
+
+	/**
+	 * Generate an Ed25519 keypair from a seed.
+	 *
+	 * @param string $seed Input seed
+	 * @return string      Keypair
+	 */
+	public static function crypto_sign_seed_keypair($seed)
+	{
+		ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_seed_keypair($seed);
+		}
+		if (self::use_fallback('crypto_sign_keypair')) {
+			return call_user_func('\\Sodium\\crypto_sign_seed_keypair', $seed);
+		}
+		$publicKey = '';
+		$secretKey = '';
+		if (PHP_INT_SIZE === 4) {
+			ParagonIE_Sodium_Core32_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
+		} else {
+			ParagonIE_Sodium_Core_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
+		}
+		return $secretKey . $publicKey;
+	}
+
+	/**
+	 * Extract an Ed25519 public key from an Ed25519 keypair.
+	 *
+	 * @param string $keypair Keypair
+	 * @return string         Public key
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_sign_publickey($keypair)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_publickey($keypair);
+		}
+		if (self::use_fallback('crypto_sign_publickey')) {
+			return call_user_func('\\Sodium\\crypto_sign_publickey', $keypair);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Core32_Ed25519::publickey($keypair);
+		}
+		return ParagonIE_Sodium_Core_Ed25519::publickey($keypair);
+	}
+
+	/**
+	 * Calculate an Ed25519 public key from an Ed25519 secret key.
+	 *
+	 * @param string $secretKey Your Ed25519 secret key
+	 * @return string           The corresponding Ed25519 public key
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_sign_publickey_from_secretkey($secretKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_publickey_from_secretkey($secretKey);
+		}
+		if (self::use_fallback('crypto_sign_publickey_from_secretkey')) {
+			return call_user_func('\\Sodium\\crypto_sign_publickey_from_secretkey', $secretKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Core32_Ed25519::publickey_from_secretkey($secretKey);
+		}
+		return ParagonIE_Sodium_Core_Ed25519::publickey_from_secretkey($secretKey);
+	}
+
+	/**
+	 * Extract an Ed25519 secret key from an Ed25519 keypair.
+	 *
+	 * @param string $keypair Keypair
+	 * @return string         Secret key
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_sign_secretkey($keypair)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
+			throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_secretkey($keypair);
+		}
+		if (self::use_fallback('crypto_sign_secretkey')) {
+			return call_user_func('\\Sodium\\crypto_sign_secretkey', $keypair);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Core32_Ed25519::secretkey($keypair);
+		}
+		return ParagonIE_Sodium_Core_Ed25519::secretkey($keypair);
+	}
+
+	/**
+	 * Calculate the Ed25519 signature of a message and return ONLY the signature.
+	 *
+	 * Algorithm: Ed25519 (EdDSA over Curve25519)
+	 *
+	 * @param string $message Message to be signed
+	 * @param string $secretKey Secret signing key
+	 * @return string           Digital signature
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_sign_detached($message, $secretKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+			throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_detached($message, $secretKey);
+		}
+		if (self::use_fallback('crypto_sign_detached')) {
+			return call_user_func('\\Sodium\\crypto_sign_detached', $message, $secretKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::sign_detached($message, $secretKey);
+		}
+		return ParagonIE_Sodium_Crypto::sign_detached($message, $secretKey);
+	}
+
+	/**
+	 * Verify the Ed25519 signature of a message.
+	 *
+	 * @param string $signature Digital sginature
+	 * @param string $message Message to be verified
+	 * @param string $publicKey Public key
+	 * @return bool             TRUE if this signature is good for this public key;
+	 *                          FALSE otherwise
+	 * @throws Error
+	 * @throws TypeError
+	 */
+	public static function crypto_sign_verify_detached($signature, $message, $publicKey)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($signature, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
+		ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 3);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($signature) !== self::CRYPTO_SIGN_BYTES) {
+			throw new Error('Argument 1 must be CRYPTO_SIGN_BYTES long.');
+		}
+		if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
+			throw new Error('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+		}
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_crypto_sign_verify_detached($signature, $message, $publicKey);
+		}
+		if (self::use_fallback('crypto_sign_verify_detached')) {
+			return call_user_func('\\Sodium\\crypto_sign_verify_detached', $signature, $message, $publicKey);
+		}
+		if (PHP_INT_SIZE === 4) {
+			return ParagonIE_Sodium_Crypto32::sign_verify_detached($signature, $message, $publicKey);
+		}
+		return ParagonIE_Sodium_Crypto::sign_verify_detached($signature, $message, $publicKey);
+	}
+
+	/**
+	 * Convert an Ed25519 secret key to a Curve25519 secret key
+	 *
+	 * @param string $sk
+	 * @return string
+	 * @throws Error
+	 */
+	public static function crypto_sign_ed25519_sk_to_curve25519($sk)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
+
+		/* Input validation: */
+		if (ParagonIE_Sodium_Core_Util::strlen($sk) < self::CRYPTO_SIGN_SEEDBYTES) {
+			throw new Error('Argument 1 must be at least CRYPTO_SIGN_SEEDBYTES long.');
+		}
+		if (self::isPhp72OrGreater()) {
+			if (is_callable('crypto_sign_ed25519_sk_to_curve25519')) {
+				return sodium_crypto_sign_ed25519_sk_to_curve25519($sk);
+			}
+		}
+		if (self::use_fallback('crypto_sign_ed25519_sk_to_curve25519')) {
+			return call_user_func('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519', $sk);
+		}
+
+		$h = hash('sha512', ParagonIE_Sodium_Core_Util::substr($sk, 0, 32), true);
+		$h[0] = ParagonIE_Sodium_Core_Util::intToChr(
+			ParagonIE_Sodium_Core_Util::chrToInt($h[0]) & 248
+		);
+		$h[31] = ParagonIE_Sodium_Core_Util::intToChr(
+			(ParagonIE_Sodium_Core_Util::chrToInt($h[31]) & 127) | 64
+		);
+		return ParagonIE_Sodium_Core_Util::substr($h, 0, 32);
+	}
+
+	/**
+	 * Cache-timing-safe implementation of hex2bin().
+	 *
+	 * @param string $string Hexadecimal string
+	 * @return string        Raw binary string
+	 * @throws TypeError
+	 */
+	public static function hex2bin($string)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
+
+		if (self::isPhp72OrGreater()) {
+			return sodium_hex2bin($string);
+		}
+		if (self::use_fallback('hex2bin')) {
+			return call_user_func('\\Sodium\\hex2bin', $string);
+		}
+		return ParagonIE_Sodium_Core_Util::hex2bin($string);
+	}
+
+	/**
+	 * Increase a string (little endian)
+	 *
+	 * @param string $var
+	 *
+	 * @return void
+	 * @throws Error (Unless libsodium is installed)
+	 */
+	public static function increment(&$var)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
+
+		if (self::isPhp72OrGreater()) {
+			sodium_increment($var);
+			return;
+		}
+		if (self::use_fallback('increment')) {
+			@call_user_func('\\Sodium\\increment', $var);
+			return;
+		}
+
+		$len = ParagonIE_Sodium_Core_Util::strlen($var);
+		$c = 1;
+		$copy = '';
+		for ($i = 0; $i < $len; ++$i) {
+			$c += ParagonIE_Sodium_Core_Util::chrToInt(
+				ParagonIE_Sodium_Core_Util::substr($var, $i, 1)
+			);
+			$copy .= ParagonIE_Sodium_Core_Util::intToChr($c);
+			$c >>= 8;
+		}
+		$var = $copy;
+	}
+
+	/**
+	 * The equivalent to the libsodium minor version we aim to be compatible
+	 * with (sans pwhash and memzero).
+	 *
+	 * @return int
+	 */
+	public static function library_version_major()
+	{
+		if (self::isPhp72OrGreater()) {
+			return sodium_library_version_major();
+		}
+		if (self::use_fallback('library_version_major')) {
+			return (int) call_user_func('\\Sodium\\library_version_major');
+		}
+		return self::LIBRARY_VERSION_MAJOR;
+	}
+
+	/**
+	 * The equivalent to the libsodium minor version we aim to be compatible
+	 * with (sans pwhash and memzero).
+	 *
+	 * @return int
+	 */
+	public static function library_version_minor()
+	{
+		if (self::isPhp72OrGreater()) {
+			return sodium_library_version_minor();
+		}
+		if (self::use_fallback('library_version_minor')) {
+			return (int) call_user_func('\\Sodium\\library_version_minor');
+		}
+		return self::LIBRARY_VERSION_MINOR;
+	}
+
+	/**
+	 * Compare two strings.
+	 *
+	 * @param string $left
+	 * @param string $right
+	 * @return int
+	 * @throws TypeError
+	 */
+	public static function memcmp($left, $right)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
+		ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
+
+		if (self::use_fallback('memcmp')) {
+			return call_user_func('\\Sodium\\memcmp', $left, $right);
+		}
+		return ParagonIE_Sodium_Core_Util::memcmp($left, $right);
+	}
+
+	/**
+	 * It's actually not possible to zero memory buffers in PHP. You need the
+	 * native library for that.
+	 *
+	 * @param string|null $var
+	 *
+	 * @return void
+	 * @throws Error (Unless libsodium is installed)
+	 */
+	public static function memzero(&$var)
+	{
+		/* Type checks: */
+		ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
+
+		if (self::isPhp72OrGreater()) {
+			sodium_memzero($var);
+			return;
+		}
+		if (self::use_fallback('memzero')) {
+			@call_user_func('\\Sodium\\memzero', $var);
+			return;
+		}
+		// This is the best we can do.
+		throw new Error(
+			'This is not implemented, as it is not possible to securely wipe memory from PHP'
+		);
+	}
+
+	/**
+	 * Generate a string of bytes from the kernel's CSPRNG.
+	 * Proudly uses /dev/urandom (if getrandom(2) is not available).
+	 *
+	 * @param int $numBytes
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function randombytes_buf($numBytes)
+	{
+		/* Type checks: */
+		if (!is_int($numBytes)) {
+			if (is_numeric($numBytes)) {
+				$numBytes = (int)$numBytes;
+			} else {
+				throw new TypeError('Argument 1 must be an integer, ' . gettype($numBytes) . ' given.');
+			}
+		}
+		if (self::use_fallback('randombytes_buf')) {
+			return call_user_func('\\Sodium\\randombytes_buf', $numBytes);
+		}
+		return random_bytes($numBytes);
+	}
+
+	/**
+	 * Generate an integer between 0 and $range (non-inclusive).
+	 *
+	 * @param int $range
+	 * @return int
+	 * @throws TypeError
+	 */
+	public static function randombytes_uniform($range)
+	{
+		/* Type checks: */
+		if (!is_int($range)) {
+			if (is_numeric($range)) {
+				$range = (int)$range;
+			} else {
+				throw new TypeError('Argument 1 must be an integer, ' . gettype($range) . ' given.');
+			}
+		}
+		if (self::use_fallback('randombytes_uniform')) {
+			return (int) call_user_func('\\Sodium\\randombytes_uniform', $range);
+		}
+		return random_int(0, $range - 1);
+	}
+
+	/**
+	 * Generate a random 16-bit integer.
+	 *
+	 * @return int
+	 */
+	public static function randombytes_random16()
+	{
+		if (self::use_fallback('randombytes_random16')) {
+			return (int) call_user_func('\\Sodium\\randombytes_random16');
+		}
+		return random_int(0, 65535);
+	}
+
+	/**
+	 * This emulates libsodium's version_string() function, except ours is
+	 * prefixed with 'polyfill-'.
+	 *
+	 * @return string
+	 */
+	public static function version_string()
+	{
+		if (self::isPhp72OrGreater()) {
+			return sodium_version_string();
+		}
+		if (self::use_fallback('version_string')) {
+			return (string) call_user_func('\\Sodium\\version_string');
+		}
+		return self::VERSION_STRING;
+	}
+
+	/**
+	 * Should we use the libsodium core function instead?
+	 * This is always a good idea, if it's available. (Unless we're in the
+	 * middle of running our unit test suite.)
+	 *
+	 * If ext/libsodium is available, use it. Return TRUE.
+	 * Otherwise, we have to use the code provided herein. Return FALSE.
+	 *
+	 * @param string $sodium_func_name
+	 *
+	 * @return bool
+	 */
+	protected static function use_fallback($sodium_func_name = '')
+	{
+		static $res = null;
+		if ($res === null) {
+			$res = extension_loaded('libsodium') && PHP_VERSION_ID >= 50300;
+		}
+		if (PHP_INT_SIZE === 4) {
+			if ($res && is_callable('\\Sodium\\' . $sodium_func_name)) {
+				// We can safely just offload to the PECL extension
+				return true;
+			}
+			/*
             if (DIRECTORY_SEPARATOR === '\\' && PHP_VERSION_ID < 70000) {
                 throw new RuntimeException(
                     'Sodium_compat produces incorrect results on systems that do not support 64-bit integers. ' .
@@ -2247,37 +2247,37 @@ 
                 'Sodium_compat produces incorrect results on systems that do not support 64-bit integers.'
             );
             */
-        }
-        if ($res === false) {
-            // No libsodium installed
-            return false;
-        }
-        if (self::$disableFallbackForUnitTests) {
-            // Don't fallback. Use the PHP implementation.
-            return false;
-        }
-        if (!empty($sodium_func_name)) {
-            return is_callable('\\Sodium\\' . $sodium_func_name);
-        }
-        return true;
-    }
-
-    /**
-     * Libsodium as implemented in PHP 7.2
-     *
-     * @ref https://wiki.php.net/rfc/libsodium
-     * @return bool
-     */
-    protected static function isPhp72OrGreater()
-    {
-        static $res = null;
-        if ($res === null) {
-            $res = PHP_VERSION_ID >= 70200 && extension_loaded('sodium');
-        }
-        if (self::$disableFallbackForUnitTests) {
-            // Don't fallback. Use the PHP implementation.
-            return false;
-        }
-        return $res;
-    }
+		}
+		if ($res === false) {
+			// No libsodium installed
+			return false;
+		}
+		if (self::$disableFallbackForUnitTests) {
+			// Don't fallback. Use the PHP implementation.
+			return false;
+		}
+		if (!empty($sodium_func_name)) {
+			return is_callable('\\Sodium\\' . $sodium_func_name);
+		}
+		return true;
+	}
+
+	/**
+	 * Libsodium as implemented in PHP 7.2
+	 *
+	 * @ref https://wiki.php.net/rfc/libsodium
+	 * @return bool
+	 */
+	protected static function isPhp72OrGreater()
+	{
+		static $res = null;
+		if ($res === null) {
+			$res = PHP_VERSION_ID >= 70200 && extension_loaded('sodium');
+		}
+		if (self::$disableFallbackForUnitTests) {
+			// Don't fallback. Use the PHP implementation.
+			return false;
+		}
+		return $res;
+	}
 }

Spacing +652 added lines, -652 removed lines

@@ -21,7 +21,7 @@ 
  * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION *
  */
 
-if (class_exists('ParagonIE_Sodium_Compat', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Compat', false ) ) {
     return;
 }
 
@@ -115,18 +115,18 @@ 
      * @return string        A hexadecimal-encoded string
      * @throws TypeError
      */
-    public static function bin2hex($string)
+    public static function bin2hex( $string )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $string, 'string', 1 );
 
-        if (self::isPhp72OrGreater()) {
-            return bin2hex($string);
+        if ( self::isPhp72OrGreater() ) {
+            return bin2hex( $string );
         }
-        if (self::use_fallback('bin2hex')) {
-            return call_user_func('\\Sodium\\bin2hex', $string);
+        if ( self::use_fallback( 'bin2hex' ) ) {
+            return call_user_func( '\\Sodium\\bin2hex', $string );
         }
-        return ParagonIE_Sodium_Core_Util::bin2hex($string);
+        return ParagonIE_Sodium_Core_Util::bin2hex( $string );
     }
 
     /**
@@ -140,19 +140,19 @@ 
      *                      > 0 if the right operand is less than the left
      * @throws TypeError
      */
-    public static function compare($left, $right)
+    public static function compare( $left, $right )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $left, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $right, 'string', 2 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_compare($left, $right);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_compare( $left, $right );
         }
-        if (self::use_fallback('compare')) {
-            return call_user_func('\\Sodium\\compare', $left, $right);
+        if ( self::use_fallback( 'compare' ) ) {
+            return call_user_func( '\\Sodium\\compare', $left, $right );
         }
-        return ParagonIE_Sodium_Core_Util::compare($left, $right);
+        return ParagonIE_Sodium_Core_Util::compare( $left, $right );
     }
 
     /**
@@ -180,23 +180,23 @@ 
         $key = ''
     ) {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ciphertext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $assocData, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 4 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES ) {
+            throw new Error( 'Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES ) {
+            throw new Error( 'Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
-            throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $ciphertext ) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES ) {
+            throw new Error( 'Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long' );
         }
 
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_crypto_aead_chacha20poly1305_decrypt(
                 $ciphertext,
                 $assocData,
@@ -204,7 +204,7 @@ 
                 $key
             );
         }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_decrypt')) {
+        if ( self::use_fallback( 'crypto_aead_chacha20poly1305_decrypt' ) ) {
             return call_user_func(
                 '\\Sodium\\crypto_aead_chacha20poly1305_decrypt',
                 $ciphertext,
@@ -213,7 +213,7 @@ 
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_decrypt(
                 $ciphertext,
                 $assocData,
@@ -255,20 +255,20 @@ 
         $key = ''
     ) {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $plaintext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $assocData, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 4 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES ) {
+            throw new Error( 'Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES ) {
+            throw new Error( 'Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long' );
         }
 
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_crypto_aead_chacha20poly1305_encrypt(
                 $plaintext,
                 $assocData,
@@ -276,7 +276,7 @@ 
                 $key
             );
         }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_encrypt')) {
+        if ( self::use_fallback( 'crypto_aead_chacha20poly1305_encrypt' ) ) {
             return call_user_func(
                 '\\Sodium\\crypto_aead_chacha20poly1305_encrypt',
                 $plaintext,
@@ -285,7 +285,7 @@ 
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_encrypt(
                 $plaintext,
                 $assocData,
@@ -326,23 +326,23 @@ 
         $key = ''
     ) {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ciphertext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $assocData, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 4 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES ) {
+            throw new Error( 'Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES ) {
+            throw new Error( 'Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
-            throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $ciphertext ) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES ) {
+            throw new Error( 'Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long' );
         }
 
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
                 $ciphertext,
                 $assocData,
@@ -350,7 +350,7 @@ 
                 $key
             );
         }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_decrypt')) {
+        if ( self::use_fallback( 'crypto_aead_chacha20poly1305_ietf_decrypt' ) ) {
             return call_user_func(
                 '\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt',
                 $ciphertext,
@@ -359,7 +359,7 @@ 
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_decrypt(
                 $ciphertext,
                 $assocData,
@@ -401,20 +401,20 @@ 
         $key = ''
     ) {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $plaintext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $assocData, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 4 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES ) {
+            throw new Error( 'Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES ) {
+            throw new Error( 'Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long' );
         }
 
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
                 $plaintext,
                 $assocData,
@@ -422,7 +422,7 @@ 
                 $key
             );
         }
-        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_encrypt')) {
+        if ( self::use_fallback( 'crypto_aead_chacha20poly1305_ietf_encrypt' ) ) {
             return call_user_func(
                 '\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt',
                 $plaintext,
@@ -431,7 +431,7 @@ 
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_encrypt(
                 $plaintext,
                 $assocData,
@@ -472,23 +472,23 @@ 
         $key = ''
     ) {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ciphertext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $assocData, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 4 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES ) {
+            throw new Error( 'Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES ) {
+            throw new Error( 'Key must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES) {
-            throw new Error('Message must be at least CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $ciphertext ) < self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES ) {
+            throw new Error( 'Message must be at least CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES long' );
         }
 
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_decrypt(
                 $ciphertext,
                 $assocData,
@@ -530,20 +530,20 @@ 
         $key = ''
     ) {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $plaintext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $assocData, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 4 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
-            throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_NPUBBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES ) {
+            throw new Error( 'Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_NPUBBYTES long' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
-            throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_KEYBYTES long');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES ) {
+            throw new Error( 'Key must be CRYPTO_AEAD_XCHACHA20POLY1305_KEYBYTES long' );
         }
 
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_encrypt(
                 $plaintext,
                 $assocData,
@@ -575,27 +575,27 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_auth($message, $key)
+    public static function crypto_auth( $message, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_AUTH_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AUTH_KEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_AUTH_KEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_auth($message, $key);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_auth( $message, $key );
         }
-        if (self::use_fallback('crypto_auth')) {
-            return call_user_func('\\Sodium\\crypto_auth', $message, $key);
+        if ( self::use_fallback( 'crypto_auth' ) ) {
+            return call_user_func( '\\Sodium\\crypto_auth', $message, $key );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::auth($message, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::auth( $message, $key );
         }
-        return ParagonIE_Sodium_Crypto::auth($message, $key);
+        return ParagonIE_Sodium_Crypto::auth( $message, $key );
     }
 
     /**
@@ -609,31 +609,31 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_auth_verify($mac, $message, $key)
+    public static function crypto_auth_verify( $mac, $message, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($mac, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $mac, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($mac) !== self::CRYPTO_AUTH_BYTES) {
-            throw new Error('Argument 1 must be CRYPTO_AUTH_BYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $mac ) !== self::CRYPTO_AUTH_BYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_AUTH_BYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_AUTH_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_AUTH_KEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_AUTH_KEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_auth_verify($mac, $message, $key);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_auth_verify( $mac, $message, $key );
         }
-        if (self::use_fallback('crypto_auth_verify')) {
-            return call_user_func('\\Sodium\\crypto_auth_verify', $mac, $message, $key);
+        if ( self::use_fallback( 'crypto_auth_verify' ) ) {
+            return call_user_func( '\\Sodium\\crypto_auth_verify', $mac, $message, $key );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::auth_verify($mac, $message, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::auth_verify( $mac, $message, $key );
         }
-        return ParagonIE_Sodium_Crypto::auth_verify($mac, $message, $key);
+        return ParagonIE_Sodium_Crypto::auth_verify( $mac, $message, $key );
     }
 
     /**
@@ -652,31 +652,31 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box($plaintext, $nonce, $keypair)
+    public static function crypto_box( $plaintext, $nonce, $keypair )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $plaintext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $keypair, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_BOX_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_BOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== self::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box($plaintext, $nonce, $keypair);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box( $plaintext, $nonce, $keypair );
         }
-        if (self::use_fallback('crypto_box')) {
-            return call_user_func('\\Sodium\\crypto_box', $plaintext, $nonce, $keypair);
+        if ( self::use_fallback( 'crypto_box' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box', $plaintext, $nonce, $keypair );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box($plaintext, $nonce, $keypair);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box( $plaintext, $nonce, $keypair );
         }
-        return ParagonIE_Sodium_Crypto::box($plaintext, $nonce, $keypair);
+        return ParagonIE_Sodium_Crypto::box( $plaintext, $nonce, $keypair );
     }
 
     /**
@@ -695,27 +695,27 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_seal($plaintext, $publicKey)
+    public static function crypto_box_seal( $plaintext, $publicKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $plaintext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $publicKey, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $publicKey ) !== self::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_seal($plaintext, $publicKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_seal( $plaintext, $publicKey );
         }
-        if (self::use_fallback('crypto_box_seal')) {
-            return call_user_func('\\Sodium\\crypto_box_seal', $plaintext, $publicKey);
+        if ( self::use_fallback( 'crypto_box_seal' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_seal', $plaintext, $publicKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_seal($plaintext, $publicKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box_seal( $plaintext, $publicKey );
         }
-        return ParagonIE_Sodium_Crypto::box_seal($plaintext, $publicKey);
+        return ParagonIE_Sodium_Crypto::box_seal( $plaintext, $publicKey );
     }
 
     /**
@@ -730,27 +730,27 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_seal_open($ciphertext, $keypair)
+    public static function crypto_box_seal_open( $ciphertext, $keypair )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ciphertext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $keypair, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== self::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_seal_open($ciphertext, $keypair);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_seal_open( $ciphertext, $keypair );
         }
-        if (self::use_fallback('crypto_box_seal_open')) {
-            return call_user_func('\\Sodium\\crypto_box_seal_open', $ciphertext, $keypair);
+        if ( self::use_fallback( 'crypto_box_seal_open' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_seal_open', $ciphertext, $keypair );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_seal_open($ciphertext, $keypair);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box_seal_open( $ciphertext, $keypair );
         }
-        return ParagonIE_Sodium_Crypto::box_seal_open($ciphertext, $keypair);
+        return ParagonIE_Sodium_Crypto::box_seal_open( $ciphertext, $keypair );
     }
 
     /**
@@ -763,11 +763,11 @@ 
      */
     public static function crypto_box_keypair()
     {
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_crypto_box_keypair();
         }
-        if (self::use_fallback('crypto_box_keypair')) {
-            return call_user_func('\\Sodium\\crypto_box_keypair');
+        if ( self::use_fallback( 'crypto_box_keypair' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_keypair' );
         }
         return ParagonIE_Sodium_Crypto::box_keypair();
     }
@@ -782,30 +782,30 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey)
+    public static function crypto_box_keypair_from_secretkey_and_publickey( $secretKey, $publicKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $secretKey, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $publicKey, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $secretKey ) !== self::CRYPTO_BOX_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $publicKey ) !== self::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_keypair_from_secretkey_and_publickey( $secretKey, $publicKey );
         }
-        if (self::use_fallback('crypto_box_keypair_from_secretkey_and_publickey')) {
-            return call_user_func('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey', $secretKey, $publicKey);
+        if ( self::use_fallback( 'crypto_box_keypair_from_secretkey_and_publickey' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey', $secretKey, $publicKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box_keypair_from_secretkey_and_publickey( $secretKey, $publicKey );
         }
-        return ParagonIE_Sodium_Crypto::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+        return ParagonIE_Sodium_Crypto::box_keypair_from_secretkey_and_publickey( $secretKey, $publicKey );
     }
 
     /**
@@ -818,34 +818,34 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_open($ciphertext, $nonce, $keypair)
+    public static function crypto_box_open( $ciphertext, $nonce, $keypair )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ciphertext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $keypair, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_BOX_MACBYTES) {
-            throw new Error('Argument 1 must be at least CRYPTO_BOX_MACBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $ciphertext ) < self::CRYPTO_BOX_MACBYTES ) {
+            throw new Error( 'Argument 1 must be at least CRYPTO_BOX_MACBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_BOX_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_BOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== self::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_open($ciphertext, $nonce, $keypair);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_open( $ciphertext, $nonce, $keypair );
         }
-        if (self::use_fallback('crypto_box_open')) {
-            return call_user_func('\\Sodium\\crypto_box_open', $ciphertext, $nonce, $keypair);
+        if ( self::use_fallback( 'crypto_box_open' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_open', $ciphertext, $nonce, $keypair );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_open($ciphertext, $nonce, $keypair);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box_open( $ciphertext, $nonce, $keypair );
         }
-        return ParagonIE_Sodium_Crypto::box_open($ciphertext, $nonce, $keypair);
+        return ParagonIE_Sodium_Crypto::box_open( $ciphertext, $nonce, $keypair );
     }
 
     /**
@@ -856,26 +856,26 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_publickey($keypair)
+    public static function crypto_box_publickey( $keypair )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $keypair, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== self::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_publickey($keypair);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_publickey( $keypair );
         }
-        if (self::use_fallback('crypto_box_publickey')) {
-            return call_user_func('\\Sodium\\crypto_box_publickey', $keypair);
+        if ( self::use_fallback( 'crypto_box_publickey' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_publickey', $keypair );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_publickey($keypair);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box_publickey( $keypair );
         }
-        return ParagonIE_Sodium_Crypto::box_publickey($keypair);
+        return ParagonIE_Sodium_Crypto::box_publickey( $keypair );
     }
 
     /**
@@ -886,26 +886,26 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_publickey_from_secretkey($secretKey)
+    public static function crypto_box_publickey_from_secretkey( $secretKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $secretKey, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $secretKey ) !== self::CRYPTO_BOX_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_publickey_from_secretkey($secretKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_publickey_from_secretkey( $secretKey );
         }
-        if (self::use_fallback('crypto_box_publickey_from_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_box_publickey_from_secretkey', $secretKey);
+        if ( self::use_fallback( 'crypto_box_publickey_from_secretkey' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_publickey_from_secretkey', $secretKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_publickey_from_secretkey($secretKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box_publickey_from_secretkey( $secretKey );
         }
-        return ParagonIE_Sodium_Crypto::box_publickey_from_secretkey($secretKey);
+        return ParagonIE_Sodium_Crypto::box_publickey_from_secretkey( $secretKey );
     }
 
     /**
@@ -916,26 +916,26 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_secretkey($keypair)
+    public static function crypto_box_secretkey( $keypair )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $keypair, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== self::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_secretkey($keypair);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_secretkey( $keypair );
         }
-        if (self::use_fallback('crypto_box_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_box_secretkey', $keypair);
+        if ( self::use_fallback( 'crypto_box_secretkey' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_secretkey', $keypair );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_secretkey($keypair);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::box_secretkey( $keypair );
         }
-        return ParagonIE_Sodium_Crypto::box_secretkey($keypair);
+        return ParagonIE_Sodium_Crypto::box_secretkey( $keypair );
     }
 
     /**
@@ -944,18 +944,18 @@ 
      * @param string $seed
      * @return string
      */
-    public static function crypto_box_seed_keypair($seed)
+    public static function crypto_box_seed_keypair( $seed )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $seed, 'string', 1 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_box_seed_keypair($seed);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_box_seed_keypair( $seed );
         }
-        if (self::use_fallback('crypto_box_seed_keypair')) {
-            return call_user_func('\\Sodium\\crypto_box_seed_keypair', $seed);
+        if ( self::use_fallback( 'crypto_box_seed_keypair' ) ) {
+            return call_user_func( '\\Sodium\\crypto_box_seed_keypair', $seed );
         }
-        return ParagonIE_Sodium_Crypto::box_seed_keypair($seed);
+        return ParagonIE_Sodium_Crypto::box_seed_keypair( $seed );
     }
 
     /**
@@ -970,36 +970,36 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+    public static function crypto_generichash( $message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        if (is_null($key)) {
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 1 );
+        if ( is_null( $key ) ) {
             $key = '';
         }
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $length, 'int', 3 );
 
         /* Input validation: */
-        if (!empty($key)) {
-            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+        if ( ! empty( $key ) ) {
+            if ( ParagonIE_Sodium_Core_Util::strlen( $key ) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN ) {
+                throw new Error( 'Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.' );
             }
-            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
-                throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+            if ( ParagonIE_Sodium_Core_Util::strlen( $key ) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX ) {
+                throw new Error( 'Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.' );
             }
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_generichash($message, $key, $length);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_generichash( $message, $key, $length );
         }
-        if (self::use_fallback('crypto_generichash')) {
-            return call_user_func('\\Sodium\\crypto_generichash', $message, $key, $length);
+        if ( self::use_fallback( 'crypto_generichash' ) ) {
+            return call_user_func( '\\Sodium\\crypto_generichash', $message, $key, $length );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::generichash($message, $key, $length);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::generichash( $message, $key, $length );
         }
-        return ParagonIE_Sodium_Crypto::generichash($message, $key, $length);
+        return ParagonIE_Sodium_Crypto::generichash( $message, $key, $length );
     }
 
     /**
@@ -1011,28 +1011,28 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES)
+    public static function crypto_generichash_final( &$ctx, $length = self::CRYPTO_GENERICHASH_BYTES )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ctx, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $length, 'int', 2 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_generichash_final($ctx, $length);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_generichash_final( $ctx, $length );
         }
-        if (self::use_fallback('crypto_generichash_final')) {
+        if ( self::use_fallback( 'crypto_generichash_final' ) ) {
             $func = '\\Sodium\\crypto_generichash_final';
-            return $func($ctx, $length);
+            return $func( $ctx, $length );
         }
-        if (PHP_INT_SIZE === 4) {
-            $result = ParagonIE_Sodium_Crypto32::generichash_final($ctx, $length);
+        if ( PHP_INT_SIZE === 4 ) {
+            $result = ParagonIE_Sodium_Crypto32::generichash_final( $ctx, $length );
         } else {
-            $result = ParagonIE_Sodium_Crypto::generichash_final($ctx, $length);
+            $result = ParagonIE_Sodium_Crypto::generichash_final( $ctx, $length );
         }
         try {
-            self::memzero($ctx);
-        } catch (Error $ex) {
-            unset($ctx);
+            self::memzero( $ctx );
+        } catch ( Error $ex ) {
+            unset( $ctx );
         }
         return $result;
     }
@@ -1047,35 +1047,35 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+    public static function crypto_generichash_init( $key = '', $length = self::CRYPTO_GENERICHASH_BYTES )
     {
         /* Type checks: */
-        if (is_null($key)) {
+        if ( is_null( $key ) ) {
             $key = '';
         }
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $length, 'int', 2 );
 
         /* Input validation: */
-        if (!empty($key)) {
-            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+        if ( ! empty( $key ) ) {
+            if ( ParagonIE_Sodium_Core_Util::strlen( $key ) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN ) {
+                throw new Error( 'Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.' );
             }
-            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
-                throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+            if ( ParagonIE_Sodium_Core_Util::strlen( $key ) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX ) {
+                throw new Error( 'Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.' );
             }
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_generichash_init($key, $length);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_generichash_init( $key, $length );
         }
-        if (self::use_fallback('crypto_generichash_init')) {
-            return call_user_func('\\Sodium\\crypto_generichash_init', $key, $length);
+        if ( self::use_fallback( 'crypto_generichash_init' ) ) {
+            return call_user_func( '\\Sodium\\crypto_generichash_init', $key, $length );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::generichash_init($key, $length);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::generichash_init( $key, $length );
         }
-        return ParagonIE_Sodium_Crypto::generichash_init($key, $length);
+        return ParagonIE_Sodium_Crypto::generichash_init( $key, $length );
     }
 
     /**
@@ -1087,25 +1087,25 @@ 
      * @return void
      * @throws TypeError
      */
-    public static function crypto_generichash_update(&$ctx, $message)
+    public static function crypto_generichash_update( &$ctx, $message )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ctx, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 2 );
 
-        if (self::isPhp72OrGreater()) {
-            sodium_crypto_generichash_update($ctx, $message);
+        if ( self::isPhp72OrGreater() ) {
+            sodium_crypto_generichash_update( $ctx, $message );
             return;
         }
-        if (self::use_fallback('crypto_generichash_update')) {
+        if ( self::use_fallback( 'crypto_generichash_update' ) ) {
             $func = '\\Sodium\\crypto_generichash_update';
-            $func($ctx, $message);
+            $func( $ctx, $message );
             return;
         }
-        if (PHP_INT_SIZE === 4) {
-            $ctx = ParagonIE_Sodium_Crypto32::generichash_update($ctx, $message);
+        if ( PHP_INT_SIZE === 4 ) {
+            $ctx = ParagonIE_Sodium_Crypto32::generichash_update( $ctx, $message );
         } else {
-            $ctx = ParagonIE_Sodium_Crypto::generichash_update($ctx, $message);
+            $ctx = ParagonIE_Sodium_Crypto::generichash_update( $ctx, $message );
         }
     }
 
@@ -1137,30 +1137,30 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    public static function crypto_kx( $my_secret, $their_public, $client_public, $server_public )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($my_secret, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($their_public, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($client_public, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($server_public, 'string', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $my_secret, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $their_public, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $client_public, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $server_public, 'string', 4 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($my_secret) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $my_secret ) !== self::CRYPTO_BOX_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($their_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $their_public ) !== self::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($client_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $client_public ) !== self::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($server_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 4 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $server_public ) !== self::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 4 must be CRYPTO_BOX_PUBLICKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            if (is_callable('sodium_crypto_kx')) {
+        if ( self::isPhp72OrGreater() ) {
+            if ( is_callable( 'sodium_crypto_kx' ) ) {
                 return sodium_crypto_kx(
                     $my_secret,
                     $their_public,
@@ -1169,7 +1169,7 @@ 
                 );
             }
         }
-        if (self::use_fallback('crypto_kx')) {
+        if ( self::use_fallback( 'crypto_kx' ) ) {
             return call_user_func(
                 '\\Sodium\\crypto_kx',
                 $my_secret,
@@ -1178,7 +1178,7 @@ 
                 $server_public
             );
         }
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Crypto32::keyExchange(
                 $my_secret,
                 $their_public,
@@ -1203,19 +1203,19 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    public static function crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $outlen, 'int', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $passwd, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $salt, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $opslimit, 'int', 4 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $memlimit, 'int', 5 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit );
         }
-        if (self::use_fallback('crypto_pwhash')) {
-            return call_user_func('\\Sodium\\crypto_pwhash', $outlen, $passwd, $salt, $opslimit, $memlimit);
+        if ( self::use_fallback( 'crypto_pwhash' ) ) {
+            return call_user_func( '\\Sodium\\crypto_pwhash', $outlen, $passwd, $salt, $opslimit, $memlimit );
         }
         // This is the best we can do.
         throw new Error(
@@ -1230,17 +1230,17 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    public static function crypto_pwhash_str( $passwd, $opslimit, $memlimit )
     {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $passwd, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $opslimit, 'int', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $memlimit, 'int', 3 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_pwhash_str( $passwd, $opslimit, $memlimit );
         }
-        if (self::use_fallback('crypto_pwhash_str')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_str', $passwd, $opslimit, $memlimit);
+        if ( self::use_fallback( 'crypto_pwhash_str' ) ) {
+            return call_user_func( '\\Sodium\\crypto_pwhash_str', $passwd, $opslimit, $memlimit );
         }
         // This is the best we can do.
         throw new Error(
@@ -1254,16 +1254,16 @@ 
      * @return bool
      * @throws Error
      */
-    public static function crypto_pwhash_str_verify($passwd, $hash)
+    public static function crypto_pwhash_str_verify( $passwd, $hash )
     {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $passwd, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $hash, 'string', 2 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_str_verify($passwd, $hash);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_pwhash_str_verify( $passwd, $hash );
         }
-        if (self::use_fallback('crypto_pwhash_str_verify')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_str_verify', $passwd, $hash);
+        if ( self::use_fallback( 'crypto_pwhash_str_verify' ) ) {
+            return call_user_func( '\\Sodium\\crypto_pwhash_str_verify', $passwd, $hash );
         }
         // This is the best we can do.
         throw new Error(
@@ -1280,19 +1280,19 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    public static function crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $outlen, 'int', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $passwd, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $salt, 'string', 3 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $opslimit, 'int', 4 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $memlimit, 'int', 5 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit );
         }
-        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256', $outlen, $passwd, $salt, $opslimit, $memlimit);
+        if ( self::use_fallback( 'crypto_pwhash_scryptsalsa208sha256' ) ) {
+            return call_user_func( '\\Sodium\\crypto_pwhash_scryptsalsa208sha256', $outlen, $passwd, $salt, $opslimit, $memlimit );
         }
         // This is the best we can do.
         throw new Error(
@@ -1307,17 +1307,17 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    public static function crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit )
     {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $passwd, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $opslimit, 'int', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $memlimit, 'int', 3 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit );
         }
-        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str', $passwd, $opslimit, $memlimit);
+        if ( self::use_fallback( 'crypto_pwhash_scryptsalsa208sha256_str' ) ) {
+            return call_user_func( '\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str', $passwd, $opslimit, $memlimit );
         }
         // This is the best we can do.
         throw new Error(
@@ -1331,16 +1331,16 @@ 
      * @return bool
      * @throws Error
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    public static function crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash )
     {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $passwd, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $hash, 'string', 2 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash );
         }
-        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str_verify')) {
-            return call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify', $passwd, $hash);
+        if ( self::use_fallback( 'crypto_pwhash_scryptsalsa208sha256_str_verify' ) ) {
+            return call_user_func( '\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify', $passwd, $hash );
         }
         // This is the best we can do.
         throw new Error(
@@ -1360,38 +1360,38 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_scalarmult($secretKey, $publicKey)
+    public static function crypto_scalarmult( $secretKey, $publicKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $secretKey, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $publicKey, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $secretKey ) !== self::CRYPTO_BOX_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $publicKey ) !== self::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_scalarmult($secretKey, $publicKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_scalarmult( $secretKey, $publicKey );
         }
-        if (self::use_fallback('crypto_scalarmult')) {
-            return call_user_func('\\Sodium\\crypto_scalarmult', $secretKey, $publicKey);
+        if ( self::use_fallback( 'crypto_scalarmult' ) ) {
+            return call_user_func( '\\Sodium\\crypto_scalarmult', $secretKey, $publicKey );
         }
 
         /* Output validation: Forbid all-zero keys */
-        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
-            throw new Error('Zero secret key is not allowed');
+        if ( ParagonIE_Sodium_Core_Util::hashEquals( $secretKey, str_repeat( "\0", self::CRYPTO_BOX_SECRETKEYBYTES ) ) ) {
+            throw new Error( 'Zero secret key is not allowed' );
         }
-        if (ParagonIE_Sodium_Core_Util::hashEquals($publicKey, str_repeat("\0", self::CRYPTO_BOX_PUBLICKEYBYTES))) {
-            throw new Error('Zero public key is not allowed');
+        if ( ParagonIE_Sodium_Core_Util::hashEquals( $publicKey, str_repeat( "\0", self::CRYPTO_BOX_PUBLICKEYBYTES ) ) ) {
+            throw new Error( 'Zero public key is not allowed' );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::scalarmult($secretKey, $publicKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::scalarmult( $secretKey, $publicKey );
         }
-        return ParagonIE_Sodium_Crypto::scalarmult($secretKey, $publicKey);
+        return ParagonIE_Sodium_Crypto::scalarmult( $secretKey, $publicKey );
     }
 
     /**
@@ -1402,29 +1402,29 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_scalarmult_base($secretKey)
+    public static function crypto_scalarmult_base( $secretKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $secretKey, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $secretKey ) !== self::CRYPTO_BOX_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_scalarmult_base($secretKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_scalarmult_base( $secretKey );
         }
-        if (self::use_fallback('crypto_scalarmult_base')) {
-            return call_user_func('\\Sodium\\crypto_scalarmult_base', $secretKey);
+        if ( self::use_fallback( 'crypto_scalarmult_base' ) ) {
+            return call_user_func( '\\Sodium\\crypto_scalarmult_base', $secretKey );
         }
-        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
-            throw new Error('Zero secret key is not allowed');
+        if ( ParagonIE_Sodium_Core_Util::hashEquals( $secretKey, str_repeat( "\0", self::CRYPTO_BOX_SECRETKEYBYTES ) ) ) {
+            throw new Error( 'Zero secret key is not allowed' );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::scalarmult_base($secretKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::scalarmult_base( $secretKey );
         }
-        return ParagonIE_Sodium_Crypto::scalarmult_base($secretKey);
+        return ParagonIE_Sodium_Crypto::scalarmult_base( $secretKey );
     }
 
     /**
@@ -1439,31 +1439,31 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox($plaintext, $nonce, $key)
+    public static function crypto_secretbox( $plaintext, $nonce, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $plaintext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_secretbox($plaintext, $nonce, $key);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_secretbox( $plaintext, $nonce, $key );
         }
-        if (self::use_fallback('crypto_secretbox')) {
-            return call_user_func('\\Sodium\\crypto_secretbox', $plaintext, $nonce, $key);
+        if ( self::use_fallback( 'crypto_secretbox' ) ) {
+            return call_user_func( '\\Sodium\\crypto_secretbox', $plaintext, $nonce, $key );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox($plaintext, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::secretbox( $plaintext, $nonce, $key );
         }
-        return ParagonIE_Sodium_Crypto::secretbox($plaintext, $nonce, $key);
+        return ParagonIE_Sodium_Crypto::secretbox( $plaintext, $nonce, $key );
     }
 
     /**
@@ -1476,31 +1476,31 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox_open($ciphertext, $nonce, $key)
+    public static function crypto_secretbox_open( $ciphertext, $nonce, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ciphertext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_secretbox_open( $ciphertext, $nonce, $key );
         }
-        if (self::use_fallback('crypto_secretbox_open')) {
-            return call_user_func('\\Sodium\\crypto_secretbox_open', $ciphertext, $nonce, $key);
+        if ( self::use_fallback( 'crypto_secretbox_open' ) ) {
+            return call_user_func( '\\Sodium\\crypto_secretbox_open', $ciphertext, $nonce, $key );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_open($ciphertext, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::secretbox_open( $ciphertext, $nonce, $key );
         }
-        return ParagonIE_Sodium_Crypto::secretbox_open($ciphertext, $nonce, $key);
+        return ParagonIE_Sodium_Crypto::secretbox_open( $ciphertext, $nonce, $key );
     }
 
     /**
@@ -1515,24 +1515,24 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    public static function crypto_secretbox_xchacha20poly1305( $plaintext, $nonce, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $plaintext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.' );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305( $plaintext, $nonce, $key );
         }
-        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
+        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305( $plaintext, $nonce, $key );
     }
     /**
      * Decrypts a message previously encrypted with crypto_secretbox_xchacha20poly1305().
@@ -1544,25 +1544,25 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    public static function crypto_secretbox_xchacha20poly1305_open( $ciphertext, $nonce, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $ciphertext, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.' );
         }
 
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305_open( $ciphertext, $nonce, $key );
         }
-        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
+        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305_open( $ciphertext, $nonce, $key );
     }
 
     /**
@@ -1574,27 +1574,27 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_shorthash($message, $key)
+    public static function crypto_shorthash( $message, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SHORTHASH_KEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SHORTHASH_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_SHORTHASH_KEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SHORTHASH_KEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_shorthash($message, $key);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_shorthash( $message, $key );
         }
-        if (self::use_fallback('crypto_shorthash')) {
-            return call_user_func('\\Sodium\\crypto_shorthash', $message, $key);
+        if ( self::use_fallback( 'crypto_shorthash' ) ) {
+            return call_user_func( '\\Sodium\\crypto_shorthash', $message, $key );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_SipHash::sipHash24($message, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Core32_SipHash::sipHash24( $message, $key );
         }
-        return ParagonIE_Sodium_Core_SipHash::sipHash24($message, $key);
+        return ParagonIE_Sodium_Core_SipHash::sipHash24( $message, $key );
     }
 
     /**
@@ -1610,31 +1610,31 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_stream($len, $nonce, $key)
+    public static function crypto_stream( $len, $nonce, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $len, 'int', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_STREAM_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_STREAM_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_STREAM_KEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_STREAM_KEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_stream($len, $nonce, $key);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_stream( $len, $nonce, $key );
         }
-        if (self::use_fallback('crypto_stream')) {
-            return call_user_func('\\Sodium\\crypto_stream', $len, $nonce, $key);
+        if ( self::use_fallback( 'crypto_stream' ) ) {
+            return call_user_func( '\\Sodium\\crypto_stream', $len, $nonce, $key );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20($len, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20( $len, $nonce, $key );
         }
-        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20($len, $nonce, $key);
+        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20( $len, $nonce, $key );
     }
 
     /**
@@ -1656,31 +1656,31 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_stream_xor($message, $nonce, $key)
+    public static function crypto_stream_xor( $message, $nonce, $key )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $nonce, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $key, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $nonce ) !== self::CRYPTO_STREAM_NONCEBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $key ) !== self::CRYPTO_STREAM_KEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_stream_xor($message, $nonce, $key);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_stream_xor( $message, $nonce, $key );
         }
-        if (self::use_fallback('crypto_stream_xor')) {
-            return call_user_func('\\Sodium\\crypto_stream_xor', $message, $nonce, $key);
+        if ( self::use_fallback( 'crypto_stream_xor' ) ) {
+            return call_user_func( '\\Sodium\\crypto_stream_xor', $message, $nonce, $key );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20_xor($message, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20_xor( $message, $nonce, $key );
         }
-        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20_xor($message, $nonce, $key);
+        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20_xor( $message, $nonce, $key );
     }
 
     /**
@@ -1695,27 +1695,27 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign($message, $secretKey)
+    public static function crypto_sign( $message, $secretKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $secretKey, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $secretKey ) !== self::CRYPTO_SIGN_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign($message, $secretKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign( $message, $secretKey );
         }
-        if (self::use_fallback('crypto_sign')) {
-            return call_user_func('\\Sodium\\crypto_sign', $message, $secretKey);
+        if ( self::use_fallback( 'crypto_sign' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign', $message, $secretKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign($message, $secretKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::sign( $message, $secretKey );
         }
-        return ParagonIE_Sodium_Crypto::sign($message, $secretKey);
+        return ParagonIE_Sodium_Crypto::sign( $message, $secretKey );
     }
 
     /**
@@ -1728,30 +1728,30 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_open($signedMessage, $publicKey)
+    public static function crypto_sign_open( $signedMessage, $publicKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($signedMessage, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $signedMessage, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $publicKey, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($signedMessage) < self::CRYPTO_SIGN_BYTES) {
-            throw new Error('Argument 1 must be at least CRYPTO_SIGN_BYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $signedMessage ) < self::CRYPTO_SIGN_BYTES ) {
+            throw new Error( 'Argument 1 must be at least CRYPTO_SIGN_BYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $publicKey ) !== self::CRYPTO_SIGN_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SIGN_PUBLICKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_open($signedMessage, $publicKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign_open( $signedMessage, $publicKey );
         }
-        if (self::use_fallback('crypto_sign_open')) {
-            return call_user_func('\\Sodium\\crypto_sign_open', $signedMessage, $publicKey);
+        if ( self::use_fallback( 'crypto_sign_open' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_open', $signedMessage, $publicKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_open($signedMessage, $publicKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::sign_open( $signedMessage, $publicKey );
         }
-        return ParagonIE_Sodium_Crypto::sign_open($signedMessage, $publicKey);
+        return ParagonIE_Sodium_Crypto::sign_open( $signedMessage, $publicKey );
     }
 
     /**
@@ -1761,15 +1761,15 @@ 
      */
     public static function crypto_sign_keypair()
     {
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_crypto_sign_keypair();
         }
-        if (self::use_fallback('crypto_sign_keypair')) {
+        if ( self::use_fallback( 'crypto_sign_keypair' ) ) {
             return call_user_func(
                 '\\Sodium\\crypto_sign_keypair'
             );
         }
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return ParagonIE_Sodium_Core32_Ed25519::keypair();
         }
         return ParagonIE_Sodium_Core_Ed25519::keypair();
@@ -1781,22 +1781,22 @@ 
      * @param string $seed Input seed
      * @return string      Keypair
      */
-    public static function crypto_sign_seed_keypair($seed)
+    public static function crypto_sign_seed_keypair( $seed )
     {
-        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $seed, 'string', 1 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_seed_keypair($seed);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign_seed_keypair( $seed );
         }
-        if (self::use_fallback('crypto_sign_keypair')) {
-            return call_user_func('\\Sodium\\crypto_sign_seed_keypair', $seed);
+        if ( self::use_fallback( 'crypto_sign_keypair' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_seed_keypair', $seed );
         }
         $publicKey = '';
         $secretKey = '';
-        if (PHP_INT_SIZE === 4) {
-            ParagonIE_Sodium_Core32_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
+        if ( PHP_INT_SIZE === 4 ) {
+            ParagonIE_Sodium_Core32_Ed25519::seed_keypair( $publicKey, $secretKey, $seed );
         } else {
-            ParagonIE_Sodium_Core_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
+            ParagonIE_Sodium_Core_Ed25519::seed_keypair( $publicKey, $secretKey, $seed );
         }
         return $secretKey . $publicKey;
     }
@@ -1809,26 +1809,26 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_publickey($keypair)
+    public static function crypto_sign_publickey( $keypair )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $keypair, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== self::CRYPTO_SIGN_KEYPAIRBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_publickey($keypair);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign_publickey( $keypair );
         }
-        if (self::use_fallback('crypto_sign_publickey')) {
-            return call_user_func('\\Sodium\\crypto_sign_publickey', $keypair);
+        if ( self::use_fallback( 'crypto_sign_publickey' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_publickey', $keypair );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::publickey($keypair);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Core32_Ed25519::publickey( $keypair );
         }
-        return ParagonIE_Sodium_Core_Ed25519::publickey($keypair);
+        return ParagonIE_Sodium_Core_Ed25519::publickey( $keypair );
     }
 
     /**
@@ -1839,26 +1839,26 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_publickey_from_secretkey($secretKey)
+    public static function crypto_sign_publickey_from_secretkey( $secretKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $secretKey, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $secretKey ) !== self::CRYPTO_SIGN_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_SIGN_SECRETKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_publickey_from_secretkey($secretKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign_publickey_from_secretkey( $secretKey );
         }
-        if (self::use_fallback('crypto_sign_publickey_from_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_sign_publickey_from_secretkey', $secretKey);
+        if ( self::use_fallback( 'crypto_sign_publickey_from_secretkey' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_publickey_from_secretkey', $secretKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::publickey_from_secretkey($secretKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Core32_Ed25519::publickey_from_secretkey( $secretKey );
         }
-        return ParagonIE_Sodium_Core_Ed25519::publickey_from_secretkey($secretKey);
+        return ParagonIE_Sodium_Core_Ed25519::publickey_from_secretkey( $secretKey );
     }
 
     /**
@@ -1869,26 +1869,26 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_secretkey($keypair)
+    public static function crypto_sign_secretkey( $keypair )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $keypair, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== self::CRYPTO_SIGN_KEYPAIRBYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_secretkey($keypair);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign_secretkey( $keypair );
         }
-        if (self::use_fallback('crypto_sign_secretkey')) {
-            return call_user_func('\\Sodium\\crypto_sign_secretkey', $keypair);
+        if ( self::use_fallback( 'crypto_sign_secretkey' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_secretkey', $keypair );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::secretkey($keypair);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Core32_Ed25519::secretkey( $keypair );
         }
-        return ParagonIE_Sodium_Core_Ed25519::secretkey($keypair);
+        return ParagonIE_Sodium_Core_Ed25519::secretkey( $keypair );
     }
 
     /**
@@ -1902,27 +1902,27 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_detached($message, $secretKey)
+    public static function crypto_sign_detached( $message, $secretKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $secretKey, 'string', 2 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $secretKey ) !== self::CRYPTO_SIGN_SECRETKEYBYTES ) {
+            throw new Error( 'Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_detached($message, $secretKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign_detached( $message, $secretKey );
         }
-        if (self::use_fallback('crypto_sign_detached')) {
-            return call_user_func('\\Sodium\\crypto_sign_detached', $message, $secretKey);
+        if ( self::use_fallback( 'crypto_sign_detached' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_detached', $message, $secretKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_detached($message, $secretKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::sign_detached( $message, $secretKey );
         }
-        return ParagonIE_Sodium_Crypto::sign_detached($message, $secretKey);
+        return ParagonIE_Sodium_Crypto::sign_detached( $message, $secretKey );
     }
 
     /**
@@ -1936,31 +1936,31 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_verify_detached($signature, $message, $publicKey)
+    public static function crypto_sign_verify_detached( $signature, $message, $publicKey )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($signature, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $signature, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $message, 'string', 2 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $publicKey, 'string', 3 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($signature) !== self::CRYPTO_SIGN_BYTES) {
-            throw new Error('Argument 1 must be CRYPTO_SIGN_BYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $signature ) !== self::CRYPTO_SIGN_BYTES ) {
+            throw new Error( 'Argument 1 must be CRYPTO_SIGN_BYTES long.' );
         }
-        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
-            throw new Error('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $publicKey ) !== self::CRYPTO_SIGN_PUBLICKEYBYTES ) {
+            throw new Error( 'Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES long.' );
         }
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_crypto_sign_verify_detached($signature, $message, $publicKey);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_crypto_sign_verify_detached( $signature, $message, $publicKey );
         }
-        if (self::use_fallback('crypto_sign_verify_detached')) {
-            return call_user_func('\\Sodium\\crypto_sign_verify_detached', $signature, $message, $publicKey);
+        if ( self::use_fallback( 'crypto_sign_verify_detached' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_verify_detached', $signature, $message, $publicKey );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_verify_detached($signature, $message, $publicKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return ParagonIE_Sodium_Crypto32::sign_verify_detached( $signature, $message, $publicKey );
         }
-        return ParagonIE_Sodium_Crypto::sign_verify_detached($signature, $message, $publicKey);
+        return ParagonIE_Sodium_Crypto::sign_verify_detached( $signature, $message, $publicKey );
     }
 
     /**
@@ -1970,32 +1970,32 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_sign_ed25519_sk_to_curve25519($sk)
+    public static function crypto_sign_ed25519_sk_to_curve25519( $sk )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $sk, 'string', 1 );
 
         /* Input validation: */
-        if (ParagonIE_Sodium_Core_Util::strlen($sk) < self::CRYPTO_SIGN_SEEDBYTES) {
-            throw new Error('Argument 1 must be at least CRYPTO_SIGN_SEEDBYTES long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $sk ) < self::CRYPTO_SIGN_SEEDBYTES ) {
+            throw new Error( 'Argument 1 must be at least CRYPTO_SIGN_SEEDBYTES long.' );
         }
-        if (self::isPhp72OrGreater()) {
-            if (is_callable('crypto_sign_ed25519_sk_to_curve25519')) {
-                return sodium_crypto_sign_ed25519_sk_to_curve25519($sk);
+        if ( self::isPhp72OrGreater() ) {
+            if ( is_callable( 'crypto_sign_ed25519_sk_to_curve25519' ) ) {
+                return sodium_crypto_sign_ed25519_sk_to_curve25519( $sk );
             }
         }
-        if (self::use_fallback('crypto_sign_ed25519_sk_to_curve25519')) {
-            return call_user_func('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519', $sk);
+        if ( self::use_fallback( 'crypto_sign_ed25519_sk_to_curve25519' ) ) {
+            return call_user_func( '\\Sodium\\crypto_sign_ed25519_sk_to_curve25519', $sk );
         }
 
-        $h = hash('sha512', ParagonIE_Sodium_Core_Util::substr($sk, 0, 32), true);
+        $h = hash( 'sha512', ParagonIE_Sodium_Core_Util::substr( $sk, 0, 32 ), true );
         $h[0] = ParagonIE_Sodium_Core_Util::intToChr(
-            ParagonIE_Sodium_Core_Util::chrToInt($h[0]) & 248
+            ParagonIE_Sodium_Core_Util::chrToInt( $h[0] ) & 248
         );
         $h[31] = ParagonIE_Sodium_Core_Util::intToChr(
-            (ParagonIE_Sodium_Core_Util::chrToInt($h[31]) & 127) | 64
+            ( ParagonIE_Sodium_Core_Util::chrToInt( $h[31] ) & 127 ) | 64
         );
-        return ParagonIE_Sodium_Core_Util::substr($h, 0, 32);
+        return ParagonIE_Sodium_Core_Util::substr( $h, 0, 32 );
     }
 
     /**
@@ -2005,18 +2005,18 @@ 
      * @return string        Raw binary string
      * @throws TypeError
      */
-    public static function hex2bin($string)
+    public static function hex2bin( $string )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $string, 'string', 1 );
 
-        if (self::isPhp72OrGreater()) {
-            return sodium_hex2bin($string);
+        if ( self::isPhp72OrGreater() ) {
+            return sodium_hex2bin( $string );
         }
-        if (self::use_fallback('hex2bin')) {
-            return call_user_func('\\Sodium\\hex2bin', $string);
+        if ( self::use_fallback( 'hex2bin' ) ) {
+            return call_user_func( '\\Sodium\\hex2bin', $string );
         }
-        return ParagonIE_Sodium_Core_Util::hex2bin($string);
+        return ParagonIE_Sodium_Core_Util::hex2bin( $string );
     }
 
     /**
@@ -2027,28 +2027,28 @@ 
      * @return void
      * @throws Error (Unless libsodium is installed)
      */
-    public static function increment(&$var)
+    public static function increment( &$var )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $var, 'string', 1 );
 
-        if (self::isPhp72OrGreater()) {
-            sodium_increment($var);
+        if ( self::isPhp72OrGreater() ) {
+            sodium_increment( $var );
             return;
         }
-        if (self::use_fallback('increment')) {
-            @call_user_func('\\Sodium\\increment', $var);
+        if ( self::use_fallback( 'increment' ) ) {
+            @call_user_func( '\\Sodium\\increment', $var );
             return;
         }
 
-        $len = ParagonIE_Sodium_Core_Util::strlen($var);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $var );
         $c = 1;
         $copy = '';
-        for ($i = 0; $i < $len; ++$i) {
+        for ( $i = 0; $i < $len; ++$i ) {
             $c += ParagonIE_Sodium_Core_Util::chrToInt(
-                ParagonIE_Sodium_Core_Util::substr($var, $i, 1)
+                ParagonIE_Sodium_Core_Util::substr( $var, $i, 1 )
             );
-            $copy .= ParagonIE_Sodium_Core_Util::intToChr($c);
+            $copy .= ParagonIE_Sodium_Core_Util::intToChr( $c );
             $c >>= 8;
         }
         $var = $copy;
@@ -2062,11 +2062,11 @@ 
      */
     public static function library_version_major()
     {
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_library_version_major();
         }
-        if (self::use_fallback('library_version_major')) {
-            return (int) call_user_func('\\Sodium\\library_version_major');
+        if ( self::use_fallback( 'library_version_major' ) ) {
+            return (int) call_user_func( '\\Sodium\\library_version_major' );
         }
         return self::LIBRARY_VERSION_MAJOR;
     }
@@ -2079,11 +2079,11 @@ 
      */
     public static function library_version_minor()
     {
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_library_version_minor();
         }
-        if (self::use_fallback('library_version_minor')) {
-            return (int) call_user_func('\\Sodium\\library_version_minor');
+        if ( self::use_fallback( 'library_version_minor' ) ) {
+            return (int) call_user_func( '\\Sodium\\library_version_minor' );
         }
         return self::LIBRARY_VERSION_MINOR;
     }
@@ -2096,16 +2096,16 @@ 
      * @return int
      * @throws TypeError
      */
-    public static function memcmp($left, $right)
+    public static function memcmp( $left, $right )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $left, 'string', 1 );
+        ParagonIE_Sodium_Core_Util::declareScalarType( $right, 'string', 2 );
 
-        if (self::use_fallback('memcmp')) {
-            return call_user_func('\\Sodium\\memcmp', $left, $right);
+        if ( self::use_fallback( 'memcmp' ) ) {
+            return call_user_func( '\\Sodium\\memcmp', $left, $right );
         }
-        return ParagonIE_Sodium_Core_Util::memcmp($left, $right);
+        return ParagonIE_Sodium_Core_Util::memcmp( $left, $right );
     }
 
     /**
@@ -2117,17 +2117,17 @@ 
      * @return void
      * @throws Error (Unless libsodium is installed)
      */
-    public static function memzero(&$var)
+    public static function memzero( &$var )
     {
         /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType( $var, 'string', 1 );
 
-        if (self::isPhp72OrGreater()) {
-            sodium_memzero($var);
+        if ( self::isPhp72OrGreater() ) {
+            sodium_memzero( $var );
             return;
         }
-        if (self::use_fallback('memzero')) {
-            @call_user_func('\\Sodium\\memzero', $var);
+        if ( self::use_fallback( 'memzero' ) ) {
+            @call_user_func( '\\Sodium\\memzero', $var );
             return;
         }
         // This is the best we can do.
@@ -2144,20 +2144,20 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function randombytes_buf($numBytes)
+    public static function randombytes_buf( $numBytes )
     {
         /* Type checks: */
-        if (!is_int($numBytes)) {
-            if (is_numeric($numBytes)) {
-                $numBytes = (int)$numBytes;
+        if ( ! is_int( $numBytes ) ) {
+            if ( is_numeric( $numBytes ) ) {
+                $numBytes = (int) $numBytes;
             } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($numBytes) . ' given.');
+                throw new TypeError( 'Argument 1 must be an integer, ' . gettype( $numBytes ) . ' given.' );
             }
         }
-        if (self::use_fallback('randombytes_buf')) {
-            return call_user_func('\\Sodium\\randombytes_buf', $numBytes);
+        if ( self::use_fallback( 'randombytes_buf' ) ) {
+            return call_user_func( '\\Sodium\\randombytes_buf', $numBytes );
         }
-        return random_bytes($numBytes);
+        return random_bytes( $numBytes );
     }
 
     /**
@@ -2167,20 +2167,20 @@ 
      * @return int
      * @throws TypeError
      */
-    public static function randombytes_uniform($range)
+    public static function randombytes_uniform( $range )
     {
         /* Type checks: */
-        if (!is_int($range)) {
-            if (is_numeric($range)) {
-                $range = (int)$range;
+        if ( ! is_int( $range ) ) {
+            if ( is_numeric( $range ) ) {
+                $range = (int) $range;
             } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($range) . ' given.');
+                throw new TypeError( 'Argument 1 must be an integer, ' . gettype( $range ) . ' given.' );
             }
         }
-        if (self::use_fallback('randombytes_uniform')) {
-            return (int) call_user_func('\\Sodium\\randombytes_uniform', $range);
+        if ( self::use_fallback( 'randombytes_uniform' ) ) {
+            return (int) call_user_func( '\\Sodium\\randombytes_uniform', $range );
         }
-        return random_int(0, $range - 1);
+        return random_int( 0, $range - 1 );
     }
 
     /**
@@ -2190,10 +2190,10 @@ 
      */
     public static function randombytes_random16()
     {
-        if (self::use_fallback('randombytes_random16')) {
-            return (int) call_user_func('\\Sodium\\randombytes_random16');
+        if ( self::use_fallback( 'randombytes_random16' ) ) {
+            return (int) call_user_func( '\\Sodium\\randombytes_random16' );
         }
-        return random_int(0, 65535);
+        return random_int( 0, 65535 );
     }
 
     /**
@@ -2204,11 +2204,11 @@ 
      */
     public static function version_string()
     {
-        if (self::isPhp72OrGreater()) {
+        if ( self::isPhp72OrGreater() ) {
             return sodium_version_string();
         }
-        if (self::use_fallback('version_string')) {
-            return (string) call_user_func('\\Sodium\\version_string');
+        if ( self::use_fallback( 'version_string' ) ) {
+            return (string) call_user_func( '\\Sodium\\version_string' );
         }
         return self::VERSION_STRING;
     }
@@ -2225,14 +2225,14 @@ 
      *
      * @return bool
      */
-    protected static function use_fallback($sodium_func_name = '')
+    protected static function use_fallback( $sodium_func_name = '' )
     {
         static $res = null;
-        if ($res === null) {
-            $res = extension_loaded('libsodium') && PHP_VERSION_ID >= 50300;
+        if ( $res === null ) {
+            $res = extension_loaded( 'libsodium' ) && PHP_VERSION_ID >= 50300;
         }
-        if (PHP_INT_SIZE === 4) {
-            if ($res && is_callable('\\Sodium\\' . $sodium_func_name)) {
+        if ( PHP_INT_SIZE === 4 ) {
+            if ( $res && is_callable( '\\Sodium\\' . $sodium_func_name ) ) {
                 // We can safely just offload to the PECL extension
                 return true;
             }
@@ -2248,16 +2248,16 @@ 
             );
             */
         }
-        if ($res === false) {
+        if ( $res === false ) {
             // No libsodium installed
             return false;
         }
-        if (self::$disableFallbackForUnitTests) {
+        if ( self::$disableFallbackForUnitTests ) {
             // Don't fallback. Use the PHP implementation.
             return false;
         }
-        if (!empty($sodium_func_name)) {
-            return is_callable('\\Sodium\\' . $sodium_func_name);
+        if ( ! empty( $sodium_func_name ) ) {
+            return is_callable( '\\Sodium\\' . $sodium_func_name );
         }
         return true;
     }
@@ -2271,10 +2271,10 @@ 
     protected static function isPhp72OrGreater()
     {
         static $res = null;
-        if ($res === null) {
-            $res = PHP_VERSION_ID >= 70200 && extension_loaded('sodium');
+        if ( $res === null ) {
+            $res = PHP_VERSION_ID >= 70200 && extension_loaded( 'sodium' );
         }
-        if (self::$disableFallbackForUnitTests) {
+        if ( self::$disableFallbackForUnitTests ) {
             // Don't fallback. Use the PHP implementation.
             return false;
         }

Braces +57 added lines, -114 removed lines

@@ -25,8 +25,7 @@ 
     return;
 }
 
-class ParagonIE_Sodium_Compat
-{
+class ParagonIE_Sodium_Compat {
     /**
      * This parameter prevents the use of the PECL extension.
      * It should only be used for unit testing.
@@ -115,8 +114,7 @@ 
      * @return string        A hexadecimal-encoded string
      * @throws TypeError
      */
-    public static function bin2hex($string)
-    {
+    public static function bin2hex($string) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
 
@@ -140,8 +138,7 @@ 
      *                      > 0 if the right operand is less than the left
      * @throws TypeError
      */
-    public static function compare($left, $right)
-    {
+    public static function compare($left, $right) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
@@ -575,8 +572,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_auth($message, $key)
-    {
+    public static function crypto_auth($message, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
@@ -609,8 +605,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_auth_verify($mac, $message, $key)
-    {
+    public static function crypto_auth_verify($mac, $message, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($mac, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
@@ -652,8 +647,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box($plaintext, $nonce, $keypair)
-    {
+    public static function crypto_box($plaintext, $nonce, $keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -695,8 +689,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_seal($plaintext, $publicKey)
-    {
+    public static function crypto_box_seal($plaintext, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -730,8 +723,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_seal_open($ciphertext, $keypair)
-    {
+    public static function crypto_box_seal_open($ciphertext, $keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 2);
@@ -761,8 +753,7 @@ 
      *                and crypto_box_publickey() exist to separate them so you
      *                don't accidentally get them mixed up!
      */
-    public static function crypto_box_keypair()
-    {
+    public static function crypto_box_keypair() {
         if (self::isPhp72OrGreater()) {
             return sodium_crypto_box_keypair();
         }
@@ -782,8 +773,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey)
-    {
+    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -818,8 +808,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_open($ciphertext, $nonce, $keypair)
-    {
+    public static function crypto_box_open($ciphertext, $nonce, $keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -856,8 +845,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_publickey($keypair)
-    {
+    public static function crypto_box_publickey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -886,8 +874,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_publickey_from_secretkey($secretKey)
-    {
+    public static function crypto_box_publickey_from_secretkey($secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
 
@@ -916,8 +903,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_box_secretkey($keypair)
-    {
+    public static function crypto_box_secretkey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -944,8 +930,7 @@ 
      * @param string $seed
      * @return string
      */
-    public static function crypto_box_seed_keypair($seed)
-    {
+    public static function crypto_box_seed_keypair($seed) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
 
@@ -970,8 +955,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
+    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         if (is_null($key)) {
@@ -1011,8 +995,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
+    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
@@ -1047,8 +1030,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
-    {
+    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES) {
         /* Type checks: */
         if (is_null($key)) {
             $key = '';
@@ -1087,8 +1069,7 @@ 
      * @return void
      * @throws TypeError
      */
-    public static function crypto_generichash_update(&$ctx, $message)
-    {
+    public static function crypto_generichash_update(&$ctx, $message) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
@@ -1137,8 +1118,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
+    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($my_secret, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($their_public, 'string', 2);
@@ -1203,8 +1183,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
@@ -1230,8 +1209,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash_str($passwd, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
@@ -1254,8 +1232,7 @@ 
      * @return bool
      * @throws Error
      */
-    public static function crypto_pwhash_str_verify($passwd, $hash)
-    {
+    public static function crypto_pwhash_str_verify($passwd, $hash) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
 
@@ -1280,8 +1257,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
@@ -1307,8 +1283,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
+    public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
         ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
@@ -1331,8 +1306,7 @@ 
      * @return bool
      * @throws Error
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
+    public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash) {
         ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
 
@@ -1360,8 +1334,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_scalarmult($secretKey, $publicKey)
-    {
+    public static function crypto_scalarmult($secretKey, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -1402,8 +1375,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_scalarmult_base($secretKey)
-    {
+    public static function crypto_scalarmult_base($secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
 
@@ -1439,8 +1411,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox($plaintext, $nonce, $key)
-    {
+    public static function crypto_secretbox($plaintext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1476,8 +1447,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox_open($ciphertext, $nonce, $key)
-    {
+    public static function crypto_secretbox_open($ciphertext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1515,8 +1485,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
+    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1544,8 +1513,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
+    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1574,8 +1542,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_shorthash($message, $key)
-    {
+    public static function crypto_shorthash($message, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
@@ -1610,8 +1577,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_stream($len, $nonce, $key)
-    {
+    public static function crypto_stream($len, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1656,8 +1622,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_stream_xor($message, $nonce, $key)
-    {
+    public static function crypto_stream_xor($message, $nonce, $key) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
@@ -1695,8 +1660,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign($message, $secretKey)
-    {
+    public static function crypto_sign($message, $secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
@@ -1728,8 +1692,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_open($signedMessage, $publicKey)
-    {
+    public static function crypto_sign_open($signedMessage, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($signedMessage, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
@@ -1759,8 +1722,7 @@ 
      *
      * @return string
      */
-    public static function crypto_sign_keypair()
-    {
+    public static function crypto_sign_keypair() {
         if (self::isPhp72OrGreater()) {
             return sodium_crypto_sign_keypair();
         }
@@ -1781,8 +1743,7 @@ 
      * @param string $seed Input seed
      * @return string      Keypair
      */
-    public static function crypto_sign_seed_keypair($seed)
-    {
+    public static function crypto_sign_seed_keypair($seed) {
         ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
 
         if (self::isPhp72OrGreater()) {
@@ -1809,8 +1770,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_publickey($keypair)
-    {
+    public static function crypto_sign_publickey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -1839,8 +1799,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_publickey_from_secretkey($secretKey)
-    {
+    public static function crypto_sign_publickey_from_secretkey($secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
 
@@ -1869,8 +1828,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_secretkey($keypair)
-    {
+    public static function crypto_sign_secretkey($keypair) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
 
@@ -1902,8 +1860,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_detached($message, $secretKey)
-    {
+    public static function crypto_sign_detached($message, $secretKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
@@ -1936,8 +1893,7 @@ 
      * @throws Error
      * @throws TypeError
      */
-    public static function crypto_sign_verify_detached($signature, $message, $publicKey)
-    {
+    public static function crypto_sign_verify_detached($signature, $message, $publicKey) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($signature, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
@@ -1970,8 +1926,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function crypto_sign_ed25519_sk_to_curve25519($sk)
-    {
+    public static function crypto_sign_ed25519_sk_to_curve25519($sk) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
 
@@ -2005,8 +1960,7 @@ 
      * @return string        Raw binary string
      * @throws TypeError
      */
-    public static function hex2bin($string)
-    {
+    public static function hex2bin($string) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
 
@@ -2027,8 +1981,7 @@ 
      * @return void
      * @throws Error (Unless libsodium is installed)
      */
-    public static function increment(&$var)
-    {
+    public static function increment(&$var) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
 
@@ -2060,8 +2013,7 @@ 
      *
      * @return int
      */
-    public static function library_version_major()
-    {
+    public static function library_version_major() {
         if (self::isPhp72OrGreater()) {
             return sodium_library_version_major();
         }
@@ -2077,8 +2029,7 @@ 
      *
      * @return int
      */
-    public static function library_version_minor()
-    {
+    public static function library_version_minor() {
         if (self::isPhp72OrGreater()) {
             return sodium_library_version_minor();
         }
@@ -2096,8 +2047,7 @@ 
      * @return int
      * @throws TypeError
      */
-    public static function memcmp($left, $right)
-    {
+    public static function memcmp($left, $right) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
         ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
@@ -2117,8 +2067,7 @@ 
      * @return void
      * @throws Error (Unless libsodium is installed)
      */
-    public static function memzero(&$var)
-    {
+    public static function memzero(&$var) {
         /* Type checks: */
         ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
 
@@ -2144,8 +2093,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function randombytes_buf($numBytes)
-    {
+    public static function randombytes_buf($numBytes) {
         /* Type checks: */
         if (!is_int($numBytes)) {
             if (is_numeric($numBytes)) {
@@ -2167,8 +2115,7 @@ 
      * @return int
      * @throws TypeError
      */
-    public static function randombytes_uniform($range)
-    {
+    public static function randombytes_uniform($range) {
         /* Type checks: */
         if (!is_int($range)) {
             if (is_numeric($range)) {
@@ -2188,8 +2135,7 @@ 
      *
      * @return int
      */
-    public static function randombytes_random16()
-    {
+    public static function randombytes_random16() {
         if (self::use_fallback('randombytes_random16')) {
             return (int) call_user_func('\\Sodium\\randombytes_random16');
         }
@@ -2202,8 +2148,7 @@ 
      *
      * @return string
      */
-    public static function version_string()
-    {
+    public static function version_string() {
         if (self::isPhp72OrGreater()) {
             return sodium_version_string();
         }
@@ -2225,8 +2170,7 @@ 
      *
      * @return bool
      */
-    protected static function use_fallback($sodium_func_name = '')
-    {
+    protected static function use_fallback($sodium_func_name = '') {
         static $res = null;
         if ($res === null) {
             $res = extension_loaded('libsodium') && PHP_VERSION_ID >= 50300;
@@ -2268,8 +2212,7 @@ 
      * @ref https://wiki.php.net/rfc/libsodium
      * @return bool
      */
-    protected static function isPhp72OrGreater()
-    {
+    protected static function isPhp72OrGreater() {
         static $res = null;
         if ($res === null) {
             $res = PHP_VERSION_ID >= 70200 && extension_loaded('sodium');

src/library/sodium_compat/src/Core/BLAKE2b.php

Doc Comments +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
      * @internal You should not use this directly from another application
      *
      * @param SplFixedArray $x
-     * @return int
+     * @return double
      */
     protected static function flatten64($x)
     {

Indentation +659 added lines, -659 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
-    return;
+	return;
 }
 
 /**
@@ -11,666 +11,666 @@ 
  */
 abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
 {
-    /**
-     * @var SplFixedArray
-     */
-    protected static $iv;
-
-    /**
-     * @var int[][]
-     */
-    protected static $sigma = array(
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
-        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
-        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
-        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
-        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
-        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
-        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
-        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
-        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
-    );
-
-    const BLOCKBYTES = 128;
-    const OUTBYTES   = 64;
-    const KEYBYTES   = 64;
-
-    /**
-     * Turn two 32-bit integers into a fixed array representing a 64-bit integer.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $high
-     * @param int $low
-     * @return SplFixedArray
-     */
-    public static function new64($high, $low)
-    {
-        $i64 = new SplFixedArray(2);
-        $i64[0] = $high & 0xffffffff;
-        $i64[1] = $low & 0xffffffff;
-        return $i64;
-    }
-
-    /**
-     * Convert an arbitrary number into an SplFixedArray of two 32-bit integers
-     * that represents a 64-bit integer.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $num
-     * @return SplFixedArray
-     */
-    protected static function to64($num)
-    {
-        list($hi, $lo) = self::numericTo64BitInteger($num);
-        return self::new64($hi, $lo);
-    }
-
-    /**
-     * Adds two 64-bit integers together, returning their sum as a SplFixedArray
-     * containing two 32-bit integers (representing a 64-bit integer).
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param SplFixedArray $y
-     * @return SplFixedArray
-     */
-    protected static function add64($x, $y)
-    {
-        $l = ($x[1] + $y[1]) & 0xffffffff;
-        return self::new64(
-            $x[0] + $y[0] + (
-                ($l < $x[1]) ? 1 : 0
-            ),
-            $l
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param SplFixedArray $y
-     * @param SplFixedArray $z
-     * @return SplFixedArray
-     */
-    protected static function add364($x, $y, $z)
-    {
-        return self::add64($x, self::add64($y, $z));
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param SplFixedArray $y
-     * @return SplFixedArray
-     * @throws Exception
-     */
-    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
-    {
-        if (!is_numeric($x[0])) {
-            throw new Exception('x[0] is not an integer');
-        }
-        if (!is_numeric($x[1])) {
-            throw new Exception('x[1] is not an integer');
-        }
-        if (!is_numeric($y[0])) {
-            throw new Exception('y[0] is not an integer');
-        }
-        if (!is_numeric($y[1])) {
-            throw new Exception('y[1] is not an integer');
-        }
-        return self::new64($x[0] ^ $y[0], $x[1] ^ $y[1]);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param int $c
-     * @return SplFixedArray
-     */
-    public static function rotr64($x, $c)
-    {
-        if ($c >= 64) {
-            $c %= 64;
-        }
-        if ($c >= 32) {
-            $tmp = $x[0];
-            $x[0] = $x[1];
-            $x[1] = $tmp;
-            $c -= 32;
-        }
-        if ($c === 0) {
-            return $x;
-        }
-
-        $l0 = 0;
-        $c = 64 - $c;
-
-        if ($c < 32) {
-            $h0 = ($x[0] << $c) | (
-                (
-                    $x[1] & ((1 << $c) - 1)
-                        <<
-                    (32 - $c)
-                ) >> (32 - $c)
-            );
-            $l0 = $x[1] << $c;
-        } else {
-            $h0 = $x[1] << ($c - 32);
-        }
-
-        $h1 = 0;
-        $c1 = 64 - $c;
-
-        if ($c1 < 32) {
-            $h1 = $x[0] >> $c1;
-            $l1 = ($x[1] >> $c1) | ($x[0] & ((1 << $c1) - 1)) << (32 - $c1);
-        } else {
-            $l1 = $x[0] >> ($c1 - 32);
-        }
-
-        return self::new64($h0 | $h1, $l0 | $l1);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @return int
-     */
-    protected static function flatten64($x)
-    {
-        return ($x[0] * 4294967296 + $x[1]);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param int $i
-     * @return SplFixedArray
-     */
-    protected static function load64(SplFixedArray $x, $i)
-    {
-        $l = $x[$i]   | ($x[$i+1]<<8) | ($x[$i+2]<<16) | ($x[$i+3]<<24);
-        $h = $x[$i+4] | ($x[$i+5]<<8) | ($x[$i+6]<<16) | ($x[$i+7]<<24);
-        return self::new64($h, $l);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param int $i
-     * @param SplFixedArray $u
-     * @return void
-     */
-    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
-    {
-        $maxLength = $x->getSize() - 1;
-        for ($j = 0; $j < 8; ++$j) {
-            /*
+	/**
+	 * @var SplFixedArray
+	 */
+	protected static $iv;
+
+	/**
+	 * @var int[][]
+	 */
+	protected static $sigma = array(
+		array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+		array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
+		array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
+		array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
+		array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
+		array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
+		array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
+		array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
+		array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
+		array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
+		array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+		array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
+	);
+
+	const BLOCKBYTES = 128;
+	const OUTBYTES   = 64;
+	const KEYBYTES   = 64;
+
+	/**
+	 * Turn two 32-bit integers into a fixed array representing a 64-bit integer.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $high
+	 * @param int $low
+	 * @return SplFixedArray
+	 */
+	public static function new64($high, $low)
+	{
+		$i64 = new SplFixedArray(2);
+		$i64[0] = $high & 0xffffffff;
+		$i64[1] = $low & 0xffffffff;
+		return $i64;
+	}
+
+	/**
+	 * Convert an arbitrary number into an SplFixedArray of two 32-bit integers
+	 * that represents a 64-bit integer.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $num
+	 * @return SplFixedArray
+	 */
+	protected static function to64($num)
+	{
+		list($hi, $lo) = self::numericTo64BitInteger($num);
+		return self::new64($hi, $lo);
+	}
+
+	/**
+	 * Adds two 64-bit integers together, returning their sum as a SplFixedArray
+	 * containing two 32-bit integers (representing a 64-bit integer).
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param SplFixedArray $y
+	 * @return SplFixedArray
+	 */
+	protected static function add64($x, $y)
+	{
+		$l = ($x[1] + $y[1]) & 0xffffffff;
+		return self::new64(
+			$x[0] + $y[0] + (
+				($l < $x[1]) ? 1 : 0
+			),
+			$l
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param SplFixedArray $y
+	 * @param SplFixedArray $z
+	 * @return SplFixedArray
+	 */
+	protected static function add364($x, $y, $z)
+	{
+		return self::add64($x, self::add64($y, $z));
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param SplFixedArray $y
+	 * @return SplFixedArray
+	 * @throws Exception
+	 */
+	protected static function xor64(SplFixedArray $x, SplFixedArray $y)
+	{
+		if (!is_numeric($x[0])) {
+			throw new Exception('x[0] is not an integer');
+		}
+		if (!is_numeric($x[1])) {
+			throw new Exception('x[1] is not an integer');
+		}
+		if (!is_numeric($y[0])) {
+			throw new Exception('y[0] is not an integer');
+		}
+		if (!is_numeric($y[1])) {
+			throw new Exception('y[1] is not an integer');
+		}
+		return self::new64($x[0] ^ $y[0], $x[1] ^ $y[1]);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param int $c
+	 * @return SplFixedArray
+	 */
+	public static function rotr64($x, $c)
+	{
+		if ($c >= 64) {
+			$c %= 64;
+		}
+		if ($c >= 32) {
+			$tmp = $x[0];
+			$x[0] = $x[1];
+			$x[1] = $tmp;
+			$c -= 32;
+		}
+		if ($c === 0) {
+			return $x;
+		}
+
+		$l0 = 0;
+		$c = 64 - $c;
+
+		if ($c < 32) {
+			$h0 = ($x[0] << $c) | (
+				(
+					$x[1] & ((1 << $c) - 1)
+						<<
+					(32 - $c)
+				) >> (32 - $c)
+			);
+			$l0 = $x[1] << $c;
+		} else {
+			$h0 = $x[1] << ($c - 32);
+		}
+
+		$h1 = 0;
+		$c1 = 64 - $c;
+
+		if ($c1 < 32) {
+			$h1 = $x[0] >> $c1;
+			$l1 = ($x[1] >> $c1) | ($x[0] & ((1 << $c1) - 1)) << (32 - $c1);
+		} else {
+			$l1 = $x[0] >> ($c1 - 32);
+		}
+
+		return self::new64($h0 | $h1, $l0 | $l1);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @return int
+	 */
+	protected static function flatten64($x)
+	{
+		return ($x[0] * 4294967296 + $x[1]);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param int $i
+	 * @return SplFixedArray
+	 */
+	protected static function load64(SplFixedArray $x, $i)
+	{
+		$l = $x[$i]   | ($x[$i+1]<<8) | ($x[$i+2]<<16) | ($x[$i+3]<<24);
+		$h = $x[$i+4] | ($x[$i+5]<<8) | ($x[$i+6]<<16) | ($x[$i+7]<<24);
+		return self::new64($h, $l);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param int $i
+	 * @param SplFixedArray $u
+	 * @return void
+	 */
+	protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
+	{
+		$maxLength = $x->getSize() - 1;
+		for ($j = 0; $j < 8; ++$j) {
+			/*
                [0, 1, 2, 3, 4, 5, 6, 7]
                     ... becomes ...
                [0, 0, 0, 0, 1, 1, 1, 1]
             */
-            $uIdx = ((7 - $j) & 4) >> 2;
-            $x[$i]   = ($u[$uIdx] & 0xff);
-            if (++$i > $maxLength) {
-                return;
-            }
-            $u[$uIdx] >>= 8;
-        }
-    }
-
-    /**
-     * This just sets the $iv static variable.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return void
-     */
-    public static function pseudoConstructor()
-    {
-        static $called = false;
-        if ($called) {
-            return;
-        }
-        self::$iv = new SplFixedArray(8);
-        self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
-        self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
-        self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
-        self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
-        self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
-        self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
-        self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
-        self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
-
-        $called = true;
-    }
-
-    /**
-     * Returns a fresh BLAKE2 context.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return SplFixedArray
-     */
-    protected static function context()
-    {
-        $ctx    = new SplFixedArray(5);
-        $ctx[0] = new SplFixedArray(8);   // h
-        $ctx[1] = new SplFixedArray(2);   // t
-        $ctx[2] = new SplFixedArray(2);   // f
-        $ctx[3] = new SplFixedArray(256); // buf
-        $ctx[4] = 0;                      // buflen
-
-        for ($i = 8; $i--;) {
-            $ctx[0][$i] = self::$iv[$i];
-        }
-        for ($i = 256; $i--;) {
-            $ctx[3][$i] = 0;
-        }
-
-        $zero = self::new64(0, 0);
-        $ctx[1][0] = $zero;
-        $ctx[1][1] = $zero;
-        $ctx[2][0] = $zero;
-        $ctx[2][1] = $zero;
-
-        return $ctx;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param SplFixedArray $buf
-     * @return void
-     */
-    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
-    {
-        $m = new SplFixedArray(16);
-        $v = new SplFixedArray(16);
-
-        for ($i = 16; $i--;) {
-            $m[$i] = self::load64($buf, $i << 3);
-        }
-
-        for ($i = 8; $i--;) {
-            $v[$i] = $ctx[0][$i];
-        }
-
-        $v[ 8] = self::$iv[0];
-        $v[ 9] = self::$iv[1];
-        $v[10] = self::$iv[2];
-        $v[11] = self::$iv[3];
-
-        $v[12] = self::xor64($ctx[1][0], self::$iv[4]);
-        $v[13] = self::xor64($ctx[1][1], self::$iv[5]);
-        $v[14] = self::xor64($ctx[2][0], self::$iv[6]);
-        $v[15] = self::xor64($ctx[2][1], self::$iv[7]);
-
-        for ($r = 0; $r < 12; ++$r) {
-            $v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
-            $v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
-            $v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
-            $v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
-            $v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
-            $v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
-            $v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
-            $v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
-        }
-
-        for ($i = 8; $i--;) {
-            $ctx[0][$i] = self::xor64(
-                $ctx[0][$i], self::xor64($v[$i], $v[$i+8])
-            );
-        }
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $r
-     * @param int $i
-     * @param int $a
-     * @param int $b
-     * @param int $c
-     * @param int $d
-     * @param SplFixedArray $v
-     * @param SplFixedArray $m
-     * @return SplFixedArray
-     */
-    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
-    {
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
-        return $v;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param int $inc
-     * @return void
-     * @throws Error
-     */
-    public static function increment_counter($ctx, $inc)
-    {
-        if ($inc < 0) {
-            throw new Error('Increasing by a negative number makes no sense.');
-        }
-        $t = self::to64($inc);
-        # S->t is $ctx[1] in our implementation
-
-        # S->t[0] = ( uint64_t )( t >> 0 );
-        $ctx[1][0] = self::add64($ctx[1][0], $t);
-
-        # S->t[1] += ( S->t[0] < inc );
-        if (self::flatten64($ctx[1][0]) < $inc) {
-            $ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
-        }
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param SplFixedArray $p
-     * @param int $plen
-     * @return void
-     */
-    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
-    {
-        self::pseudoConstructor();
-
-        $offset = 0;
-        while ($plen > 0) {
-            $left = $ctx[4];
-            $fill = 256 - $left;
-
-            if ($plen > $fill) {
-                # memcpy( S->buf + left, in, fill ); /* Fill buffer */
-                for ($i = $fill; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
-                }
-
-                # S->buflen += fill;
-                $ctx[4] += $fill;
-
-                # blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
-                self::increment_counter($ctx, 128);
-
-                # blake2b_compress( S, S->buf ); /* Compress */
-                self::compress($ctx, $ctx[3]);
-
-                # memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
-                for ($i = 128; $i--;) {
-                    $ctx[3][$i] = $ctx[3][$i + 128];
-                }
-
-                # S->buflen -= BLAKE2B_BLOCKBYTES;
-                $ctx[4] -= 128;
-
-                # in += fill;
-                $offset += $fill;
-
-                # inlen -= fill;
-                $plen -= $fill;
-            } else {
-                for ($i = $plen; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
-                }
-                $ctx[4] += $plen;
-                $offset += $plen;
-                $plen -= $plen;
-            }
-        }
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param SplFixedArray $out
-     * @return SplFixedArray
-     * @throws Error
-     */
-    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
-    {
-        self::pseudoConstructor();
-        if ($ctx[4] > 128) {
-            self::increment_counter($ctx, 128);
-            self::compress($ctx, $ctx[3]);
-            $ctx[4] -= 128;
-            if ($ctx[4] > 128) {
-                throw new Error('Failed to assert that buflen <= 128 bytes');
-            }
-            for ($i = $ctx[4]; $i--;) {
-                $ctx[3][$i] = $ctx[3][$i + 128];
-            }
-        }
-
-        self::increment_counter($ctx, $ctx[4]);
-        $ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
-
-        for ($i = 256 - $ctx[4]; $i--;) {
-            $ctx[3][$i+$ctx[4]] = 0;
-        }
-
-        self::compress($ctx, $ctx[3]);
-
-        $i = (int) (($out->getSize() - 1) / 8);
-        for (; $i >= 0; --$i) {
-            self::store64($out, $i << 3, $ctx[0][$i]);
-        }
-        return $out;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray|null $key
-     * @param int $outlen
-     * @return SplFixedArray
-     * @throws Exception
-     */
-    public static function init($key = null, $outlen = 64)
-    {
-        self::pseudoConstructor();
-        $klen = 0;
-
-        if ($key !== null) {
-            if (count($key) > 64) {
-                throw new Exception('Invalid key size');
-            }
-            $klen = count($key);
-        }
-
-        if ($outlen > 64) {
-            throw new Exception('Invalid output size');
-        }
-
-        $ctx = self::context();
-
-        $p = new SplFixedArray(64);
-        for ($i = 64; --$i;) {
-            $p[$i] = 0;
-        }
-
-        $p[0] = $outlen; // digest_length
-        $p[1] = $klen;   // key_length
-        $p[2] = 1;       // fanout
-        $p[3] = 1;       // depth
-
-        $ctx[0][0] = self::xor64(
-            $ctx[0][0],
-            self::load64($p, 0)
-        );
-
-        if ($klen > 0 && $key instanceof SplFixedArray) {
-            $block = new SplFixedArray(128);
-            for ($i = 128; $i--;) {
-                $block[$i] = 0;
-            }
-            for ($i = $klen; $i--;) {
-                $block[$i] = $key[$i];
-            }
-            self::update($ctx, $block, 128);
-        }
-
-        return $ctx;
-    }
-
-    /**
-     * Convert a string into an SplFixedArray of integers
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $str
-     * @return SplFixedArray
-     */
-    public static function stringToSplFixedArray($str = '')
-    {
-        $values = unpack('C*', $str);
-        return SplFixedArray::fromArray(array_values($values));
-    }
-
-    /**
-     * Convert an SplFixedArray of integers into a string
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $a
-     * @return string
-     */
-    public static function SplFixedArrayToString(SplFixedArray $a)
-    {
-        /**
-         * @var array<mixed, int>
-         */
-        $arr = $a->toArray();
-        $c = $a->count();
-        array_unshift($arr, str_repeat('C', $c));
-        return call_user_func_array('pack', $arr);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray[SplFixedArray] $ctx
-     * @return string
-     */
-    public static function contextToString(SplFixedArray $ctx)
-    {
-        $str = '';
-        $ctxA = $ctx[0]->toArray();
-
-        # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
-            $str .= self::store32_le($ctxA[$i][1]);
-            $str .= self::store32_le($ctxA[$i][0]);
-        }
-
-        # uint64_t t[2];
-        # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
-            $ctxA = $ctx[$i]->toArray();
-            $str .= self::store32_le($ctxA[0][1]);
-            $str .= self::store32_le($ctxA[0][0]);
-            $str .= self::store32_le($ctxA[1][1]);
-            $str .= self::store32_le($ctxA[1][0]);
-        }
-
-        # uint8_t buf[2 * 128];
-        $str .= self::SplFixedArrayToString($ctx[3]);
-
-        # size_t buflen;
-        $str .= implode('', array(
-            self::intToChr($ctx[4] & 0xff),
-            self::intToChr(($ctx[4] >> 8) & 0xff),
-            self::intToChr(($ctx[4] >> 16) & 0xff),
-            self::intToChr(($ctx[4] >> 24) & 0xff),
-            self::intToChr(($ctx[4] >> 32) & 0xff),
-            self::intToChr(($ctx[4] >> 40) & 0xff),
-            self::intToChr(($ctx[4] >> 48) & 0xff),
-            self::intToChr(($ctx[4] >> 56) & 0xff)
-        ));
-        # uint8_t last_node;
-        return $str . "\x00";
-    }
-
-    /**
-     * Creates an SplFixedArray containing other SplFixedArray elements, from
-     * a string (compatible with \Sodium\crypto_generichash_{init, update, final})
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $string
-     * @return SplFixedArray
-     */
-    public static function stringToContext($string)
-    {
-        $ctx = self::context();
-
-        # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
-            $ctx[0][$i] = SplFixedArray::fromArray(
-                array(
-                    self::load_4(
-                        self::substr($string, (($i << 3) + 4), 4)
-                    ),
-                    self::load_4(
-                        self::substr($string, (($i << 3) + 0), 4)
-                    )
-                )
-            );
-        }
-
-        # uint64_t t[2];
-        # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
-            $ctx[$i][1] = SplFixedArray::fromArray(
-                array(
-                    self::load_4(self::substr($string, 76 + (($i - 1) << 4), 4)),
-                    self::load_4(self::substr($string, 72 + (($i - 1) << 4), 4))
-                )
-            );
-            $ctx[$i][0] = SplFixedArray::fromArray(
-                array(
-                    self::load_4(self::substr($string, 68 + (($i - 1) << 4), 4)),
-                    self::load_4(self::substr($string, 64 + (($i - 1) << 4), 4))
-                )
-            );
-        }
-
-        # uint8_t buf[2 * 128];
-        $ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
-
-
-        # uint8_t buf[2 * 128];
-        $int = 0;
-        for ($i = 0; $i < 8; ++$i) {
-            $int |= self::chrToInt($string[352 + $i]) << ($i << 3);
-        }
-        $ctx[4] = $int;
-
-        return $ctx;
-    }
+			$uIdx = ((7 - $j) & 4) >> 2;
+			$x[$i]   = ($u[$uIdx] & 0xff);
+			if (++$i > $maxLength) {
+				return;
+			}
+			$u[$uIdx] >>= 8;
+		}
+	}
+
+	/**
+	 * This just sets the $iv static variable.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return void
+	 */
+	public static function pseudoConstructor()
+	{
+		static $called = false;
+		if ($called) {
+			return;
+		}
+		self::$iv = new SplFixedArray(8);
+		self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
+		self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
+		self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
+		self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
+		self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
+		self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
+		self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
+		self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
+
+		$called = true;
+	}
+
+	/**
+	 * Returns a fresh BLAKE2 context.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return SplFixedArray
+	 */
+	protected static function context()
+	{
+		$ctx    = new SplFixedArray(5);
+		$ctx[0] = new SplFixedArray(8);   // h
+		$ctx[1] = new SplFixedArray(2);   // t
+		$ctx[2] = new SplFixedArray(2);   // f
+		$ctx[3] = new SplFixedArray(256); // buf
+		$ctx[4] = 0;                      // buflen
+
+		for ($i = 8; $i--;) {
+			$ctx[0][$i] = self::$iv[$i];
+		}
+		for ($i = 256; $i--;) {
+			$ctx[3][$i] = 0;
+		}
+
+		$zero = self::new64(0, 0);
+		$ctx[1][0] = $zero;
+		$ctx[1][1] = $zero;
+		$ctx[2][0] = $zero;
+		$ctx[2][1] = $zero;
+
+		return $ctx;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $ctx
+	 * @param SplFixedArray $buf
+	 * @return void
+	 */
+	protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
+	{
+		$m = new SplFixedArray(16);
+		$v = new SplFixedArray(16);
+
+		for ($i = 16; $i--;) {
+			$m[$i] = self::load64($buf, $i << 3);
+		}
+
+		for ($i = 8; $i--;) {
+			$v[$i] = $ctx[0][$i];
+		}
+
+		$v[ 8] = self::$iv[0];
+		$v[ 9] = self::$iv[1];
+		$v[10] = self::$iv[2];
+		$v[11] = self::$iv[3];
+
+		$v[12] = self::xor64($ctx[1][0], self::$iv[4]);
+		$v[13] = self::xor64($ctx[1][1], self::$iv[5]);
+		$v[14] = self::xor64($ctx[2][0], self::$iv[6]);
+		$v[15] = self::xor64($ctx[2][1], self::$iv[7]);
+
+		for ($r = 0; $r < 12; ++$r) {
+			$v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
+			$v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
+			$v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
+			$v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
+			$v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
+			$v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
+			$v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
+			$v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
+		}
+
+		for ($i = 8; $i--;) {
+			$ctx[0][$i] = self::xor64(
+				$ctx[0][$i], self::xor64($v[$i], $v[$i+8])
+			);
+		}
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $r
+	 * @param int $i
+	 * @param int $a
+	 * @param int $b
+	 * @param int $c
+	 * @param int $d
+	 * @param SplFixedArray $v
+	 * @param SplFixedArray $m
+	 * @return SplFixedArray
+	 */
+	public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
+	{
+		$v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
+		$v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
+		$v[$c] = self::add64($v[$c], $v[$d]);
+		$v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
+		$v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
+		$v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
+		$v[$c] = self::add64($v[$c], $v[$d]);
+		$v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
+		return $v;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $ctx
+	 * @param int $inc
+	 * @return void
+	 * @throws Error
+	 */
+	public static function increment_counter($ctx, $inc)
+	{
+		if ($inc < 0) {
+			throw new Error('Increasing by a negative number makes no sense.');
+		}
+		$t = self::to64($inc);
+		# S->t is $ctx[1] in our implementation
+
+		# S->t[0] = ( uint64_t )( t >> 0 );
+		$ctx[1][0] = self::add64($ctx[1][0], $t);
+
+		# S->t[1] += ( S->t[0] < inc );
+		if (self::flatten64($ctx[1][0]) < $inc) {
+			$ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
+		}
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $ctx
+	 * @param SplFixedArray $p
+	 * @param int $plen
+	 * @return void
+	 */
+	public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
+	{
+		self::pseudoConstructor();
+
+		$offset = 0;
+		while ($plen > 0) {
+			$left = $ctx[4];
+			$fill = 256 - $left;
+
+			if ($plen > $fill) {
+				# memcpy( S->buf + left, in, fill ); /* Fill buffer */
+				for ($i = $fill; $i--;) {
+					$ctx[3][$i + $left] = $p[$i + $offset];
+				}
+
+				# S->buflen += fill;
+				$ctx[4] += $fill;
+
+				# blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
+				self::increment_counter($ctx, 128);
+
+				# blake2b_compress( S, S->buf ); /* Compress */
+				self::compress($ctx, $ctx[3]);
+
+				# memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
+				for ($i = 128; $i--;) {
+					$ctx[3][$i] = $ctx[3][$i + 128];
+				}
+
+				# S->buflen -= BLAKE2B_BLOCKBYTES;
+				$ctx[4] -= 128;
+
+				# in += fill;
+				$offset += $fill;
+
+				# inlen -= fill;
+				$plen -= $fill;
+			} else {
+				for ($i = $plen; $i--;) {
+					$ctx[3][$i + $left] = $p[$i + $offset];
+				}
+				$ctx[4] += $plen;
+				$offset += $plen;
+				$plen -= $plen;
+			}
+		}
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $ctx
+	 * @param SplFixedArray $out
+	 * @return SplFixedArray
+	 * @throws Error
+	 */
+	public static function finish(SplFixedArray $ctx, SplFixedArray $out)
+	{
+		self::pseudoConstructor();
+		if ($ctx[4] > 128) {
+			self::increment_counter($ctx, 128);
+			self::compress($ctx, $ctx[3]);
+			$ctx[4] -= 128;
+			if ($ctx[4] > 128) {
+				throw new Error('Failed to assert that buflen <= 128 bytes');
+			}
+			for ($i = $ctx[4]; $i--;) {
+				$ctx[3][$i] = $ctx[3][$i + 128];
+			}
+		}
+
+		self::increment_counter($ctx, $ctx[4]);
+		$ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
+
+		for ($i = 256 - $ctx[4]; $i--;) {
+			$ctx[3][$i+$ctx[4]] = 0;
+		}
+
+		self::compress($ctx, $ctx[3]);
+
+		$i = (int) (($out->getSize() - 1) / 8);
+		for (; $i >= 0; --$i) {
+			self::store64($out, $i << 3, $ctx[0][$i]);
+		}
+		return $out;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray|null $key
+	 * @param int $outlen
+	 * @return SplFixedArray
+	 * @throws Exception
+	 */
+	public static function init($key = null, $outlen = 64)
+	{
+		self::pseudoConstructor();
+		$klen = 0;
+
+		if ($key !== null) {
+			if (count($key) > 64) {
+				throw new Exception('Invalid key size');
+			}
+			$klen = count($key);
+		}
+
+		if ($outlen > 64) {
+			throw new Exception('Invalid output size');
+		}
+
+		$ctx = self::context();
+
+		$p = new SplFixedArray(64);
+		for ($i = 64; --$i;) {
+			$p[$i] = 0;
+		}
+
+		$p[0] = $outlen; // digest_length
+		$p[1] = $klen;   // key_length
+		$p[2] = 1;       // fanout
+		$p[3] = 1;       // depth
+
+		$ctx[0][0] = self::xor64(
+			$ctx[0][0],
+			self::load64($p, 0)
+		);
+
+		if ($klen > 0 && $key instanceof SplFixedArray) {
+			$block = new SplFixedArray(128);
+			for ($i = 128; $i--;) {
+				$block[$i] = 0;
+			}
+			for ($i = $klen; $i--;) {
+				$block[$i] = $key[$i];
+			}
+			self::update($ctx, $block, 128);
+		}
+
+		return $ctx;
+	}
+
+	/**
+	 * Convert a string into an SplFixedArray of integers
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $str
+	 * @return SplFixedArray
+	 */
+	public static function stringToSplFixedArray($str = '')
+	{
+		$values = unpack('C*', $str);
+		return SplFixedArray::fromArray(array_values($values));
+	}
+
+	/**
+	 * Convert an SplFixedArray of integers into a string
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $a
+	 * @return string
+	 */
+	public static function SplFixedArrayToString(SplFixedArray $a)
+	{
+		/**
+		 * @var array<mixed, int>
+		 */
+		$arr = $a->toArray();
+		$c = $a->count();
+		array_unshift($arr, str_repeat('C', $c));
+		return call_user_func_array('pack', $arr);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray[SplFixedArray] $ctx
+	 * @return string
+	 */
+	public static function contextToString(SplFixedArray $ctx)
+	{
+		$str = '';
+		$ctxA = $ctx[0]->toArray();
+
+		# uint64_t h[8];
+		for ($i = 0; $i < 8; ++$i) {
+			$str .= self::store32_le($ctxA[$i][1]);
+			$str .= self::store32_le($ctxA[$i][0]);
+		}
+
+		# uint64_t t[2];
+		# uint64_t f[2];
+		for ($i = 1; $i < 3; ++$i) {
+			$ctxA = $ctx[$i]->toArray();
+			$str .= self::store32_le($ctxA[0][1]);
+			$str .= self::store32_le($ctxA[0][0]);
+			$str .= self::store32_le($ctxA[1][1]);
+			$str .= self::store32_le($ctxA[1][0]);
+		}
+
+		# uint8_t buf[2 * 128];
+		$str .= self::SplFixedArrayToString($ctx[3]);
+
+		# size_t buflen;
+		$str .= implode('', array(
+			self::intToChr($ctx[4] & 0xff),
+			self::intToChr(($ctx[4] >> 8) & 0xff),
+			self::intToChr(($ctx[4] >> 16) & 0xff),
+			self::intToChr(($ctx[4] >> 24) & 0xff),
+			self::intToChr(($ctx[4] >> 32) & 0xff),
+			self::intToChr(($ctx[4] >> 40) & 0xff),
+			self::intToChr(($ctx[4] >> 48) & 0xff),
+			self::intToChr(($ctx[4] >> 56) & 0xff)
+		));
+		# uint8_t last_node;
+		return $str . "\x00";
+	}
+
+	/**
+	 * Creates an SplFixedArray containing other SplFixedArray elements, from
+	 * a string (compatible with \Sodium\crypto_generichash_{init, update, final})
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $string
+	 * @return SplFixedArray
+	 */
+	public static function stringToContext($string)
+	{
+		$ctx = self::context();
+
+		# uint64_t h[8];
+		for ($i = 0; $i < 8; ++$i) {
+			$ctx[0][$i] = SplFixedArray::fromArray(
+				array(
+					self::load_4(
+						self::substr($string, (($i << 3) + 4), 4)
+					),
+					self::load_4(
+						self::substr($string, (($i << 3) + 0), 4)
+					)
+				)
+			);
+		}
+
+		# uint64_t t[2];
+		# uint64_t f[2];
+		for ($i = 1; $i < 3; ++$i) {
+			$ctx[$i][1] = SplFixedArray::fromArray(
+				array(
+					self::load_4(self::substr($string, 76 + (($i - 1) << 4), 4)),
+					self::load_4(self::substr($string, 72 + (($i - 1) << 4), 4))
+				)
+			);
+			$ctx[$i][0] = SplFixedArray::fromArray(
+				array(
+					self::load_4(self::substr($string, 68 + (($i - 1) << 4), 4)),
+					self::load_4(self::substr($string, 64 + (($i - 1) << 4), 4))
+				)
+			);
+		}
+
+		# uint8_t buf[2 * 128];
+		$ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
+
+
+		# uint8_t buf[2 * 128];
+		$int = 0;
+		for ($i = 0; $i < 8; ++$i) {
+			$int |= self::chrToInt($string[352 + $i]) << ($i << 3);
+		}
+		$ctx[4] = $int;
+
+		return $ctx;
+	}
 }

Spacing +195 added lines, -195 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_BLAKE2b', false ) ) {
     return;
 }
 
@@ -20,18 +20,18 @@ 
      * @var int[][]
      */
     protected static $sigma = array(
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
-        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
-        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
-        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
-        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
-        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
-        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
-        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
-        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
+        array( 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ),
+        array( 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 ),
+        array( 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 ),
+        array( 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 ),
+        array( 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 ),
+        array( 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 ),
+        array( 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 ),
+        array( 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 ),
+        array( 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 ),
+        array( 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 ),
+        array( 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ),
+        array( 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 )
     );
 
     const BLOCKBYTES = 128;
@@ -47,9 +47,9 @@ 
      * @param int $low
      * @return SplFixedArray
      */
-    public static function new64($high, $low)
+    public static function new64( $high, $low )
     {
-        $i64 = new SplFixedArray(2);
+        $i64 = new SplFixedArray( 2 );
         $i64[0] = $high & 0xffffffff;
         $i64[1] = $low & 0xffffffff;
         return $i64;
@@ -64,10 +64,10 @@ 
      * @param int $num
      * @return SplFixedArray
      */
-    protected static function to64($num)
+    protected static function to64( $num )
     {
-        list($hi, $lo) = self::numericTo64BitInteger($num);
-        return self::new64($hi, $lo);
+        list( $hi, $lo ) = self::numericTo64BitInteger( $num );
+        return self::new64( $hi, $lo );
     }
 
     /**
@@ -80,12 +80,12 @@ 
      * @param SplFixedArray $y
      * @return SplFixedArray
      */
-    protected static function add64($x, $y)
+    protected static function add64( $x, $y )
     {
-        $l = ($x[1] + $y[1]) & 0xffffffff;
+        $l = ( $x[1] + $y[1] ) & 0xffffffff;
         return self::new64(
             $x[0] + $y[0] + (
-                ($l < $x[1]) ? 1 : 0
+                ( $l < $x[1] ) ? 1 : 0
             ),
             $l
         );
@@ -99,9 +99,9 @@ 
      * @param SplFixedArray $z
      * @return SplFixedArray
      */
-    protected static function add364($x, $y, $z)
+    protected static function add364( $x, $y, $z )
     {
-        return self::add64($x, self::add64($y, $z));
+        return self::add64( $x, self::add64( $y, $z ) );
     }
 
     /**
@@ -112,21 +112,21 @@ 
      * @return SplFixedArray
      * @throws Exception
      */
-    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
+    protected static function xor64( SplFixedArray $x, SplFixedArray $y )
     {
-        if (!is_numeric($x[0])) {
-            throw new Exception('x[0] is not an integer');
+        if ( ! is_numeric( $x[0] ) ) {
+            throw new Exception( 'x[0] is not an integer' );
         }
-        if (!is_numeric($x[1])) {
-            throw new Exception('x[1] is not an integer');
+        if ( ! is_numeric( $x[1] ) ) {
+            throw new Exception( 'x[1] is not an integer' );
         }
-        if (!is_numeric($y[0])) {
-            throw new Exception('y[0] is not an integer');
+        if ( ! is_numeric( $y[0] ) ) {
+            throw new Exception( 'y[0] is not an integer' );
         }
-        if (!is_numeric($y[1])) {
-            throw new Exception('y[1] is not an integer');
+        if ( ! is_numeric( $y[1] ) ) {
+            throw new Exception( 'y[1] is not an integer' );
         }
-        return self::new64($x[0] ^ $y[0], $x[1] ^ $y[1]);
+        return self::new64( $x[0] ^ $y[0], $x[1] ^ $y[1] );
     }
 
     /**
@@ -136,48 +136,48 @@ 
      * @param int $c
      * @return SplFixedArray
      */
-    public static function rotr64($x, $c)
+    public static function rotr64( $x, $c )
     {
-        if ($c >= 64) {
+        if ( $c >= 64 ) {
             $c %= 64;
         }
-        if ($c >= 32) {
+        if ( $c >= 32 ) {
             $tmp = $x[0];
             $x[0] = $x[1];
             $x[1] = $tmp;
             $c -= 32;
         }
-        if ($c === 0) {
+        if ( $c === 0 ) {
             return $x;
         }
 
         $l0 = 0;
         $c = 64 - $c;
 
-        if ($c < 32) {
-            $h0 = ($x[0] << $c) | (
+        if ( $c < 32 ) {
+            $h0 = ( $x[0] << $c ) | (
                 (
-                    $x[1] & ((1 << $c) - 1)
+                    $x[1] & ( ( 1 << $c ) - 1 )
                         <<
-                    (32 - $c)
-                ) >> (32 - $c)
+                    ( 32 - $c )
+                ) >> ( 32 - $c )
             );
             $l0 = $x[1] << $c;
         } else {
-            $h0 = $x[1] << ($c - 32);
+            $h0 = $x[1] << ( $c - 32 );
         }
 
         $h1 = 0;
         $c1 = 64 - $c;
 
-        if ($c1 < 32) {
+        if ( $c1 < 32 ) {
             $h1 = $x[0] >> $c1;
-            $l1 = ($x[1] >> $c1) | ($x[0] & ((1 << $c1) - 1)) << (32 - $c1);
+            $l1 = ( $x[1] >> $c1 ) | ( $x[0] & ( ( 1 << $c1 ) - 1 ) ) << ( 32 - $c1 );
         } else {
-            $l1 = $x[0] >> ($c1 - 32);
+            $l1 = $x[0] >> ( $c1 - 32 );
         }
 
-        return self::new64($h0 | $h1, $l0 | $l1);
+        return self::new64( $h0 | $h1, $l0 | $l1 );
     }
 
     /**
@@ -186,9 +186,9 @@ 
      * @param SplFixedArray $x
      * @return int
      */
-    protected static function flatten64($x)
+    protected static function flatten64( $x )
     {
-        return ($x[0] * 4294967296 + $x[1]);
+        return ( $x[0] * 4294967296 + $x[1] );
     }
 
     /**
@@ -198,11 +198,11 @@ 
      * @param int $i
      * @return SplFixedArray
      */
-    protected static function load64(SplFixedArray $x, $i)
+    protected static function load64( SplFixedArray $x, $i )
     {
-        $l = $x[$i]   | ($x[$i+1]<<8) | ($x[$i+2]<<16) | ($x[$i+3]<<24);
-        $h = $x[$i+4] | ($x[$i+5]<<8) | ($x[$i+6]<<16) | ($x[$i+7]<<24);
-        return self::new64($h, $l);
+        $l = $x[$i] | ( $x[$i + 1] << 8 ) | ( $x[$i + 2] << 16 ) | ( $x[$i + 3] << 24 );
+        $h = $x[$i + 4] | ( $x[$i + 5] << 8 ) | ( $x[$i + 6] << 16 ) | ( $x[$i + 7] << 24 );
+        return self::new64( $h, $l );
     }
 
     /**
@@ -213,17 +213,17 @@ 
      * @param SplFixedArray $u
      * @return void
      */
-    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
+    protected static function store64( SplFixedArray $x, $i, SplFixedArray $u )
     {
         $maxLength = $x->getSize() - 1;
-        for ($j = 0; $j < 8; ++$j) {
+        for ( $j = 0; $j < 8; ++$j ) {
             /*
                [0, 1, 2, 3, 4, 5, 6, 7]
                     ... becomes ...
                [0, 0, 0, 0, 1, 1, 1, 1]
             */
-            $uIdx = ((7 - $j) & 4) >> 2;
-            $x[$i]   = ($u[$uIdx] & 0xff);
+            $uIdx = ( ( 7 - $j ) & 4 ) >> 2;
+            $x[$i] = ( $u[$uIdx] & 0xff );
             if (++$i > $maxLength) {
                 return;
             }
@@ -241,18 +241,18 @@ 
     public static function pseudoConstructor()
     {
         static $called = false;
-        if ($called) {
+        if ( $called ) {
             return;
         }
-        self::$iv = new SplFixedArray(8);
-        self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
-        self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
-        self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
-        self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
-        self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
-        self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
-        self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
-        self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
+        self::$iv = new SplFixedArray( 8 );
+        self::$iv[0] = self::new64( 0x6a09e667, 0xf3bcc908 );
+        self::$iv[1] = self::new64( 0xbb67ae85, 0x84caa73b );
+        self::$iv[2] = self::new64( 0x3c6ef372, 0xfe94f82b );
+        self::$iv[3] = self::new64( 0xa54ff53a, 0x5f1d36f1 );
+        self::$iv[4] = self::new64( 0x510e527f, 0xade682d1 );
+        self::$iv[5] = self::new64( 0x9b05688c, 0x2b3e6c1f );
+        self::$iv[6] = self::new64( 0x1f83d9ab, 0xfb41bd6b );
+        self::$iv[7] = self::new64( 0x5be0cd19, 0x137e2179 );
 
         $called = true;
     }
@@ -266,21 +266,21 @@ 
      */
     protected static function context()
     {
-        $ctx    = new SplFixedArray(5);
-        $ctx[0] = new SplFixedArray(8);   // h
-        $ctx[1] = new SplFixedArray(2);   // t
-        $ctx[2] = new SplFixedArray(2);   // f
-        $ctx[3] = new SplFixedArray(256); // buf
-        $ctx[4] = 0;                      // buflen
-
-        for ($i = 8; $i--;) {
+        $ctx    = new SplFixedArray( 5 );
+        $ctx[0] = new SplFixedArray( 8 ); // h
+        $ctx[1] = new SplFixedArray( 2 ); // t
+        $ctx[2] = new SplFixedArray( 2 ); // f
+        $ctx[3] = new SplFixedArray( 256 ); // buf
+        $ctx[4] = 0; // buflen
+
+        for ( $i = 8; $i--; ) {
             $ctx[0][$i] = self::$iv[$i];
         }
-        for ($i = 256; $i--;) {
+        for ( $i = 256; $i--; ) {
             $ctx[3][$i] = 0;
         }
 
-        $zero = self::new64(0, 0);
+        $zero = self::new64( 0, 0 );
         $ctx[1][0] = $zero;
         $ctx[1][1] = $zero;
         $ctx[2][0] = $zero;
@@ -296,43 +296,43 @@ 
      * @param SplFixedArray $buf
      * @return void
      */
-    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
+    protected static function compress( SplFixedArray $ctx, SplFixedArray $buf )
     {
-        $m = new SplFixedArray(16);
-        $v = new SplFixedArray(16);
+        $m = new SplFixedArray( 16 );
+        $v = new SplFixedArray( 16 );
 
-        for ($i = 16; $i--;) {
-            $m[$i] = self::load64($buf, $i << 3);
+        for ( $i = 16; $i--; ) {
+            $m[$i] = self::load64( $buf, $i << 3 );
         }
 
-        for ($i = 8; $i--;) {
+        for ( $i = 8; $i--; ) {
             $v[$i] = $ctx[0][$i];
         }
 
-        $v[ 8] = self::$iv[0];
-        $v[ 9] = self::$iv[1];
+        $v[8] = self::$iv[0];
+        $v[9] = self::$iv[1];
         $v[10] = self::$iv[2];
         $v[11] = self::$iv[3];
 
-        $v[12] = self::xor64($ctx[1][0], self::$iv[4]);
-        $v[13] = self::xor64($ctx[1][1], self::$iv[5]);
-        $v[14] = self::xor64($ctx[2][0], self::$iv[6]);
-        $v[15] = self::xor64($ctx[2][1], self::$iv[7]);
+        $v[12] = self::xor64( $ctx[1][0], self::$iv[4] );
+        $v[13] = self::xor64( $ctx[1][1], self::$iv[5] );
+        $v[14] = self::xor64( $ctx[2][0], self::$iv[6] );
+        $v[15] = self::xor64( $ctx[2][1], self::$iv[7] );
 
-        for ($r = 0; $r < 12; ++$r) {
-            $v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
-            $v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
-            $v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
-            $v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
-            $v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
-            $v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
-            $v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
-            $v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
+        for ( $r = 0; $r < 12; ++$r ) {
+            $v = self::G( $r, 0, 0, 4, 8, 12, $v, $m );
+            $v = self::G( $r, 1, 1, 5, 9, 13, $v, $m );
+            $v = self::G( $r, 2, 2, 6, 10, 14, $v, $m );
+            $v = self::G( $r, 3, 3, 7, 11, 15, $v, $m );
+            $v = self::G( $r, 4, 0, 5, 10, 15, $v, $m );
+            $v = self::G( $r, 5, 1, 6, 11, 12, $v, $m );
+            $v = self::G( $r, 6, 2, 7, 8, 13, $v, $m );
+            $v = self::G( $r, 7, 3, 4, 9, 14, $v, $m );
         }
 
-        for ($i = 8; $i--;) {
+        for ( $i = 8; $i--; ) {
             $ctx[0][$i] = self::xor64(
-                $ctx[0][$i], self::xor64($v[$i], $v[$i+8])
+                $ctx[0][$i], self::xor64( $v[$i], $v[$i + 8] )
             );
         }
     }
@@ -350,16 +350,16 @@ 
      * @param SplFixedArray $m
      * @return SplFixedArray
      */
-    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
+    public static function G( $r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m )
     {
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
+        $v[$a] = self::add364( $v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]] );
+        $v[$d] = self::rotr64( self::xor64( $v[$d], $v[$a] ), 32 );
+        $v[$c] = self::add64( $v[$c], $v[$d] );
+        $v[$b] = self::rotr64( self::xor64( $v[$b], $v[$c] ), 24 );
+        $v[$a] = self::add364( $v[$a], $v[$b], $m[self::$sigma[$r][( $i << 1 ) + 1]] );
+        $v[$d] = self::rotr64( self::xor64( $v[$d], $v[$a] ), 16 );
+        $v[$c] = self::add64( $v[$c], $v[$d] );
+        $v[$b] = self::rotr64( self::xor64( $v[$b], $v[$c] ), 63 );
         return $v;
     }
 
@@ -371,20 +371,20 @@ 
      * @return void
      * @throws Error
      */
-    public static function increment_counter($ctx, $inc)
+    public static function increment_counter( $ctx, $inc )
     {
-        if ($inc < 0) {
-            throw new Error('Increasing by a negative number makes no sense.');
+        if ( $inc < 0 ) {
+            throw new Error( 'Increasing by a negative number makes no sense.' );
         }
-        $t = self::to64($inc);
+        $t = self::to64( $inc );
         # S->t is $ctx[1] in our implementation
 
         # S->t[0] = ( uint64_t )( t >> 0 );
-        $ctx[1][0] = self::add64($ctx[1][0], $t);
+        $ctx[1][0] = self::add64( $ctx[1][0], $t );
 
         # S->t[1] += ( S->t[0] < inc );
-        if (self::flatten64($ctx[1][0]) < $inc) {
-            $ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
+        if ( self::flatten64( $ctx[1][0] ) < $inc ) {
+            $ctx[1][1] = self::add64( $ctx[1][1], self::to64( 1 ) );
         }
     }
 
@@ -396,18 +396,18 @@ 
      * @param int $plen
      * @return void
      */
-    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
+    public static function update( SplFixedArray $ctx, SplFixedArray $p, $plen )
     {
         self::pseudoConstructor();
 
         $offset = 0;
-        while ($plen > 0) {
+        while ( $plen > 0 ) {
             $left = $ctx[4];
             $fill = 256 - $left;
 
-            if ($plen > $fill) {
+            if ( $plen > $fill ) {
                 # memcpy( S->buf + left, in, fill ); /* Fill buffer */
-                for ($i = $fill; $i--;) {
+                for ( $i = $fill; $i--; ) {
                     $ctx[3][$i + $left] = $p[$i + $offset];
                 }
 
@@ -415,13 +415,13 @@ 
                 $ctx[4] += $fill;
 
                 # blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
-                self::increment_counter($ctx, 128);
+                self::increment_counter( $ctx, 128 );
 
                 # blake2b_compress( S, S->buf ); /* Compress */
-                self::compress($ctx, $ctx[3]);
+                self::compress( $ctx, $ctx[3] );
 
                 # memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
-                for ($i = 128; $i--;) {
+                for ( $i = 128; $i--; ) {
                     $ctx[3][$i] = $ctx[3][$i + 128];
                 }
 
@@ -434,7 +434,7 @@ 
                 # inlen -= fill;
                 $plen -= $fill;
             } else {
-                for ($i = $plen; $i--;) {
+                for ( $i = $plen; $i--; ) {
                     $ctx[3][$i + $left] = $p[$i + $offset];
                 }
                 $ctx[4] += $plen;
@@ -452,33 +452,33 @@ 
      * @return SplFixedArray
      * @throws Error
      */
-    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
+    public static function finish( SplFixedArray $ctx, SplFixedArray $out )
     {
         self::pseudoConstructor();
-        if ($ctx[4] > 128) {
-            self::increment_counter($ctx, 128);
-            self::compress($ctx, $ctx[3]);
+        if ( $ctx[4] > 128 ) {
+            self::increment_counter( $ctx, 128 );
+            self::compress( $ctx, $ctx[3] );
             $ctx[4] -= 128;
-            if ($ctx[4] > 128) {
-                throw new Error('Failed to assert that buflen <= 128 bytes');
+            if ( $ctx[4] > 128 ) {
+                throw new Error( 'Failed to assert that buflen <= 128 bytes' );
             }
-            for ($i = $ctx[4]; $i--;) {
+            for ( $i = $ctx[4]; $i--; ) {
                 $ctx[3][$i] = $ctx[3][$i + 128];
             }
         }
 
-        self::increment_counter($ctx, $ctx[4]);
-        $ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
+        self::increment_counter( $ctx, $ctx[4] );
+        $ctx[2][0] = self::new64( 0xffffffff, 0xffffffff );
 
-        for ($i = 256 - $ctx[4]; $i--;) {
-            $ctx[3][$i+$ctx[4]] = 0;
+        for ( $i = 256 - $ctx[4]; $i--; ) {
+            $ctx[3][$i + $ctx[4]] = 0;
         }
 
-        self::compress($ctx, $ctx[3]);
+        self::compress( $ctx, $ctx[3] );
 
-        $i = (int) (($out->getSize() - 1) / 8);
-        for (; $i >= 0; --$i) {
-            self::store64($out, $i << 3, $ctx[0][$i]);
+        $i = (int) ( ( $out->getSize() - 1 ) / 8 );
+        for ( ; $i >= 0; --$i ) {
+            self::store64( $out, $i << 3, $ctx[0][$i] );
         }
         return $out;
     }
@@ -491,48 +491,48 @@ 
      * @return SplFixedArray
      * @throws Exception
      */
-    public static function init($key = null, $outlen = 64)
+    public static function init( $key = null, $outlen = 64 )
     {
         self::pseudoConstructor();
         $klen = 0;
 
-        if ($key !== null) {
-            if (count($key) > 64) {
-                throw new Exception('Invalid key size');
+        if ( $key !== null ) {
+            if ( count( $key ) > 64 ) {
+                throw new Exception( 'Invalid key size' );
             }
-            $klen = count($key);
+            $klen = count( $key );
         }
 
-        if ($outlen > 64) {
-            throw new Exception('Invalid output size');
+        if ( $outlen > 64 ) {
+            throw new Exception( 'Invalid output size' );
         }
 
         $ctx = self::context();
 
-        $p = new SplFixedArray(64);
-        for ($i = 64; --$i;) {
+        $p = new SplFixedArray( 64 );
+        for ( $i = 64; --$i; ) {
             $p[$i] = 0;
         }
 
         $p[0] = $outlen; // digest_length
-        $p[1] = $klen;   // key_length
-        $p[2] = 1;       // fanout
-        $p[3] = 1;       // depth
+        $p[1] = $klen; // key_length
+        $p[2] = 1; // fanout
+        $p[3] = 1; // depth
 
         $ctx[0][0] = self::xor64(
             $ctx[0][0],
-            self::load64($p, 0)
+            self::load64( $p, 0 )
         );
 
-        if ($klen > 0 && $key instanceof SplFixedArray) {
-            $block = new SplFixedArray(128);
-            for ($i = 128; $i--;) {
+        if ( $klen > 0 && $key instanceof SplFixedArray ) {
+            $block = new SplFixedArray( 128 );
+            for ( $i = 128; $i--; ) {
                 $block[$i] = 0;
             }
-            for ($i = $klen; $i--;) {
+            for ( $i = $klen; $i--; ) {
                 $block[$i] = $key[$i];
             }
-            self::update($ctx, $block, 128);
+            self::update( $ctx, $block, 128 );
         }
 
         return $ctx;
@@ -546,10 +546,10 @@ 
      * @param string $str
      * @return SplFixedArray
      */
-    public static function stringToSplFixedArray($str = '')
+    public static function stringToSplFixedArray( $str = '' )
     {
-        $values = unpack('C*', $str);
-        return SplFixedArray::fromArray(array_values($values));
+        $values = unpack( 'C*', $str );
+        return SplFixedArray::fromArray( array_values( $values ) );
     }
 
     /**
@@ -560,15 +560,15 @@ 
      * @param SplFixedArray $a
      * @return string
      */
-    public static function SplFixedArrayToString(SplFixedArray $a)
+    public static function SplFixedArrayToString( SplFixedArray $a )
     {
         /**
          * @var array<mixed, int>
          */
         $arr = $a->toArray();
         $c = $a->count();
-        array_unshift($arr, str_repeat('C', $c));
-        return call_user_func_array('pack', $arr);
+        array_unshift( $arr, str_repeat( 'C', $c ) );
+        return call_user_func_array( 'pack', $arr );
     }
 
     /**
@@ -577,41 +577,41 @@ 
      * @param SplFixedArray[SplFixedArray] $ctx
      * @return string
      */
-    public static function contextToString(SplFixedArray $ctx)
+    public static function contextToString( SplFixedArray $ctx )
     {
         $str = '';
         $ctxA = $ctx[0]->toArray();
 
         # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
-            $str .= self::store32_le($ctxA[$i][1]);
-            $str .= self::store32_le($ctxA[$i][0]);
+        for ( $i = 0; $i < 8; ++$i ) {
+            $str .= self::store32_le( $ctxA[$i][1] );
+            $str .= self::store32_le( $ctxA[$i][0] );
         }
 
         # uint64_t t[2];
         # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
+        for ( $i = 1; $i < 3; ++$i ) {
             $ctxA = $ctx[$i]->toArray();
-            $str .= self::store32_le($ctxA[0][1]);
-            $str .= self::store32_le($ctxA[0][0]);
-            $str .= self::store32_le($ctxA[1][1]);
-            $str .= self::store32_le($ctxA[1][0]);
+            $str .= self::store32_le( $ctxA[0][1] );
+            $str .= self::store32_le( $ctxA[0][0] );
+            $str .= self::store32_le( $ctxA[1][1] );
+            $str .= self::store32_le( $ctxA[1][0] );
         }
 
         # uint8_t buf[2 * 128];
-        $str .= self::SplFixedArrayToString($ctx[3]);
+        $str .= self::SplFixedArrayToString( $ctx[3] );
 
         # size_t buflen;
-        $str .= implode('', array(
-            self::intToChr($ctx[4] & 0xff),
-            self::intToChr(($ctx[4] >> 8) & 0xff),
-            self::intToChr(($ctx[4] >> 16) & 0xff),
-            self::intToChr(($ctx[4] >> 24) & 0xff),
-            self::intToChr(($ctx[4] >> 32) & 0xff),
-            self::intToChr(($ctx[4] >> 40) & 0xff),
-            self::intToChr(($ctx[4] >> 48) & 0xff),
-            self::intToChr(($ctx[4] >> 56) & 0xff)
-        ));
+        $str .= implode( '', array(
+            self::intToChr( $ctx[4] & 0xff ),
+            self::intToChr( ( $ctx[4] >> 8 ) & 0xff ),
+            self::intToChr( ( $ctx[4] >> 16 ) & 0xff ),
+            self::intToChr( ( $ctx[4] >> 24 ) & 0xff ),
+            self::intToChr( ( $ctx[4] >> 32 ) & 0xff ),
+            self::intToChr( ( $ctx[4] >> 40 ) & 0xff ),
+            self::intToChr( ( $ctx[4] >> 48 ) & 0xff ),
+            self::intToChr( ( $ctx[4] >> 56 ) & 0xff )
+        ) );
         # uint8_t last_node;
         return $str . "\x00";
     }
@@ -625,19 +625,19 @@ 
      * @param string $string
      * @return SplFixedArray
      */
-    public static function stringToContext($string)
+    public static function stringToContext( $string )
     {
         $ctx = self::context();
 
         # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
+        for ( $i = 0; $i < 8; ++$i ) {
             $ctx[0][$i] = SplFixedArray::fromArray(
                 array(
                     self::load_4(
-                        self::substr($string, (($i << 3) + 4), 4)
+                        self::substr( $string, ( ( $i << 3 ) + 4 ), 4 )
                     ),
                     self::load_4(
-                        self::substr($string, (($i << 3) + 0), 4)
+                        self::substr( $string, ( ( $i << 3 ) + 0 ), 4 )
                     )
                 )
             );
@@ -645,29 +645,29 @@ 
 
         # uint64_t t[2];
         # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
+        for ( $i = 1; $i < 3; ++$i ) {
             $ctx[$i][1] = SplFixedArray::fromArray(
                 array(
-                    self::load_4(self::substr($string, 76 + (($i - 1) << 4), 4)),
-                    self::load_4(self::substr($string, 72 + (($i - 1) << 4), 4))
+                    self::load_4( self::substr( $string, 76 + ( ( $i - 1 ) << 4 ), 4 ) ),
+                    self::load_4( self::substr( $string, 72 + ( ( $i - 1 ) << 4 ), 4 ) )
                 )
             );
             $ctx[$i][0] = SplFixedArray::fromArray(
                 array(
-                    self::load_4(self::substr($string, 68 + (($i - 1) << 4), 4)),
-                    self::load_4(self::substr($string, 64 + (($i - 1) << 4), 4))
+                    self::load_4( self::substr( $string, 68 + ( ( $i - 1 ) << 4 ), 4 ) ),
+                    self::load_4( self::substr( $string, 64 + ( ( $i - 1 ) << 4 ), 4 ) )
                 )
             );
         }
 
         # uint8_t buf[2 * 128];
-        $ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
+        $ctx[3] = self::stringToSplFixedArray( self::substr( $string, 96, 256 ) );
 
 
         # uint8_t buf[2 * 128];
         $int = 0;
-        for ($i = 0; $i < 8; ++$i) {
-            $int |= self::chrToInt($string[352 + $i]) << ($i << 3);
+        for ( $i = 0; $i < 8; ++$i ) {
+            $int |= self::chrToInt( $string[352 + $i] ) << ( $i << 3 );
         }
         $ctx[4] = $int;
 

Braces +22 added lines, -44 removed lines

@@ -9,8 +9,7 @@ 
  *
  * Based on the work of Devi Mandiri in devi/salt.
  */
-abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
-{
+abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util {
     /**
      * @var SplFixedArray
      */
@@ -47,8 +46,7 @@ 
      * @param int $low
      * @return SplFixedArray
      */
-    public static function new64($high, $low)
-    {
+    public static function new64($high, $low) {
         $i64 = new SplFixedArray(2);
         $i64[0] = $high & 0xffffffff;
         $i64[1] = $low & 0xffffffff;
@@ -64,8 +62,7 @@ 
      * @param int $num
      * @return SplFixedArray
      */
-    protected static function to64($num)
-    {
+    protected static function to64($num) {
         list($hi, $lo) = self::numericTo64BitInteger($num);
         return self::new64($hi, $lo);
     }
@@ -80,8 +77,7 @@ 
      * @param SplFixedArray $y
      * @return SplFixedArray
      */
-    protected static function add64($x, $y)
-    {
+    protected static function add64($x, $y) {
         $l = ($x[1] + $y[1]) & 0xffffffff;
         return self::new64(
             $x[0] + $y[0] + (
@@ -99,8 +95,7 @@ 
      * @param SplFixedArray $z
      * @return SplFixedArray
      */
-    protected static function add364($x, $y, $z)
-    {
+    protected static function add364($x, $y, $z) {
         return self::add64($x, self::add64($y, $z));
     }
 
@@ -112,8 +107,7 @@ 
      * @return SplFixedArray
      * @throws Exception
      */
-    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
-    {
+    protected static function xor64(SplFixedArray $x, SplFixedArray $y) {
         if (!is_numeric($x[0])) {
             throw new Exception('x[0] is not an integer');
         }
@@ -136,8 +130,7 @@ 
      * @param int $c
      * @return SplFixedArray
      */
-    public static function rotr64($x, $c)
-    {
+    public static function rotr64($x, $c) {
         if ($c >= 64) {
             $c %= 64;
         }
@@ -186,8 +179,7 @@ 
      * @param SplFixedArray $x
      * @return int
      */
-    protected static function flatten64($x)
-    {
+    protected static function flatten64($x) {
         return ($x[0] * 4294967296 + $x[1]);
     }
 
@@ -198,8 +190,7 @@ 
      * @param int $i
      * @return SplFixedArray
      */
-    protected static function load64(SplFixedArray $x, $i)
-    {
+    protected static function load64(SplFixedArray $x, $i) {
         $l = $x[$i]   | ($x[$i+1]<<8) | ($x[$i+2]<<16) | ($x[$i+3]<<24);
         $h = $x[$i+4] | ($x[$i+5]<<8) | ($x[$i+6]<<16) | ($x[$i+7]<<24);
         return self::new64($h, $l);
@@ -213,8 +204,7 @@ 
      * @param SplFixedArray $u
      * @return void
      */
-    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
-    {
+    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u) {
         $maxLength = $x->getSize() - 1;
         for ($j = 0; $j < 8; ++$j) {
             /*
@@ -238,8 +228,7 @@ 
      *
      * @return void
      */
-    public static function pseudoConstructor()
-    {
+    public static function pseudoConstructor() {
         static $called = false;
         if ($called) {
             return;
@@ -264,8 +253,7 @@ 
      *
      * @return SplFixedArray
      */
-    protected static function context()
-    {
+    protected static function context() {
         $ctx    = new SplFixedArray(5);
         $ctx[0] = new SplFixedArray(8);   // h
         $ctx[1] = new SplFixedArray(2);   // t
@@ -296,8 +284,7 @@ 
      * @param SplFixedArray $buf
      * @return void
      */
-    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
-    {
+    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf) {
         $m = new SplFixedArray(16);
         $v = new SplFixedArray(16);
 
@@ -350,8 +337,7 @@ 
      * @param SplFixedArray $m
      * @return SplFixedArray
      */
-    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
-    {
+    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m) {
         $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
         $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
         $v[$c] = self::add64($v[$c], $v[$d]);
@@ -371,8 +357,7 @@ 
      * @return void
      * @throws Error
      */
-    public static function increment_counter($ctx, $inc)
-    {
+    public static function increment_counter($ctx, $inc) {
         if ($inc < 0) {
             throw new Error('Increasing by a negative number makes no sense.');
         }
@@ -396,8 +381,7 @@ 
      * @param int $plen
      * @return void
      */
-    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
-    {
+    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen) {
         self::pseudoConstructor();
 
         $offset = 0;
@@ -452,8 +436,7 @@ 
      * @return SplFixedArray
      * @throws Error
      */
-    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
-    {
+    public static function finish(SplFixedArray $ctx, SplFixedArray $out) {
         self::pseudoConstructor();
         if ($ctx[4] > 128) {
             self::increment_counter($ctx, 128);
@@ -491,8 +474,7 @@ 
      * @return SplFixedArray
      * @throws Exception
      */
-    public static function init($key = null, $outlen = 64)
-    {
+    public static function init($key = null, $outlen = 64) {
         self::pseudoConstructor();
         $klen = 0;
 
@@ -546,8 +528,7 @@ 
      * @param string $str
      * @return SplFixedArray
      */
-    public static function stringToSplFixedArray($str = '')
-    {
+    public static function stringToSplFixedArray($str = '') {
         $values = unpack('C*', $str);
         return SplFixedArray::fromArray(array_values($values));
     }
@@ -560,8 +541,7 @@ 
      * @param SplFixedArray $a
      * @return string
      */
-    public static function SplFixedArrayToString(SplFixedArray $a)
-    {
+    public static function SplFixedArrayToString(SplFixedArray $a) {
         /**
          * @var array<mixed, int>
          */
@@ -577,8 +557,7 @@ 
      * @param SplFixedArray[SplFixedArray] $ctx
      * @return string
      */
-    public static function contextToString(SplFixedArray $ctx)
-    {
+    public static function contextToString(SplFixedArray $ctx) {
         $str = '';
         $ctxA = $ctx[0]->toArray();
 
@@ -625,8 +604,7 @@ 
      * @param string $string
      * @return SplFixedArray
      */
-    public static function stringToContext($string)
-    {
+    public static function stringToContext($string) {
         $ctx = self::context();
 
         # uint64_t h[8];

src/library/sodium_compat/src/Core/Curve25519.php

Doc Comments +1 added lines, -1 removed lines

@@ -1636,7 +1636,7 @@
     /**
      * @internal You should not use this directly from another application
      *
-     * @param string $a
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $a
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
      * @param string $b
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2

Indentation +2547 added lines, -2547 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
-    return;
+	return;
 }
 
 /**
@@ -15,2550 +15,2550 @@ 
  */
 abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Curve25519_H
 {
-    /**
-     * Get a field element of size 10 with a value of 0
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_0()
-    {
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-        );
-    }
-
-    /**
-     * Get a field element of size 10 with a value of 1
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_1()
-    {
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-        );
-    }
-
-    /**
-     * Add two field elements.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_add(
-        ParagonIE_Sodium_Core_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core_Curve25519_Fe $g
-    ) {
-        $arr = array();
-        for ($i = 0; $i < 10; ++$i) {
-            $arr[$i] = (int) ($f[$i] + $g[$i]);
-        }
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($arr);
-    }
-
-    /**
-     * Constant-time conditional move.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
-     * @param int $b
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_cmov(
-        ParagonIE_Sodium_Core_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core_Curve25519_Fe $g,
-        $b = 0
-    ) {
-        $h = array();
-        $b *= -1;
-        for ($i = 0; $i < 10; ++$i) {
-            $x = (($f[$i] ^ $g[$i]) & $b);
-            $h[$i] = $f[$i] ^ $x;
-        }
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
-    }
-
-    /**
-     * Create a copy of a field element.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        $h = clone $f;
-        return $h;
-    }
-
-    /**
-     * Give: 32-byte string.
-     * Receive: A field element object to use for internal calculations.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     * @throws RangeException
-     */
-    public static function fe_frombytes($s)
-    {
-        if (self::strlen($s) !== 32) {
-            throw new RangeException('Expected a 32-byte string.');
-        }
-        $h0 = self::load_4($s);
-        $h1 = self::load_3(self::substr($s, 4, 3)) << 6;
-        $h2 = self::load_3(self::substr($s, 7, 3)) << 5;
-        $h3 = self::load_3(self::substr($s, 10, 3)) << 3;
-        $h4 = self::load_3(self::substr($s, 13, 3)) << 2;
-        $h5 = self::load_4(self::substr($s, 16, 4));
-        $h6 = self::load_3(self::substr($s, 20, 3)) << 7;
-        $h7 = self::load_3(self::substr($s, 23, 3)) << 5;
-        $h8 = self::load_3(self::substr($s, 26, 3)) << 4;
-        $h9 = (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2;
-
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
-        $h9 -= $carry9 << 25;
-        $carry1 = ($h1 + (1 << 24)) >> 25;
-        $h2 += $carry1;
-        $h1 -= $carry1 << 25;
-        $carry3 = ($h3 + (1 << 24)) >> 25;
-        $h4 += $carry3;
-        $h3 -= $carry3 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
-        $h6 += $carry5;
-        $h5 -= $carry5 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
-        $h8 += $carry7;
-        $h7 -= $carry7 << 25;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
-        $h1 += $carry0;
-        $h0 -= $carry0 << 26;
-        $carry2 = ($h2 + (1 << 25)) >> 26;
-        $h3 += $carry2;
-        $h2 -= $carry2 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
-        $h5 += $carry4;
-        $h4 -= $carry4 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
-        $h7 += $carry6;
-        $h6 -= $carry6 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
-        $h9 += $carry8;
-        $h8 -= $carry8 << 26;
-
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
-            )
-        );
-    }
-
-    /**
-     * Convert a field element to a byte string.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
-     * @return string
-     */
-    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
-    {
-        $h[0] = (int) $h[0];
-        $h[1] = (int) $h[1];
-        $h[2] = (int) $h[2];
-        $h[3] = (int) $h[3];
-        $h[4] = (int) $h[4];
-        $h[5] = (int) $h[5];
-        $h[6] = (int) $h[6];
-        $h[7] = (int) $h[7];
-        $h[8] = (int) $h[8];
-        $h[9] = (int) $h[9];
-
-        $q = (self::mul($h[9], 19, 5) + (1 << 24)) >> 25;
-        $q = ($h[0] + $q) >> 26;
-        $q = ($h[1] + $q) >> 25;
-        $q = ($h[2] + $q) >> 26;
-        $q = ($h[3] + $q) >> 25;
-        $q = ($h[4] + $q) >> 26;
-        $q = ($h[5] + $q) >> 25;
-        $q = ($h[6] + $q) >> 26;
-        $q = ($h[7] + $q) >> 25;
-        $q = ($h[8] + $q) >> 26;
-        $q = ($h[9] + $q) >> 25;
-
-        $h[0] += self::mul($q, 19, 5);
-
-        $carry0 = $h[0] >> 26;
-        $h[1] += $carry0;
-        $h[0] -= $carry0 << 26;
-        $carry1 = $h[1] >> 25;
-        $h[2] += $carry1;
-        $h[1] -= $carry1 << 25;
-        $carry2 = $h[2] >> 26;
-        $h[3] += $carry2;
-        $h[2] -= $carry2 << 26;
-        $carry3 = $h[3] >> 25;
-        $h[4] += $carry3;
-        $h[3] -= $carry3 << 25;
-        $carry4 = $h[4] >> 26;
-        $h[5] += $carry4;
-        $h[4] -= $carry4 << 26;
-        $carry5 = $h[5] >> 25;
-        $h[6] += $carry5;
-        $h[5] -= $carry5 << 25;
-        $carry6 = $h[6] >> 26;
-        $h[7] += $carry6;
-        $h[6] -= $carry6 << 26;
-        $carry7 = $h[7] >> 25;
-        $h[8] += $carry7;
-        $h[7] -= $carry7 << 25;
-        $carry8 = $h[8] >> 26;
-        $h[9] += $carry8;
-        $h[8] -= $carry8 << 26;
-        $carry9 = $h[9] >> 25;
-        $h[9] -= $carry9 << 25;
-
-        /**
-         * @var array<int, int>
-         */
-        $s = array(
-            (int) (($h[0] >> 0) & 0xff),
-            (int) (($h[0] >> 8) & 0xff),
-            (int) (($h[0] >> 16) & 0xff),
-            (int) ((($h[0] >> 24) | ($h[1] << 2)) & 0xff),
-            (int) (($h[1] >> 6) & 0xff),
-            (int) (($h[1] >> 14) & 0xff),
-            (int) ((($h[1] >> 22) | ($h[2] << 3)) & 0xff),
-            (int) (($h[2] >> 5) & 0xff),
-            (int) (($h[2] >> 13) & 0xff),
-            (int) ((($h[2] >> 21) | ($h[3] << 5)) & 0xff),
-            (int) (($h[3] >> 3) & 0xff),
-            (int) (($h[3] >> 11) & 0xff),
-            (int) ((($h[3] >> 19) | ($h[4] << 6)) & 0xff),
-            (int) (($h[4] >> 2) & 0xff),
-            (int) (($h[4] >> 10) & 0xff),
-            (int) (($h[4] >> 18) & 0xff),
-            (int) (($h[5] >> 0) & 0xff),
-            (int) (($h[5] >> 8) & 0xff),
-            (int) (($h[5] >> 16) & 0xff),
-            (int) ((($h[5] >> 24) | ($h[6] << 1)) & 0xff),
-            (int) (($h[6] >> 7) & 0xff),
-            (int) (($h[6] >> 15) & 0xff),
-            (int) ((($h[6] >> 23) | ($h[7] << 3)) & 0xff),
-            (int) (($h[7] >> 5) & 0xff),
-            (int) (($h[7] >> 13) & 0xff),
-            (int) ((($h[7] >> 21) | ($h[8] << 4)) & 0xff),
-            (int) (($h[8] >> 4) & 0xff),
-            (int) (($h[8] >> 12) & 0xff),
-            (int) ((($h[8] >> 20) | ($h[9] << 6)) & 0xff),
-            (int) (($h[9] >> 2) & 0xff),
-            (int) (($h[9] >> 10) & 0xff),
-            (int) (($h[9] >> 18) & 0xff)
-        );
-        return self::intArrayToString($s);
-    }
-
-    /**
-     * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return int
-     */
-    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        $str = self::fe_tobytes($f);
-        return self::chrToInt($str[0]) & 1;
-    }
-
-    /**
-     * Returns 0 if this field element results in all NUL bytes.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return bool
-     */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        static $zero;
-        if ($zero === null) {
-            $zero = str_repeat("\x00", 32);
-        }
-        $str = self::fe_tobytes($f);
-        return !self::verify_32($str, $zero);
-    }
-
-    /**
-     * Multiply two field elements
-     *
-     * h = f * g
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @security Is multiplication a source of timing leaks? If so, can we do
-     *           anything to prevent that from happening?
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_mul(
-        ParagonIE_Sodium_Core_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core_Curve25519_Fe $g
-    ) {
-        $f0 = $f[0];
-        $f1 = $f[1];
-        $f2 = $f[2];
-        $f3 = $f[3];
-        $f4 = $f[4];
-        $f5 = $f[5];
-        $f6 = $f[6];
-        $f7 = $f[7];
-        $f8 = $f[8];
-        $f9 = $f[9];
-        $g0 = $g[0];
-        $g1 = $g[1];
-        $g2 = $g[2];
-        $g3 = $g[3];
-        $g4 = $g[4];
-        $g5 = $g[5];
-        $g6 = $g[6];
-        $g7 = $g[7];
-        $g8 = $g[8];
-        $g9 = $g[9];
-        $g1_19 = self::mul($g1, 19, 5);
-        $g2_19 = self::mul($g2, 19, 5);
-        $g3_19 = self::mul($g3, 19, 5);
-        $g4_19 = self::mul($g4, 19, 5);
-        $g5_19 = self::mul($g5, 19, 5);
-        $g6_19 = self::mul($g6, 19, 5);
-        $g7_19 = self::mul($g7, 19, 5);
-        $g8_19 = self::mul($g8, 19, 5);
-        $g9_19 = self::mul($g9, 19, 5);
-        $f1_2 = $f1 << 1;
-        $f3_2 = $f3 << 1;
-        $f5_2 = $f5 << 1;
-        $f7_2 = $f7 << 1;
-        $f9_2 = $f9 << 1;
-        $f0g0    = self::mul($f0,    $g0);
-        $f0g1    = self::mul($f0,    $g1);
-        $f0g2    = self::mul($f0,    $g2);
-        $f0g3    = self::mul($f0,    $g3);
-        $f0g4    = self::mul($f0,    $g4);
-        $f0g5    = self::mul($f0,    $g5);
-        $f0g6    = self::mul($f0,    $g6);
-        $f0g7    = self::mul($f0,    $g7);
-        $f0g8    = self::mul($f0,    $g8);
-        $f0g9    = self::mul($f0,    $g9);
-        $f1g0    = self::mul($f1,    $g0);
-        $f1g1_2  = self::mul($f1_2,  $g1);
-        $f1g2    = self::mul($f1,    $g2);
-        $f1g3_2  = self::mul($f1_2,  $g3);
-        $f1g4    = self::mul($f1,    $g4);
-        $f1g5_2  = self::mul($f1_2,  $g5);
-        $f1g6    = self::mul($f1,    $g6);
-        $f1g7_2  = self::mul($f1_2,  $g7);
-        $f1g8    = self::mul($f1,    $g8);
-        $f1g9_38 = self::mul($f1_2,  $g9_19);
-        $f2g0    = self::mul($f2,    $g0);
-        $f2g1    = self::mul($f2,    $g1);
-        $f2g2    = self::mul($f2,    $g2);
-        $f2g3    = self::mul($f2,    $g3);
-        $f2g4    = self::mul($f2,    $g4);
-        $f2g5    = self::mul($f2,    $g5);
-        $f2g6    = self::mul($f2,    $g6);
-        $f2g7    = self::mul($f2,    $g7);
-        $f2g8_19 = self::mul($f2,    $g8_19);
-        $f2g9_19 = self::mul($f2,    $g9_19);
-        $f3g0    = self::mul($f3,    $g0);
-        $f3g1_2  = self::mul($f3_2,  $g1);
-        $f3g2    = self::mul($f3,    $g2);
-        $f3g3_2  = self::mul($f3_2,  $g3);
-        $f3g4    = self::mul($f3,    $g4);
-        $f3g5_2  = self::mul($f3_2,  $g5);
-        $f3g6    = self::mul($f3,    $g6);
-        $f3g7_38 = self::mul($f3_2,  $g7_19);
-        $f3g8_19 = self::mul($f3,    $g8_19);
-        $f3g9_38 = self::mul($f3_2,  $g9_19);
-        $f4g0    = self::mul($f4,    $g0);
-        $f4g1    = self::mul($f4,    $g1);
-        $f4g2    = self::mul($f4,    $g2);
-        $f4g3    = self::mul($f4,    $g3);
-        $f4g4    = self::mul($f4,    $g4);
-        $f4g5    = self::mul($f4,    $g5);
-        $f4g6_19 = self::mul($f4,    $g6_19);
-        $f4g7_19 = self::mul($f4,    $g7_19);
-        $f4g8_19 = self::mul($f4,    $g8_19);
-        $f4g9_19 = self::mul($f4,    $g9_19);
-        $f5g0    = self::mul($f5,    $g0);
-        $f5g1_2  = self::mul($f5_2,  $g1);
-        $f5g2    = self::mul($f5,    $g2);
-        $f5g3_2  = self::mul($f5_2,  $g3);
-        $f5g4    = self::mul($f5,    $g4);
-        $f5g5_38 = self::mul($f5_2,  $g5_19);
-        $f5g6_19 = self::mul($f5,    $g6_19);
-        $f5g7_38 = self::mul($f5_2,  $g7_19);
-        $f5g8_19 = self::mul($f5,    $g8_19);
-        $f5g9_38 = self::mul($f5_2,  $g9_19);
-        $f6g0    = self::mul($f6,    $g0);
-        $f6g1    = self::mul($f6,    $g1);
-        $f6g2    = self::mul($f6,    $g2);
-        $f6g3    = self::mul($f6,    $g3);
-        $f6g4_19 = self::mul($f6,    $g4_19);
-        $f6g5_19 = self::mul($f6,    $g5_19);
-        $f6g6_19 = self::mul($f6,    $g6_19);
-        $f6g7_19 = self::mul($f6,    $g7_19);
-        $f6g8_19 = self::mul($f6,    $g8_19);
-        $f6g9_19 = self::mul($f6,    $g9_19);
-        $f7g0    = self::mul($f7,    $g0);
-        $f7g1_2  = self::mul($f7_2,  $g1);
-        $f7g2    = self::mul($f7,    $g2);
-        $f7g3_38 = self::mul($f7_2,  $g3_19);
-        $f7g4_19 = self::mul($f7,    $g4_19);
-        $f7g5_38 = self::mul($f7_2,  $g5_19);
-        $f7g6_19 = self::mul($f7,    $g6_19);
-        $f7g7_38 = self::mul($f7_2,  $g7_19);
-        $f7g8_19 = self::mul($f7,    $g8_19);
-        $f7g9_38 = self::mul($f7_2,  $g9_19);
-        $f8g0    = self::mul($f8,    $g0);
-        $f8g1    = self::mul($f8,    $g1);
-        $f8g2_19 = self::mul($f8,    $g2_19);
-        $f8g3_19 = self::mul($f8,    $g3_19);
-        $f8g4_19 = self::mul($f8,    $g4_19);
-        $f8g5_19 = self::mul($f8,    $g5_19);
-        $f8g6_19 = self::mul($f8,    $g6_19);
-        $f8g7_19 = self::mul($f8,    $g7_19);
-        $f8g8_19 = self::mul($f8,    $g8_19);
-        $f8g9_19 = self::mul($f8,    $g9_19);
-        $f9g0    = self::mul($f9,    $g0);
-        $f9g1_38 = self::mul($f9_2,  $g1_19);
-        $f9g2_19 = self::mul($f9,    $g2_19);
-        $f9g3_38 = self::mul($f9_2,  $g3_19);
-        $f9g4_19 = self::mul($f9,    $g4_19);
-        $f9g5_38 = self::mul($f9_2,  $g5_19);
-        $f9g6_19 = self::mul($f9,    $g6_19);
-        $f9g7_38 = self::mul($f9_2,  $g7_19);
-        $f9g8_19 = self::mul($f9,    $g8_19);
-        $f9g9_38 = self::mul($f9_2,  $g9_19);
-        $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
-        $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
-        $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
-        $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
-        $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
-        $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
-        $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
-        $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
-        $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
-        $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
-        $h1 += $carry0;
-        $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
-        $h5 += $carry4;
-        $h4 -= $carry4 << 26;
-
-        $carry1 = ($h1 + (1 << 24)) >> 25;
-        $h2 += $carry1;
-        $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
-        $h6 += $carry5;
-        $h5 -= $carry5 << 25;
-
-        $carry2 = ($h2 + (1 << 25)) >> 26;
-        $h3 += $carry2;
-        $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
-        $h7 += $carry6;
-        $h6 -= $carry6 << 26;
-
-        $carry3 = ($h3 + (1 << 24)) >> 25;
-        $h4 += $carry3;
-        $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
-        $h8 += $carry7;
-        $h7 -= $carry7 << 25;
-
-        $carry4 = ($h4 + (1 << 25)) >> 26;
-        $h5 += $carry4;
-        $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
-        $h9 += $carry8;
-        $h8 -= $carry8 << 26;
-
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
-        $h9 -= $carry9 << 25;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
-        $h1 += $carry0;
-        $h0 -= $carry0 << 26;
-
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
-            )
-        );
-    }
-
-    /**
-     * Get the negative values for each piece of the field element.
-     *
-     * h = -f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        $h = new ParagonIE_Sodium_Core_Curve25519_Fe();
-        for ($i = 0; $i < 10; ++$i) {
-            $h[$i] = -$f[$i];
-        }
-        return $h;
-    }
-
-    /**
-     * Square a field element
-     *
-     * h = f * f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
-
-        $f0_2 = $f0 << 1;
-        $f1_2 = $f1 << 1;
-        $f2_2 = $f2 << 1;
-        $f3_2 = $f3 << 1;
-        $f4_2 = $f4 << 1;
-        $f5_2 = $f5 << 1;
-        $f6_2 = $f6 << 1;
-        $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6);
-        $f6_19 = self::mul($f6, 19, 5);
-        $f7_38 = self::mul($f7, 38, 6);
-        $f8_19 = self::mul($f8, 19, 5);
-        $f9_38 = self::mul($f9, 38, 6);
-        $f0f0    = self::mul($f0,    $f0);
-        $f0f1_2  = self::mul($f0_2,  $f1);
-        $f0f2_2  = self::mul($f0_2,  $f2);
-        $f0f3_2  = self::mul($f0_2,  $f3);
-        $f0f4_2  = self::mul($f0_2,  $f4);
-        $f0f5_2  = self::mul($f0_2,  $f5);
-        $f0f6_2  = self::mul($f0_2,  $f6);
-        $f0f7_2  = self::mul($f0_2,  $f7);
-        $f0f8_2  = self::mul($f0_2,  $f8);
-        $f0f9_2  = self::mul($f0_2,  $f9);
-        $f1f1_2  = self::mul($f1_2,  $f1);
-        $f1f2_2  = self::mul($f1_2,  $f2);
-        $f1f3_4  = self::mul($f1_2,  $f3_2);
-        $f1f4_2  = self::mul($f1_2,  $f4);
-        $f1f5_4  = self::mul($f1_2,  $f5_2);
-        $f1f6_2  = self::mul($f1_2,  $f6);
-        $f1f7_4  = self::mul($f1_2,  $f7_2);
-        $f1f8_2  = self::mul($f1_2,  $f8);
-        $f1f9_76 = self::mul($f1_2,  $f9_38);
-        $f2f2    = self::mul($f2,    $f2);
-        $f2f3_2  = self::mul($f2_2,  $f3);
-        $f2f4_2  = self::mul($f2_2,  $f4);
-        $f2f5_2  = self::mul($f2_2,  $f5);
-        $f2f6_2  = self::mul($f2_2,  $f6);
-        $f2f7_2  = self::mul($f2_2,  $f7);
-        $f2f8_38 = self::mul($f2_2,  $f8_19);
-        $f2f9_38 = self::mul($f2,    $f9_38);
-        $f3f3_2  = self::mul($f3_2,  $f3);
-        $f3f4_2  = self::mul($f3_2,  $f4);
-        $f3f5_4  = self::mul($f3_2,  $f5_2);
-        $f3f6_2  = self::mul($f3_2,  $f6);
-        $f3f7_76 = self::mul($f3_2,  $f7_38);
-        $f3f8_38 = self::mul($f3_2,  $f8_19);
-        $f3f9_76 = self::mul($f3_2,  $f9_38);
-        $f4f4    = self::mul($f4,    $f4);
-        $f4f5_2  = self::mul($f4_2,  $f5);
-        $f4f6_38 = self::mul($f4_2,  $f6_19);
-        $f4f7_38 = self::mul($f4,    $f7_38);
-        $f4f8_38 = self::mul($f4_2,  $f8_19);
-        $f4f9_38 = self::mul($f4,    $f9_38);
-        $f5f5_38 = self::mul($f5,    $f5_38);
-        $f5f6_38 = self::mul($f5_2,  $f6_19);
-        $f5f7_76 = self::mul($f5_2,  $f7_38);
-        $f5f8_38 = self::mul($f5_2,  $f8_19);
-        $f5f9_76 = self::mul($f5_2,  $f9_38);
-        $f6f6_19 = self::mul($f6,    $f6_19);
-        $f6f7_38 = self::mul($f6,    $f7_38);
-        $f6f8_38 = self::mul($f6_2,  $f8_19);
-        $f6f9_38 = self::mul($f6,    $f9_38);
-        $f7f7_38 = self::mul($f7,    $f7_38);
-        $f7f8_38 = self::mul($f7_2,  $f8_19);
-        $f7f9_76 = self::mul($f7_2,  $f9_38);
-        $f8f8_19 = self::mul($f8,    $f8_19);
-        $f8f9_38 = self::mul($f8,    $f9_38);
-        $f9f9_38 = self::mul($f9,    $f9_38);
-        $h0 = $f0f0   + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
-        $h1 = $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38;
-        $h2 = $f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
-        $h3 = $f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38;
-        $h4 = $f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38;
-        $h5 = $f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38;
-        $h6 = $f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19;
-        $h7 = $f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38;
-        $h8 = $f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38;
-        $h9 = $f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
-        $h1 += $carry0;
-        $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
-        $h5 += $carry4;
-        $h4 -= $carry4 << 26;
-
-        $carry1 = ($h1 + (1 << 24)) >> 25;
-        $h2 += $carry1;
-        $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
-        $h6 += $carry5;
-        $h5 -= $carry5 << 25;
-
-        $carry2 = ($h2 + (1 << 25)) >> 26;
-        $h3 += $carry2;
-        $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
-        $h7 += $carry6;
-        $h6 -= $carry6 << 26;
-
-        $carry3 = ($h3 + (1 << 24)) >> 25;
-        $h4 += $carry3;
-        $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
-        $h8 += $carry7;
-        $h7 -= $carry7 << 25;
-
-        $carry4 = ($h4 + (1 << 25)) >> 26;
-        $h5 += $carry4;
-        $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
-        $h9 += $carry8;
-        $h8 -= $carry8 << 26;
-
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
-        $h9 -= $carry9 << 25;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
-        $h1 += $carry0;
-        $h0 -= $carry0 << 26;
-
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
-            )
-        );
-    }
-
-
-    /**
-     * Square and double a field element
-     *
-     * h = 2 * f * f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
-
-        $f0_2 = $f0 << 1;
-        $f1_2 = $f1 << 1;
-        $f2_2 = $f2 << 1;
-        $f3_2 = $f3 << 1;
-        $f4_2 = $f4 << 1;
-        $f5_2 = $f5 << 1;
-        $f6_2 = $f6 << 1;
-        $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6); /* 1.959375*2^30 */
-        $f6_19 = self::mul($f6, 19, 5); /* 1.959375*2^30 */
-        $f7_38 = self::mul($f7, 38, 6); /* 1.959375*2^30 */
-        $f8_19 = self::mul($f8, 19, 5); /* 1.959375*2^30 */
-        $f9_38 = self::mul($f9, 38, 6); /* 1.959375*2^30 */
-        $f0f0 = self::mul($f0, (int) $f0);
-        $f0f1_2 = self::mul($f0_2, (int) $f1);
-        $f0f2_2 = self::mul($f0_2, (int) $f2);
-        $f0f3_2 = self::mul($f0_2, (int) $f3);
-        $f0f4_2 = self::mul($f0_2, (int) $f4);
-        $f0f5_2 = self::mul($f0_2, (int) $f5);
-        $f0f6_2 = self::mul($f0_2, (int) $f6);
-        $f0f7_2 = self::mul($f0_2, (int) $f7);
-        $f0f8_2 = self::mul($f0_2, (int) $f8);
-        $f0f9_2 = self::mul($f0_2, (int) $f9);
-        $f1f1_2 = self::mul($f1_2,  (int) $f1);
-        $f1f2_2 = self::mul($f1_2,  (int) $f2);
-        $f1f3_4 = self::mul($f1_2,  (int) $f3_2);
-        $f1f4_2 = self::mul($f1_2,  (int) $f4);
-        $f1f5_4 = self::mul($f1_2,  (int) $f5_2);
-        $f1f6_2 = self::mul($f1_2,  (int) $f6);
-        $f1f7_4 = self::mul($f1_2,  (int) $f7_2);
-        $f1f8_2 = self::mul($f1_2,  (int) $f8);
-        $f1f9_76 = self::mul($f1_2,  (int) $f9_38);
-        $f2f2 = self::mul($f2,  (int) $f2);
-        $f2f3_2 = self::mul($f2_2,  (int) $f3);
-        $f2f4_2 = self::mul($f2_2,  (int) $f4);
-        $f2f5_2 = self::mul($f2_2,  (int) $f5);
-        $f2f6_2 = self::mul($f2_2,  (int) $f6);
-        $f2f7_2 = self::mul($f2_2,  (int) $f7);
-        $f2f8_38 = self::mul($f2_2,  (int) $f8_19);
-        $f2f9_38 = self::mul($f2,  (int) $f9_38);
-        $f3f3_2 = self::mul($f3_2,  (int) $f3);
-        $f3f4_2 = self::mul($f3_2,  (int) $f4);
-        $f3f5_4 = self::mul($f3_2,  (int) $f5_2);
-        $f3f6_2 = self::mul($f3_2,  (int) $f6);
-        $f3f7_76 = self::mul($f3_2,  (int) $f7_38);
-        $f3f8_38 = self::mul($f3_2,  (int) $f8_19);
-        $f3f9_76 = self::mul($f3_2,  (int) $f9_38);
-        $f4f4 = self::mul($f4,  (int) $f4);
-        $f4f5_2 = self::mul($f4_2,  (int) $f5);
-        $f4f6_38 = self::mul($f4_2,  (int) $f6_19);
-        $f4f7_38 = self::mul($f4,  (int) $f7_38);
-        $f4f8_38 = self::mul($f4_2,  (int) $f8_19);
-        $f4f9_38 = self::mul($f4,  (int) $f9_38);
-        $f5f5_38 = self::mul($f5,  (int) $f5_38);
-        $f5f6_38 = self::mul($f5_2,  (int) $f6_19);
-        $f5f7_76 = self::mul($f5_2,  (int) $f7_38);
-        $f5f8_38 = self::mul($f5_2,  (int) $f8_19);
-        $f5f9_76 = self::mul($f5_2,  (int) $f9_38);
-        $f6f6_19 = self::mul($f6,  (int) $f6_19);
-        $f6f7_38 = self::mul($f6,  (int) $f7_38);
-        $f6f8_38 = self::mul($f6_2,  (int) $f8_19);
-        $f6f9_38 = self::mul($f6,  (int) $f9_38);
-        $f7f7_38 = self::mul($f7,  (int) $f7_38);
-        $f7f8_38 = self::mul($f7_2,  (int) $f8_19);
-        $f7f9_76 = self::mul($f7_2,  (int) $f9_38);
-        $f8f8_19 = self::mul($f8,  (int) $f8_19);
-        $f8f9_38 = self::mul($f8,  (int) $f9_38);
-        $f9f9_38 = self::mul($f9,  (int) $f9_38);
-
-        $h0 = (int) ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38);
-        $h1 = (int) ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38);
-        $h2 = (int) ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19);
-        $h3 = (int) ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38);
-        $h4 = (int) ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38);
-        $h5 = (int) ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38);
-        $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19);
-        $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38);
-        $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38);
-        $h9 = (int) ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2);
-
-        $h0 = (int) ($h0 + $h0);
-        $h1 = (int) ($h1 + $h1);
-        $h2 = (int) ($h2 + $h2);
-        $h3 = (int) ($h3 + $h3);
-        $h4 = (int) ($h4 + $h4);
-        $h5 = (int) ($h5 + $h5);
-        $h6 = (int) ($h6 + $h6);
-        $h7 = (int) ($h7 + $h7);
-        $h8 = (int) ($h8 + $h8);
-        $h9 = (int) ($h9 + $h9);
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
-        $h1 += $carry0;
-        $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
-        $h5 += $carry4;
-        $h4 -= $carry4 << 26;
-
-        $carry1 = ($h1 + (1 << 24)) >> 25;
-        $h2 += $carry1;
-        $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
-        $h6 += $carry5;
-        $h5 -= $carry5 << 25;
-
-        $carry2 = ($h2 + (1 << 25)) >> 26;
-        $h3 += $carry2;
-        $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
-        $h7 += $carry6;
-        $h6 -= $carry6 << 26;
-
-        $carry3 = ($h3 + (1 << 24)) >> 25;
-        $h4 += $carry3;
-        $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
-        $h8 += $carry7;
-        $h7 -= $carry7 << 25;
-
-        $carry4 = ($h4 + (1 << 25)) >> 26;
-        $h5 += $carry4;
-        $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
-        $h9 += $carry8;
-        $h8 -= $carry8 << 26;
-
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
-        $h9 -= $carry9 << 25;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
-        $h1 += $carry0;
-        $h0 -= $carry0 << 26;
-
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
-            )
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
-    {
-        $z = clone $Z;
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t2 = self::fe_sq($t0);
-        $t1 = self::fe_mul($t1, $t2);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 20; ++$i) {
-            $t3 = self::fe_sq($t3);
-        }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 100; ++$i) {
-            $t3 = self::fe_sq($t3);
-        }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-        return self::fe_mul($t1, $t0);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
-    {
-        # fe_sq(t0, z);
-        # fe_sq(t1, t0);
-        # fe_sq(t1, t1);
-        # fe_mul(t1, z, t1);
-        # fe_mul(t0, t0, t1);
-        # fe_sq(t0, t0);
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 5; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
-
-        # for (i = 1; i < 20; ++i) {
-        #     fe_sq(t2, t2);
-        # }
-        for ($i = 1; $i < 20; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
-
-        # for (i = 1; i < 100; ++i) {
-        #     fe_sq(t2, t2);
-        # }
-        for ($i = 1; $i < 100; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t0, t0);
-        # fe_sq(t0, t0);
-        # fe_mul(out, t0, z);
-        $t0 = self::fe_mul($t1, $t0);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_sq($t0);
-        return self::fe_mul($t0, $z);
-    }
-
-    /**
-     * Subtract two field elements.
-     *
-     * h = f - g
-     *
-     * Preconditions:
-     * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-     * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-     *
-     * Postconditions:
-     * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
-    {
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) ($f[0] - $g[0]),
-                (int) ($f[1] - $g[1]),
-                (int) ($f[2] - $g[2]),
-                (int) ($f[3] - $g[3]),
-                (int) ($f[4] - $g[4]),
-                (int) ($f[5] - $g[5]),
-                (int) ($f[6] - $g[6]),
-                (int) ($f[7] - $g[7]),
-                (int) ($f[8] - $g[8]),
-                (int) ($f[9] - $g[9])
-            )
-        );
-    }
-
-    /**
-     * Add two group elements.
-     *
-     * r = p + q
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
-     */
-    public static function ge_add(
-        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
-    ) {
-        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YplusX);
-        $r->Y = self::fe_mul($r->Y, $q->YminusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0   = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
-     * @param string $a
-     * @return array<int, mixed>
-     */
-    public static function slide($a)
-    {
-        if (self::strlen($a) < 256) {
-            if (self::strlen($a) < 16) {
-                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
-            }
-        }
-        $r = array();
-        for ($i = 0; $i < 256; ++$i) {
-            $r[$i] = 1 & (
-                    self::chrToInt($a[$i >> 3])
-                        >>
-                    ($i & 7)
-                );
-        }
-
-        for ($i = 0;$i < 256;++$i) {
-            if ($r[$i]) {
-                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
-                    if ($r[$i + $b]) {
-                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
-                            $r[$i] += $r[$i + $b] << $b;
-                            $r[$i + $b] = 0;
-                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
-                            $r[$i] -= $r[$i + $b] << $b;
-                            for ($k = $i + $b; $k < 256; ++$k) {
-                                if (!$r[$k]) {
-                                    $r[$k] = 1;
-                                    break;
-                                }
-                                $r[$k] = 0;
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
-     */
-    public static function ge_frombytes_negate_vartime($s)
-    {
-        static $d = null;
-        if (!$d) {
-            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
-        }
-
-        # fe_frombytes(h->Y,s);
-        # fe_1(h->Z);
-        $h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
-            self::fe_0(),
-            self::fe_frombytes($s),
-            self::fe_1()
-        );
-
-        # fe_sq(u,h->Y);
-        # fe_mul(v,u,d);
-        # fe_sub(u,u,h->Z);       /* u = y^2-1 */
-        # fe_add(v,v,h->Z);       /* v = dy^2+1 */
-        $u = self::fe_sq($h->Y);
-        $v = self::fe_mul($u, $d);
-        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
-        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
-
-        # fe_sq(v3,v);
-        # fe_mul(v3,v3,v);        /* v3 = v^3 */
-        # fe_sq(h->X,v3);
-        # fe_mul(h->X,h->X,v);
-        # fe_mul(h->X,h->X,u);    /* x = uv^7 */
-        $v3 = self::fe_sq($v);
-        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
-        $h->X = self::fe_sq($v3);
-        $h->X = self::fe_mul($h->X, $v);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
-
-        # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
-        # fe_mul(h->X,h->X,v3);
-        # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
-        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
-        $h->X = self::fe_mul($h->X, $v3);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
-
-        # fe_sq(vxx,h->X);
-        # fe_mul(vxx,vxx,v);
-        # fe_sub(check,vxx,u);    /* vx^2-u */
-        $vxx = self::fe_sq($h->X);
-        $vxx = self::fe_mul($vxx, $v);
-        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
-
-        # if (fe_isnonzero(check)) {
-        #     fe_add(check,vxx,u);  /* vx^2+u */
-        #     if (fe_isnonzero(check)) {
-        #         return -1;
-        #     }
-        #     fe_mul(h->X,h->X,sqrtm1);
-        # }
-        if (self::fe_isnonzero($check)) {
-            $check = self::fe_add($vxx, $u); /* vx^2 + u */
-            if (self::fe_isnonzero($check)) {
-                throw new RangeException('Internal check failed.');
-            }
-            $h->X = self::fe_mul(
-                $h->X,
-                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1)
-            );
-        }
-
-        # if (fe_isnegative(h->X) == (s[31] >> 7)) {
-        #     fe_neg(h->X,h->X);
-        # }
-        $i = self::chrToInt($s[31]);
-        if (self::fe_isnegative($h->X) === ($i >> 7)) {
-            $h->X = self::fe_neg($h->X);
-        }
-
-        # fe_mul(h->T,h->X,h->Y);
-        $h->T = self::fe_mul($h->X, $h->Y);
-        return $h;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
-     */
-    public static function ge_madd(
-        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
-        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
-    ) {
-        $r = clone $R;
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yplusx);
-        $r->Y = self::fe_mul($r->Y, $q->yminusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
-     */
-    public static function ge_msub(
-        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
-        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
-    ) {
-        $r = clone $R;
-
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yminusx);
-        $r->Y = self::fe_mul($r->Y, $q->yplusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add($p->Z, $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
-     */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
-    {
-        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
-     */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
-    {
-        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        $r->T = self::fe_mul($p->X, $p->Y);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
-     */
-    public static function ge_p2_0()
-    {
-        return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
-            self::fe_0(),
-            self::fe_1(),
-            self::fe_1()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
-     */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
-    {
-        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
-
-        $r->X = self::fe_sq($p->X);
-        $r->Z = self::fe_sq($p->Y);
-        $r->T = self::fe_sq2($p->Z);
-        $r->Y = self::fe_add($p->X, $p->Y);
-        $t0   = self::fe_sq($r->Y);
-        $r->Y = self::fe_add($r->Z, $r->X);
-        $r->Z = self::fe_sub($r->Z, $r->X);
-        $r->X = self::fe_sub($t0, $r->Y);
-        $r->T = self::fe_sub($r->T, $r->Z);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
-     */
-    public static function ge_p3_0()
-    {
-        return new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
-            self::fe_0(),
-            self::fe_1(),
-            self::fe_1(),
-            self::fe_0()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
-     */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
-        static $d2 = null;
-        if ($d2 === null) {
-            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
-        }
-        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
-        $r->YplusX = self::fe_add($p->Y, $p->X);
-        $r->YminusX = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_copy($p->Z);
-        $r->T2d = self::fe_mul($p->T, $d2);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
-     */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
-        return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
-            $p->X,
-            $p->Y,
-            $p->Z
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
-     * @return string
-     */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
-    {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
-        );
-        return $s;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
-     */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
-        $q = self::ge_p3_to_p2($p);
-        return self::ge_p2_dbl($q);
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
-     */
-    public static function ge_precomp_0()
-    {
-        return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_1(),
-            self::fe_1(),
-            self::fe_0()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $b
-     * @param int $c
-     * @return int
-     */
-    public static function equal($b, $c)
-    {
-        return (($b ^ $c) - 1 & 0xffffffff) >> 31;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $char
-     * @return int (1 = yes, 0 = no)
-     */
-    public static function negative($char)
-    {
-        if (is_int($char)) {
-            return $char < 0 ? 1 : 0;
-        }
-        $x = self::chrToInt(self::substr($char, 0, 1));
-        if (PHP_INT_SIZE === 8) {
-            return $x >> 63;
-        }
-        return $x >> 31;
-    }
-
-    /**
-     * Conditional move
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u
-     * @param int $b
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
-     */
-    public static function cmov(
-        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t,
-        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u,
-        $b
-    ) {
-        if (!is_int($b)) {
-            throw new InvalidArgumentException('Expected an integer.');
-        }
-        return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_cmov($t->yplusx, $u->yplusx, $b),
-            self::fe_cmov($t->yminusx, $u->yminusx, $b),
-            self::fe_cmov($t->xy2d, $u->xy2d, $b)
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $pos
-     * @param int $b
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
-     */
-    public static function ge_select($pos = 0, $b = 0)
-    {
-        static $base = null;
-        if ($base === null) {
-            $base = array();
-            foreach (self::$base as $i => $bas) {
-                for ($j = 0; $j < 8; ++$j) {
-                    $base[$i][$j] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][0]),
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][1]),
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][2])
-                    );
-                }
-            }
-        }
-        if (!is_int($pos)) {
-            throw new InvalidArgumentException('Position must be an integer');
-        }
-        if ($pos < 0 || $pos > 31) {
-            throw new RangeException('Position is out of range [0, 31]');
-        }
-
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
-
-        $t = self::ge_precomp_0();
-        for ($i = 0; $i < 8; ++$i) {
-            $t = self::cmov(
-                $t,
-                $base[$pos][$i],
-                self::equal($babs, $i + 1)
-            );
-        }
-        $minusT = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_copy($t->yminusx),
-            self::fe_copy($t->yplusx),
-            self::fe_neg($t->xy2d)
-        );
-        return self::cmov($t, $minusT, $bnegative);
-    }
-
-    /**
-     * Subtract two group elements.
-     *
-     * r = p - q
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
-     */
-    public static function ge_sub(
-        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
-    ) {
-        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
-
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YminusX);
-        $r->Y = self::fe_mul($r->Y, $q->YplusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0 = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * Convert a group element to a byte string.
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h
-     * @return string
-     */
-    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
-    {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
-        );
-        return $s;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
-     * @param string $b
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
-     */
-    public static function ge_double_scalarmult_vartime(
-        $a,
-        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A,
-        $b
-    ) {
-        /**
-         * @var ParagonIE_Sodium_Core_Curve25519_Ge_Cached[]
-         */
-        $Ai = array();
-
-        /**
-         * @var ParagonIE_Sodium_Core_Curve25519_Ge_Precomp[]
-         */
-        static $Bi = array();
-        if (!$Bi) {
-            for ($i = 0; $i < 8; ++$i) {
-                $Bi[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][0]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][1]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][2])
-                );
-            }
-        }
-        for ($i = 0; $i < 8; ++$i) {
-            $Ai[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
-                self::fe_0(),
-                self::fe_0(),
-                self::fe_0(),
-                self::fe_0()
-            );
-        }
-
-        # slide(aslide,a);
-        # slide(bslide,b);
-        $aslide = self::slide($a);
-        $bslide = self::slide($b);
-
-        # ge_p3_to_cached(&Ai[0],A);
-        # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
-        $Ai[0] = self::ge_p3_to_cached($A);
-        $t = self::ge_p3_dbl($A);
-        $A2 = self::ge_p1p1_to_p3($t);
-
-        # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
-        # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
-        # ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
-        # ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
-        # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
-        # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
-        # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
-        for ($i = 0; $i < 7; ++$i) {
-            $t = self::ge_add($A2, $Ai[$i]);
-            $u = self::ge_p1p1_to_p3($t);
-            $Ai[$i + 1] = self::ge_p3_to_cached($u);
-        }
-
-        # ge_p2_0(r);
-        $r = self::ge_p2_0();
-
-        # for (i = 255;i >= 0;--i) {
-        #     if (aslide[i] || bslide[i]) break;
-        # }
-        $i = 255;
-        for (; $i >= 0; --$i) {
-            if ($aslide[$i] || $bslide[$i]) {
-                break;
-            }
-        }
-
-        # for (;i >= 0;--i) {
-        for (; $i >= 0; --$i) {
-            # ge_p2_dbl(&t,r);
-            $t = self::ge_p2_dbl($r);
-
-            # if (aslide[i] > 0) {
-            if ($aslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_add(&t,&u,&Ai[aslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_add(
-                    $u,
-                    $Ai[(int) floor($aslide[$i] / 2)]
-                );
-            # } else if (aslide[i] < 0) {
-            } elseif ($aslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_sub(
-                    $u,
-                    $Ai[(int) floor(-$aslide[$i] / 2)]
-                );
-            }
-
-            # if (bslide[i] > 0) {
-            if ($bslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_madd(&t,&u,&Bi[bslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_madd(
-                    $t,
-                    $u,
-                    $Bi[(int) floor($bslide[$i] / 2)]
-                );
-            # } else if (bslide[i] < 0) {
-            } elseif ($bslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_msub(
-                    $t,
-                    $u,
-                    $Bi[(int) floor(-$bslide[$i] / 2)]
-                );
-            }
-            # ge_p1p1_to_p2(r,&t);
-            $r = self::ge_p1p1_to_p2($t);
-        }
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
-     */
-    public static function ge_scalarmult_base($a)
-    {
-        $e = array();
-        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
-
-        for ($i = 0; $i < 32; ++$i) {
-            $e[$i << 1] = self::chrToInt($a[$i]) & 15;
-            $e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
-        }
-
-        $carry = 0;
-        for ($i = 0; $i < 63; ++$i) {
-            $e[$i] += $carry;
-            $carry = $e[$i] + 8;
-            $carry >>= 4;
-            $e[$i] -= $carry << 4;
-        }
-        $e[63] += $carry;
-
-        $h = self::ge_p3_0();
-
-        for ($i = 1; $i < 64; $i += 2) {
-            $t = self::ge_select((int) floor($i / 2), $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
-        }
-
-        $r = self::ge_p3_dbl($h);
-
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-
-        $h = self::ge_p1p1_to_p3($r);
-
-        for ($i = 0; $i < 64; $i += 2) {
-            $t = self::ge_select($i >> 1, $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
-        }
-        return $h;
-    }
-
-    /**
-     * Calculates (ab + c) mod l
-     * where l = 2^252 + 27742317777372353535851937790883648493
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param string $b
-     * @param string $c
-     * @return string
-     */
-    public static function sc_muladd($a, $b, $c)
-    {
-        $a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
-        $a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
-        $a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
-        $a3 = 2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7);
-        $a4 = 2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4);
-        $a5 = 2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1);
-        $a6 = 2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6);
-        $a7 = 2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3);
-        $a8 = 2097151 & self::load_3(self::substr($a, 21, 3));
-        $a9 = 2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5);
-        $a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
-        $a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
-        $b0 = 2097151 & self::load_3(self::substr($b, 0, 3));
-        $b1 = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
-        $b2 = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
-        $b3 = 2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7);
-        $b4 = 2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4);
-        $b5 = 2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1);
-        $b6 = 2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6);
-        $b7 = 2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3);
-        $b8 = 2097151 & self::load_3(self::substr($b, 21, 3));
-        $b9 = 2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5);
-        $b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
-        $b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
-        $c0 = 2097151 & self::load_3(self::substr($c, 0, 3));
-        $c1 = 2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5);
-        $c2 = 2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2);
-        $c3 = 2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7);
-        $c4 = 2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4);
-        $c5 = 2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1);
-        $c6 = 2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6);
-        $c7 = 2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3);
-        $c8 = 2097151 & self::load_3(self::substr($c, 21, 3));
-        $c9 = 2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5);
-        $c10 = 2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2);
-        $c11 = (self::load_4(self::substr($c, 28, 4)) >> 7);
-
-        /* Can't really avoid the pyramid here: */
-        $s0 = $c0 + self::mul($a0, $b0);
-        $s1 = $c1 + self::mul($a0, $b1) + self::mul($a1, $b0);
-        $s2 = $c2 + self::mul($a0, $b2) + self::mul($a1, $b1) + self::mul($a2, $b0);
-        $s3 = $c3 + self::mul($a0, $b3) + self::mul($a1, $b2) + self::mul($a2, $b1) + self::mul($a3, $b0);
-        $s4 = $c4 + self::mul($a0, $b4) + self::mul($a1, $b3) + self::mul($a2, $b2) + self::mul($a3, $b1) + self::mul($a4, $b0);
-        $s5 = $c5 + self::mul($a0, $b5) + self::mul($a1, $b4) + self::mul($a2, $b3) + self::mul($a3, $b2) + self::mul($a4, $b1) + self::mul($a5, $b0);
-        $s6 = $c6 + self::mul($a0, $b6) + self::mul($a1, $b5) + self::mul($a2, $b4) + self::mul($a3, $b3) + self::mul($a4, $b2) + self::mul($a5, $b1) + self::mul($a6, $b0);
-        $s7 = $c7 + self::mul($a0, $b7) + self::mul($a1, $b6) + self::mul($a2, $b5) + self::mul($a3, $b4) + self::mul($a4, $b3) + self::mul($a5, $b2) + self::mul($a6, $b1) + self::mul($a7, $b0);
-        $s8 = $c8 + self::mul($a0, $b8) + self::mul($a1, $b7) + self::mul($a2, $b6) + self::mul($a3, $b5) + self::mul($a4, $b4) + self::mul($a5, $b3) + self::mul($a6, $b2) + self::mul($a7, $b1) + self::mul($a8, $b0);
-        $s9 = $c9 + self::mul($a0, $b9) + self::mul($a1, $b8) + self::mul($a2, $b7) + self::mul($a3, $b6) + self::mul($a4, $b5) + self::mul($a5, $b4) + self::mul($a6, $b3) + self::mul($a7, $b2) + self::mul($a8, $b1) + self::mul($a9, $b0);
-        $s10 = $c10 + self::mul($a0, $b10) + self::mul($a1, $b9) + self::mul($a2, $b8) + self::mul($a3, $b7) + self::mul($a4, $b6) + self::mul($a5, $b5) + self::mul($a6, $b4) + self::mul($a7, $b3) + self::mul($a8, $b2) + self::mul($a9, $b1) + self::mul($a10, $b0);
-        $s11 = $c11 + self::mul($a0, $b11) + self::mul($a1, $b10) + self::mul($a2, $b9) + self::mul($a3, $b8) + self::mul($a4, $b7) + self::mul($a5, $b6) + self::mul($a6, $b5) + self::mul($a7, $b4) + self::mul($a8, $b3) + self::mul($a9, $b2) + self::mul($a10, $b1) + self::mul($a11, $b0);
-        $s12 = self::mul($a1, $b11) + self::mul($a2, $b10) + self::mul($a3, $b9) + self::mul($a4, $b8) + self::mul($a5, $b7) + self::mul($a6, $b6) + self::mul($a7, $b5) + self::mul($a8, $b4) + self::mul($a9, $b3) + self::mul($a10, $b2) + self::mul($a11, $b1);
-        $s13 = self::mul($a2, $b11) + self::mul($a3, $b10) + self::mul($a4, $b9) + self::mul($a5, $b8) + self::mul($a6, $b7) + self::mul($a7, $b6) + self::mul($a8, $b5) + self::mul($a9, $b4) + self::mul($a10, $b3) + self::mul($a11, $b2);
-        $s14 = self::mul($a3, $b11) + self::mul($a4, $b10) + self::mul($a5, $b9) + self::mul($a6, $b8) + self::mul($a7, $b7) + self::mul($a8, $b6) + self::mul($a9, $b5) + self::mul($a10, $b4) + self::mul($a11, $b3);
-        $s15 = self::mul($a4, $b11) + self::mul($a5, $b10) + self::mul($a6, $b9) + self::mul($a7, $b8) + self::mul($a8, $b7) + self::mul($a9, $b6) + self::mul($a10, $b5) + self::mul($a11, $b4);
-        $s16 = self::mul($a5, $b11) + self::mul($a6, $b10) + self::mul($a7, $b9) + self::mul($a8, $b8) + self::mul($a9, $b7) + self::mul($a10, $b6) + self::mul($a11, $b5);
-        $s17 = self::mul($a6, $b11) + self::mul($a7, $b10) + self::mul($a8, $b9) + self::mul($a9, $b8) + self::mul($a10, $b7) + self::mul($a11, $b6);
-        $s18 = self::mul($a7, $b11) + self::mul($a8, $b10) + self::mul($a9, $b9) + self::mul($a10, $b8) + self::mul($a11, $b7);
-        $s19 = self::mul($a8, $b11) + self::mul($a9, $b10) + self::mul($a10, $b9) + self::mul($a11, $b8);
-        $s20 = self::mul($a9, $b11) + self::mul($a10, $b10) + self::mul($a11, $b9);
-        $s21 = self::mul($a10, $b11) + self::mul($a11, $b10);
-        $s22 = self::mul($a11, $b11);
-        $s23 = 0;
-
-        $carry0 = ($s0 + (1 << 20)) >> 21;
-        $s1 += $carry0;
-        $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
-        $s3 += $carry2;
-        $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
-        $s5 += $carry4;
-        $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
-        $s13 += $carry12;
-        $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
-        $s15 += $carry14;
-        $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
-        $s17 += $carry16;
-        $s16 -= $carry16 << 21;
-        $carry18 = ($s18 + (1 << 20)) >> 21;
-        $s19 += $carry18;
-        $s18 -= $carry18 << 21;
-        $carry20 = ($s20 + (1 << 20)) >> 21;
-        $s21 += $carry20;
-        $s20 -= $carry20 << 21;
-        $carry22 = ($s22 + (1 << 20)) >> 21;
-        $s23 += $carry22;
-        $s22 -= $carry22 << 21;
-
-        $carry1 = ($s1 + (1 << 20)) >> 21;
-        $s2 += $carry1;
-        $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
-        $s4 += $carry3;
-        $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
-        $s6 += $carry5;
-        $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
-        $s12 += $carry11;
-        $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
-        $s14 += $carry13;
-        $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
-        $s16 += $carry15;
-        $s15 -= $carry15 << 21;
-        $carry17 = ($s17 + (1 << 20)) >> 21;
-        $s18 += $carry17;
-        $s17 -= $carry17 << 21;
-        $carry19 = ($s19 + (1 << 20)) >> 21;
-        $s20 += $carry19;
-        $s19 -= $carry19 << 21;
-        $carry21 = ($s21 + (1 << 20)) >> 21;
-        $s22 += $carry21;
-        $s21 -= $carry21 << 21;
-
-        $s11 += self::mul($s23, 666643, 20);
-        $s12 += self::mul($s23, 470296, 19);
-        $s13 += self::mul($s23, 654183, 20);
-        $s14 -= self::mul($s23, 997805, 20);
-        $s15 += self::mul($s23, 136657, 18);
-        $s16 -= self::mul($s23, 683901, 20);
-
-        $s10 += self::mul($s22, 666643, 20);
-        $s11 += self::mul($s22, 470296, 19);
-        $s12 += self::mul($s22, 654183, 20);
-        $s13 -= self::mul($s22, 997805, 20);
-        $s14 += self::mul($s22, 136657, 18);
-        $s15 -= self::mul($s22, 683901, 20);
-
-        $s9  += self::mul($s21,  666643, 20);
-        $s10 += self::mul($s21,  470296, 19);
-        $s11 += self::mul($s21,  654183, 20);
-        $s12 -= self::mul($s21,  997805, 20);
-        $s13 += self::mul($s21,  136657, 18);
-        $s14 -= self::mul($s21,  683901, 20);
-
-        $s8  += self::mul($s20,  666643, 20);
-        $s9  += self::mul($s20,  470296, 19);
-        $s10 += self::mul($s20,  654183, 20);
-        $s11 -= self::mul($s20,  997805, 20);
-        $s12 += self::mul($s20,  136657, 18);
-        $s13 -= self::mul($s20,  683901, 20);
-
-        $s7  += self::mul($s19,  666643, 20);
-        $s8  += self::mul($s19,  470296, 19);
-        $s9  += self::mul($s19,  654183, 20);
-        $s10 -= self::mul($s19,  997805, 20);
-        $s11 += self::mul($s19,  136657, 18);
-        $s12 -= self::mul($s19,  683901, 20);
-
-        $s6  += self::mul($s18,  666643, 20);
-        $s7  += self::mul($s18,  470296, 19);
-        $s8  += self::mul($s18,  654183, 20);
-        $s9  -= self::mul($s18,  997805, 20);
-        $s10 += self::mul($s18,  136657, 18);
-        $s11 -= self::mul($s18,  683901, 20);
-
-        $carry6 = ($s6 + (1 << 20)) >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
-        $s13 += $carry12;
-        $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
-        $s15 += $carry14;
-        $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
-        $s17 += $carry16;
-        $s16 -= $carry16 << 21;
-
-        $carry7 = ($s7 + (1 << 20)) >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
-        $s12 += $carry11;
-        $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
-        $s14 += $carry13;
-        $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
-        $s16 += $carry15;
-        $s15 -= $carry15 << 21;
-
-        $s5  += self::mul($s17,  666643, 20);
-        $s6  += self::mul($s17,  470296, 19);
-        $s7  += self::mul($s17,  654183, 20);
-        $s8  -= self::mul($s17,  997805, 20);
-        $s9  += self::mul($s17,  136657, 18);
-        $s10 -= self::mul($s17,  683901, 20);
-
-        $s4 += self::mul($s16,  666643, 20);
-        $s5 += self::mul($s16,  470296, 19);
-        $s6 += self::mul($s16,  654183, 20);
-        $s7 -= self::mul($s16,  997805, 20);
-        $s8 += self::mul($s16,  136657, 18);
-        $s9 -= self::mul($s16,  683901, 20);
-
-        $s3 += self::mul($s15,  666643, 20);
-        $s4 += self::mul($s15,  470296, 19);
-        $s5 += self::mul($s15,  654183, 20);
-        $s6 -= self::mul($s15,  997805, 20);
-        $s7 += self::mul($s15,  136657, 18);
-        $s8 -= self::mul($s15,  683901, 20);
-
-        $s2 += self::mul($s14,  666643, 20);
-        $s3 += self::mul($s14,  470296, 19);
-        $s4 += self::mul($s14,  654183, 20);
-        $s5 -= self::mul($s14,  997805, 20);
-        $s6 += self::mul($s14,  136657, 18);
-        $s7 -= self::mul($s14,  683901, 20);
-
-        $s1 += self::mul($s13,  666643, 20);
-        $s2 += self::mul($s13,  470296, 19);
-        $s3 += self::mul($s13,  654183, 20);
-        $s4 -= self::mul($s13,  997805, 20);
-        $s5 += self::mul($s13,  136657, 18);
-        $s6 -= self::mul($s13,  683901, 20);
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
-        $s12 = 0;
-
-        $carry0 = ($s0 + (1 << 20)) >> 21;
-        $s1 += $carry0;
-        $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
-        $s3 += $carry2;
-        $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
-        $s5 += $carry4;
-        $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-
-        $carry1 = ($s1 + (1 << 20)) >> 21;
-        $s2 += $carry1;
-        $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
-        $s4 += $carry3;
-        $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
-        $s6 += $carry5;
-        $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
-        $s12 += $carry11;
-        $s11 -= $carry11 << 21;
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
-        $s12 = 0;
-
-        $carry0 = $s0 >> 21;
-        $s1 += $carry0;
-        $s0 -= $carry0 << 21;
-        $carry1 = $s1 >> 21;
-        $s2 += $carry1;
-        $s1 -= $carry1 << 21;
-        $carry2 = $s2 >> 21;
-        $s3 += $carry2;
-        $s2 -= $carry2 << 21;
-        $carry3 = $s3 >> 21;
-        $s4 += $carry3;
-        $s3 -= $carry3 << 21;
-        $carry4 = $s4 >> 21;
-        $s5 += $carry4;
-        $s4 -= $carry4 << 21;
-        $carry5 = $s5 >> 21;
-        $s6 += $carry5;
-        $s5 -= $carry5 << 21;
-        $carry6 = $s6 >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry7 = $s7 >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry8 = $s8 >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry9 = $s9 >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry10 = $s10 >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-        $carry11 = $s11 >> 21;
-        $s12 += $carry11;
-        $s11 -= $carry11 << 21;
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
-
-        $carry0 = $s0 >> 21;
-        $s1 += $carry0;
-        $s0 -= $carry0 << 21;
-        $carry1 = $s1 >> 21;
-        $s2 += $carry1;
-        $s1 -= $carry1 << 21;
-        $carry2 = $s2 >> 21;
-        $s3 += $carry2;
-        $s2 -= $carry2 << 21;
-        $carry3 = $s3 >> 21;
-        $s4 += $carry3;
-        $s3 -= $carry3 << 21;
-        $carry4 = $s4 >> 21;
-        $s5 += $carry4;
-        $s4 -= $carry4 << 21;
-        $carry5 = $s5 >> 21;
-        $s6 += $carry5;
-        $s5 -= $carry5 << 21;
-        $carry6 = $s6 >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry7 = $s7 >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry8 = $s8 >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry9 = $s9 >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry10 = $s10 >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) (0xff & ($s0 >> 0)),
-            (int) (0xff & ($s0 >> 8)),
-            (int) (0xff & (($s0 >> 16) | $s1 << 5)),
-            (int) (0xff & ($s1 >> 3)),
-            (int) (0xff & ($s1 >> 11)),
-            (int) (0xff & (($s1 >> 19) | $s2 << 2)),
-            (int) (0xff & ($s2 >> 6)),
-            (int) (0xff & (($s2 >> 14) | $s3 << 7)),
-            (int) (0xff & ($s3 >> 1)),
-            (int) (0xff & ($s3 >> 9)),
-            (int) (0xff & (($s3 >> 17) | $s4 << 4)),
-            (int) (0xff & ($s4 >> 4)),
-            (int) (0xff & ($s4 >> 12)),
-            (int) (0xff & (($s4 >> 20) | $s5 << 1)),
-            (int) (0xff & ($s5 >> 7)),
-            (int) (0xff & (($s5 >> 15) | $s6 << 6)),
-            (int) (0xff & ($s6 >> 2)),
-            (int) (0xff & ($s6 >> 10)),
-            (int) (0xff & (($s6 >> 18) | $s7 << 3)),
-            (int) (0xff & ($s7 >> 5)),
-            (int) (0xff & ($s7 >> 13)),
-            (int) (0xff & ($s8 >> 0)),
-            (int) (0xff & ($s8 >> 8)),
-            (int) (0xff & (($s8 >> 16) | $s9 << 5)),
-            (int) (0xff & ($s9 >> 3)),
-            (int) (0xff & ($s9 >> 11)),
-            (int) (0xff & (($s9 >> 19) | $s10 << 2)),
-            (int) (0xff & ($s10 >> 6)),
-            (int) (0xff & (($s10 >> 14) | $s11 << 7)),
-            (int) (0xff & ($s11 >> 1)),
-            (int) (0xff & ($s11 >> 9)),
-            0xff & ($s11 >> 17)
-        );
-        return self::intArrayToString($arr);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return string
-     */
-    public static function sc_reduce($s)
-    {
-        $s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
-        $s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
-        $s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);
-        $s3 = 2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7);
-        $s4 = 2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4);
-        $s5 = 2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1);
-        $s6 = 2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6);
-        $s7 = 2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3);
-        $s8 = 2097151 & self::load_3(self::substr($s, 21, 3));
-        $s9 = 2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5);
-        $s10 = 2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2);
-        $s11 = 2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7);
-        $s12 = 2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4);
-        $s13 = 2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1);
-        $s14 = 2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6);
-        $s15 = 2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3);
-        $s16 = 2097151 & self::load_3(self::substr($s, 42, 3));
-        $s17 = 2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5);
-        $s18 = 2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2);
-        $s19 = 2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7);
-        $s20 = 2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4);
-        $s21 = 2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1);
-        $s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6);
-        $s23 = (self::load_4(self::substr($s, 60, 4)) >> 3);
-
-        $s11 += self::mul($s23,  666643, 20);
-        $s12 += self::mul($s23,  470296, 19);
-        $s13 += self::mul($s23,  654183, 20);
-        $s14 -= self::mul($s23,  997805, 20);
-        $s15 += self::mul($s23,  136657, 18);
-        $s16 -= self::mul($s23,  683901, 20);
-
-        $s10 += self::mul($s22,  666643, 20);
-        $s11 += self::mul($s22,  470296, 19);
-        $s12 += self::mul($s22,  654183, 20);
-        $s13 -= self::mul($s22,  997805, 20);
-        $s14 += self::mul($s22,  136657, 18);
-        $s15 -= self::mul($s22,  683901, 20);
-
-        $s9  += self::mul($s21,  666643, 20);
-        $s10 += self::mul($s21,  470296, 19);
-        $s11 += self::mul($s21,  654183, 20);
-        $s12 -= self::mul($s21,  997805, 20);
-        $s13 += self::mul($s21,  136657, 18);
-        $s14 -= self::mul($s21,  683901, 20);
-
-        $s8  += self::mul($s20,  666643, 20);
-        $s9  += self::mul($s20,  470296, 19);
-        $s10 += self::mul($s20,  654183, 20);
-        $s11 -= self::mul($s20,  997805, 20);
-        $s12 += self::mul($s20,  136657, 18);
-        $s13 -= self::mul($s20,  683901, 20);
-
-        $s7  += self::mul($s19,  666643, 20);
-        $s8  += self::mul($s19,  470296, 19);
-        $s9  += self::mul($s19,  654183, 20);
-        $s10 -= self::mul($s19,  997805, 20);
-        $s11 += self::mul($s19,  136657, 18);
-        $s12 -= self::mul($s19,  683901, 20);
-
-        $s6  += self::mul($s18,  666643, 20);
-        $s7  += self::mul($s18,  470296, 19);
-        $s8  += self::mul($s18,  654183, 20);
-        $s9  -= self::mul($s18,  997805, 20);
-        $s10 += self::mul($s18,  136657, 18);
-        $s11 -= self::mul($s18,  683901, 20);
-
-        $carry6 = ($s6 + (1 << 20)) >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
-        $s13 += $carry12;
-        $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
-        $s15 += $carry14;
-        $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
-        $s17 += $carry16;
-        $s16 -= $carry16 << 21;
-
-        $carry7 = ($s7 + (1 << 20)) >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
-        $s12 += $carry11;
-        $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
-        $s14 += $carry13;
-        $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
-        $s16 += $carry15;
-        $s15 -= $carry15 << 21;
-
-        $s5  += self::mul($s17,  666643, 20);
-        $s6  += self::mul($s17,  470296, 19);
-        $s7  += self::mul($s17,  654183, 20);
-        $s8  -= self::mul($s17,  997805, 20);
-        $s9  += self::mul($s17,  136657, 18);
-        $s10 -= self::mul($s17,  683901, 20);
-
-        $s4 += self::mul($s16,  666643, 20);
-        $s5 += self::mul($s16,  470296, 19);
-        $s6 += self::mul($s16,  654183, 20);
-        $s7 -= self::mul($s16,  997805, 20);
-        $s8 += self::mul($s16,  136657, 18);
-        $s9 -= self::mul($s16,  683901, 20);
-
-        $s3 += self::mul($s15,  666643, 20);
-        $s4 += self::mul($s15,  470296, 19);
-        $s5 += self::mul($s15,  654183, 20);
-        $s6 -= self::mul($s15,  997805, 20);
-        $s7 += self::mul($s15,  136657, 18);
-        $s8 -= self::mul($s15,  683901, 20);
-
-        $s2 += self::mul($s14,  666643, 20);
-        $s3 += self::mul($s14,  470296, 19);
-        $s4 += self::mul($s14,  654183, 20);
-        $s5 -= self::mul($s14,  997805, 20);
-        $s6 += self::mul($s14,  136657, 18);
-        $s7 -= self::mul($s14,  683901, 20);
-
-        $s1 += self::mul($s13,  666643, 20);
-        $s2 += self::mul($s13,  470296, 19);
-        $s3 += self::mul($s13,  654183, 20);
-        $s4 -= self::mul($s13,  997805, 20);
-        $s5 += self::mul($s13,  136657, 18);
-        $s6 -= self::mul($s13,  683901, 20);
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
-        $s12 = 0;
-
-        $carry0 = ($s0 + (1 << 20)) >> 21;
-        $s1 += $carry0;
-        $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
-        $s3 += $carry2;
-        $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
-        $s5 += $carry4;
-        $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-
-        $carry1 = ($s1 + (1 << 20)) >> 21;
-        $s2 += $carry1;
-        $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
-        $s4 += $carry3;
-        $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
-        $s6 += $carry5;
-        $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
-        $s12 += $carry11;
-        $s11 -= $carry11 << 21;
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
-        $s12 = 0;
-
-        $carry0 = $s0 >> 21;
-        $s1 += $carry0;
-        $s0 -= $carry0 << 21;
-        $carry1 = $s1 >> 21;
-        $s2 += $carry1;
-        $s1 -= $carry1 << 21;
-        $carry2 = $s2 >> 21;
-        $s3 += $carry2;
-        $s2 -= $carry2 << 21;
-        $carry3 = $s3 >> 21;
-        $s4 += $carry3;
-        $s3 -= $carry3 << 21;
-        $carry4 = $s4 >> 21;
-        $s5 += $carry4;
-        $s4 -= $carry4 << 21;
-        $carry5 = $s5 >> 21;
-        $s6 += $carry5;
-        $s5 -= $carry5 << 21;
-        $carry6 = $s6 >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry7 = $s7 >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry8 = $s8 >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry9 = $s9 >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry10 = $s10 >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-        $carry11 = $s11 >> 21;
-        $s12 += $carry11;
-        $s11 -= $carry11 << 21;
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
-
-        $carry0 = $s0 >> 21;
-        $s1 += $carry0;
-        $s0 -= $carry0 << 21;
-        $carry1 = $s1 >> 21;
-        $s2 += $carry1;
-        $s1 -= $carry1 << 21;
-        $carry2 = $s2 >> 21;
-        $s3 += $carry2;
-        $s2 -= $carry2 << 21;
-        $carry3 = $s3 >> 21;
-        $s4 += $carry3;
-        $s3 -= $carry3 << 21;
-        $carry4 = $s4 >> 21;
-        $s5 += $carry4;
-        $s4 -= $carry4 << 21;
-        $carry5 = $s5 >> 21;
-        $s6 += $carry5;
-        $s5 -= $carry5 << 21;
-        $carry6 = $s6 >> 21;
-        $s7 += $carry6;
-        $s6 -= $carry6 << 21;
-        $carry7 = $s7 >> 21;
-        $s8 += $carry7;
-        $s7 -= $carry7 << 21;
-        $carry8 = $s8 >> 21;
-        $s9 += $carry8;
-        $s8 -= $carry8 << 21;
-        $carry9 = $s9 >> 21;
-        $s10 += $carry9;
-        $s9 -= $carry9 << 21;
-        $carry10 = $s10 >> 21;
-        $s11 += $carry10;
-        $s10 -= $carry10 << 21;
-
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) ($s0 >> 0),
-            (int) ($s0 >> 8),
-            (int) (($s0 >> 16) | $s1 << 5),
-            (int) ($s1 >> 3),
-            (int) ($s1 >> 11),
-            (int) (($s1 >> 19) | $s2 << 2),
-            (int) ($s2 >> 6),
-            (int) (($s2 >> 14) | $s3 << 7),
-            (int) ($s3 >> 1),
-            (int) ($s3 >> 9),
-            (int) (($s3 >> 17) | $s4 << 4),
-            (int) ($s4 >> 4),
-            (int) ($s4 >> 12),
-            (int) (($s4 >> 20) | $s5 << 1),
-            (int) ($s5 >> 7),
-            (int) (($s5 >> 15) | $s6 << 6),
-            (int) ($s6 >> 2),
-            (int) ($s6 >> 10),
-            (int) (($s6 >> 18) | $s7 << 3),
-            (int) ($s7 >> 5),
-            (int) ($s7 >> 13),
-            (int) ($s8 >> 0),
-            (int) ($s8 >> 8),
-            (int) (($s8 >> 16) | $s9 << 5),
-            (int) ($s9 >> 3),
-            (int) ($s9 >> 11),
-            (int) (($s9 >> 19) | $s10 << 2),
-            (int) ($s10 >> 6),
-            (int) (($s10 >> 14) | $s11 << 7),
-            (int) ($s11 >> 1),
-            (int) ($s11 >> 9),
-            (int) $s11 >> 17
-        );
-        return self::intArrayToString($arr);
-    }
+	/**
+	 * Get a field element of size 10 with a value of 0
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_0()
+	{
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+			array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+		);
+	}
+
+	/**
+	 * Get a field element of size 10 with a value of 1
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_1()
+	{
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+			array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+		);
+	}
+
+	/**
+	 * Add two field elements.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_add(
+		ParagonIE_Sodium_Core_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core_Curve25519_Fe $g
+	) {
+		$arr = array();
+		for ($i = 0; $i < 10; ++$i) {
+			$arr[$i] = (int) ($f[$i] + $g[$i]);
+		}
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($arr);
+	}
+
+	/**
+	 * Constant-time conditional move.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+	 * @param int $b
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_cmov(
+		ParagonIE_Sodium_Core_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core_Curve25519_Fe $g,
+		$b = 0
+	) {
+		$h = array();
+		$b *= -1;
+		for ($i = 0; $i < 10; ++$i) {
+			$x = (($f[$i] ^ $g[$i]) & $b);
+			$h[$i] = $f[$i] ^ $x;
+		}
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+	}
+
+	/**
+	 * Create a copy of a field element.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+	{
+		$h = clone $f;
+		return $h;
+	}
+
+	/**
+	 * Give: 32-byte string.
+	 * Receive: A field element object to use for internal calculations.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $s
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 * @throws RangeException
+	 */
+	public static function fe_frombytes($s)
+	{
+		if (self::strlen($s) !== 32) {
+			throw new RangeException('Expected a 32-byte string.');
+		}
+		$h0 = self::load_4($s);
+		$h1 = self::load_3(self::substr($s, 4, 3)) << 6;
+		$h2 = self::load_3(self::substr($s, 7, 3)) << 5;
+		$h3 = self::load_3(self::substr($s, 10, 3)) << 3;
+		$h4 = self::load_3(self::substr($s, 13, 3)) << 2;
+		$h5 = self::load_4(self::substr($s, 16, 4));
+		$h6 = self::load_3(self::substr($s, 20, 3)) << 7;
+		$h7 = self::load_3(self::substr($s, 23, 3)) << 5;
+		$h8 = self::load_3(self::substr($s, 26, 3)) << 4;
+		$h9 = (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2;
+
+		$carry9 = ($h9 + (1 << 24)) >> 25;
+		$h0 += self::mul($carry9, 19, 5);
+		$h9 -= $carry9 << 25;
+		$carry1 = ($h1 + (1 << 24)) >> 25;
+		$h2 += $carry1;
+		$h1 -= $carry1 << 25;
+		$carry3 = ($h3 + (1 << 24)) >> 25;
+		$h4 += $carry3;
+		$h3 -= $carry3 << 25;
+		$carry5 = ($h5 + (1 << 24)) >> 25;
+		$h6 += $carry5;
+		$h5 -= $carry5 << 25;
+		$carry7 = ($h7 + (1 << 24)) >> 25;
+		$h8 += $carry7;
+		$h7 -= $carry7 << 25;
+
+		$carry0 = ($h0 + (1 << 25)) >> 26;
+		$h1 += $carry0;
+		$h0 -= $carry0 << 26;
+		$carry2 = ($h2 + (1 << 25)) >> 26;
+		$h3 += $carry2;
+		$h2 -= $carry2 << 26;
+		$carry4 = ($h4 + (1 << 25)) >> 26;
+		$h5 += $carry4;
+		$h4 -= $carry4 << 26;
+		$carry6 = ($h6 + (1 << 25)) >> 26;
+		$h7 += $carry6;
+		$h6 -= $carry6 << 26;
+		$carry8 = ($h8 + (1 << 25)) >> 26;
+		$h9 += $carry8;
+		$h8 -= $carry8 << 26;
+
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+			array(
+				(int) $h0,
+				(int) $h1,
+				(int) $h2,
+				(int) $h3,
+				(int) $h4,
+				(int) $h5,
+				(int) $h6,
+				(int) $h7,
+				(int) $h8,
+				(int) $h9
+			)
+		);
+	}
+
+	/**
+	 * Convert a field element to a byte string.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
+	 * @return string
+	 */
+	public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
+	{
+		$h[0] = (int) $h[0];
+		$h[1] = (int) $h[1];
+		$h[2] = (int) $h[2];
+		$h[3] = (int) $h[3];
+		$h[4] = (int) $h[4];
+		$h[5] = (int) $h[5];
+		$h[6] = (int) $h[6];
+		$h[7] = (int) $h[7];
+		$h[8] = (int) $h[8];
+		$h[9] = (int) $h[9];
+
+		$q = (self::mul($h[9], 19, 5) + (1 << 24)) >> 25;
+		$q = ($h[0] + $q) >> 26;
+		$q = ($h[1] + $q) >> 25;
+		$q = ($h[2] + $q) >> 26;
+		$q = ($h[3] + $q) >> 25;
+		$q = ($h[4] + $q) >> 26;
+		$q = ($h[5] + $q) >> 25;
+		$q = ($h[6] + $q) >> 26;
+		$q = ($h[7] + $q) >> 25;
+		$q = ($h[8] + $q) >> 26;
+		$q = ($h[9] + $q) >> 25;
+
+		$h[0] += self::mul($q, 19, 5);
+
+		$carry0 = $h[0] >> 26;
+		$h[1] += $carry0;
+		$h[0] -= $carry0 << 26;
+		$carry1 = $h[1] >> 25;
+		$h[2] += $carry1;
+		$h[1] -= $carry1 << 25;
+		$carry2 = $h[2] >> 26;
+		$h[3] += $carry2;
+		$h[2] -= $carry2 << 26;
+		$carry3 = $h[3] >> 25;
+		$h[4] += $carry3;
+		$h[3] -= $carry3 << 25;
+		$carry4 = $h[4] >> 26;
+		$h[5] += $carry4;
+		$h[4] -= $carry4 << 26;
+		$carry5 = $h[5] >> 25;
+		$h[6] += $carry5;
+		$h[5] -= $carry5 << 25;
+		$carry6 = $h[6] >> 26;
+		$h[7] += $carry6;
+		$h[6] -= $carry6 << 26;
+		$carry7 = $h[7] >> 25;
+		$h[8] += $carry7;
+		$h[7] -= $carry7 << 25;
+		$carry8 = $h[8] >> 26;
+		$h[9] += $carry8;
+		$h[8] -= $carry8 << 26;
+		$carry9 = $h[9] >> 25;
+		$h[9] -= $carry9 << 25;
+
+		/**
+		 * @var array<int, int>
+		 */
+		$s = array(
+			(int) (($h[0] >> 0) & 0xff),
+			(int) (($h[0] >> 8) & 0xff),
+			(int) (($h[0] >> 16) & 0xff),
+			(int) ((($h[0] >> 24) | ($h[1] << 2)) & 0xff),
+			(int) (($h[1] >> 6) & 0xff),
+			(int) (($h[1] >> 14) & 0xff),
+			(int) ((($h[1] >> 22) | ($h[2] << 3)) & 0xff),
+			(int) (($h[2] >> 5) & 0xff),
+			(int) (($h[2] >> 13) & 0xff),
+			(int) ((($h[2] >> 21) | ($h[3] << 5)) & 0xff),
+			(int) (($h[3] >> 3) & 0xff),
+			(int) (($h[3] >> 11) & 0xff),
+			(int) ((($h[3] >> 19) | ($h[4] << 6)) & 0xff),
+			(int) (($h[4] >> 2) & 0xff),
+			(int) (($h[4] >> 10) & 0xff),
+			(int) (($h[4] >> 18) & 0xff),
+			(int) (($h[5] >> 0) & 0xff),
+			(int) (($h[5] >> 8) & 0xff),
+			(int) (($h[5] >> 16) & 0xff),
+			(int) ((($h[5] >> 24) | ($h[6] << 1)) & 0xff),
+			(int) (($h[6] >> 7) & 0xff),
+			(int) (($h[6] >> 15) & 0xff),
+			(int) ((($h[6] >> 23) | ($h[7] << 3)) & 0xff),
+			(int) (($h[7] >> 5) & 0xff),
+			(int) (($h[7] >> 13) & 0xff),
+			(int) ((($h[7] >> 21) | ($h[8] << 4)) & 0xff),
+			(int) (($h[8] >> 4) & 0xff),
+			(int) (($h[8] >> 12) & 0xff),
+			(int) ((($h[8] >> 20) | ($h[9] << 6)) & 0xff),
+			(int) (($h[9] >> 2) & 0xff),
+			(int) (($h[9] >> 10) & 0xff),
+			(int) (($h[9] >> 18) & 0xff)
+		);
+		return self::intArrayToString($s);
+	}
+
+	/**
+	 * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @return int
+	 */
+	public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+	{
+		$str = self::fe_tobytes($f);
+		return self::chrToInt($str[0]) & 1;
+	}
+
+	/**
+	 * Returns 0 if this field element results in all NUL bytes.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @return bool
+	 */
+	public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+	{
+		static $zero;
+		if ($zero === null) {
+			$zero = str_repeat("\x00", 32);
+		}
+		$str = self::fe_tobytes($f);
+		return !self::verify_32($str, $zero);
+	}
+
+	/**
+	 * Multiply two field elements
+	 *
+	 * h = f * g
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @security Is multiplication a source of timing leaks? If so, can we do
+	 *           anything to prevent that from happening?
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_mul(
+		ParagonIE_Sodium_Core_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core_Curve25519_Fe $g
+	) {
+		$f0 = $f[0];
+		$f1 = $f[1];
+		$f2 = $f[2];
+		$f3 = $f[3];
+		$f4 = $f[4];
+		$f5 = $f[5];
+		$f6 = $f[6];
+		$f7 = $f[7];
+		$f8 = $f[8];
+		$f9 = $f[9];
+		$g0 = $g[0];
+		$g1 = $g[1];
+		$g2 = $g[2];
+		$g3 = $g[3];
+		$g4 = $g[4];
+		$g5 = $g[5];
+		$g6 = $g[6];
+		$g7 = $g[7];
+		$g8 = $g[8];
+		$g9 = $g[9];
+		$g1_19 = self::mul($g1, 19, 5);
+		$g2_19 = self::mul($g2, 19, 5);
+		$g3_19 = self::mul($g3, 19, 5);
+		$g4_19 = self::mul($g4, 19, 5);
+		$g5_19 = self::mul($g5, 19, 5);
+		$g6_19 = self::mul($g6, 19, 5);
+		$g7_19 = self::mul($g7, 19, 5);
+		$g8_19 = self::mul($g8, 19, 5);
+		$g9_19 = self::mul($g9, 19, 5);
+		$f1_2 = $f1 << 1;
+		$f3_2 = $f3 << 1;
+		$f5_2 = $f5 << 1;
+		$f7_2 = $f7 << 1;
+		$f9_2 = $f9 << 1;
+		$f0g0    = self::mul($f0,    $g0);
+		$f0g1    = self::mul($f0,    $g1);
+		$f0g2    = self::mul($f0,    $g2);
+		$f0g3    = self::mul($f0,    $g3);
+		$f0g4    = self::mul($f0,    $g4);
+		$f0g5    = self::mul($f0,    $g5);
+		$f0g6    = self::mul($f0,    $g6);
+		$f0g7    = self::mul($f0,    $g7);
+		$f0g8    = self::mul($f0,    $g8);
+		$f0g9    = self::mul($f0,    $g9);
+		$f1g0    = self::mul($f1,    $g0);
+		$f1g1_2  = self::mul($f1_2,  $g1);
+		$f1g2    = self::mul($f1,    $g2);
+		$f1g3_2  = self::mul($f1_2,  $g3);
+		$f1g4    = self::mul($f1,    $g4);
+		$f1g5_2  = self::mul($f1_2,  $g5);
+		$f1g6    = self::mul($f1,    $g6);
+		$f1g7_2  = self::mul($f1_2,  $g7);
+		$f1g8    = self::mul($f1,    $g8);
+		$f1g9_38 = self::mul($f1_2,  $g9_19);
+		$f2g0    = self::mul($f2,    $g0);
+		$f2g1    = self::mul($f2,    $g1);
+		$f2g2    = self::mul($f2,    $g2);
+		$f2g3    = self::mul($f2,    $g3);
+		$f2g4    = self::mul($f2,    $g4);
+		$f2g5    = self::mul($f2,    $g5);
+		$f2g6    = self::mul($f2,    $g6);
+		$f2g7    = self::mul($f2,    $g7);
+		$f2g8_19 = self::mul($f2,    $g8_19);
+		$f2g9_19 = self::mul($f2,    $g9_19);
+		$f3g0    = self::mul($f3,    $g0);
+		$f3g1_2  = self::mul($f3_2,  $g1);
+		$f3g2    = self::mul($f3,    $g2);
+		$f3g3_2  = self::mul($f3_2,  $g3);
+		$f3g4    = self::mul($f3,    $g4);
+		$f3g5_2  = self::mul($f3_2,  $g5);
+		$f3g6    = self::mul($f3,    $g6);
+		$f3g7_38 = self::mul($f3_2,  $g7_19);
+		$f3g8_19 = self::mul($f3,    $g8_19);
+		$f3g9_38 = self::mul($f3_2,  $g9_19);
+		$f4g0    = self::mul($f4,    $g0);
+		$f4g1    = self::mul($f4,    $g1);
+		$f4g2    = self::mul($f4,    $g2);
+		$f4g3    = self::mul($f4,    $g3);
+		$f4g4    = self::mul($f4,    $g4);
+		$f4g5    = self::mul($f4,    $g5);
+		$f4g6_19 = self::mul($f4,    $g6_19);
+		$f4g7_19 = self::mul($f4,    $g7_19);
+		$f4g8_19 = self::mul($f4,    $g8_19);
+		$f4g9_19 = self::mul($f4,    $g9_19);
+		$f5g0    = self::mul($f5,    $g0);
+		$f5g1_2  = self::mul($f5_2,  $g1);
+		$f5g2    = self::mul($f5,    $g2);
+		$f5g3_2  = self::mul($f5_2,  $g3);
+		$f5g4    = self::mul($f5,    $g4);
+		$f5g5_38 = self::mul($f5_2,  $g5_19);
+		$f5g6_19 = self::mul($f5,    $g6_19);
+		$f5g7_38 = self::mul($f5_2,  $g7_19);
+		$f5g8_19 = self::mul($f5,    $g8_19);
+		$f5g9_38 = self::mul($f5_2,  $g9_19);
+		$f6g0    = self::mul($f6,    $g0);
+		$f6g1    = self::mul($f6,    $g1);
+		$f6g2    = self::mul($f6,    $g2);
+		$f6g3    = self::mul($f6,    $g3);
+		$f6g4_19 = self::mul($f6,    $g4_19);
+		$f6g5_19 = self::mul($f6,    $g5_19);
+		$f6g6_19 = self::mul($f6,    $g6_19);
+		$f6g7_19 = self::mul($f6,    $g7_19);
+		$f6g8_19 = self::mul($f6,    $g8_19);
+		$f6g9_19 = self::mul($f6,    $g9_19);
+		$f7g0    = self::mul($f7,    $g0);
+		$f7g1_2  = self::mul($f7_2,  $g1);
+		$f7g2    = self::mul($f7,    $g2);
+		$f7g3_38 = self::mul($f7_2,  $g3_19);
+		$f7g4_19 = self::mul($f7,    $g4_19);
+		$f7g5_38 = self::mul($f7_2,  $g5_19);
+		$f7g6_19 = self::mul($f7,    $g6_19);
+		$f7g7_38 = self::mul($f7_2,  $g7_19);
+		$f7g8_19 = self::mul($f7,    $g8_19);
+		$f7g9_38 = self::mul($f7_2,  $g9_19);
+		$f8g0    = self::mul($f8,    $g0);
+		$f8g1    = self::mul($f8,    $g1);
+		$f8g2_19 = self::mul($f8,    $g2_19);
+		$f8g3_19 = self::mul($f8,    $g3_19);
+		$f8g4_19 = self::mul($f8,    $g4_19);
+		$f8g5_19 = self::mul($f8,    $g5_19);
+		$f8g6_19 = self::mul($f8,    $g6_19);
+		$f8g7_19 = self::mul($f8,    $g7_19);
+		$f8g8_19 = self::mul($f8,    $g8_19);
+		$f8g9_19 = self::mul($f8,    $g9_19);
+		$f9g0    = self::mul($f9,    $g0);
+		$f9g1_38 = self::mul($f9_2,  $g1_19);
+		$f9g2_19 = self::mul($f9,    $g2_19);
+		$f9g3_38 = self::mul($f9_2,  $g3_19);
+		$f9g4_19 = self::mul($f9,    $g4_19);
+		$f9g5_38 = self::mul($f9_2,  $g5_19);
+		$f9g6_19 = self::mul($f9,    $g6_19);
+		$f9g7_38 = self::mul($f9_2,  $g7_19);
+		$f9g8_19 = self::mul($f9,    $g8_19);
+		$f9g9_38 = self::mul($f9_2,  $g9_19);
+		$h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
+		$h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
+		$h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
+		$h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
+		$h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
+		$h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
+		$h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
+		$h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
+		$h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
+		$h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
+
+		$carry0 = ($h0 + (1 << 25)) >> 26;
+		$h1 += $carry0;
+		$h0 -= $carry0 << 26;
+		$carry4 = ($h4 + (1 << 25)) >> 26;
+		$h5 += $carry4;
+		$h4 -= $carry4 << 26;
+
+		$carry1 = ($h1 + (1 << 24)) >> 25;
+		$h2 += $carry1;
+		$h1 -= $carry1 << 25;
+		$carry5 = ($h5 + (1 << 24)) >> 25;
+		$h6 += $carry5;
+		$h5 -= $carry5 << 25;
+
+		$carry2 = ($h2 + (1 << 25)) >> 26;
+		$h3 += $carry2;
+		$h2 -= $carry2 << 26;
+		$carry6 = ($h6 + (1 << 25)) >> 26;
+		$h7 += $carry6;
+		$h6 -= $carry6 << 26;
+
+		$carry3 = ($h3 + (1 << 24)) >> 25;
+		$h4 += $carry3;
+		$h3 -= $carry3 << 25;
+		$carry7 = ($h7 + (1 << 24)) >> 25;
+		$h8 += $carry7;
+		$h7 -= $carry7 << 25;
+
+		$carry4 = ($h4 + (1 << 25)) >> 26;
+		$h5 += $carry4;
+		$h4 -= $carry4 << 26;
+		$carry8 = ($h8 + (1 << 25)) >> 26;
+		$h9 += $carry8;
+		$h8 -= $carry8 << 26;
+
+		$carry9 = ($h9 + (1 << 24)) >> 25;
+		$h0 += self::mul($carry9, 19, 5);
+		$h9 -= $carry9 << 25;
+
+		$carry0 = ($h0 + (1 << 25)) >> 26;
+		$h1 += $carry0;
+		$h0 -= $carry0 << 26;
+
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+			array(
+				(int) $h0,
+				(int) $h1,
+				(int) $h2,
+				(int) $h3,
+				(int) $h4,
+				(int) $h5,
+				(int) $h6,
+				(int) $h7,
+				(int) $h8,
+				(int) $h9
+			)
+		);
+	}
+
+	/**
+	 * Get the negative values for each piece of the field element.
+	 *
+	 * h = -f
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+	{
+		$h = new ParagonIE_Sodium_Core_Curve25519_Fe();
+		for ($i = 0; $i < 10; ++$i) {
+			$h[$i] = -$f[$i];
+		}
+		return $h;
+	}
+
+	/**
+	 * Square a field element
+	 *
+	 * h = f * f
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+	{
+		$f0 = (int) $f[0];
+		$f1 = (int) $f[1];
+		$f2 = (int) $f[2];
+		$f3 = (int) $f[3];
+		$f4 = (int) $f[4];
+		$f5 = (int) $f[5];
+		$f6 = (int) $f[6];
+		$f7 = (int) $f[7];
+		$f8 = (int) $f[8];
+		$f9 = (int) $f[9];
+
+		$f0_2 = $f0 << 1;
+		$f1_2 = $f1 << 1;
+		$f2_2 = $f2 << 1;
+		$f3_2 = $f3 << 1;
+		$f4_2 = $f4 << 1;
+		$f5_2 = $f5 << 1;
+		$f6_2 = $f6 << 1;
+		$f7_2 = $f7 << 1;
+		$f5_38 = self::mul($f5, 38, 6);
+		$f6_19 = self::mul($f6, 19, 5);
+		$f7_38 = self::mul($f7, 38, 6);
+		$f8_19 = self::mul($f8, 19, 5);
+		$f9_38 = self::mul($f9, 38, 6);
+		$f0f0    = self::mul($f0,    $f0);
+		$f0f1_2  = self::mul($f0_2,  $f1);
+		$f0f2_2  = self::mul($f0_2,  $f2);
+		$f0f3_2  = self::mul($f0_2,  $f3);
+		$f0f4_2  = self::mul($f0_2,  $f4);
+		$f0f5_2  = self::mul($f0_2,  $f5);
+		$f0f6_2  = self::mul($f0_2,  $f6);
+		$f0f7_2  = self::mul($f0_2,  $f7);
+		$f0f8_2  = self::mul($f0_2,  $f8);
+		$f0f9_2  = self::mul($f0_2,  $f9);
+		$f1f1_2  = self::mul($f1_2,  $f1);
+		$f1f2_2  = self::mul($f1_2,  $f2);
+		$f1f3_4  = self::mul($f1_2,  $f3_2);
+		$f1f4_2  = self::mul($f1_2,  $f4);
+		$f1f5_4  = self::mul($f1_2,  $f5_2);
+		$f1f6_2  = self::mul($f1_2,  $f6);
+		$f1f7_4  = self::mul($f1_2,  $f7_2);
+		$f1f8_2  = self::mul($f1_2,  $f8);
+		$f1f9_76 = self::mul($f1_2,  $f9_38);
+		$f2f2    = self::mul($f2,    $f2);
+		$f2f3_2  = self::mul($f2_2,  $f3);
+		$f2f4_2  = self::mul($f2_2,  $f4);
+		$f2f5_2  = self::mul($f2_2,  $f5);
+		$f2f6_2  = self::mul($f2_2,  $f6);
+		$f2f7_2  = self::mul($f2_2,  $f7);
+		$f2f8_38 = self::mul($f2_2,  $f8_19);
+		$f2f9_38 = self::mul($f2,    $f9_38);
+		$f3f3_2  = self::mul($f3_2,  $f3);
+		$f3f4_2  = self::mul($f3_2,  $f4);
+		$f3f5_4  = self::mul($f3_2,  $f5_2);
+		$f3f6_2  = self::mul($f3_2,  $f6);
+		$f3f7_76 = self::mul($f3_2,  $f7_38);
+		$f3f8_38 = self::mul($f3_2,  $f8_19);
+		$f3f9_76 = self::mul($f3_2,  $f9_38);
+		$f4f4    = self::mul($f4,    $f4);
+		$f4f5_2  = self::mul($f4_2,  $f5);
+		$f4f6_38 = self::mul($f4_2,  $f6_19);
+		$f4f7_38 = self::mul($f4,    $f7_38);
+		$f4f8_38 = self::mul($f4_2,  $f8_19);
+		$f4f9_38 = self::mul($f4,    $f9_38);
+		$f5f5_38 = self::mul($f5,    $f5_38);
+		$f5f6_38 = self::mul($f5_2,  $f6_19);
+		$f5f7_76 = self::mul($f5_2,  $f7_38);
+		$f5f8_38 = self::mul($f5_2,  $f8_19);
+		$f5f9_76 = self::mul($f5_2,  $f9_38);
+		$f6f6_19 = self::mul($f6,    $f6_19);
+		$f6f7_38 = self::mul($f6,    $f7_38);
+		$f6f8_38 = self::mul($f6_2,  $f8_19);
+		$f6f9_38 = self::mul($f6,    $f9_38);
+		$f7f7_38 = self::mul($f7,    $f7_38);
+		$f7f8_38 = self::mul($f7_2,  $f8_19);
+		$f7f9_76 = self::mul($f7_2,  $f9_38);
+		$f8f8_19 = self::mul($f8,    $f8_19);
+		$f8f9_38 = self::mul($f8,    $f9_38);
+		$f9f9_38 = self::mul($f9,    $f9_38);
+		$h0 = $f0f0   + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
+		$h1 = $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38;
+		$h2 = $f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
+		$h3 = $f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38;
+		$h4 = $f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38;
+		$h5 = $f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38;
+		$h6 = $f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19;
+		$h7 = $f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38;
+		$h8 = $f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38;
+		$h9 = $f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2;
+
+		$carry0 = ($h0 + (1 << 25)) >> 26;
+		$h1 += $carry0;
+		$h0 -= $carry0 << 26;
+		$carry4 = ($h4 + (1 << 25)) >> 26;
+		$h5 += $carry4;
+		$h4 -= $carry4 << 26;
+
+		$carry1 = ($h1 + (1 << 24)) >> 25;
+		$h2 += $carry1;
+		$h1 -= $carry1 << 25;
+		$carry5 = ($h5 + (1 << 24)) >> 25;
+		$h6 += $carry5;
+		$h5 -= $carry5 << 25;
+
+		$carry2 = ($h2 + (1 << 25)) >> 26;
+		$h3 += $carry2;
+		$h2 -= $carry2 << 26;
+		$carry6 = ($h6 + (1 << 25)) >> 26;
+		$h7 += $carry6;
+		$h6 -= $carry6 << 26;
+
+		$carry3 = ($h3 + (1 << 24)) >> 25;
+		$h4 += $carry3;
+		$h3 -= $carry3 << 25;
+		$carry7 = ($h7 + (1 << 24)) >> 25;
+		$h8 += $carry7;
+		$h7 -= $carry7 << 25;
+
+		$carry4 = ($h4 + (1 << 25)) >> 26;
+		$h5 += $carry4;
+		$h4 -= $carry4 << 26;
+		$carry8 = ($h8 + (1 << 25)) >> 26;
+		$h9 += $carry8;
+		$h8 -= $carry8 << 26;
+
+		$carry9 = ($h9 + (1 << 24)) >> 25;
+		$h0 += self::mul($carry9, 19, 5);
+		$h9 -= $carry9 << 25;
+
+		$carry0 = ($h0 + (1 << 25)) >> 26;
+		$h1 += $carry0;
+		$h0 -= $carry0 << 26;
+
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+			array(
+				(int) $h0,
+				(int) $h1,
+				(int) $h2,
+				(int) $h3,
+				(int) $h4,
+				(int) $h5,
+				(int) $h6,
+				(int) $h7,
+				(int) $h8,
+				(int) $h9
+			)
+		);
+	}
+
+
+	/**
+	 * Square and double a field element
+	 *
+	 * h = 2 * f * f
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+	{
+		$f0 = (int) $f[0];
+		$f1 = (int) $f[1];
+		$f2 = (int) $f[2];
+		$f3 = (int) $f[3];
+		$f4 = (int) $f[4];
+		$f5 = (int) $f[5];
+		$f6 = (int) $f[6];
+		$f7 = (int) $f[7];
+		$f8 = (int) $f[8];
+		$f9 = (int) $f[9];
+
+		$f0_2 = $f0 << 1;
+		$f1_2 = $f1 << 1;
+		$f2_2 = $f2 << 1;
+		$f3_2 = $f3 << 1;
+		$f4_2 = $f4 << 1;
+		$f5_2 = $f5 << 1;
+		$f6_2 = $f6 << 1;
+		$f7_2 = $f7 << 1;
+		$f5_38 = self::mul($f5, 38, 6); /* 1.959375*2^30 */
+		$f6_19 = self::mul($f6, 19, 5); /* 1.959375*2^30 */
+		$f7_38 = self::mul($f7, 38, 6); /* 1.959375*2^30 */
+		$f8_19 = self::mul($f8, 19, 5); /* 1.959375*2^30 */
+		$f9_38 = self::mul($f9, 38, 6); /* 1.959375*2^30 */
+		$f0f0 = self::mul($f0, (int) $f0);
+		$f0f1_2 = self::mul($f0_2, (int) $f1);
+		$f0f2_2 = self::mul($f0_2, (int) $f2);
+		$f0f3_2 = self::mul($f0_2, (int) $f3);
+		$f0f4_2 = self::mul($f0_2, (int) $f4);
+		$f0f5_2 = self::mul($f0_2, (int) $f5);
+		$f0f6_2 = self::mul($f0_2, (int) $f6);
+		$f0f7_2 = self::mul($f0_2, (int) $f7);
+		$f0f8_2 = self::mul($f0_2, (int) $f8);
+		$f0f9_2 = self::mul($f0_2, (int) $f9);
+		$f1f1_2 = self::mul($f1_2,  (int) $f1);
+		$f1f2_2 = self::mul($f1_2,  (int) $f2);
+		$f1f3_4 = self::mul($f1_2,  (int) $f3_2);
+		$f1f4_2 = self::mul($f1_2,  (int) $f4);
+		$f1f5_4 = self::mul($f1_2,  (int) $f5_2);
+		$f1f6_2 = self::mul($f1_2,  (int) $f6);
+		$f1f7_4 = self::mul($f1_2,  (int) $f7_2);
+		$f1f8_2 = self::mul($f1_2,  (int) $f8);
+		$f1f9_76 = self::mul($f1_2,  (int) $f9_38);
+		$f2f2 = self::mul($f2,  (int) $f2);
+		$f2f3_2 = self::mul($f2_2,  (int) $f3);
+		$f2f4_2 = self::mul($f2_2,  (int) $f4);
+		$f2f5_2 = self::mul($f2_2,  (int) $f5);
+		$f2f6_2 = self::mul($f2_2,  (int) $f6);
+		$f2f7_2 = self::mul($f2_2,  (int) $f7);
+		$f2f8_38 = self::mul($f2_2,  (int) $f8_19);
+		$f2f9_38 = self::mul($f2,  (int) $f9_38);
+		$f3f3_2 = self::mul($f3_2,  (int) $f3);
+		$f3f4_2 = self::mul($f3_2,  (int) $f4);
+		$f3f5_4 = self::mul($f3_2,  (int) $f5_2);
+		$f3f6_2 = self::mul($f3_2,  (int) $f6);
+		$f3f7_76 = self::mul($f3_2,  (int) $f7_38);
+		$f3f8_38 = self::mul($f3_2,  (int) $f8_19);
+		$f3f9_76 = self::mul($f3_2,  (int) $f9_38);
+		$f4f4 = self::mul($f4,  (int) $f4);
+		$f4f5_2 = self::mul($f4_2,  (int) $f5);
+		$f4f6_38 = self::mul($f4_2,  (int) $f6_19);
+		$f4f7_38 = self::mul($f4,  (int) $f7_38);
+		$f4f8_38 = self::mul($f4_2,  (int) $f8_19);
+		$f4f9_38 = self::mul($f4,  (int) $f9_38);
+		$f5f5_38 = self::mul($f5,  (int) $f5_38);
+		$f5f6_38 = self::mul($f5_2,  (int) $f6_19);
+		$f5f7_76 = self::mul($f5_2,  (int) $f7_38);
+		$f5f8_38 = self::mul($f5_2,  (int) $f8_19);
+		$f5f9_76 = self::mul($f5_2,  (int) $f9_38);
+		$f6f6_19 = self::mul($f6,  (int) $f6_19);
+		$f6f7_38 = self::mul($f6,  (int) $f7_38);
+		$f6f8_38 = self::mul($f6_2,  (int) $f8_19);
+		$f6f9_38 = self::mul($f6,  (int) $f9_38);
+		$f7f7_38 = self::mul($f7,  (int) $f7_38);
+		$f7f8_38 = self::mul($f7_2,  (int) $f8_19);
+		$f7f9_76 = self::mul($f7_2,  (int) $f9_38);
+		$f8f8_19 = self::mul($f8,  (int) $f8_19);
+		$f8f9_38 = self::mul($f8,  (int) $f9_38);
+		$f9f9_38 = self::mul($f9,  (int) $f9_38);
+
+		$h0 = (int) ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38);
+		$h1 = (int) ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38);
+		$h2 = (int) ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19);
+		$h3 = (int) ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38);
+		$h4 = (int) ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38);
+		$h5 = (int) ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38);
+		$h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19);
+		$h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38);
+		$h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38);
+		$h9 = (int) ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2);
+
+		$h0 = (int) ($h0 + $h0);
+		$h1 = (int) ($h1 + $h1);
+		$h2 = (int) ($h2 + $h2);
+		$h3 = (int) ($h3 + $h3);
+		$h4 = (int) ($h4 + $h4);
+		$h5 = (int) ($h5 + $h5);
+		$h6 = (int) ($h6 + $h6);
+		$h7 = (int) ($h7 + $h7);
+		$h8 = (int) ($h8 + $h8);
+		$h9 = (int) ($h9 + $h9);
+
+		$carry0 = ($h0 + (1 << 25)) >> 26;
+		$h1 += $carry0;
+		$h0 -= $carry0 << 26;
+		$carry4 = ($h4 + (1 << 25)) >> 26;
+		$h5 += $carry4;
+		$h4 -= $carry4 << 26;
+
+		$carry1 = ($h1 + (1 << 24)) >> 25;
+		$h2 += $carry1;
+		$h1 -= $carry1 << 25;
+		$carry5 = ($h5 + (1 << 24)) >> 25;
+		$h6 += $carry5;
+		$h5 -= $carry5 << 25;
+
+		$carry2 = ($h2 + (1 << 25)) >> 26;
+		$h3 += $carry2;
+		$h2 -= $carry2 << 26;
+		$carry6 = ($h6 + (1 << 25)) >> 26;
+		$h7 += $carry6;
+		$h6 -= $carry6 << 26;
+
+		$carry3 = ($h3 + (1 << 24)) >> 25;
+		$h4 += $carry3;
+		$h3 -= $carry3 << 25;
+		$carry7 = ($h7 + (1 << 24)) >> 25;
+		$h8 += $carry7;
+		$h7 -= $carry7 << 25;
+
+		$carry4 = ($h4 + (1 << 25)) >> 26;
+		$h5 += $carry4;
+		$h4 -= $carry4 << 26;
+		$carry8 = ($h8 + (1 << 25)) >> 26;
+		$h9 += $carry8;
+		$h8 -= $carry8 << 26;
+
+		$carry9 = ($h9 + (1 << 24)) >> 25;
+		$h0 += self::mul($carry9, 19, 5);
+		$h9 -= $carry9 << 25;
+
+		$carry0 = ($h0 + (1 << 25)) >> 26;
+		$h1 += $carry0;
+		$h0 -= $carry0 << 26;
+
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+			array(
+				(int) $h0,
+				(int) $h1,
+				(int) $h2,
+				(int) $h3,
+				(int) $h4,
+				(int) $h5,
+				(int) $h6,
+				(int) $h7,
+				(int) $h8,
+				(int) $h9
+			)
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
+	{
+		$z = clone $Z;
+		$t0 = self::fe_sq($z);
+		$t1 = self::fe_sq($t0);
+		$t1 = self::fe_sq($t1);
+		$t1 = self::fe_mul($z, $t1);
+		$t0 = self::fe_mul($t0, $t1);
+		$t2 = self::fe_sq($t0);
+		$t1 = self::fe_mul($t1, $t2);
+		$t2 = self::fe_sq($t1);
+		for ($i = 1; $i < 5; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t1 = self::fe_mul($t2, $t1);
+		$t2 = self::fe_sq($t1);
+		for ($i = 1; $i < 10; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t2 = self::fe_mul($t2, $t1);
+		$t3 = self::fe_sq($t2);
+		for ($i = 1; $i < 20; ++$i) {
+			$t3 = self::fe_sq($t3);
+		}
+		$t2 = self::fe_mul($t3, $t2);
+		$t2 = self::fe_sq($t2);
+		for ($i = 1; $i < 10; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t1 = self::fe_mul($t2, $t1);
+		$t2 = self::fe_sq($t1);
+		for ($i = 1; $i < 50; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t2 = self::fe_mul($t2, $t1);
+		$t3 = self::fe_sq($t2);
+		for ($i = 1; $i < 100; ++$i) {
+			$t3 = self::fe_sq($t3);
+		}
+		$t2 = self::fe_mul($t3, $t2);
+		$t2 = self::fe_sq($t2);
+		for ($i = 1; $i < 50; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t1 = self::fe_mul($t2, $t1);
+		$t1 = self::fe_sq($t1);
+		for ($i = 1; $i < 5; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+		return self::fe_mul($t1, $t0);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
+	{
+		# fe_sq(t0, z);
+		# fe_sq(t1, t0);
+		# fe_sq(t1, t1);
+		# fe_mul(t1, z, t1);
+		# fe_mul(t0, t0, t1);
+		# fe_sq(t0, t0);
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t1, t0);
+		$t0 = self::fe_sq($z);
+		$t1 = self::fe_sq($t0);
+		$t1 = self::fe_sq($t1);
+		$t1 = self::fe_mul($z, $t1);
+		$t0 = self::fe_mul($t0, $t1);
+		$t0 = self::fe_sq($t0);
+		$t0 = self::fe_mul($t1, $t0);
+		$t1 = self::fe_sq($t0);
+
+		# for (i = 1; i < 5; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 5; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t1, t0);
+		$t0 = self::fe_mul($t1, $t0);
+		$t1 = self::fe_sq($t0);
+
+		# for (i = 1; i < 10; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 10; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t1, t1, t0);
+		# fe_sq(t2, t1);
+		$t1 = self::fe_mul($t1, $t0);
+		$t2 = self::fe_sq($t1);
+
+		# for (i = 1; i < 20; ++i) {
+		#     fe_sq(t2, t2);
+		# }
+		for ($i = 1; $i < 20; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+
+		# fe_mul(t1, t2, t1);
+		# fe_sq(t1, t1);
+		$t1 = self::fe_mul($t2, $t1);
+		$t1 = self::fe_sq($t1);
+
+		# for (i = 1; i < 10; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 10; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t1, t0);
+		$t0 = self::fe_mul($t1, $t0);
+		$t1 = self::fe_sq($t0);
+
+		# for (i = 1; i < 50; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 50; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t1, t1, t0);
+		# fe_sq(t2, t1);
+		$t1 = self::fe_mul($t1, $t0);
+		$t2 = self::fe_sq($t1);
+
+		# for (i = 1; i < 100; ++i) {
+		#     fe_sq(t2, t2);
+		# }
+		for ($i = 1; $i < 100; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+
+		# fe_mul(t1, t2, t1);
+		# fe_sq(t1, t1);
+		$t1 = self::fe_mul($t2, $t1);
+		$t1 = self::fe_sq($t1);
+
+		# for (i = 1; i < 50; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 50; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t0, t0);
+		# fe_sq(t0, t0);
+		# fe_mul(out, t0, z);
+		$t0 = self::fe_mul($t1, $t0);
+		$t0 = self::fe_sq($t0);
+		$t0 = self::fe_sq($t0);
+		return self::fe_mul($t0, $z);
+	}
+
+	/**
+	 * Subtract two field elements.
+	 *
+	 * h = f - g
+	 *
+	 * Preconditions:
+	 * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+	 * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+	 *
+	 * Postconditions:
+	 * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+	 * @return ParagonIE_Sodium_Core_Curve25519_Fe
+	 */
+	public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
+	{
+		return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+			array(
+				(int) ($f[0] - $g[0]),
+				(int) ($f[1] - $g[1]),
+				(int) ($f[2] - $g[2]),
+				(int) ($f[3] - $g[3]),
+				(int) ($f[4] - $g[4]),
+				(int) ($f[5] - $g[5]),
+				(int) ($f[6] - $g[6]),
+				(int) ($f[7] - $g[7]),
+				(int) ($f[8] - $g[8]),
+				(int) ($f[9] - $g[9])
+			)
+		);
+	}
+
+	/**
+	 * Add two group elements.
+	 *
+	 * r = p + q
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+	 */
+	public static function ge_add(
+		ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+	) {
+		$r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->YplusX);
+		$r->Y = self::fe_mul($r->Y, $q->YminusX);
+		$r->T = self::fe_mul($q->T2d, $p->T);
+		$r->X = self::fe_mul($p->Z, $q->Z);
+		$t0   = self::fe_add($r->X, $r->X);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_add($t0, $r->T);
+		$r->T = self::fe_sub($t0, $r->T);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
+	 * @param string $a
+	 * @return array<int, mixed>
+	 */
+	public static function slide($a)
+	{
+		if (self::strlen($a) < 256) {
+			if (self::strlen($a) < 16) {
+				$a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+			}
+		}
+		$r = array();
+		for ($i = 0; $i < 256; ++$i) {
+			$r[$i] = 1 & (
+					self::chrToInt($a[$i >> 3])
+						>>
+					($i & 7)
+				);
+		}
+
+		for ($i = 0;$i < 256;++$i) {
+			if ($r[$i]) {
+				for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
+					if ($r[$i + $b]) {
+						if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
+							$r[$i] += $r[$i + $b] << $b;
+							$r[$i + $b] = 0;
+						} elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
+							$r[$i] -= $r[$i + $b] << $b;
+							for ($k = $i + $b; $k < 256; ++$k) {
+								if (!$r[$k]) {
+									$r[$k] = 1;
+									break;
+								}
+								$r[$k] = 0;
+							}
+						} else {
+							break;
+						}
+					}
+				}
+			}
+		}
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $s
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+	 */
+	public static function ge_frombytes_negate_vartime($s)
+	{
+		static $d = null;
+		if (!$d) {
+			$d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
+		}
+
+		# fe_frombytes(h->Y,s);
+		# fe_1(h->Z);
+		$h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
+			self::fe_0(),
+			self::fe_frombytes($s),
+			self::fe_1()
+		);
+
+		# fe_sq(u,h->Y);
+		# fe_mul(v,u,d);
+		# fe_sub(u,u,h->Z);       /* u = y^2-1 */
+		# fe_add(v,v,h->Z);       /* v = dy^2+1 */
+		$u = self::fe_sq($h->Y);
+		$v = self::fe_mul($u, $d);
+		$u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
+		$v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+
+		# fe_sq(v3,v);
+		# fe_mul(v3,v3,v);        /* v3 = v^3 */
+		# fe_sq(h->X,v3);
+		# fe_mul(h->X,h->X,v);
+		# fe_mul(h->X,h->X,u);    /* x = uv^7 */
+		$v3 = self::fe_sq($v);
+		$v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
+		$h->X = self::fe_sq($v3);
+		$h->X = self::fe_mul($h->X, $v);
+		$h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+
+		# fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
+		# fe_mul(h->X,h->X,v3);
+		# fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
+		$h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
+		$h->X = self::fe_mul($h->X, $v3);
+		$h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+
+		# fe_sq(vxx,h->X);
+		# fe_mul(vxx,vxx,v);
+		# fe_sub(check,vxx,u);    /* vx^2-u */
+		$vxx = self::fe_sq($h->X);
+		$vxx = self::fe_mul($vxx, $v);
+		$check = self::fe_sub($vxx, $u); /* vx^2 - u */
+
+		# if (fe_isnonzero(check)) {
+		#     fe_add(check,vxx,u);  /* vx^2+u */
+		#     if (fe_isnonzero(check)) {
+		#         return -1;
+		#     }
+		#     fe_mul(h->X,h->X,sqrtm1);
+		# }
+		if (self::fe_isnonzero($check)) {
+			$check = self::fe_add($vxx, $u); /* vx^2 + u */
+			if (self::fe_isnonzero($check)) {
+				throw new RangeException('Internal check failed.');
+			}
+			$h->X = self::fe_mul(
+				$h->X,
+				ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1)
+			);
+		}
+
+		# if (fe_isnegative(h->X) == (s[31] >> 7)) {
+		#     fe_neg(h->X,h->X);
+		# }
+		$i = self::chrToInt($s[31]);
+		if (self::fe_isnegative($h->X) === ($i >> 7)) {
+			$h->X = self::fe_neg($h->X);
+		}
+
+		# fe_mul(h->T,h->X,h->Y);
+		$h->T = self::fe_mul($h->X, $h->Y);
+		return $h;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+	 */
+	public static function ge_madd(
+		ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
+		ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+	) {
+		$r = clone $R;
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->yplusx);
+		$r->Y = self::fe_mul($r->Y, $q->yminusx);
+		$r->T = self::fe_mul($q->xy2d, $p->T);
+		$t0 = self::fe_add(clone $p->Z, clone $p->Z);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_add($t0, $r->T);
+		$r->T = self::fe_sub($t0, $r->T);
+
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+	 */
+	public static function ge_msub(
+		ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
+		ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+	) {
+		$r = clone $R;
+
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->yminusx);
+		$r->Y = self::fe_mul($r->Y, $q->yplusx);
+		$r->T = self::fe_mul($q->xy2d, $p->T);
+		$t0 = self::fe_add($p->Z, $p->Z);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_sub($t0, $r->T);
+		$r->T = self::fe_add($t0, $r->T);
+
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+	 */
+	public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+	{
+		$r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
+		$r->X = self::fe_mul($p->X, $p->T);
+		$r->Y = self::fe_mul($p->Y, $p->Z);
+		$r->Z = self::fe_mul($p->Z, $p->T);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+	 */
+	public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+	{
+		$r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
+		$r->X = self::fe_mul($p->X, $p->T);
+		$r->Y = self::fe_mul($p->Y, $p->Z);
+		$r->Z = self::fe_mul($p->Z, $p->T);
+		$r->T = self::fe_mul($p->X, $p->Y);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+	 */
+	public static function ge_p2_0()
+	{
+		return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
+			self::fe_0(),
+			self::fe_1(),
+			self::fe_1()
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+	 */
+	public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
+	{
+		$r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+		$r->X = self::fe_sq($p->X);
+		$r->Z = self::fe_sq($p->Y);
+		$r->T = self::fe_sq2($p->Z);
+		$r->Y = self::fe_add($p->X, $p->Y);
+		$t0   = self::fe_sq($r->Y);
+		$r->Y = self::fe_add($r->Z, $r->X);
+		$r->Z = self::fe_sub($r->Z, $r->X);
+		$r->X = self::fe_sub($t0, $r->Y);
+		$r->T = self::fe_sub($r->T, $r->Z);
+
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+	 */
+	public static function ge_p3_0()
+	{
+		return new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
+			self::fe_0(),
+			self::fe_1(),
+			self::fe_1(),
+			self::fe_0()
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+	 */
+	public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+	{
+		static $d2 = null;
+		if ($d2 === null) {
+			$d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
+		}
+		$r = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
+		$r->YplusX = self::fe_add($p->Y, $p->X);
+		$r->YminusX = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_copy($p->Z);
+		$r->T2d = self::fe_mul($p->T, $d2);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+	 */
+	public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+	{
+		return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
+			$p->X,
+			$p->Y,
+			$p->Z
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
+	 * @return string
+	 */
+	public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
+	{
+		$recip = self::fe_invert($h->Z);
+		$x = self::fe_mul($h->X, $recip);
+		$y = self::fe_mul($h->Y, $recip);
+		$s = self::fe_tobytes($y);
+		$s[31] = self::intToChr(
+			self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+		);
+		return $s;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+	 */
+	public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+	{
+		$q = self::ge_p3_to_p2($p);
+		return self::ge_p2_dbl($q);
+	}
+
+	/**
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+	 */
+	public static function ge_precomp_0()
+	{
+		return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+			self::fe_1(),
+			self::fe_1(),
+			self::fe_0()
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $b
+	 * @param int $c
+	 * @return int
+	 */
+	public static function equal($b, $c)
+	{
+		return (($b ^ $c) - 1 & 0xffffffff) >> 31;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $char
+	 * @return int (1 = yes, 0 = no)
+	 */
+	public static function negative($char)
+	{
+		if (is_int($char)) {
+			return $char < 0 ? 1 : 0;
+		}
+		$x = self::chrToInt(self::substr($char, 0, 1));
+		if (PHP_INT_SIZE === 8) {
+			return $x >> 63;
+		}
+		return $x >> 31;
+	}
+
+	/**
+	 * Conditional move
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u
+	 * @param int $b
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+	 */
+	public static function cmov(
+		ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t,
+		ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u,
+		$b
+	) {
+		if (!is_int($b)) {
+			throw new InvalidArgumentException('Expected an integer.');
+		}
+		return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+			self::fe_cmov($t->yplusx, $u->yplusx, $b),
+			self::fe_cmov($t->yminusx, $u->yminusx, $b),
+			self::fe_cmov($t->xy2d, $u->xy2d, $b)
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $pos
+	 * @param int $b
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+	 */
+	public static function ge_select($pos = 0, $b = 0)
+	{
+		static $base = null;
+		if ($base === null) {
+			$base = array();
+			foreach (self::$base as $i => $bas) {
+				for ($j = 0; $j < 8; ++$j) {
+					$base[$i][$j] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+						ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][0]),
+						ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][1]),
+						ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][2])
+					);
+				}
+			}
+		}
+		if (!is_int($pos)) {
+			throw new InvalidArgumentException('Position must be an integer');
+		}
+		if ($pos < 0 || $pos > 31) {
+			throw new RangeException('Position is out of range [0, 31]');
+		}
+
+		$bnegative = self::negative($b);
+		$babs = $b - (((-$bnegative) & $b) << 1);
+
+		$t = self::ge_precomp_0();
+		for ($i = 0; $i < 8; ++$i) {
+			$t = self::cmov(
+				$t,
+				$base[$pos][$i],
+				self::equal($babs, $i + 1)
+			);
+		}
+		$minusT = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+			self::fe_copy($t->yminusx),
+			self::fe_copy($t->yplusx),
+			self::fe_neg($t->xy2d)
+		);
+		return self::cmov($t, $minusT, $bnegative);
+	}
+
+	/**
+	 * Subtract two group elements.
+	 *
+	 * r = p - q
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+	 */
+	public static function ge_sub(
+		ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+	) {
+		$r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->YminusX);
+		$r->Y = self::fe_mul($r->Y, $q->YplusX);
+		$r->T = self::fe_mul($q->T2d, $p->T);
+		$r->X = self::fe_mul($p->Z, $q->Z);
+		$t0 = self::fe_add($r->X, $r->X);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_sub($t0, $r->T);
+		$r->T = self::fe_add($t0, $r->T);
+
+		return $r;
+	}
+
+	/**
+	 * Convert a group element to a byte string.
+	 *
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h
+	 * @return string
+	 */
+	public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
+	{
+		$recip = self::fe_invert($h->Z);
+		$x = self::fe_mul($h->X, $recip);
+		$y = self::fe_mul($h->Y, $recip);
+		$s = self::fe_tobytes($y);
+		$s[31] = self::intToChr(
+			self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+		);
+		return $s;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
+	 * @param string $b
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+	 */
+	public static function ge_double_scalarmult_vartime(
+		$a,
+		ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A,
+		$b
+	) {
+		/**
+		 * @var ParagonIE_Sodium_Core_Curve25519_Ge_Cached[]
+		 */
+		$Ai = array();
+
+		/**
+		 * @var ParagonIE_Sodium_Core_Curve25519_Ge_Precomp[]
+		 */
+		static $Bi = array();
+		if (!$Bi) {
+			for ($i = 0; $i < 8; ++$i) {
+				$Bi[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+					ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][0]),
+					ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][1]),
+					ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][2])
+				);
+			}
+		}
+		for ($i = 0; $i < 8; ++$i) {
+			$Ai[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
+				self::fe_0(),
+				self::fe_0(),
+				self::fe_0(),
+				self::fe_0()
+			);
+		}
+
+		# slide(aslide,a);
+		# slide(bslide,b);
+		$aslide = self::slide($a);
+		$bslide = self::slide($b);
+
+		# ge_p3_to_cached(&Ai[0],A);
+		# ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
+		$Ai[0] = self::ge_p3_to_cached($A);
+		$t = self::ge_p3_dbl($A);
+		$A2 = self::ge_p1p1_to_p3($t);
+
+		# ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
+		# ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
+		# ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
+		# ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
+		# ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
+		# ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
+		# ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
+		for ($i = 0; $i < 7; ++$i) {
+			$t = self::ge_add($A2, $Ai[$i]);
+			$u = self::ge_p1p1_to_p3($t);
+			$Ai[$i + 1] = self::ge_p3_to_cached($u);
+		}
+
+		# ge_p2_0(r);
+		$r = self::ge_p2_0();
+
+		# for (i = 255;i >= 0;--i) {
+		#     if (aslide[i] || bslide[i]) break;
+		# }
+		$i = 255;
+		for (; $i >= 0; --$i) {
+			if ($aslide[$i] || $bslide[$i]) {
+				break;
+			}
+		}
+
+		# for (;i >= 0;--i) {
+		for (; $i >= 0; --$i) {
+			# ge_p2_dbl(&t,r);
+			$t = self::ge_p2_dbl($r);
+
+			# if (aslide[i] > 0) {
+			if ($aslide[$i] > 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_add(&t,&u,&Ai[aslide[i]/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_add(
+					$u,
+					$Ai[(int) floor($aslide[$i] / 2)]
+				);
+			# } else if (aslide[i] < 0) {
+			} elseif ($aslide[$i] < 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_sub(
+					$u,
+					$Ai[(int) floor(-$aslide[$i] / 2)]
+				);
+			}
+
+			# if (bslide[i] > 0) {
+			if ($bslide[$i] > 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_madd(&t,&u,&Bi[bslide[i]/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_madd(
+					$t,
+					$u,
+					$Bi[(int) floor($bslide[$i] / 2)]
+				);
+			# } else if (bslide[i] < 0) {
+			} elseif ($bslide[$i] < 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_msub(
+					$t,
+					$u,
+					$Bi[(int) floor(-$bslide[$i] / 2)]
+				);
+			}
+			# ge_p1p1_to_p2(r,&t);
+			$r = self::ge_p1p1_to_p2($t);
+		}
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+	 */
+	public static function ge_scalarmult_base($a)
+	{
+		$e = array();
+		$r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+		for ($i = 0; $i < 32; ++$i) {
+			$e[$i << 1] = self::chrToInt($a[$i]) & 15;
+			$e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
+		}
+
+		$carry = 0;
+		for ($i = 0; $i < 63; ++$i) {
+			$e[$i] += $carry;
+			$carry = $e[$i] + 8;
+			$carry >>= 4;
+			$e[$i] -= $carry << 4;
+		}
+		$e[63] += $carry;
+
+		$h = self::ge_p3_0();
+
+		for ($i = 1; $i < 64; $i += 2) {
+			$t = self::ge_select((int) floor($i / 2), $e[$i]);
+			$r = self::ge_madd($r, $h, $t);
+			$h = self::ge_p1p1_to_p3($r);
+		}
+
+		$r = self::ge_p3_dbl($h);
+
+		$s = self::ge_p1p1_to_p2($r);
+		$r = self::ge_p2_dbl($s);
+		$s = self::ge_p1p1_to_p2($r);
+		$r = self::ge_p2_dbl($s);
+		$s = self::ge_p1p1_to_p2($r);
+		$r = self::ge_p2_dbl($s);
+
+		$h = self::ge_p1p1_to_p3($r);
+
+		for ($i = 0; $i < 64; $i += 2) {
+			$t = self::ge_select($i >> 1, $e[$i]);
+			$r = self::ge_madd($r, $h, $t);
+			$h = self::ge_p1p1_to_p3($r);
+		}
+		return $h;
+	}
+
+	/**
+	 * Calculates (ab + c) mod l
+	 * where l = 2^252 + 27742317777372353535851937790883648493
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @param string $b
+	 * @param string $c
+	 * @return string
+	 */
+	public static function sc_muladd($a, $b, $c)
+	{
+		$a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
+		$a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
+		$a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
+		$a3 = 2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7);
+		$a4 = 2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4);
+		$a5 = 2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1);
+		$a6 = 2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6);
+		$a7 = 2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3);
+		$a8 = 2097151 & self::load_3(self::substr($a, 21, 3));
+		$a9 = 2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5);
+		$a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
+		$a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
+		$b0 = 2097151 & self::load_3(self::substr($b, 0, 3));
+		$b1 = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
+		$b2 = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
+		$b3 = 2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7);
+		$b4 = 2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4);
+		$b5 = 2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1);
+		$b6 = 2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6);
+		$b7 = 2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3);
+		$b8 = 2097151 & self::load_3(self::substr($b, 21, 3));
+		$b9 = 2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5);
+		$b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
+		$b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
+		$c0 = 2097151 & self::load_3(self::substr($c, 0, 3));
+		$c1 = 2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5);
+		$c2 = 2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2);
+		$c3 = 2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7);
+		$c4 = 2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4);
+		$c5 = 2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1);
+		$c6 = 2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6);
+		$c7 = 2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3);
+		$c8 = 2097151 & self::load_3(self::substr($c, 21, 3));
+		$c9 = 2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5);
+		$c10 = 2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2);
+		$c11 = (self::load_4(self::substr($c, 28, 4)) >> 7);
+
+		/* Can't really avoid the pyramid here: */
+		$s0 = $c0 + self::mul($a0, $b0);
+		$s1 = $c1 + self::mul($a0, $b1) + self::mul($a1, $b0);
+		$s2 = $c2 + self::mul($a0, $b2) + self::mul($a1, $b1) + self::mul($a2, $b0);
+		$s3 = $c3 + self::mul($a0, $b3) + self::mul($a1, $b2) + self::mul($a2, $b1) + self::mul($a3, $b0);
+		$s4 = $c4 + self::mul($a0, $b4) + self::mul($a1, $b3) + self::mul($a2, $b2) + self::mul($a3, $b1) + self::mul($a4, $b0);
+		$s5 = $c5 + self::mul($a0, $b5) + self::mul($a1, $b4) + self::mul($a2, $b3) + self::mul($a3, $b2) + self::mul($a4, $b1) + self::mul($a5, $b0);
+		$s6 = $c6 + self::mul($a0, $b6) + self::mul($a1, $b5) + self::mul($a2, $b4) + self::mul($a3, $b3) + self::mul($a4, $b2) + self::mul($a5, $b1) + self::mul($a6, $b0);
+		$s7 = $c7 + self::mul($a0, $b7) + self::mul($a1, $b6) + self::mul($a2, $b5) + self::mul($a3, $b4) + self::mul($a4, $b3) + self::mul($a5, $b2) + self::mul($a6, $b1) + self::mul($a7, $b0);
+		$s8 = $c8 + self::mul($a0, $b8) + self::mul($a1, $b7) + self::mul($a2, $b6) + self::mul($a3, $b5) + self::mul($a4, $b4) + self::mul($a5, $b3) + self::mul($a6, $b2) + self::mul($a7, $b1) + self::mul($a8, $b0);
+		$s9 = $c9 + self::mul($a0, $b9) + self::mul($a1, $b8) + self::mul($a2, $b7) + self::mul($a3, $b6) + self::mul($a4, $b5) + self::mul($a5, $b4) + self::mul($a6, $b3) + self::mul($a7, $b2) + self::mul($a8, $b1) + self::mul($a9, $b0);
+		$s10 = $c10 + self::mul($a0, $b10) + self::mul($a1, $b9) + self::mul($a2, $b8) + self::mul($a3, $b7) + self::mul($a4, $b6) + self::mul($a5, $b5) + self::mul($a6, $b4) + self::mul($a7, $b3) + self::mul($a8, $b2) + self::mul($a9, $b1) + self::mul($a10, $b0);
+		$s11 = $c11 + self::mul($a0, $b11) + self::mul($a1, $b10) + self::mul($a2, $b9) + self::mul($a3, $b8) + self::mul($a4, $b7) + self::mul($a5, $b6) + self::mul($a6, $b5) + self::mul($a7, $b4) + self::mul($a8, $b3) + self::mul($a9, $b2) + self::mul($a10, $b1) + self::mul($a11, $b0);
+		$s12 = self::mul($a1, $b11) + self::mul($a2, $b10) + self::mul($a3, $b9) + self::mul($a4, $b8) + self::mul($a5, $b7) + self::mul($a6, $b6) + self::mul($a7, $b5) + self::mul($a8, $b4) + self::mul($a9, $b3) + self::mul($a10, $b2) + self::mul($a11, $b1);
+		$s13 = self::mul($a2, $b11) + self::mul($a3, $b10) + self::mul($a4, $b9) + self::mul($a5, $b8) + self::mul($a6, $b7) + self::mul($a7, $b6) + self::mul($a8, $b5) + self::mul($a9, $b4) + self::mul($a10, $b3) + self::mul($a11, $b2);
+		$s14 = self::mul($a3, $b11) + self::mul($a4, $b10) + self::mul($a5, $b9) + self::mul($a6, $b8) + self::mul($a7, $b7) + self::mul($a8, $b6) + self::mul($a9, $b5) + self::mul($a10, $b4) + self::mul($a11, $b3);
+		$s15 = self::mul($a4, $b11) + self::mul($a5, $b10) + self::mul($a6, $b9) + self::mul($a7, $b8) + self::mul($a8, $b7) + self::mul($a9, $b6) + self::mul($a10, $b5) + self::mul($a11, $b4);
+		$s16 = self::mul($a5, $b11) + self::mul($a6, $b10) + self::mul($a7, $b9) + self::mul($a8, $b8) + self::mul($a9, $b7) + self::mul($a10, $b6) + self::mul($a11, $b5);
+		$s17 = self::mul($a6, $b11) + self::mul($a7, $b10) + self::mul($a8, $b9) + self::mul($a9, $b8) + self::mul($a10, $b7) + self::mul($a11, $b6);
+		$s18 = self::mul($a7, $b11) + self::mul($a8, $b10) + self::mul($a9, $b9) + self::mul($a10, $b8) + self::mul($a11, $b7);
+		$s19 = self::mul($a8, $b11) + self::mul($a9, $b10) + self::mul($a10, $b9) + self::mul($a11, $b8);
+		$s20 = self::mul($a9, $b11) + self::mul($a10, $b10) + self::mul($a11, $b9);
+		$s21 = self::mul($a10, $b11) + self::mul($a11, $b10);
+		$s22 = self::mul($a11, $b11);
+		$s23 = 0;
+
+		$carry0 = ($s0 + (1 << 20)) >> 21;
+		$s1 += $carry0;
+		$s0 -= $carry0 << 21;
+		$carry2 = ($s2 + (1 << 20)) >> 21;
+		$s3 += $carry2;
+		$s2 -= $carry2 << 21;
+		$carry4 = ($s4 + (1 << 20)) >> 21;
+		$s5 += $carry4;
+		$s4 -= $carry4 << 21;
+		$carry6 = ($s6 + (1 << 20)) >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry8 = ($s8 + (1 << 20)) >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry10 = ($s10 + (1 << 20)) >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+		$carry12 = ($s12 + (1 << 20)) >> 21;
+		$s13 += $carry12;
+		$s12 -= $carry12 << 21;
+		$carry14 = ($s14 + (1 << 20)) >> 21;
+		$s15 += $carry14;
+		$s14 -= $carry14 << 21;
+		$carry16 = ($s16 + (1 << 20)) >> 21;
+		$s17 += $carry16;
+		$s16 -= $carry16 << 21;
+		$carry18 = ($s18 + (1 << 20)) >> 21;
+		$s19 += $carry18;
+		$s18 -= $carry18 << 21;
+		$carry20 = ($s20 + (1 << 20)) >> 21;
+		$s21 += $carry20;
+		$s20 -= $carry20 << 21;
+		$carry22 = ($s22 + (1 << 20)) >> 21;
+		$s23 += $carry22;
+		$s22 -= $carry22 << 21;
+
+		$carry1 = ($s1 + (1 << 20)) >> 21;
+		$s2 += $carry1;
+		$s1 -= $carry1 << 21;
+		$carry3 = ($s3 + (1 << 20)) >> 21;
+		$s4 += $carry3;
+		$s3 -= $carry3 << 21;
+		$carry5 = ($s5 + (1 << 20)) >> 21;
+		$s6 += $carry5;
+		$s5 -= $carry5 << 21;
+		$carry7 = ($s7 + (1 << 20)) >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry9 = ($s9 + (1 << 20)) >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry11 = ($s11 + (1 << 20)) >> 21;
+		$s12 += $carry11;
+		$s11 -= $carry11 << 21;
+		$carry13 = ($s13 + (1 << 20)) >> 21;
+		$s14 += $carry13;
+		$s13 -= $carry13 << 21;
+		$carry15 = ($s15 + (1 << 20)) >> 21;
+		$s16 += $carry15;
+		$s15 -= $carry15 << 21;
+		$carry17 = ($s17 + (1 << 20)) >> 21;
+		$s18 += $carry17;
+		$s17 -= $carry17 << 21;
+		$carry19 = ($s19 + (1 << 20)) >> 21;
+		$s20 += $carry19;
+		$s19 -= $carry19 << 21;
+		$carry21 = ($s21 + (1 << 20)) >> 21;
+		$s22 += $carry21;
+		$s21 -= $carry21 << 21;
+
+		$s11 += self::mul($s23, 666643, 20);
+		$s12 += self::mul($s23, 470296, 19);
+		$s13 += self::mul($s23, 654183, 20);
+		$s14 -= self::mul($s23, 997805, 20);
+		$s15 += self::mul($s23, 136657, 18);
+		$s16 -= self::mul($s23, 683901, 20);
+
+		$s10 += self::mul($s22, 666643, 20);
+		$s11 += self::mul($s22, 470296, 19);
+		$s12 += self::mul($s22, 654183, 20);
+		$s13 -= self::mul($s22, 997805, 20);
+		$s14 += self::mul($s22, 136657, 18);
+		$s15 -= self::mul($s22, 683901, 20);
+
+		$s9  += self::mul($s21,  666643, 20);
+		$s10 += self::mul($s21,  470296, 19);
+		$s11 += self::mul($s21,  654183, 20);
+		$s12 -= self::mul($s21,  997805, 20);
+		$s13 += self::mul($s21,  136657, 18);
+		$s14 -= self::mul($s21,  683901, 20);
+
+		$s8  += self::mul($s20,  666643, 20);
+		$s9  += self::mul($s20,  470296, 19);
+		$s10 += self::mul($s20,  654183, 20);
+		$s11 -= self::mul($s20,  997805, 20);
+		$s12 += self::mul($s20,  136657, 18);
+		$s13 -= self::mul($s20,  683901, 20);
+
+		$s7  += self::mul($s19,  666643, 20);
+		$s8  += self::mul($s19,  470296, 19);
+		$s9  += self::mul($s19,  654183, 20);
+		$s10 -= self::mul($s19,  997805, 20);
+		$s11 += self::mul($s19,  136657, 18);
+		$s12 -= self::mul($s19,  683901, 20);
+
+		$s6  += self::mul($s18,  666643, 20);
+		$s7  += self::mul($s18,  470296, 19);
+		$s8  += self::mul($s18,  654183, 20);
+		$s9  -= self::mul($s18,  997805, 20);
+		$s10 += self::mul($s18,  136657, 18);
+		$s11 -= self::mul($s18,  683901, 20);
+
+		$carry6 = ($s6 + (1 << 20)) >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry8 = ($s8 + (1 << 20)) >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry10 = ($s10 + (1 << 20)) >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+		$carry12 = ($s12 + (1 << 20)) >> 21;
+		$s13 += $carry12;
+		$s12 -= $carry12 << 21;
+		$carry14 = ($s14 + (1 << 20)) >> 21;
+		$s15 += $carry14;
+		$s14 -= $carry14 << 21;
+		$carry16 = ($s16 + (1 << 20)) >> 21;
+		$s17 += $carry16;
+		$s16 -= $carry16 << 21;
+
+		$carry7 = ($s7 + (1 << 20)) >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry9 = ($s9 + (1 << 20)) >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry11 = ($s11 + (1 << 20)) >> 21;
+		$s12 += $carry11;
+		$s11 -= $carry11 << 21;
+		$carry13 = ($s13 + (1 << 20)) >> 21;
+		$s14 += $carry13;
+		$s13 -= $carry13 << 21;
+		$carry15 = ($s15 + (1 << 20)) >> 21;
+		$s16 += $carry15;
+		$s15 -= $carry15 << 21;
+
+		$s5  += self::mul($s17,  666643, 20);
+		$s6  += self::mul($s17,  470296, 19);
+		$s7  += self::mul($s17,  654183, 20);
+		$s8  -= self::mul($s17,  997805, 20);
+		$s9  += self::mul($s17,  136657, 18);
+		$s10 -= self::mul($s17,  683901, 20);
+
+		$s4 += self::mul($s16,  666643, 20);
+		$s5 += self::mul($s16,  470296, 19);
+		$s6 += self::mul($s16,  654183, 20);
+		$s7 -= self::mul($s16,  997805, 20);
+		$s8 += self::mul($s16,  136657, 18);
+		$s9 -= self::mul($s16,  683901, 20);
+
+		$s3 += self::mul($s15,  666643, 20);
+		$s4 += self::mul($s15,  470296, 19);
+		$s5 += self::mul($s15,  654183, 20);
+		$s6 -= self::mul($s15,  997805, 20);
+		$s7 += self::mul($s15,  136657, 18);
+		$s8 -= self::mul($s15,  683901, 20);
+
+		$s2 += self::mul($s14,  666643, 20);
+		$s3 += self::mul($s14,  470296, 19);
+		$s4 += self::mul($s14,  654183, 20);
+		$s5 -= self::mul($s14,  997805, 20);
+		$s6 += self::mul($s14,  136657, 18);
+		$s7 -= self::mul($s14,  683901, 20);
+
+		$s1 += self::mul($s13,  666643, 20);
+		$s2 += self::mul($s13,  470296, 19);
+		$s3 += self::mul($s13,  654183, 20);
+		$s4 -= self::mul($s13,  997805, 20);
+		$s5 += self::mul($s13,  136657, 18);
+		$s6 -= self::mul($s13,  683901, 20);
+
+		$s0 += self::mul($s12,  666643, 20);
+		$s1 += self::mul($s12,  470296, 19);
+		$s2 += self::mul($s12,  654183, 20);
+		$s3 -= self::mul($s12,  997805, 20);
+		$s4 += self::mul($s12,  136657, 18);
+		$s5 -= self::mul($s12,  683901, 20);
+		$s12 = 0;
+
+		$carry0 = ($s0 + (1 << 20)) >> 21;
+		$s1 += $carry0;
+		$s0 -= $carry0 << 21;
+		$carry2 = ($s2 + (1 << 20)) >> 21;
+		$s3 += $carry2;
+		$s2 -= $carry2 << 21;
+		$carry4 = ($s4 + (1 << 20)) >> 21;
+		$s5 += $carry4;
+		$s4 -= $carry4 << 21;
+		$carry6 = ($s6 + (1 << 20)) >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry8 = ($s8 + (1 << 20)) >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry10 = ($s10 + (1 << 20)) >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+
+		$carry1 = ($s1 + (1 << 20)) >> 21;
+		$s2 += $carry1;
+		$s1 -= $carry1 << 21;
+		$carry3 = ($s3 + (1 << 20)) >> 21;
+		$s4 += $carry3;
+		$s3 -= $carry3 << 21;
+		$carry5 = ($s5 + (1 << 20)) >> 21;
+		$s6 += $carry5;
+		$s5 -= $carry5 << 21;
+		$carry7 = ($s7 + (1 << 20)) >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry9 = ($s9 + (1 << 20)) >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry11 = ($s11 + (1 << 20)) >> 21;
+		$s12 += $carry11;
+		$s11 -= $carry11 << 21;
+
+		$s0 += self::mul($s12,  666643, 20);
+		$s1 += self::mul($s12,  470296, 19);
+		$s2 += self::mul($s12,  654183, 20);
+		$s3 -= self::mul($s12,  997805, 20);
+		$s4 += self::mul($s12,  136657, 18);
+		$s5 -= self::mul($s12,  683901, 20);
+		$s12 = 0;
+
+		$carry0 = $s0 >> 21;
+		$s1 += $carry0;
+		$s0 -= $carry0 << 21;
+		$carry1 = $s1 >> 21;
+		$s2 += $carry1;
+		$s1 -= $carry1 << 21;
+		$carry2 = $s2 >> 21;
+		$s3 += $carry2;
+		$s2 -= $carry2 << 21;
+		$carry3 = $s3 >> 21;
+		$s4 += $carry3;
+		$s3 -= $carry3 << 21;
+		$carry4 = $s4 >> 21;
+		$s5 += $carry4;
+		$s4 -= $carry4 << 21;
+		$carry5 = $s5 >> 21;
+		$s6 += $carry5;
+		$s5 -= $carry5 << 21;
+		$carry6 = $s6 >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry7 = $s7 >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry8 = $s8 >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry9 = $s9 >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry10 = $s10 >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+		$carry11 = $s11 >> 21;
+		$s12 += $carry11;
+		$s11 -= $carry11 << 21;
+
+		$s0 += self::mul($s12,  666643, 20);
+		$s1 += self::mul($s12,  470296, 19);
+		$s2 += self::mul($s12,  654183, 20);
+		$s3 -= self::mul($s12,  997805, 20);
+		$s4 += self::mul($s12,  136657, 18);
+		$s5 -= self::mul($s12,  683901, 20);
+
+		$carry0 = $s0 >> 21;
+		$s1 += $carry0;
+		$s0 -= $carry0 << 21;
+		$carry1 = $s1 >> 21;
+		$s2 += $carry1;
+		$s1 -= $carry1 << 21;
+		$carry2 = $s2 >> 21;
+		$s3 += $carry2;
+		$s2 -= $carry2 << 21;
+		$carry3 = $s3 >> 21;
+		$s4 += $carry3;
+		$s3 -= $carry3 << 21;
+		$carry4 = $s4 >> 21;
+		$s5 += $carry4;
+		$s4 -= $carry4 << 21;
+		$carry5 = $s5 >> 21;
+		$s6 += $carry5;
+		$s5 -= $carry5 << 21;
+		$carry6 = $s6 >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry7 = $s7 >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry8 = $s8 >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry9 = $s9 >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry10 = $s10 >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+
+		/**
+		 * @var array<int, int>
+		 */
+		$arr = array(
+			(int) (0xff & ($s0 >> 0)),
+			(int) (0xff & ($s0 >> 8)),
+			(int) (0xff & (($s0 >> 16) | $s1 << 5)),
+			(int) (0xff & ($s1 >> 3)),
+			(int) (0xff & ($s1 >> 11)),
+			(int) (0xff & (($s1 >> 19) | $s2 << 2)),
+			(int) (0xff & ($s2 >> 6)),
+			(int) (0xff & (($s2 >> 14) | $s3 << 7)),
+			(int) (0xff & ($s3 >> 1)),
+			(int) (0xff & ($s3 >> 9)),
+			(int) (0xff & (($s3 >> 17) | $s4 << 4)),
+			(int) (0xff & ($s4 >> 4)),
+			(int) (0xff & ($s4 >> 12)),
+			(int) (0xff & (($s4 >> 20) | $s5 << 1)),
+			(int) (0xff & ($s5 >> 7)),
+			(int) (0xff & (($s5 >> 15) | $s6 << 6)),
+			(int) (0xff & ($s6 >> 2)),
+			(int) (0xff & ($s6 >> 10)),
+			(int) (0xff & (($s6 >> 18) | $s7 << 3)),
+			(int) (0xff & ($s7 >> 5)),
+			(int) (0xff & ($s7 >> 13)),
+			(int) (0xff & ($s8 >> 0)),
+			(int) (0xff & ($s8 >> 8)),
+			(int) (0xff & (($s8 >> 16) | $s9 << 5)),
+			(int) (0xff & ($s9 >> 3)),
+			(int) (0xff & ($s9 >> 11)),
+			(int) (0xff & (($s9 >> 19) | $s10 << 2)),
+			(int) (0xff & ($s10 >> 6)),
+			(int) (0xff & (($s10 >> 14) | $s11 << 7)),
+			(int) (0xff & ($s11 >> 1)),
+			(int) (0xff & ($s11 >> 9)),
+			0xff & ($s11 >> 17)
+		);
+		return self::intArrayToString($arr);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $s
+	 * @return string
+	 */
+	public static function sc_reduce($s)
+	{
+		$s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
+		$s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
+		$s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);
+		$s3 = 2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7);
+		$s4 = 2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4);
+		$s5 = 2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1);
+		$s6 = 2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6);
+		$s7 = 2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3);
+		$s8 = 2097151 & self::load_3(self::substr($s, 21, 3));
+		$s9 = 2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5);
+		$s10 = 2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2);
+		$s11 = 2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7);
+		$s12 = 2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4);
+		$s13 = 2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1);
+		$s14 = 2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6);
+		$s15 = 2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3);
+		$s16 = 2097151 & self::load_3(self::substr($s, 42, 3));
+		$s17 = 2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5);
+		$s18 = 2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2);
+		$s19 = 2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7);
+		$s20 = 2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4);
+		$s21 = 2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1);
+		$s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6);
+		$s23 = (self::load_4(self::substr($s, 60, 4)) >> 3);
+
+		$s11 += self::mul($s23,  666643, 20);
+		$s12 += self::mul($s23,  470296, 19);
+		$s13 += self::mul($s23,  654183, 20);
+		$s14 -= self::mul($s23,  997805, 20);
+		$s15 += self::mul($s23,  136657, 18);
+		$s16 -= self::mul($s23,  683901, 20);
+
+		$s10 += self::mul($s22,  666643, 20);
+		$s11 += self::mul($s22,  470296, 19);
+		$s12 += self::mul($s22,  654183, 20);
+		$s13 -= self::mul($s22,  997805, 20);
+		$s14 += self::mul($s22,  136657, 18);
+		$s15 -= self::mul($s22,  683901, 20);
+
+		$s9  += self::mul($s21,  666643, 20);
+		$s10 += self::mul($s21,  470296, 19);
+		$s11 += self::mul($s21,  654183, 20);
+		$s12 -= self::mul($s21,  997805, 20);
+		$s13 += self::mul($s21,  136657, 18);
+		$s14 -= self::mul($s21,  683901, 20);
+
+		$s8  += self::mul($s20,  666643, 20);
+		$s9  += self::mul($s20,  470296, 19);
+		$s10 += self::mul($s20,  654183, 20);
+		$s11 -= self::mul($s20,  997805, 20);
+		$s12 += self::mul($s20,  136657, 18);
+		$s13 -= self::mul($s20,  683901, 20);
+
+		$s7  += self::mul($s19,  666643, 20);
+		$s8  += self::mul($s19,  470296, 19);
+		$s9  += self::mul($s19,  654183, 20);
+		$s10 -= self::mul($s19,  997805, 20);
+		$s11 += self::mul($s19,  136657, 18);
+		$s12 -= self::mul($s19,  683901, 20);
+
+		$s6  += self::mul($s18,  666643, 20);
+		$s7  += self::mul($s18,  470296, 19);
+		$s8  += self::mul($s18,  654183, 20);
+		$s9  -= self::mul($s18,  997805, 20);
+		$s10 += self::mul($s18,  136657, 18);
+		$s11 -= self::mul($s18,  683901, 20);
+
+		$carry6 = ($s6 + (1 << 20)) >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry8 = ($s8 + (1 << 20)) >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry10 = ($s10 + (1 << 20)) >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+		$carry12 = ($s12 + (1 << 20)) >> 21;
+		$s13 += $carry12;
+		$s12 -= $carry12 << 21;
+		$carry14 = ($s14 + (1 << 20)) >> 21;
+		$s15 += $carry14;
+		$s14 -= $carry14 << 21;
+		$carry16 = ($s16 + (1 << 20)) >> 21;
+		$s17 += $carry16;
+		$s16 -= $carry16 << 21;
+
+		$carry7 = ($s7 + (1 << 20)) >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry9 = ($s9 + (1 << 20)) >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry11 = ($s11 + (1 << 20)) >> 21;
+		$s12 += $carry11;
+		$s11 -= $carry11 << 21;
+		$carry13 = ($s13 + (1 << 20)) >> 21;
+		$s14 += $carry13;
+		$s13 -= $carry13 << 21;
+		$carry15 = ($s15 + (1 << 20)) >> 21;
+		$s16 += $carry15;
+		$s15 -= $carry15 << 21;
+
+		$s5  += self::mul($s17,  666643, 20);
+		$s6  += self::mul($s17,  470296, 19);
+		$s7  += self::mul($s17,  654183, 20);
+		$s8  -= self::mul($s17,  997805, 20);
+		$s9  += self::mul($s17,  136657, 18);
+		$s10 -= self::mul($s17,  683901, 20);
+
+		$s4 += self::mul($s16,  666643, 20);
+		$s5 += self::mul($s16,  470296, 19);
+		$s6 += self::mul($s16,  654183, 20);
+		$s7 -= self::mul($s16,  997805, 20);
+		$s8 += self::mul($s16,  136657, 18);
+		$s9 -= self::mul($s16,  683901, 20);
+
+		$s3 += self::mul($s15,  666643, 20);
+		$s4 += self::mul($s15,  470296, 19);
+		$s5 += self::mul($s15,  654183, 20);
+		$s6 -= self::mul($s15,  997805, 20);
+		$s7 += self::mul($s15,  136657, 18);
+		$s8 -= self::mul($s15,  683901, 20);
+
+		$s2 += self::mul($s14,  666643, 20);
+		$s3 += self::mul($s14,  470296, 19);
+		$s4 += self::mul($s14,  654183, 20);
+		$s5 -= self::mul($s14,  997805, 20);
+		$s6 += self::mul($s14,  136657, 18);
+		$s7 -= self::mul($s14,  683901, 20);
+
+		$s1 += self::mul($s13,  666643, 20);
+		$s2 += self::mul($s13,  470296, 19);
+		$s3 += self::mul($s13,  654183, 20);
+		$s4 -= self::mul($s13,  997805, 20);
+		$s5 += self::mul($s13,  136657, 18);
+		$s6 -= self::mul($s13,  683901, 20);
+
+		$s0 += self::mul($s12,  666643, 20);
+		$s1 += self::mul($s12,  470296, 19);
+		$s2 += self::mul($s12,  654183, 20);
+		$s3 -= self::mul($s12,  997805, 20);
+		$s4 += self::mul($s12,  136657, 18);
+		$s5 -= self::mul($s12,  683901, 20);
+		$s12 = 0;
+
+		$carry0 = ($s0 + (1 << 20)) >> 21;
+		$s1 += $carry0;
+		$s0 -= $carry0 << 21;
+		$carry2 = ($s2 + (1 << 20)) >> 21;
+		$s3 += $carry2;
+		$s2 -= $carry2 << 21;
+		$carry4 = ($s4 + (1 << 20)) >> 21;
+		$s5 += $carry4;
+		$s4 -= $carry4 << 21;
+		$carry6 = ($s6 + (1 << 20)) >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry8 = ($s8 + (1 << 20)) >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry10 = ($s10 + (1 << 20)) >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+
+		$carry1 = ($s1 + (1 << 20)) >> 21;
+		$s2 += $carry1;
+		$s1 -= $carry1 << 21;
+		$carry3 = ($s3 + (1 << 20)) >> 21;
+		$s4 += $carry3;
+		$s3 -= $carry3 << 21;
+		$carry5 = ($s5 + (1 << 20)) >> 21;
+		$s6 += $carry5;
+		$s5 -= $carry5 << 21;
+		$carry7 = ($s7 + (1 << 20)) >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry9 = ($s9 + (1 << 20)) >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry11 = ($s11 + (1 << 20)) >> 21;
+		$s12 += $carry11;
+		$s11 -= $carry11 << 21;
+
+		$s0 += self::mul($s12,  666643, 20);
+		$s1 += self::mul($s12,  470296, 19);
+		$s2 += self::mul($s12,  654183, 20);
+		$s3 -= self::mul($s12,  997805, 20);
+		$s4 += self::mul($s12,  136657, 18);
+		$s5 -= self::mul($s12,  683901, 20);
+		$s12 = 0;
+
+		$carry0 = $s0 >> 21;
+		$s1 += $carry0;
+		$s0 -= $carry0 << 21;
+		$carry1 = $s1 >> 21;
+		$s2 += $carry1;
+		$s1 -= $carry1 << 21;
+		$carry2 = $s2 >> 21;
+		$s3 += $carry2;
+		$s2 -= $carry2 << 21;
+		$carry3 = $s3 >> 21;
+		$s4 += $carry3;
+		$s3 -= $carry3 << 21;
+		$carry4 = $s4 >> 21;
+		$s5 += $carry4;
+		$s4 -= $carry4 << 21;
+		$carry5 = $s5 >> 21;
+		$s6 += $carry5;
+		$s5 -= $carry5 << 21;
+		$carry6 = $s6 >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry7 = $s7 >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry8 = $s8 >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry9 = $s9 >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry10 = $s10 >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+		$carry11 = $s11 >> 21;
+		$s12 += $carry11;
+		$s11 -= $carry11 << 21;
+
+		$s0 += self::mul($s12,  666643, 20);
+		$s1 += self::mul($s12,  470296, 19);
+		$s2 += self::mul($s12,  654183, 20);
+		$s3 -= self::mul($s12,  997805, 20);
+		$s4 += self::mul($s12,  136657, 18);
+		$s5 -= self::mul($s12,  683901, 20);
+
+		$carry0 = $s0 >> 21;
+		$s1 += $carry0;
+		$s0 -= $carry0 << 21;
+		$carry1 = $s1 >> 21;
+		$s2 += $carry1;
+		$s1 -= $carry1 << 21;
+		$carry2 = $s2 >> 21;
+		$s3 += $carry2;
+		$s2 -= $carry2 << 21;
+		$carry3 = $s3 >> 21;
+		$s4 += $carry3;
+		$s3 -= $carry3 << 21;
+		$carry4 = $s4 >> 21;
+		$s5 += $carry4;
+		$s4 -= $carry4 << 21;
+		$carry5 = $s5 >> 21;
+		$s6 += $carry5;
+		$s5 -= $carry5 << 21;
+		$carry6 = $s6 >> 21;
+		$s7 += $carry6;
+		$s6 -= $carry6 << 21;
+		$carry7 = $s7 >> 21;
+		$s8 += $carry7;
+		$s7 -= $carry7 << 21;
+		$carry8 = $s8 >> 21;
+		$s9 += $carry8;
+		$s8 -= $carry8 << 21;
+		$carry9 = $s9 >> 21;
+		$s10 += $carry9;
+		$s9 -= $carry9 << 21;
+		$carry10 = $s10 >> 21;
+		$s11 += $carry10;
+		$s10 -= $carry10 << 21;
+
+		/**
+		 * @var array<int, int>
+		 */
+		$arr = array(
+			(int) ($s0 >> 0),
+			(int) ($s0 >> 8),
+			(int) (($s0 >> 16) | $s1 << 5),
+			(int) ($s1 >> 3),
+			(int) ($s1 >> 11),
+			(int) (($s1 >> 19) | $s2 << 2),
+			(int) ($s2 >> 6),
+			(int) (($s2 >> 14) | $s3 << 7),
+			(int) ($s3 >> 1),
+			(int) ($s3 >> 9),
+			(int) (($s3 >> 17) | $s4 << 4),
+			(int) ($s4 >> 4),
+			(int) ($s4 >> 12),
+			(int) (($s4 >> 20) | $s5 << 1),
+			(int) ($s5 >> 7),
+			(int) (($s5 >> 15) | $s6 << 6),
+			(int) ($s6 >> 2),
+			(int) ($s6 >> 10),
+			(int) (($s6 >> 18) | $s7 << 3),
+			(int) ($s7 >> 5),
+			(int) ($s7 >> 13),
+			(int) ($s8 >> 0),
+			(int) ($s8 >> 8),
+			(int) (($s8 >> 16) | $s9 << 5),
+			(int) ($s9 >> 3),
+			(int) ($s9 >> 11),
+			(int) (($s9 >> 19) | $s10 << 2),
+			(int) ($s10 >> 6),
+			(int) (($s10 >> 14) | $s11 << 7),
+			(int) ($s11 >> 1),
+			(int) ($s11 >> 9),
+			(int) $s11 >> 17
+		);
+		return self::intArrayToString($arr);
+	}
 }

Spacing +1112 added lines, -1112 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Curve25519', false ) ) {
     return;
 }
 
@@ -25,7 +25,7 @@ 
     public static function fe_0()
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
         );
     }
 
@@ -39,7 +39,7 @@ 
     public static function fe_1()
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            array( 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
         );
     }
 
@@ -57,10 +57,10 @@ 
         ParagonIE_Sodium_Core_Curve25519_Fe $g
     ) {
         $arr = array();
-        for ($i = 0; $i < 10; ++$i) {
-            $arr[$i] = (int) ($f[$i] + $g[$i]);
+        for ( $i = 0; $i < 10; ++$i ) {
+            $arr[$i] = (int) ( $f[$i] + $g[$i] );
         }
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($arr);
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $arr );
     }
 
     /**
@@ -80,11 +80,11 @@ 
     ) {
         $h = array();
         $b *= -1;
-        for ($i = 0; $i < 10; ++$i) {
-            $x = (($f[$i] ^ $g[$i]) & $b);
+        for ( $i = 0; $i < 10; ++$i ) {
+            $x = ( ( $f[$i] ^ $g[$i] ) & $b );
             $h[$i] = $f[$i] ^ $x;
         }
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $h );
     }
 
     /**
@@ -95,7 +95,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_copy( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         $h = clone $f;
         return $h;
@@ -111,51 +111,51 @@ 
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      * @throws RangeException
      */
-    public static function fe_frombytes($s)
+    public static function fe_frombytes( $s )
     {
-        if (self::strlen($s) !== 32) {
-            throw new RangeException('Expected a 32-byte string.');
+        if ( self::strlen( $s ) !== 32 ) {
+            throw new RangeException( 'Expected a 32-byte string.' );
         }
-        $h0 = self::load_4($s);
-        $h1 = self::load_3(self::substr($s, 4, 3)) << 6;
-        $h2 = self::load_3(self::substr($s, 7, 3)) << 5;
-        $h3 = self::load_3(self::substr($s, 10, 3)) << 3;
-        $h4 = self::load_3(self::substr($s, 13, 3)) << 2;
-        $h5 = self::load_4(self::substr($s, 16, 4));
-        $h6 = self::load_3(self::substr($s, 20, 3)) << 7;
-        $h7 = self::load_3(self::substr($s, 23, 3)) << 5;
-        $h8 = self::load_3(self::substr($s, 26, 3)) << 4;
-        $h9 = (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2;
-
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $h0 = self::load_4( $s );
+        $h1 = self::load_3( self::substr( $s, 4, 3 ) ) << 6;
+        $h2 = self::load_3( self::substr( $s, 7, 3 ) ) << 5;
+        $h3 = self::load_3( self::substr( $s, 10, 3 ) ) << 3;
+        $h4 = self::load_3( self::substr( $s, 13, 3 ) ) << 2;
+        $h5 = self::load_4( self::substr( $s, 16, 4 ) );
+        $h6 = self::load_3( self::substr( $s, 20, 3 ) ) << 7;
+        $h7 = self::load_3( self::substr( $s, 23, 3 ) ) << 5;
+        $h8 = self::load_3( self::substr( $s, 26, 3 ) ) << 4;
+        $h9 = ( self::load_3( self::substr( $s, 29, 3 ) ) & 8388607 ) << 2;
+
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
@@ -183,7 +183,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
      * @return string
      */
-    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
+    public static function fe_tobytes( ParagonIE_Sodium_Core_Curve25519_Fe $h )
     {
         $h[0] = (int) $h[0];
         $h[1] = (int) $h[1];
@@ -196,19 +196,19 @@ 
         $h[8] = (int) $h[8];
         $h[9] = (int) $h[9];
 
-        $q = (self::mul($h[9], 19, 5) + (1 << 24)) >> 25;
-        $q = ($h[0] + $q) >> 26;
-        $q = ($h[1] + $q) >> 25;
-        $q = ($h[2] + $q) >> 26;
-        $q = ($h[3] + $q) >> 25;
-        $q = ($h[4] + $q) >> 26;
-        $q = ($h[5] + $q) >> 25;
-        $q = ($h[6] + $q) >> 26;
-        $q = ($h[7] + $q) >> 25;
-        $q = ($h[8] + $q) >> 26;
-        $q = ($h[9] + $q) >> 25;
+        $q = ( self::mul( $h[9], 19, 5 ) + ( 1 << 24 ) ) >> 25;
+        $q = ( $h[0] + $q ) >> 26;
+        $q = ( $h[1] + $q ) >> 25;
+        $q = ( $h[2] + $q ) >> 26;
+        $q = ( $h[3] + $q ) >> 25;
+        $q = ( $h[4] + $q ) >> 26;
+        $q = ( $h[5] + $q ) >> 25;
+        $q = ( $h[6] + $q ) >> 26;
+        $q = ( $h[7] + $q ) >> 25;
+        $q = ( $h[8] + $q ) >> 26;
+        $q = ( $h[9] + $q ) >> 25;
 
-        $h[0] += self::mul($q, 19, 5);
+        $h[0] += self::mul( $q, 19, 5 );
 
         $carry0 = $h[0] >> 26;
         $h[1] += $carry0;
@@ -244,40 +244,40 @@ 
          * @var array<int, int>
          */
         $s = array(
-            (int) (($h[0] >> 0) & 0xff),
-            (int) (($h[0] >> 8) & 0xff),
-            (int) (($h[0] >> 16) & 0xff),
-            (int) ((($h[0] >> 24) | ($h[1] << 2)) & 0xff),
-            (int) (($h[1] >> 6) & 0xff),
-            (int) (($h[1] >> 14) & 0xff),
-            (int) ((($h[1] >> 22) | ($h[2] << 3)) & 0xff),
-            (int) (($h[2] >> 5) & 0xff),
-            (int) (($h[2] >> 13) & 0xff),
-            (int) ((($h[2] >> 21) | ($h[3] << 5)) & 0xff),
-            (int) (($h[3] >> 3) & 0xff),
-            (int) (($h[3] >> 11) & 0xff),
-            (int) ((($h[3] >> 19) | ($h[4] << 6)) & 0xff),
-            (int) (($h[4] >> 2) & 0xff),
-            (int) (($h[4] >> 10) & 0xff),
-            (int) (($h[4] >> 18) & 0xff),
-            (int) (($h[5] >> 0) & 0xff),
-            (int) (($h[5] >> 8) & 0xff),
-            (int) (($h[5] >> 16) & 0xff),
-            (int) ((($h[5] >> 24) | ($h[6] << 1)) & 0xff),
-            (int) (($h[6] >> 7) & 0xff),
-            (int) (($h[6] >> 15) & 0xff),
-            (int) ((($h[6] >> 23) | ($h[7] << 3)) & 0xff),
-            (int) (($h[7] >> 5) & 0xff),
-            (int) (($h[7] >> 13) & 0xff),
-            (int) ((($h[7] >> 21) | ($h[8] << 4)) & 0xff),
-            (int) (($h[8] >> 4) & 0xff),
-            (int) (($h[8] >> 12) & 0xff),
-            (int) ((($h[8] >> 20) | ($h[9] << 6)) & 0xff),
-            (int) (($h[9] >> 2) & 0xff),
-            (int) (($h[9] >> 10) & 0xff),
-            (int) (($h[9] >> 18) & 0xff)
+            (int) ( ( $h[0] >> 0 ) & 0xff ),
+            (int) ( ( $h[0] >> 8 ) & 0xff ),
+            (int) ( ( $h[0] >> 16 ) & 0xff ),
+            (int) ( ( ( $h[0] >> 24 ) | ( $h[1] << 2 ) ) & 0xff ),
+            (int) ( ( $h[1] >> 6 ) & 0xff ),
+            (int) ( ( $h[1] >> 14 ) & 0xff ),
+            (int) ( ( ( $h[1] >> 22 ) | ( $h[2] << 3 ) ) & 0xff ),
+            (int) ( ( $h[2] >> 5 ) & 0xff ),
+            (int) ( ( $h[2] >> 13 ) & 0xff ),
+            (int) ( ( ( $h[2] >> 21 ) | ( $h[3] << 5 ) ) & 0xff ),
+            (int) ( ( $h[3] >> 3 ) & 0xff ),
+            (int) ( ( $h[3] >> 11 ) & 0xff ),
+            (int) ( ( ( $h[3] >> 19 ) | ( $h[4] << 6 ) ) & 0xff ),
+            (int) ( ( $h[4] >> 2 ) & 0xff ),
+            (int) ( ( $h[4] >> 10 ) & 0xff ),
+            (int) ( ( $h[4] >> 18 ) & 0xff ),
+            (int) ( ( $h[5] >> 0 ) & 0xff ),
+            (int) ( ( $h[5] >> 8 ) & 0xff ),
+            (int) ( ( $h[5] >> 16 ) & 0xff ),
+            (int) ( ( ( $h[5] >> 24 ) | ( $h[6] << 1 ) ) & 0xff ),
+            (int) ( ( $h[6] >> 7 ) & 0xff ),
+            (int) ( ( $h[6] >> 15 ) & 0xff ),
+            (int) ( ( ( $h[6] >> 23 ) | ( $h[7] << 3 ) ) & 0xff ),
+            (int) ( ( $h[7] >> 5 ) & 0xff ),
+            (int) ( ( $h[7] >> 13 ) & 0xff ),
+            (int) ( ( ( $h[7] >> 21 ) | ( $h[8] << 4 ) ) & 0xff ),
+            (int) ( ( $h[8] >> 4 ) & 0xff ),
+            (int) ( ( $h[8] >> 12 ) & 0xff ),
+            (int) ( ( ( $h[8] >> 20 ) | ( $h[9] << 6 ) ) & 0xff ),
+            (int) ( ( $h[9] >> 2 ) & 0xff ),
+            (int) ( ( $h[9] >> 10 ) & 0xff ),
+            (int) ( ( $h[9] >> 18 ) & 0xff )
         );
-        return self::intArrayToString($s);
+        return self::intArrayToString( $s );
     }
 
     /**
@@ -288,10 +288,10 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return int
      */
-    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_isnegative( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
-        $str = self::fe_tobytes($f);
-        return self::chrToInt($str[0]) & 1;
+        $str = self::fe_tobytes( $f );
+        return self::chrToInt( $str[0] ) & 1;
     }
 
     /**
@@ -302,14 +302,14 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return bool
      */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_isnonzero( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         static $zero;
-        if ($zero === null) {
-            $zero = str_repeat("\x00", 32);
+        if ( $zero === null ) {
+            $zero = str_repeat( "\x00", 32 );
         }
-        $str = self::fe_tobytes($f);
-        return !self::verify_32($str, $zero);
+        $str = self::fe_tobytes( $f );
+        return ! self::verify_32( $str, $zero );
     }
 
     /**
@@ -350,171 +350,171 @@ 
         $g7 = $g[7];
         $g8 = $g[8];
         $g9 = $g[9];
-        $g1_19 = self::mul($g1, 19, 5);
-        $g2_19 = self::mul($g2, 19, 5);
-        $g3_19 = self::mul($g3, 19, 5);
-        $g4_19 = self::mul($g4, 19, 5);
-        $g5_19 = self::mul($g5, 19, 5);
-        $g6_19 = self::mul($g6, 19, 5);
-        $g7_19 = self::mul($g7, 19, 5);
-        $g8_19 = self::mul($g8, 19, 5);
-        $g9_19 = self::mul($g9, 19, 5);
+        $g1_19 = self::mul( $g1, 19, 5 );
+        $g2_19 = self::mul( $g2, 19, 5 );
+        $g3_19 = self::mul( $g3, 19, 5 );
+        $g4_19 = self::mul( $g4, 19, 5 );
+        $g5_19 = self::mul( $g5, 19, 5 );
+        $g6_19 = self::mul( $g6, 19, 5 );
+        $g7_19 = self::mul( $g7, 19, 5 );
+        $g8_19 = self::mul( $g8, 19, 5 );
+        $g9_19 = self::mul( $g9, 19, 5 );
         $f1_2 = $f1 << 1;
         $f3_2 = $f3 << 1;
         $f5_2 = $f5 << 1;
         $f7_2 = $f7 << 1;
         $f9_2 = $f9 << 1;
-        $f0g0    = self::mul($f0,    $g0);
-        $f0g1    = self::mul($f0,    $g1);
-        $f0g2    = self::mul($f0,    $g2);
-        $f0g3    = self::mul($f0,    $g3);
-        $f0g4    = self::mul($f0,    $g4);
-        $f0g5    = self::mul($f0,    $g5);
-        $f0g6    = self::mul($f0,    $g6);
-        $f0g7    = self::mul($f0,    $g7);
-        $f0g8    = self::mul($f0,    $g8);
-        $f0g9    = self::mul($f0,    $g9);
-        $f1g0    = self::mul($f1,    $g0);
-        $f1g1_2  = self::mul($f1_2,  $g1);
-        $f1g2    = self::mul($f1,    $g2);
-        $f1g3_2  = self::mul($f1_2,  $g3);
-        $f1g4    = self::mul($f1,    $g4);
-        $f1g5_2  = self::mul($f1_2,  $g5);
-        $f1g6    = self::mul($f1,    $g6);
-        $f1g7_2  = self::mul($f1_2,  $g7);
-        $f1g8    = self::mul($f1,    $g8);
-        $f1g9_38 = self::mul($f1_2,  $g9_19);
-        $f2g0    = self::mul($f2,    $g0);
-        $f2g1    = self::mul($f2,    $g1);
-        $f2g2    = self::mul($f2,    $g2);
-        $f2g3    = self::mul($f2,    $g3);
-        $f2g4    = self::mul($f2,    $g4);
-        $f2g5    = self::mul($f2,    $g5);
-        $f2g6    = self::mul($f2,    $g6);
-        $f2g7    = self::mul($f2,    $g7);
-        $f2g8_19 = self::mul($f2,    $g8_19);
-        $f2g9_19 = self::mul($f2,    $g9_19);
-        $f3g0    = self::mul($f3,    $g0);
-        $f3g1_2  = self::mul($f3_2,  $g1);
-        $f3g2    = self::mul($f3,    $g2);
-        $f3g3_2  = self::mul($f3_2,  $g3);
-        $f3g4    = self::mul($f3,    $g4);
-        $f3g5_2  = self::mul($f3_2,  $g5);
-        $f3g6    = self::mul($f3,    $g6);
-        $f3g7_38 = self::mul($f3_2,  $g7_19);
-        $f3g8_19 = self::mul($f3,    $g8_19);
-        $f3g9_38 = self::mul($f3_2,  $g9_19);
-        $f4g0    = self::mul($f4,    $g0);
-        $f4g1    = self::mul($f4,    $g1);
-        $f4g2    = self::mul($f4,    $g2);
-        $f4g3    = self::mul($f4,    $g3);
-        $f4g4    = self::mul($f4,    $g4);
-        $f4g5    = self::mul($f4,    $g5);
-        $f4g6_19 = self::mul($f4,    $g6_19);
-        $f4g7_19 = self::mul($f4,    $g7_19);
-        $f4g8_19 = self::mul($f4,    $g8_19);
-        $f4g9_19 = self::mul($f4,    $g9_19);
-        $f5g0    = self::mul($f5,    $g0);
-        $f5g1_2  = self::mul($f5_2,  $g1);
-        $f5g2    = self::mul($f5,    $g2);
-        $f5g3_2  = self::mul($f5_2,  $g3);
-        $f5g4    = self::mul($f5,    $g4);
-        $f5g5_38 = self::mul($f5_2,  $g5_19);
-        $f5g6_19 = self::mul($f5,    $g6_19);
-        $f5g7_38 = self::mul($f5_2,  $g7_19);
-        $f5g8_19 = self::mul($f5,    $g8_19);
-        $f5g9_38 = self::mul($f5_2,  $g9_19);
-        $f6g0    = self::mul($f6,    $g0);
-        $f6g1    = self::mul($f6,    $g1);
-        $f6g2    = self::mul($f6,    $g2);
-        $f6g3    = self::mul($f6,    $g3);
-        $f6g4_19 = self::mul($f6,    $g4_19);
-        $f6g5_19 = self::mul($f6,    $g5_19);
-        $f6g6_19 = self::mul($f6,    $g6_19);
-        $f6g7_19 = self::mul($f6,    $g7_19);
-        $f6g8_19 = self::mul($f6,    $g8_19);
-        $f6g9_19 = self::mul($f6,    $g9_19);
-        $f7g0    = self::mul($f7,    $g0);
-        $f7g1_2  = self::mul($f7_2,  $g1);
-        $f7g2    = self::mul($f7,    $g2);
-        $f7g3_38 = self::mul($f7_2,  $g3_19);
-        $f7g4_19 = self::mul($f7,    $g4_19);
-        $f7g5_38 = self::mul($f7_2,  $g5_19);
-        $f7g6_19 = self::mul($f7,    $g6_19);
-        $f7g7_38 = self::mul($f7_2,  $g7_19);
-        $f7g8_19 = self::mul($f7,    $g8_19);
-        $f7g9_38 = self::mul($f7_2,  $g9_19);
-        $f8g0    = self::mul($f8,    $g0);
-        $f8g1    = self::mul($f8,    $g1);
-        $f8g2_19 = self::mul($f8,    $g2_19);
-        $f8g3_19 = self::mul($f8,    $g3_19);
-        $f8g4_19 = self::mul($f8,    $g4_19);
-        $f8g5_19 = self::mul($f8,    $g5_19);
-        $f8g6_19 = self::mul($f8,    $g6_19);
-        $f8g7_19 = self::mul($f8,    $g7_19);
-        $f8g8_19 = self::mul($f8,    $g8_19);
-        $f8g9_19 = self::mul($f8,    $g9_19);
-        $f9g0    = self::mul($f9,    $g0);
-        $f9g1_38 = self::mul($f9_2,  $g1_19);
-        $f9g2_19 = self::mul($f9,    $g2_19);
-        $f9g3_38 = self::mul($f9_2,  $g3_19);
-        $f9g4_19 = self::mul($f9,    $g4_19);
-        $f9g5_38 = self::mul($f9_2,  $g5_19);
-        $f9g6_19 = self::mul($f9,    $g6_19);
-        $f9g7_38 = self::mul($f9_2,  $g7_19);
-        $f9g8_19 = self::mul($f9,    $g8_19);
-        $f9g9_38 = self::mul($f9_2,  $g9_19);
+        $f0g0    = self::mul( $f0, $g0 );
+        $f0g1    = self::mul( $f0, $g1 );
+        $f0g2    = self::mul( $f0, $g2 );
+        $f0g3    = self::mul( $f0, $g3 );
+        $f0g4    = self::mul( $f0, $g4 );
+        $f0g5    = self::mul( $f0, $g5 );
+        $f0g6    = self::mul( $f0, $g6 );
+        $f0g7    = self::mul( $f0, $g7 );
+        $f0g8    = self::mul( $f0, $g8 );
+        $f0g9    = self::mul( $f0, $g9 );
+        $f1g0    = self::mul( $f1, $g0 );
+        $f1g1_2  = self::mul( $f1_2, $g1 );
+        $f1g2    = self::mul( $f1, $g2 );
+        $f1g3_2  = self::mul( $f1_2, $g3 );
+        $f1g4    = self::mul( $f1, $g4 );
+        $f1g5_2  = self::mul( $f1_2, $g5 );
+        $f1g6    = self::mul( $f1, $g6 );
+        $f1g7_2  = self::mul( $f1_2, $g7 );
+        $f1g8    = self::mul( $f1, $g8 );
+        $f1g9_38 = self::mul( $f1_2, $g9_19 );
+        $f2g0    = self::mul( $f2, $g0 );
+        $f2g1    = self::mul( $f2, $g1 );
+        $f2g2    = self::mul( $f2, $g2 );
+        $f2g3    = self::mul( $f2, $g3 );
+        $f2g4    = self::mul( $f2, $g4 );
+        $f2g5    = self::mul( $f2, $g5 );
+        $f2g6    = self::mul( $f2, $g6 );
+        $f2g7    = self::mul( $f2, $g7 );
+        $f2g8_19 = self::mul( $f2, $g8_19 );
+        $f2g9_19 = self::mul( $f2, $g9_19 );
+        $f3g0    = self::mul( $f3, $g0 );
+        $f3g1_2  = self::mul( $f3_2, $g1 );
+        $f3g2    = self::mul( $f3, $g2 );
+        $f3g3_2  = self::mul( $f3_2, $g3 );
+        $f3g4    = self::mul( $f3, $g4 );
+        $f3g5_2  = self::mul( $f3_2, $g5 );
+        $f3g6    = self::mul( $f3, $g6 );
+        $f3g7_38 = self::mul( $f3_2, $g7_19 );
+        $f3g8_19 = self::mul( $f3, $g8_19 );
+        $f3g9_38 = self::mul( $f3_2, $g9_19 );
+        $f4g0    = self::mul( $f4, $g0 );
+        $f4g1    = self::mul( $f4, $g1 );
+        $f4g2    = self::mul( $f4, $g2 );
+        $f4g3    = self::mul( $f4, $g3 );
+        $f4g4    = self::mul( $f4, $g4 );
+        $f4g5    = self::mul( $f4, $g5 );
+        $f4g6_19 = self::mul( $f4, $g6_19 );
+        $f4g7_19 = self::mul( $f4, $g7_19 );
+        $f4g8_19 = self::mul( $f4, $g8_19 );
+        $f4g9_19 = self::mul( $f4, $g9_19 );
+        $f5g0    = self::mul( $f5, $g0 );
+        $f5g1_2  = self::mul( $f5_2, $g1 );
+        $f5g2    = self::mul( $f5, $g2 );
+        $f5g3_2  = self::mul( $f5_2, $g3 );
+        $f5g4    = self::mul( $f5, $g4 );
+        $f5g5_38 = self::mul( $f5_2, $g5_19 );
+        $f5g6_19 = self::mul( $f5, $g6_19 );
+        $f5g7_38 = self::mul( $f5_2, $g7_19 );
+        $f5g8_19 = self::mul( $f5, $g8_19 );
+        $f5g9_38 = self::mul( $f5_2, $g9_19 );
+        $f6g0    = self::mul( $f6, $g0 );
+        $f6g1    = self::mul( $f6, $g1 );
+        $f6g2    = self::mul( $f6, $g2 );
+        $f6g3    = self::mul( $f6, $g3 );
+        $f6g4_19 = self::mul( $f6, $g4_19 );
+        $f6g5_19 = self::mul( $f6, $g5_19 );
+        $f6g6_19 = self::mul( $f6, $g6_19 );
+        $f6g7_19 = self::mul( $f6, $g7_19 );
+        $f6g8_19 = self::mul( $f6, $g8_19 );
+        $f6g9_19 = self::mul( $f6, $g9_19 );
+        $f7g0    = self::mul( $f7, $g0 );
+        $f7g1_2  = self::mul( $f7_2, $g1 );
+        $f7g2    = self::mul( $f7, $g2 );
+        $f7g3_38 = self::mul( $f7_2, $g3_19 );
+        $f7g4_19 = self::mul( $f7, $g4_19 );
+        $f7g5_38 = self::mul( $f7_2, $g5_19 );
+        $f7g6_19 = self::mul( $f7, $g6_19 );
+        $f7g7_38 = self::mul( $f7_2, $g7_19 );
+        $f7g8_19 = self::mul( $f7, $g8_19 );
+        $f7g9_38 = self::mul( $f7_2, $g9_19 );
+        $f8g0    = self::mul( $f8, $g0 );
+        $f8g1    = self::mul( $f8, $g1 );
+        $f8g2_19 = self::mul( $f8, $g2_19 );
+        $f8g3_19 = self::mul( $f8, $g3_19 );
+        $f8g4_19 = self::mul( $f8, $g4_19 );
+        $f8g5_19 = self::mul( $f8, $g5_19 );
+        $f8g6_19 = self::mul( $f8, $g6_19 );
+        $f8g7_19 = self::mul( $f8, $g7_19 );
+        $f8g8_19 = self::mul( $f8, $g8_19 );
+        $f8g9_19 = self::mul( $f8, $g9_19 );
+        $f9g0    = self::mul( $f9, $g0 );
+        $f9g1_38 = self::mul( $f9_2, $g1_19 );
+        $f9g2_19 = self::mul( $f9, $g2_19 );
+        $f9g3_38 = self::mul( $f9_2, $g3_19 );
+        $f9g4_19 = self::mul( $f9, $g4_19 );
+        $f9g5_38 = self::mul( $f9_2, $g5_19 );
+        $f9g6_19 = self::mul( $f9, $g6_19 );
+        $f9g7_38 = self::mul( $f9_2, $g7_19 );
+        $f9g8_19 = self::mul( $f9, $g8_19 );
+        $f9g9_38 = self::mul( $f9_2, $g9_19 );
         $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
-        $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
-        $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
-        $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
-        $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
-        $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
-        $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
-        $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
-        $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
-        $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 = $f0g1 + $f1g0 + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
+        $h2 = $f0g2 + $f1g1_2 + $f2g0 + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
+        $h3 = $f0g3 + $f1g2 + $f2g1 + $f3g0 + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
+        $h4 = $f0g4 + $f1g3_2 + $f2g2 + $f3g1_2 + $f4g0 + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
+        $h5 = $f0g5 + $f1g4 + $f2g3 + $f3g2 + $f4g1 + $f5g0 + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
+        $h6 = $f0g6 + $f1g5_2 + $f2g4 + $f3g3_2 + $f4g2 + $f5g1_2 + $f6g0 + $f7g9_38 + $f8g8_19 + $f9g7_38;
+        $h7 = $f0g7 + $f1g6 + $f2g5 + $f3g4 + $f4g3 + $f5g2 + $f6g1 + $f7g0 + $f8g9_19 + $f9g8_19;
+        $h8 = $f0g8 + $f1g7_2 + $f2g6 + $f3g5_2 + $f4g4 + $f5g3_2 + $f6g2 + $f7g1_2 + $f8g0 + $f9g9_38;
+        $h9 = $f0g9 + $f1g8 + $f2g7 + $f3g6 + $f4g5 + $f5g4 + $f6g3 + $f7g2 + $f8g1 + $f9g0;
+
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
 
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
 
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
 
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
@@ -544,10 +544,10 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_neg( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         $h = new ParagonIE_Sodium_Core_Curve25519_Fe();
-        for ($i = 0; $i < 10; ++$i) {
+        for ( $i = 0; $i < 10; ++$i ) {
             $h[$i] = -$f[$i];
         }
         return $h;
@@ -563,7 +563,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_sq( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         $f0 = (int) $f[0];
         $f1 = (int) $f[1];
@@ -584,117 +584,117 @@ 
         $f5_2 = $f5 << 1;
         $f6_2 = $f6 << 1;
         $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6);
-        $f6_19 = self::mul($f6, 19, 5);
-        $f7_38 = self::mul($f7, 38, 6);
-        $f8_19 = self::mul($f8, 19, 5);
-        $f9_38 = self::mul($f9, 38, 6);
-        $f0f0    = self::mul($f0,    $f0);
-        $f0f1_2  = self::mul($f0_2,  $f1);
-        $f0f2_2  = self::mul($f0_2,  $f2);
-        $f0f3_2  = self::mul($f0_2,  $f3);
-        $f0f4_2  = self::mul($f0_2,  $f4);
-        $f0f5_2  = self::mul($f0_2,  $f5);
-        $f0f6_2  = self::mul($f0_2,  $f6);
-        $f0f7_2  = self::mul($f0_2,  $f7);
-        $f0f8_2  = self::mul($f0_2,  $f8);
-        $f0f9_2  = self::mul($f0_2,  $f9);
-        $f1f1_2  = self::mul($f1_2,  $f1);
-        $f1f2_2  = self::mul($f1_2,  $f2);
-        $f1f3_4  = self::mul($f1_2,  $f3_2);
-        $f1f4_2  = self::mul($f1_2,  $f4);
-        $f1f5_4  = self::mul($f1_2,  $f5_2);
-        $f1f6_2  = self::mul($f1_2,  $f6);
-        $f1f7_4  = self::mul($f1_2,  $f7_2);
-        $f1f8_2  = self::mul($f1_2,  $f8);
-        $f1f9_76 = self::mul($f1_2,  $f9_38);
-        $f2f2    = self::mul($f2,    $f2);
-        $f2f3_2  = self::mul($f2_2,  $f3);
-        $f2f4_2  = self::mul($f2_2,  $f4);
-        $f2f5_2  = self::mul($f2_2,  $f5);
-        $f2f6_2  = self::mul($f2_2,  $f6);
-        $f2f7_2  = self::mul($f2_2,  $f7);
-        $f2f8_38 = self::mul($f2_2,  $f8_19);
-        $f2f9_38 = self::mul($f2,    $f9_38);
-        $f3f3_2  = self::mul($f3_2,  $f3);
-        $f3f4_2  = self::mul($f3_2,  $f4);
-        $f3f5_4  = self::mul($f3_2,  $f5_2);
-        $f3f6_2  = self::mul($f3_2,  $f6);
-        $f3f7_76 = self::mul($f3_2,  $f7_38);
-        $f3f8_38 = self::mul($f3_2,  $f8_19);
-        $f3f9_76 = self::mul($f3_2,  $f9_38);
-        $f4f4    = self::mul($f4,    $f4);
-        $f4f5_2  = self::mul($f4_2,  $f5);
-        $f4f6_38 = self::mul($f4_2,  $f6_19);
-        $f4f7_38 = self::mul($f4,    $f7_38);
-        $f4f8_38 = self::mul($f4_2,  $f8_19);
-        $f4f9_38 = self::mul($f4,    $f9_38);
-        $f5f5_38 = self::mul($f5,    $f5_38);
-        $f5f6_38 = self::mul($f5_2,  $f6_19);
-        $f5f7_76 = self::mul($f5_2,  $f7_38);
-        $f5f8_38 = self::mul($f5_2,  $f8_19);
-        $f5f9_76 = self::mul($f5_2,  $f9_38);
-        $f6f6_19 = self::mul($f6,    $f6_19);
-        $f6f7_38 = self::mul($f6,    $f7_38);
-        $f6f8_38 = self::mul($f6_2,  $f8_19);
-        $f6f9_38 = self::mul($f6,    $f9_38);
-        $f7f7_38 = self::mul($f7,    $f7_38);
-        $f7f8_38 = self::mul($f7_2,  $f8_19);
-        $f7f9_76 = self::mul($f7_2,  $f9_38);
-        $f8f8_19 = self::mul($f8,    $f8_19);
-        $f8f9_38 = self::mul($f8,    $f9_38);
-        $f9f9_38 = self::mul($f9,    $f9_38);
-        $h0 = $f0f0   + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
+        $f5_38 = self::mul( $f5, 38, 6 );
+        $f6_19 = self::mul( $f6, 19, 5 );
+        $f7_38 = self::mul( $f7, 38, 6 );
+        $f8_19 = self::mul( $f8, 19, 5 );
+        $f9_38 = self::mul( $f9, 38, 6 );
+        $f0f0    = self::mul( $f0, $f0 );
+        $f0f1_2  = self::mul( $f0_2, $f1 );
+        $f0f2_2  = self::mul( $f0_2, $f2 );
+        $f0f3_2  = self::mul( $f0_2, $f3 );
+        $f0f4_2  = self::mul( $f0_2, $f4 );
+        $f0f5_2  = self::mul( $f0_2, $f5 );
+        $f0f6_2  = self::mul( $f0_2, $f6 );
+        $f0f7_2  = self::mul( $f0_2, $f7 );
+        $f0f8_2  = self::mul( $f0_2, $f8 );
+        $f0f9_2  = self::mul( $f0_2, $f9 );
+        $f1f1_2  = self::mul( $f1_2, $f1 );
+        $f1f2_2  = self::mul( $f1_2, $f2 );
+        $f1f3_4  = self::mul( $f1_2, $f3_2 );
+        $f1f4_2  = self::mul( $f1_2, $f4 );
+        $f1f5_4  = self::mul( $f1_2, $f5_2 );
+        $f1f6_2  = self::mul( $f1_2, $f6 );
+        $f1f7_4  = self::mul( $f1_2, $f7_2 );
+        $f1f8_2  = self::mul( $f1_2, $f8 );
+        $f1f9_76 = self::mul( $f1_2, $f9_38 );
+        $f2f2    = self::mul( $f2, $f2 );
+        $f2f3_2  = self::mul( $f2_2, $f3 );
+        $f2f4_2  = self::mul( $f2_2, $f4 );
+        $f2f5_2  = self::mul( $f2_2, $f5 );
+        $f2f6_2  = self::mul( $f2_2, $f6 );
+        $f2f7_2  = self::mul( $f2_2, $f7 );
+        $f2f8_38 = self::mul( $f2_2, $f8_19 );
+        $f2f9_38 = self::mul( $f2, $f9_38 );
+        $f3f3_2  = self::mul( $f3_2, $f3 );
+        $f3f4_2  = self::mul( $f3_2, $f4 );
+        $f3f5_4  = self::mul( $f3_2, $f5_2 );
+        $f3f6_2  = self::mul( $f3_2, $f6 );
+        $f3f7_76 = self::mul( $f3_2, $f7_38 );
+        $f3f8_38 = self::mul( $f3_2, $f8_19 );
+        $f3f9_76 = self::mul( $f3_2, $f9_38 );
+        $f4f4    = self::mul( $f4, $f4 );
+        $f4f5_2  = self::mul( $f4_2, $f5 );
+        $f4f6_38 = self::mul( $f4_2, $f6_19 );
+        $f4f7_38 = self::mul( $f4, $f7_38 );
+        $f4f8_38 = self::mul( $f4_2, $f8_19 );
+        $f4f9_38 = self::mul( $f4, $f9_38 );
+        $f5f5_38 = self::mul( $f5, $f5_38 );
+        $f5f6_38 = self::mul( $f5_2, $f6_19 );
+        $f5f7_76 = self::mul( $f5_2, $f7_38 );
+        $f5f8_38 = self::mul( $f5_2, $f8_19 );
+        $f5f9_76 = self::mul( $f5_2, $f9_38 );
+        $f6f6_19 = self::mul( $f6, $f6_19 );
+        $f6f7_38 = self::mul( $f6, $f7_38 );
+        $f6f8_38 = self::mul( $f6_2, $f8_19 );
+        $f6f9_38 = self::mul( $f6, $f9_38 );
+        $f7f7_38 = self::mul( $f7, $f7_38 );
+        $f7f8_38 = self::mul( $f7_2, $f8_19 );
+        $f7f9_76 = self::mul( $f7_2, $f9_38 );
+        $f8f8_19 = self::mul( $f8, $f8_19 );
+        $f8f9_38 = self::mul( $f8, $f9_38 );
+        $f9f9_38 = self::mul( $f9, $f9_38 );
+        $h0 = $f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
         $h1 = $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38;
-        $h2 = $f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
-        $h3 = $f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38;
-        $h4 = $f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38;
-        $h5 = $f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38;
-        $h6 = $f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19;
-        $h7 = $f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38;
-        $h8 = $f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38;
-        $h9 = $f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h2 = $f0f2_2 + $f1f1_2 + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
+        $h3 = $f0f3_2 + $f1f2_2 + $f4f9_38 + $f5f8_38 + $f6f7_38;
+        $h4 = $f0f4_2 + $f1f3_4 + $f2f2 + $f5f9_76 + $f6f8_38 + $f7f7_38;
+        $h5 = $f0f5_2 + $f1f4_2 + $f2f3_2 + $f6f9_38 + $f7f8_38;
+        $h6 = $f0f6_2 + $f1f5_4 + $f2f4_2 + $f3f3_2 + $f7f9_76 + $f8f8_19;
+        $h7 = $f0f7_2 + $f1f6_2 + $f2f5_2 + $f3f4_2 + $f8f9_38;
+        $h8 = $f0f8_2 + $f1f7_4 + $f2f6_2 + $f3f5_4 + $f4f4 + $f9f9_38;
+        $h9 = $f0f9_2 + $f1f8_2 + $f2f7_2 + $f3f6_2 + $f4f5_2;
+
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
 
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
 
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
 
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
@@ -725,7 +725,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_sq2( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         $f0 = (int) $f[0];
         $f1 = (int) $f[1];
@@ -746,129 +746,129 @@ 
         $f5_2 = $f5 << 1;
         $f6_2 = $f6 << 1;
         $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6); /* 1.959375*2^30 */
-        $f6_19 = self::mul($f6, 19, 5); /* 1.959375*2^30 */
-        $f7_38 = self::mul($f7, 38, 6); /* 1.959375*2^30 */
-        $f8_19 = self::mul($f8, 19, 5); /* 1.959375*2^30 */
-        $f9_38 = self::mul($f9, 38, 6); /* 1.959375*2^30 */
-        $f0f0 = self::mul($f0, (int) $f0);
-        $f0f1_2 = self::mul($f0_2, (int) $f1);
-        $f0f2_2 = self::mul($f0_2, (int) $f2);
-        $f0f3_2 = self::mul($f0_2, (int) $f3);
-        $f0f4_2 = self::mul($f0_2, (int) $f4);
-        $f0f5_2 = self::mul($f0_2, (int) $f5);
-        $f0f6_2 = self::mul($f0_2, (int) $f6);
-        $f0f7_2 = self::mul($f0_2, (int) $f7);
-        $f0f8_2 = self::mul($f0_2, (int) $f8);
-        $f0f9_2 = self::mul($f0_2, (int) $f9);
-        $f1f1_2 = self::mul($f1_2,  (int) $f1);
-        $f1f2_2 = self::mul($f1_2,  (int) $f2);
-        $f1f3_4 = self::mul($f1_2,  (int) $f3_2);
-        $f1f4_2 = self::mul($f1_2,  (int) $f4);
-        $f1f5_4 = self::mul($f1_2,  (int) $f5_2);
-        $f1f6_2 = self::mul($f1_2,  (int) $f6);
-        $f1f7_4 = self::mul($f1_2,  (int) $f7_2);
-        $f1f8_2 = self::mul($f1_2,  (int) $f8);
-        $f1f9_76 = self::mul($f1_2,  (int) $f9_38);
-        $f2f2 = self::mul($f2,  (int) $f2);
-        $f2f3_2 = self::mul($f2_2,  (int) $f3);
-        $f2f4_2 = self::mul($f2_2,  (int) $f4);
-        $f2f5_2 = self::mul($f2_2,  (int) $f5);
-        $f2f6_2 = self::mul($f2_2,  (int) $f6);
-        $f2f7_2 = self::mul($f2_2,  (int) $f7);
-        $f2f8_38 = self::mul($f2_2,  (int) $f8_19);
-        $f2f9_38 = self::mul($f2,  (int) $f9_38);
-        $f3f3_2 = self::mul($f3_2,  (int) $f3);
-        $f3f4_2 = self::mul($f3_2,  (int) $f4);
-        $f3f5_4 = self::mul($f3_2,  (int) $f5_2);
-        $f3f6_2 = self::mul($f3_2,  (int) $f6);
-        $f3f7_76 = self::mul($f3_2,  (int) $f7_38);
-        $f3f8_38 = self::mul($f3_2,  (int) $f8_19);
-        $f3f9_76 = self::mul($f3_2,  (int) $f9_38);
-        $f4f4 = self::mul($f4,  (int) $f4);
-        $f4f5_2 = self::mul($f4_2,  (int) $f5);
-        $f4f6_38 = self::mul($f4_2,  (int) $f6_19);
-        $f4f7_38 = self::mul($f4,  (int) $f7_38);
-        $f4f8_38 = self::mul($f4_2,  (int) $f8_19);
-        $f4f9_38 = self::mul($f4,  (int) $f9_38);
-        $f5f5_38 = self::mul($f5,  (int) $f5_38);
-        $f5f6_38 = self::mul($f5_2,  (int) $f6_19);
-        $f5f7_76 = self::mul($f5_2,  (int) $f7_38);
-        $f5f8_38 = self::mul($f5_2,  (int) $f8_19);
-        $f5f9_76 = self::mul($f5_2,  (int) $f9_38);
-        $f6f6_19 = self::mul($f6,  (int) $f6_19);
-        $f6f7_38 = self::mul($f6,  (int) $f7_38);
-        $f6f8_38 = self::mul($f6_2,  (int) $f8_19);
-        $f6f9_38 = self::mul($f6,  (int) $f9_38);
-        $f7f7_38 = self::mul($f7,  (int) $f7_38);
-        $f7f8_38 = self::mul($f7_2,  (int) $f8_19);
-        $f7f9_76 = self::mul($f7_2,  (int) $f9_38);
-        $f8f8_19 = self::mul($f8,  (int) $f8_19);
-        $f8f9_38 = self::mul($f8,  (int) $f9_38);
-        $f9f9_38 = self::mul($f9,  (int) $f9_38);
-
-        $h0 = (int) ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38);
-        $h1 = (int) ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38);
-        $h2 = (int) ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19);
-        $h3 = (int) ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38);
-        $h4 = (int) ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38);
-        $h5 = (int) ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38);
-        $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19);
-        $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38);
-        $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38);
-        $h9 = (int) ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2);
-
-        $h0 = (int) ($h0 + $h0);
-        $h1 = (int) ($h1 + $h1);
-        $h2 = (int) ($h2 + $h2);
-        $h3 = (int) ($h3 + $h3);
-        $h4 = (int) ($h4 + $h4);
-        $h5 = (int) ($h5 + $h5);
-        $h6 = (int) ($h6 + $h6);
-        $h7 = (int) ($h7 + $h7);
-        $h8 = (int) ($h8 + $h8);
-        $h9 = (int) ($h9 + $h9);
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $f5_38 = self::mul( $f5, 38, 6 ); /* 1.959375*2^30 */
+        $f6_19 = self::mul( $f6, 19, 5 ); /* 1.959375*2^30 */
+        $f7_38 = self::mul( $f7, 38, 6 ); /* 1.959375*2^30 */
+        $f8_19 = self::mul( $f8, 19, 5 ); /* 1.959375*2^30 */
+        $f9_38 = self::mul( $f9, 38, 6 ); /* 1.959375*2^30 */
+        $f0f0 = self::mul( $f0, (int) $f0 );
+        $f0f1_2 = self::mul( $f0_2, (int) $f1 );
+        $f0f2_2 = self::mul( $f0_2, (int) $f2 );
+        $f0f3_2 = self::mul( $f0_2, (int) $f3 );
+        $f0f4_2 = self::mul( $f0_2, (int) $f4 );
+        $f0f5_2 = self::mul( $f0_2, (int) $f5 );
+        $f0f6_2 = self::mul( $f0_2, (int) $f6 );
+        $f0f7_2 = self::mul( $f0_2, (int) $f7 );
+        $f0f8_2 = self::mul( $f0_2, (int) $f8 );
+        $f0f9_2 = self::mul( $f0_2, (int) $f9 );
+        $f1f1_2 = self::mul( $f1_2, (int) $f1 );
+        $f1f2_2 = self::mul( $f1_2, (int) $f2 );
+        $f1f3_4 = self::mul( $f1_2, (int) $f3_2 );
+        $f1f4_2 = self::mul( $f1_2, (int) $f4 );
+        $f1f5_4 = self::mul( $f1_2, (int) $f5_2 );
+        $f1f6_2 = self::mul( $f1_2, (int) $f6 );
+        $f1f7_4 = self::mul( $f1_2, (int) $f7_2 );
+        $f1f8_2 = self::mul( $f1_2, (int) $f8 );
+        $f1f9_76 = self::mul( $f1_2, (int) $f9_38 );
+        $f2f2 = self::mul( $f2, (int) $f2 );
+        $f2f3_2 = self::mul( $f2_2, (int) $f3 );
+        $f2f4_2 = self::mul( $f2_2, (int) $f4 );
+        $f2f5_2 = self::mul( $f2_2, (int) $f5 );
+        $f2f6_2 = self::mul( $f2_2, (int) $f6 );
+        $f2f7_2 = self::mul( $f2_2, (int) $f7 );
+        $f2f8_38 = self::mul( $f2_2, (int) $f8_19 );
+        $f2f9_38 = self::mul( $f2, (int) $f9_38 );
+        $f3f3_2 = self::mul( $f3_2, (int) $f3 );
+        $f3f4_2 = self::mul( $f3_2, (int) $f4 );
+        $f3f5_4 = self::mul( $f3_2, (int) $f5_2 );
+        $f3f6_2 = self::mul( $f3_2, (int) $f6 );
+        $f3f7_76 = self::mul( $f3_2, (int) $f7_38 );
+        $f3f8_38 = self::mul( $f3_2, (int) $f8_19 );
+        $f3f9_76 = self::mul( $f3_2, (int) $f9_38 );
+        $f4f4 = self::mul( $f4, (int) $f4 );
+        $f4f5_2 = self::mul( $f4_2, (int) $f5 );
+        $f4f6_38 = self::mul( $f4_2, (int) $f6_19 );
+        $f4f7_38 = self::mul( $f4, (int) $f7_38 );
+        $f4f8_38 = self::mul( $f4_2, (int) $f8_19 );
+        $f4f9_38 = self::mul( $f4, (int) $f9_38 );
+        $f5f5_38 = self::mul( $f5, (int) $f5_38 );
+        $f5f6_38 = self::mul( $f5_2, (int) $f6_19 );
+        $f5f7_76 = self::mul( $f5_2, (int) $f7_38 );
+        $f5f8_38 = self::mul( $f5_2, (int) $f8_19 );
+        $f5f9_76 = self::mul( $f5_2, (int) $f9_38 );
+        $f6f6_19 = self::mul( $f6, (int) $f6_19 );
+        $f6f7_38 = self::mul( $f6, (int) $f7_38 );
+        $f6f8_38 = self::mul( $f6_2, (int) $f8_19 );
+        $f6f9_38 = self::mul( $f6, (int) $f9_38 );
+        $f7f7_38 = self::mul( $f7, (int) $f7_38 );
+        $f7f8_38 = self::mul( $f7_2, (int) $f8_19 );
+        $f7f9_76 = self::mul( $f7_2, (int) $f9_38 );
+        $f8f8_19 = self::mul( $f8, (int) $f8_19 );
+        $f8f9_38 = self::mul( $f8, (int) $f9_38 );
+        $f9f9_38 = self::mul( $f9, (int) $f9_38 );
+
+        $h0 = (int) ( $f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38 );
+        $h1 = (int) ( $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38 );
+        $h2 = (int) ( $f0f2_2 + $f1f1_2 + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19 );
+        $h3 = (int) ( $f0f3_2 + $f1f2_2 + $f4f9_38 + $f5f8_38 + $f6f7_38 );
+        $h4 = (int) ( $f0f4_2 + $f1f3_4 + $f2f2 + $f5f9_76 + $f6f8_38 + $f7f7_38 );
+        $h5 = (int) ( $f0f5_2 + $f1f4_2 + $f2f3_2 + $f6f9_38 + $f7f8_38 );
+        $h6 = (int) ( $f0f6_2 + $f1f5_4 + $f2f4_2 + $f3f3_2 + $f7f9_76 + $f8f8_19 );
+        $h7 = (int) ( $f0f7_2 + $f1f6_2 + $f2f5_2 + $f3f4_2 + $f8f9_38 );
+        $h8 = (int) ( $f0f8_2 + $f1f7_4 + $f2f6_2 + $f3f5_4 + $f4f4 + $f9f9_38 );
+        $h9 = (int) ( $f0f9_2 + $f1f8_2 + $f2f7_2 + $f3f6_2 + $f4f5_2 );
+
+        $h0 = (int) ( $h0 + $h0 );
+        $h1 = (int) ( $h1 + $h1 );
+        $h2 = (int) ( $h2 + $h2 );
+        $h3 = (int) ( $h3 + $h3 );
+        $h4 = (int) ( $h4 + $h4 );
+        $h5 = (int) ( $h5 + $h5 );
+        $h6 = (int) ( $h6 + $h6 );
+        $h7 = (int) ( $h7 + $h7 );
+        $h8 = (int) ( $h8 + $h8 );
+        $h9 = (int) ( $h9 + $h9 );
+
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
 
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
 
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
 
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
@@ -894,56 +894,56 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
+    public static function fe_invert( ParagonIE_Sodium_Core_Curve25519_Fe $Z )
     {
         $z = clone $Z;
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t2 = self::fe_sq($t0);
-        $t1 = self::fe_mul($t1, $t2);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t0 = self::fe_sq( $z );
+        $t1 = self::fe_sq( $t0 );
+        $t1 = self::fe_sq( $t1 );
+        $t1 = self::fe_mul( $z, $t1 );
+        $t0 = self::fe_mul( $t0, $t1 );
+        $t2 = self::fe_sq( $t0 );
+        $t1 = self::fe_mul( $t1, $t2 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 20; ++$i) {
-            $t3 = self::fe_sq($t3);
+        $t2 = self::fe_mul( $t2, $t1 );
+        $t3 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 20; ++$i ) {
+            $t3 = self::fe_sq( $t3 );
         }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t2 = self::fe_mul( $t3, $t2 );
+        $t2 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 100; ++$i) {
-            $t3 = self::fe_sq($t3);
+        $t2 = self::fe_mul( $t2, $t1 );
+        $t3 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 100; ++$i ) {
+            $t3 = self::fe_sq( $t3 );
         }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t2 = self::fe_mul( $t3, $t2 );
+        $t2 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
-        return self::fe_mul($t1, $t0);
+        return self::fe_mul( $t1, $t0 );
     }
 
     /**
@@ -954,7 +954,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
+    public static function fe_pow22523( ParagonIE_Sodium_Core_Curve25519_Fe $z )
     {
         # fe_sq(t0, z);
         # fe_sq(t1, t0);
@@ -964,102 +964,102 @@ 
         # fe_sq(t0, t0);
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_sq( $z );
+        $t1 = self::fe_sq( $t0 );
+        $t1 = self::fe_sq( $t1 );
+        $t1 = self::fe_mul( $z, $t1 );
+        $t0 = self::fe_mul( $t0, $t1 );
+        $t0 = self::fe_sq( $t0 );
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 5; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 10; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t1, t1, t0);
         # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t1, $t0 );
+        $t2 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 20; ++i) {
         #     fe_sq(t2, t2);
         # }
-        for ($i = 1; $i < 20; ++$i) {
-            $t2 = self::fe_sq($t2);
+        for ( $i = 1; $i < 20; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
 
         # fe_mul(t1, t2, t1);
         # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 10; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 50; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t1, t1, t0);
         # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t1, $t0 );
+        $t2 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 100; ++i) {
         #     fe_sq(t2, t2);
         # }
-        for ($i = 1; $i < 100; ++$i) {
-            $t2 = self::fe_sq($t2);
+        for ( $i = 1; $i < 100; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
 
         # fe_mul(t1, t2, t1);
         # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 50; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t0, t0);
         # fe_sq(t0, t0);
         # fe_mul(out, t0, z);
-        $t0 = self::fe_mul($t1, $t0);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_sq($t0);
-        return self::fe_mul($t0, $z);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t0 = self::fe_sq( $t0 );
+        $t0 = self::fe_sq( $t0 );
+        return self::fe_mul( $t0, $z );
     }
 
     /**
@@ -1080,20 +1080,20 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
+    public static function fe_sub( ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g )
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(
-                (int) ($f[0] - $g[0]),
-                (int) ($f[1] - $g[1]),
-                (int) ($f[2] - $g[2]),
-                (int) ($f[3] - $g[3]),
-                (int) ($f[4] - $g[4]),
-                (int) ($f[5] - $g[5]),
-                (int) ($f[6] - $g[6]),
-                (int) ($f[7] - $g[7]),
-                (int) ($f[8] - $g[8]),
-                (int) ($f[9] - $g[9])
+                (int) ( $f[0] - $g[0] ),
+                (int) ( $f[1] - $g[1] ),
+                (int) ( $f[2] - $g[2] ),
+                (int) ( $f[3] - $g[3] ),
+                (int) ( $f[4] - $g[4] ),
+                (int) ( $f[5] - $g[5] ),
+                (int) ( $f[6] - $g[6] ),
+                (int) ( $f[7] - $g[7] ),
+                (int) ( $f[8] - $g[8] ),
+                (int) ( $f[9] - $g[9] )
             )
         );
     }
@@ -1114,17 +1114,17 @@ 
         ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
     ) {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YplusX);
-        $r->Y = self::fe_mul($r->Y, $q->YminusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0   = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->YplusX );
+        $r->Y = self::fe_mul( $r->Y, $q->YminusX );
+        $r->T = self::fe_mul( $q->T2d, $p->T );
+        $r->X = self::fe_mul( $p->Z, $q->Z );
+        $t0   = self::fe_add( $r->X, $r->X );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_add( $t0, $r->T );
+        $r->T = self::fe_sub( $t0, $r->T );
         return $r;
     }
 
@@ -1135,33 +1135,33 @@ 
      * @param string $a
      * @return array<int, mixed>
      */
-    public static function slide($a)
+    public static function slide( $a )
     {
-        if (self::strlen($a) < 256) {
-            if (self::strlen($a) < 16) {
-                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+        if ( self::strlen( $a ) < 256 ) {
+            if ( self::strlen( $a ) < 16 ) {
+                $a = str_pad( $a, 256, '0', STR_PAD_RIGHT );
             }
         }
         $r = array();
-        for ($i = 0; $i < 256; ++$i) {
+        for ( $i = 0; $i < 256; ++$i ) {
             $r[$i] = 1 & (
-                    self::chrToInt($a[$i >> 3])
+                    self::chrToInt( $a[$i >> 3] )
                         >>
-                    ($i & 7)
+                    ( $i & 7 )
                 );
         }
 
-        for ($i = 0;$i < 256;++$i) {
-            if ($r[$i]) {
-                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
-                    if ($r[$i + $b]) {
-                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
+        for ( $i = 0; $i < 256; ++$i ) {
+            if ( $r[$i] ) {
+                for ( $b = 1; $b <= 6 && $i + $b < 256; ++$b ) {
+                    if ( $r[$i + $b] ) {
+                        if ( $r[$i] + ( $r[$i + $b] << $b ) <= 15 ) {
                             $r[$i] += $r[$i + $b] << $b;
                             $r[$i + $b] = 0;
-                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
+                        } elseif ( $r[$i] - ( $r[$i + $b] << $b ) >= -15 ) {
                             $r[$i] -= $r[$i + $b] << $b;
-                            for ($k = $i + $b; $k < 256; ++$k) {
-                                if (!$r[$k]) {
+                            for ( $k = $i + $b; $k < 256; ++$k ) {
+                                if ( ! $r[$k] ) {
                                     $r[$k] = 1;
                                     break;
                                 }
@@ -1183,18 +1183,18 @@ 
      * @param string $s
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_frombytes_negate_vartime($s)
+    public static function ge_frombytes_negate_vartime( $s )
     {
         static $d = null;
-        if (!$d) {
-            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
+        if ( ! $d ) {
+            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$d );
         }
 
         # fe_frombytes(h->Y,s);
         # fe_1(h->Z);
         $h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
             self::fe_0(),
-            self::fe_frombytes($s),
+            self::fe_frombytes( $s ),
             self::fe_1()
         );
 
@@ -1202,35 +1202,35 @@ 
         # fe_mul(v,u,d);
         # fe_sub(u,u,h->Z);       /* u = y^2-1 */
         # fe_add(v,v,h->Z);       /* v = dy^2+1 */
-        $u = self::fe_sq($h->Y);
-        $v = self::fe_mul($u, $d);
-        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
-        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+        $u = self::fe_sq( $h->Y );
+        $v = self::fe_mul( $u, $d );
+        $u = self::fe_sub( $u, $h->Z ); /* u =  y^2 - 1 */
+        $v = self::fe_add( $v, $h->Z ); /* v = dy^2 + 1 */
 
         # fe_sq(v3,v);
         # fe_mul(v3,v3,v);        /* v3 = v^3 */
         # fe_sq(h->X,v3);
         # fe_mul(h->X,h->X,v);
         # fe_mul(h->X,h->X,u);    /* x = uv^7 */
-        $v3 = self::fe_sq($v);
-        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
-        $h->X = self::fe_sq($v3);
-        $h->X = self::fe_mul($h->X, $v);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+        $v3 = self::fe_sq( $v );
+        $v3 = self::fe_mul( $v3, $v ); /* v3 = v^3 */
+        $h->X = self::fe_sq( $v3 );
+        $h->X = self::fe_mul( $h->X, $v );
+        $h->X = self::fe_mul( $h->X, $u ); /* x = uv^7 */
 
         # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
         # fe_mul(h->X,h->X,v3);
         # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
-        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
-        $h->X = self::fe_mul($h->X, $v3);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+        $h->X = self::fe_pow22523( $h->X ); /* x = (uv^7)^((q-5)/8) */
+        $h->X = self::fe_mul( $h->X, $v3 );
+        $h->X = self::fe_mul( $h->X, $u ); /* x = uv^3(uv^7)^((q-5)/8) */
 
         # fe_sq(vxx,h->X);
         # fe_mul(vxx,vxx,v);
         # fe_sub(check,vxx,u);    /* vx^2-u */
-        $vxx = self::fe_sq($h->X);
-        $vxx = self::fe_mul($vxx, $v);
-        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
+        $vxx = self::fe_sq( $h->X );
+        $vxx = self::fe_mul( $vxx, $v );
+        $check = self::fe_sub( $vxx, $u ); /* vx^2 - u */
 
         # if (fe_isnonzero(check)) {
         #     fe_add(check,vxx,u);  /* vx^2+u */
@@ -1239,27 +1239,27 @@ 
         #     }
         #     fe_mul(h->X,h->X,sqrtm1);
         # }
-        if (self::fe_isnonzero($check)) {
-            $check = self::fe_add($vxx, $u); /* vx^2 + u */
-            if (self::fe_isnonzero($check)) {
-                throw new RangeException('Internal check failed.');
+        if ( self::fe_isnonzero( $check ) ) {
+            $check = self::fe_add( $vxx, $u ); /* vx^2 + u */
+            if ( self::fe_isnonzero( $check ) ) {
+                throw new RangeException( 'Internal check failed.' );
             }
             $h->X = self::fe_mul(
                 $h->X,
-                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1)
+                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$sqrtm1 )
             );
         }
 
         # if (fe_isnegative(h->X) == (s[31] >> 7)) {
         #     fe_neg(h->X,h->X);
         # }
-        $i = self::chrToInt($s[31]);
-        if (self::fe_isnegative($h->X) === ($i >> 7)) {
-            $h->X = self::fe_neg($h->X);
+        $i = self::chrToInt( $s[31] );
+        if ( self::fe_isnegative( $h->X ) === ( $i >> 7 ) ) {
+            $h->X = self::fe_neg( $h->X );
         }
 
         # fe_mul(h->T,h->X,h->Y);
-        $h->T = self::fe_mul($h->X, $h->Y);
+        $h->T = self::fe_mul( $h->X, $h->Y );
         return $h;
     }
 
@@ -1277,16 +1277,16 @@ 
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
     ) {
         $r = clone $R;
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yplusx);
-        $r->Y = self::fe_mul($r->Y, $q->yminusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->yplusx );
+        $r->Y = self::fe_mul( $r->Y, $q->yminusx );
+        $r->T = self::fe_mul( $q->xy2d, $p->T );
+        $t0 = self::fe_add( clone $p->Z, clone $p->Z );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_add( $t0, $r->T );
+        $r->T = self::fe_sub( $t0, $r->T );
 
         return $r;
     }
@@ -1306,16 +1306,16 @@ 
     ) {
         $r = clone $R;
 
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yminusx);
-        $r->Y = self::fe_mul($r->Y, $q->yplusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add($p->Z, $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->yminusx );
+        $r->Y = self::fe_mul( $r->Y, $q->yplusx );
+        $r->T = self::fe_mul( $q->xy2d, $p->T );
+        $t0 = self::fe_add( $p->Z, $p->Z );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_sub( $t0, $r->T );
+        $r->T = self::fe_add( $t0, $r->T );
 
         return $r;
     }
@@ -1326,12 +1326,12 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    public static function ge_p1p1_to_p2( ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p )
     {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
+        $r->X = self::fe_mul( $p->X, $p->T );
+        $r->Y = self::fe_mul( $p->Y, $p->Z );
+        $r->Z = self::fe_mul( $p->Z, $p->T );
         return $r;
     }
 
@@ -1341,13 +1341,13 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    public static function ge_p1p1_to_p3( ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p )
     {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        $r->T = self::fe_mul($p->X, $p->Y);
+        $r->X = self::fe_mul( $p->X, $p->T );
+        $r->Y = self::fe_mul( $p->Y, $p->Z );
+        $r->Z = self::fe_mul( $p->Z, $p->T );
+        $r->T = self::fe_mul( $p->X, $p->Y );
         return $r;
     }
 
@@ -1371,19 +1371,19 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
+    public static function ge_p2_dbl( ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p )
     {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
-        $r->X = self::fe_sq($p->X);
-        $r->Z = self::fe_sq($p->Y);
-        $r->T = self::fe_sq2($p->Z);
-        $r->Y = self::fe_add($p->X, $p->Y);
-        $t0   = self::fe_sq($r->Y);
-        $r->Y = self::fe_add($r->Z, $r->X);
-        $r->Z = self::fe_sub($r->Z, $r->X);
-        $r->X = self::fe_sub($t0, $r->Y);
-        $r->T = self::fe_sub($r->T, $r->Z);
+        $r->X = self::fe_sq( $p->X );
+        $r->Z = self::fe_sq( $p->Y );
+        $r->T = self::fe_sq2( $p->Z );
+        $r->Y = self::fe_add( $p->X, $p->Y );
+        $t0   = self::fe_sq( $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->X );
+        $r->Z = self::fe_sub( $r->Z, $r->X );
+        $r->X = self::fe_sub( $t0, $r->Y );
+        $r->T = self::fe_sub( $r->T, $r->Z );
 
         return $r;
     }
@@ -1409,17 +1409,17 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
      */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    public static function ge_p3_to_cached( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p )
     {
         static $d2 = null;
-        if ($d2 === null) {
-            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
+        if ( $d2 === null ) {
+            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$d2 );
         }
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
-        $r->YplusX = self::fe_add($p->Y, $p->X);
-        $r->YminusX = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_copy($p->Z);
-        $r->T2d = self::fe_mul($p->T, $d2);
+        $r->YplusX = self::fe_add( $p->Y, $p->X );
+        $r->YminusX = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_copy( $p->Z );
+        $r->T2d = self::fe_mul( $p->T, $d2 );
         return $r;
     }
 
@@ -1429,7 +1429,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    public static function ge_p3_to_p2( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p )
     {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
             $p->X,
@@ -1444,14 +1444,14 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
      * @return string
      */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
+    public static function ge_p3_tobytes( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h )
     {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
+        $recip = self::fe_invert( $h->Z );
+        $x = self::fe_mul( $h->X, $recip );
+        $y = self::fe_mul( $h->Y, $recip );
+        $s = self::fe_tobytes( $y );
         $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+            self::chrToInt( $s[31] ) ^ ( self::fe_isnegative( $x ) << 7 )
         );
         return $s;
     }
@@ -1462,10 +1462,10 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    public static function ge_p3_dbl( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p )
     {
-        $q = self::ge_p3_to_p2($p);
-        return self::ge_p2_dbl($q);
+        $q = self::ge_p3_to_p2( $p );
+        return self::ge_p2_dbl( $q );
     }
 
     /**
@@ -1487,9 +1487,9 @@ 
      * @param int $c
      * @return int
      */
-    public static function equal($b, $c)
+    public static function equal( $b, $c )
     {
-        return (($b ^ $c) - 1 & 0xffffffff) >> 31;
+        return ( ( $b ^ $c ) - 1 & 0xffffffff ) >> 31;
     }
 
     /**
@@ -1498,13 +1498,13 @@ 
      * @param int $char
      * @return int (1 = yes, 0 = no)
      */
-    public static function negative($char)
+    public static function negative( $char )
     {
-        if (is_int($char)) {
+        if ( is_int( $char ) ) {
             return $char < 0 ? 1 : 0;
         }
-        $x = self::chrToInt(self::substr($char, 0, 1));
-        if (PHP_INT_SIZE === 8) {
+        $x = self::chrToInt( self::substr( $char, 0, 1 ) );
+        if ( PHP_INT_SIZE === 8 ) {
             return $x >> 63;
         }
         return $x >> 31;
@@ -1525,13 +1525,13 @@ 
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u,
         $b
     ) {
-        if (!is_int($b)) {
-            throw new InvalidArgumentException('Expected an integer.');
+        if ( ! is_int( $b ) ) {
+            throw new InvalidArgumentException( 'Expected an integer.' );
         }
         return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_cmov($t->yplusx, $u->yplusx, $b),
-            self::fe_cmov($t->yminusx, $u->yminusx, $b),
-            self::fe_cmov($t->xy2d, $u->xy2d, $b)
+            self::fe_cmov( $t->yplusx, $u->yplusx, $b ),
+            self::fe_cmov( $t->yminusx, $u->yminusx, $b ),
+            self::fe_cmov( $t->xy2d, $u->xy2d, $b )
         );
     }
 
@@ -1542,45 +1542,45 @@ 
      * @param int $b
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
      */
-    public static function ge_select($pos = 0, $b = 0)
+    public static function ge_select( $pos = 0, $b = 0 )
     {
         static $base = null;
-        if ($base === null) {
+        if ( $base === null ) {
             $base = array();
-            foreach (self::$base as $i => $bas) {
-                for ($j = 0; $j < 8; ++$j) {
+            foreach ( self::$base as $i => $bas ) {
+                for ( $j = 0; $j < 8; ++$j ) {
                     $base[$i][$j] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][0]),
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][1]),
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][2])
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $bas[$j][0] ),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $bas[$j][1] ),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $bas[$j][2] )
                     );
                 }
             }
         }
-        if (!is_int($pos)) {
-            throw new InvalidArgumentException('Position must be an integer');
+        if ( ! is_int( $pos ) ) {
+            throw new InvalidArgumentException( 'Position must be an integer' );
         }
-        if ($pos < 0 || $pos > 31) {
-            throw new RangeException('Position is out of range [0, 31]');
+        if ( $pos < 0 || $pos > 31 ) {
+            throw new RangeException( 'Position is out of range [0, 31]' );
         }
 
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
+        $bnegative = self::negative( $b );
+        $babs = $b - ( ( (-$bnegative) & $b ) << 1 );
 
         $t = self::ge_precomp_0();
-        for ($i = 0; $i < 8; ++$i) {
+        for ( $i = 0; $i < 8; ++$i ) {
             $t = self::cmov(
                 $t,
                 $base[$pos][$i],
-                self::equal($babs, $i + 1)
+                self::equal( $babs, $i + 1 )
             );
         }
         $minusT = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_copy($t->yminusx),
-            self::fe_copy($t->yplusx),
-            self::fe_neg($t->xy2d)
+            self::fe_copy( $t->yminusx ),
+            self::fe_copy( $t->yplusx ),
+            self::fe_neg( $t->xy2d )
         );
-        return self::cmov($t, $minusT, $bnegative);
+        return self::cmov( $t, $minusT, $bnegative );
     }
 
     /**
@@ -1600,17 +1600,17 @@ 
     ) {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YminusX);
-        $r->Y = self::fe_mul($r->Y, $q->YplusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0 = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->YminusX );
+        $r->Y = self::fe_mul( $r->Y, $q->YplusX );
+        $r->T = self::fe_mul( $q->T2d, $p->T );
+        $r->X = self::fe_mul( $p->Z, $q->Z );
+        $t0 = self::fe_add( $r->X, $r->X );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_sub( $t0, $r->T );
+        $r->T = self::fe_add( $t0, $r->T );
 
         return $r;
     }
@@ -1621,14 +1621,14 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h
      * @return string
      */
-    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
+    public static function ge_tobytes( ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h )
     {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
+        $recip = self::fe_invert( $h->Z );
+        $x = self::fe_mul( $h->X, $recip );
+        $y = self::fe_mul( $h->Y, $recip );
+        $s = self::fe_tobytes( $y );
         $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+            self::chrToInt( $s[31] ) ^ ( self::fe_isnegative( $x ) << 7 )
         );
         return $s;
     }
@@ -1655,16 +1655,16 @@ 
          * @var ParagonIE_Sodium_Core_Curve25519_Ge_Precomp[]
          */
         static $Bi = array();
-        if (!$Bi) {
-            for ($i = 0; $i < 8; ++$i) {
+        if ( ! $Bi ) {
+            for ( $i = 0; $i < 8; ++$i ) {
                 $Bi[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][0]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][1]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][2])
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$base2[$i][0] ),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$base2[$i][1] ),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$base2[$i][2] )
                 );
             }
         }
-        for ($i = 0; $i < 8; ++$i) {
+        for ( $i = 0; $i < 8; ++$i ) {
             $Ai[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
                 self::fe_0(),
                 self::fe_0(),
@@ -1675,14 +1675,14 @@ 
 
         # slide(aslide,a);
         # slide(bslide,b);
-        $aslide = self::slide($a);
-        $bslide = self::slide($b);
+        $aslide = self::slide( $a );
+        $bslide = self::slide( $b );
 
         # ge_p3_to_cached(&Ai[0],A);
         # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
-        $Ai[0] = self::ge_p3_to_cached($A);
-        $t = self::ge_p3_dbl($A);
-        $A2 = self::ge_p1p1_to_p3($t);
+        $Ai[0] = self::ge_p3_to_cached( $A );
+        $t = self::ge_p3_dbl( $A );
+        $A2 = self::ge_p1p1_to_p3( $t );
 
         # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
         # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
@@ -1691,10 +1691,10 @@ 
         # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
         # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
         # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
-        for ($i = 0; $i < 7; ++$i) {
-            $t = self::ge_add($A2, $Ai[$i]);
-            $u = self::ge_p1p1_to_p3($t);
-            $Ai[$i + 1] = self::ge_p3_to_cached($u);
+        for ( $i = 0; $i < 7; ++$i ) {
+            $t = self::ge_add( $A2, $Ai[$i] );
+            $u = self::ge_p1p1_to_p3( $t );
+            $Ai[$i + 1] = self::ge_p3_to_cached( $u );
         }
 
         # ge_p2_0(r);
@@ -1704,31 +1704,31 @@ 
         #     if (aslide[i] || bslide[i]) break;
         # }
         $i = 255;
-        for (; $i >= 0; --$i) {
-            if ($aslide[$i] || $bslide[$i]) {
+        for ( ; $i >= 0; --$i ) {
+            if ( $aslide[$i] || $bslide[$i] ) {
                 break;
             }
         }
 
         # for (;i >= 0;--i) {
-        for (; $i >= 0; --$i) {
+        for ( ; $i >= 0; --$i ) {
             # ge_p2_dbl(&t,r);
-            $t = self::ge_p2_dbl($r);
+            $t = self::ge_p2_dbl( $r );
 
             # if (aslide[i] > 0) {
-            if ($aslide[$i] > 0) {
+            if ( $aslide[$i] > 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_add(&t,&u,&Ai[aslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_add(
                     $u,
-                    $Ai[(int) floor($aslide[$i] / 2)]
+                    $Ai[(int) floor( $aslide[$i] / 2 )]
                 );
             # } else if (aslide[i] < 0) {
-            } elseif ($aslide[$i] < 0) {
+            } elseif ( $aslide[$i] < 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_sub(
                     $u,
                     $Ai[(int) floor(-$aslide[$i] / 2)]
@@ -1736,20 +1736,20 @@ 
             }
 
             # if (bslide[i] > 0) {
-            if ($bslide[$i] > 0) {
+            if ( $bslide[$i] > 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_madd(&t,&u,&Bi[bslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_madd(
                     $t,
                     $u,
-                    $Bi[(int) floor($bslide[$i] / 2)]
+                    $Bi[(int) floor( $bslide[$i] / 2 )]
                 );
             # } else if (bslide[i] < 0) {
-            } elseif ($bslide[$i] < 0) {
+            } elseif ( $bslide[$i] < 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_msub(
                     $t,
                     $u,
@@ -1757,7 +1757,7 @@ 
                 );
             }
             # ge_p1p1_to_p2(r,&t);
-            $r = self::ge_p1p1_to_p2($t);
+            $r = self::ge_p1p1_to_p2( $t );
         }
         return $r;
     }
@@ -1768,18 +1768,18 @@ 
      * @param string $a
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_scalarmult_base($a)
+    public static function ge_scalarmult_base( $a )
     {
         $e = array();
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
-        for ($i = 0; $i < 32; ++$i) {
-            $e[$i << 1] = self::chrToInt($a[$i]) & 15;
-            $e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
+        for ( $i = 0; $i < 32; ++$i ) {
+            $e[$i << 1] = self::chrToInt( $a[$i] ) & 15;
+            $e[( $i << 1 ) + 1] = ( self::chrToInt( $a[$i] ) >> 4 ) & 15;
         }
 
         $carry = 0;
-        for ($i = 0; $i < 63; ++$i) {
+        for ( $i = 0; $i < 63; ++$i ) {
             $e[$i] += $carry;
             $carry = $e[$i] + 8;
             $carry >>= 4;
@@ -1789,27 +1789,27 @@ 
 
         $h = self::ge_p3_0();
 
-        for ($i = 1; $i < 64; $i += 2) {
-            $t = self::ge_select((int) floor($i / 2), $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
+        for ( $i = 1; $i < 64; $i += 2 ) {
+            $t = self::ge_select( (int) floor( $i / 2 ), $e[$i] );
+            $r = self::ge_madd( $r, $h, $t );
+            $h = self::ge_p1p1_to_p3( $r );
         }
 
-        $r = self::ge_p3_dbl($h);
+        $r = self::ge_p3_dbl( $h );
 
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
 
-        $h = self::ge_p1p1_to_p3($r);
+        $h = self::ge_p1p1_to_p3( $r );
 
-        for ($i = 0; $i < 64; $i += 2) {
-            $t = self::ge_select($i >> 1, $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
+        for ( $i = 0; $i < 64; $i += 2 ) {
+            $t = self::ge_select( $i >> 1, $e[$i] );
+            $r = self::ge_madd( $r, $h, $t );
+            $h = self::ge_p1p1_to_p3( $r );
         }
         return $h;
     }
@@ -1825,306 +1825,306 @@ 
      * @param string $c
      * @return string
      */
-    public static function sc_muladd($a, $b, $c)
+    public static function sc_muladd( $a, $b, $c )
     {
-        $a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
-        $a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
-        $a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
-        $a3 = 2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7);
-        $a4 = 2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4);
-        $a5 = 2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1);
-        $a6 = 2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6);
-        $a7 = 2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3);
-        $a8 = 2097151 & self::load_3(self::substr($a, 21, 3));
-        $a9 = 2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5);
-        $a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
-        $a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
-        $b0 = 2097151 & self::load_3(self::substr($b, 0, 3));
-        $b1 = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
-        $b2 = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
-        $b3 = 2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7);
-        $b4 = 2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4);
-        $b5 = 2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1);
-        $b6 = 2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6);
-        $b7 = 2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3);
-        $b8 = 2097151 & self::load_3(self::substr($b, 21, 3));
-        $b9 = 2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5);
-        $b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
-        $b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
-        $c0 = 2097151 & self::load_3(self::substr($c, 0, 3));
-        $c1 = 2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5);
-        $c2 = 2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2);
-        $c3 = 2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7);
-        $c4 = 2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4);
-        $c5 = 2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1);
-        $c6 = 2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6);
-        $c7 = 2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3);
-        $c8 = 2097151 & self::load_3(self::substr($c, 21, 3));
-        $c9 = 2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5);
-        $c10 = 2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2);
-        $c11 = (self::load_4(self::substr($c, 28, 4)) >> 7);
+        $a0 = 2097151 & self::load_3( self::substr( $a, 0, 3 ) );
+        $a1 = 2097151 & ( self::load_4( self::substr( $a, 2, 4 ) ) >> 5 );
+        $a2 = 2097151 & ( self::load_3( self::substr( $a, 5, 3 ) ) >> 2 );
+        $a3 = 2097151 & ( self::load_4( self::substr( $a, 7, 4 ) ) >> 7 );
+        $a4 = 2097151 & ( self::load_4( self::substr( $a, 10, 4 ) ) >> 4 );
+        $a5 = 2097151 & ( self::load_3( self::substr( $a, 13, 3 ) ) >> 1 );
+        $a6 = 2097151 & ( self::load_4( self::substr( $a, 15, 4 ) ) >> 6 );
+        $a7 = 2097151 & ( self::load_3( self::substr( $a, 18, 3 ) ) >> 3 );
+        $a8 = 2097151 & self::load_3( self::substr( $a, 21, 3 ) );
+        $a9 = 2097151 & ( self::load_4( self::substr( $a, 23, 4 ) ) >> 5 );
+        $a10 = 2097151 & ( self::load_3( self::substr( $a, 26, 3 ) ) >> 2 );
+        $a11 = ( self::load_4( self::substr( $a, 28, 4 ) ) >> 7 );
+        $b0 = 2097151 & self::load_3( self::substr( $b, 0, 3 ) );
+        $b1 = 2097151 & ( self::load_4( self::substr( $b, 2, 4 ) ) >> 5 );
+        $b2 = 2097151 & ( self::load_3( self::substr( $b, 5, 3 ) ) >> 2 );
+        $b3 = 2097151 & ( self::load_4( self::substr( $b, 7, 4 ) ) >> 7 );
+        $b4 = 2097151 & ( self::load_4( self::substr( $b, 10, 4 ) ) >> 4 );
+        $b5 = 2097151 & ( self::load_3( self::substr( $b, 13, 3 ) ) >> 1 );
+        $b6 = 2097151 & ( self::load_4( self::substr( $b, 15, 4 ) ) >> 6 );
+        $b7 = 2097151 & ( self::load_3( self::substr( $b, 18, 3 ) ) >> 3 );
+        $b8 = 2097151 & self::load_3( self::substr( $b, 21, 3 ) );
+        $b9 = 2097151 & ( self::load_4( self::substr( $b, 23, 4 ) ) >> 5 );
+        $b10 = 2097151 & ( self::load_3( self::substr( $b, 26, 3 ) ) >> 2 );
+        $b11 = ( self::load_4( self::substr( $b, 28, 4 ) ) >> 7 );
+        $c0 = 2097151 & self::load_3( self::substr( $c, 0, 3 ) );
+        $c1 = 2097151 & ( self::load_4( self::substr( $c, 2, 4 ) ) >> 5 );
+        $c2 = 2097151 & ( self::load_3( self::substr( $c, 5, 3 ) ) >> 2 );
+        $c3 = 2097151 & ( self::load_4( self::substr( $c, 7, 4 ) ) >> 7 );
+        $c4 = 2097151 & ( self::load_4( self::substr( $c, 10, 4 ) ) >> 4 );
+        $c5 = 2097151 & ( self::load_3( self::substr( $c, 13, 3 ) ) >> 1 );
+        $c6 = 2097151 & ( self::load_4( self::substr( $c, 15, 4 ) ) >> 6 );
+        $c7 = 2097151 & ( self::load_3( self::substr( $c, 18, 3 ) ) >> 3 );
+        $c8 = 2097151 & self::load_3( self::substr( $c, 21, 3 ) );
+        $c9 = 2097151 & ( self::load_4( self::substr( $c, 23, 4 ) ) >> 5 );
+        $c10 = 2097151 & ( self::load_3( self::substr( $c, 26, 3 ) ) >> 2 );
+        $c11 = ( self::load_4( self::substr( $c, 28, 4 ) ) >> 7 );
 
         /* Can't really avoid the pyramid here: */
-        $s0 = $c0 + self::mul($a0, $b0);
-        $s1 = $c1 + self::mul($a0, $b1) + self::mul($a1, $b0);
-        $s2 = $c2 + self::mul($a0, $b2) + self::mul($a1, $b1) + self::mul($a2, $b0);
-        $s3 = $c3 + self::mul($a0, $b3) + self::mul($a1, $b2) + self::mul($a2, $b1) + self::mul($a3, $b0);
-        $s4 = $c4 + self::mul($a0, $b4) + self::mul($a1, $b3) + self::mul($a2, $b2) + self::mul($a3, $b1) + self::mul($a4, $b0);
-        $s5 = $c5 + self::mul($a0, $b5) + self::mul($a1, $b4) + self::mul($a2, $b3) + self::mul($a3, $b2) + self::mul($a4, $b1) + self::mul($a5, $b0);
-        $s6 = $c6 + self::mul($a0, $b6) + self::mul($a1, $b5) + self::mul($a2, $b4) + self::mul($a3, $b3) + self::mul($a4, $b2) + self::mul($a5, $b1) + self::mul($a6, $b0);
-        $s7 = $c7 + self::mul($a0, $b7) + self::mul($a1, $b6) + self::mul($a2, $b5) + self::mul($a3, $b4) + self::mul($a4, $b3) + self::mul($a5, $b2) + self::mul($a6, $b1) + self::mul($a7, $b0);
-        $s8 = $c8 + self::mul($a0, $b8) + self::mul($a1, $b7) + self::mul($a2, $b6) + self::mul($a3, $b5) + self::mul($a4, $b4) + self::mul($a5, $b3) + self::mul($a6, $b2) + self::mul($a7, $b1) + self::mul($a8, $b0);
-        $s9 = $c9 + self::mul($a0, $b9) + self::mul($a1, $b8) + self::mul($a2, $b7) + self::mul($a3, $b6) + self::mul($a4, $b5) + self::mul($a5, $b4) + self::mul($a6, $b3) + self::mul($a7, $b2) + self::mul($a8, $b1) + self::mul($a9, $b0);
-        $s10 = $c10 + self::mul($a0, $b10) + self::mul($a1, $b9) + self::mul($a2, $b8) + self::mul($a3, $b7) + self::mul($a4, $b6) + self::mul($a5, $b5) + self::mul($a6, $b4) + self::mul($a7, $b3) + self::mul($a8, $b2) + self::mul($a9, $b1) + self::mul($a10, $b0);
-        $s11 = $c11 + self::mul($a0, $b11) + self::mul($a1, $b10) + self::mul($a2, $b9) + self::mul($a3, $b8) + self::mul($a4, $b7) + self::mul($a5, $b6) + self::mul($a6, $b5) + self::mul($a7, $b4) + self::mul($a8, $b3) + self::mul($a9, $b2) + self::mul($a10, $b1) + self::mul($a11, $b0);
-        $s12 = self::mul($a1, $b11) + self::mul($a2, $b10) + self::mul($a3, $b9) + self::mul($a4, $b8) + self::mul($a5, $b7) + self::mul($a6, $b6) + self::mul($a7, $b5) + self::mul($a8, $b4) + self::mul($a9, $b3) + self::mul($a10, $b2) + self::mul($a11, $b1);
-        $s13 = self::mul($a2, $b11) + self::mul($a3, $b10) + self::mul($a4, $b9) + self::mul($a5, $b8) + self::mul($a6, $b7) + self::mul($a7, $b6) + self::mul($a8, $b5) + self::mul($a9, $b4) + self::mul($a10, $b3) + self::mul($a11, $b2);
-        $s14 = self::mul($a3, $b11) + self::mul($a4, $b10) + self::mul($a5, $b9) + self::mul($a6, $b8) + self::mul($a7, $b7) + self::mul($a8, $b6) + self::mul($a9, $b5) + self::mul($a10, $b4) + self::mul($a11, $b3);
-        $s15 = self::mul($a4, $b11) + self::mul($a5, $b10) + self::mul($a6, $b9) + self::mul($a7, $b8) + self::mul($a8, $b7) + self::mul($a9, $b6) + self::mul($a10, $b5) + self::mul($a11, $b4);
-        $s16 = self::mul($a5, $b11) + self::mul($a6, $b10) + self::mul($a7, $b9) + self::mul($a8, $b8) + self::mul($a9, $b7) + self::mul($a10, $b6) + self::mul($a11, $b5);
-        $s17 = self::mul($a6, $b11) + self::mul($a7, $b10) + self::mul($a8, $b9) + self::mul($a9, $b8) + self::mul($a10, $b7) + self::mul($a11, $b6);
-        $s18 = self::mul($a7, $b11) + self::mul($a8, $b10) + self::mul($a9, $b9) + self::mul($a10, $b8) + self::mul($a11, $b7);
-        $s19 = self::mul($a8, $b11) + self::mul($a9, $b10) + self::mul($a10, $b9) + self::mul($a11, $b8);
-        $s20 = self::mul($a9, $b11) + self::mul($a10, $b10) + self::mul($a11, $b9);
-        $s21 = self::mul($a10, $b11) + self::mul($a11, $b10);
-        $s22 = self::mul($a11, $b11);
+        $s0 = $c0 + self::mul( $a0, $b0 );
+        $s1 = $c1 + self::mul( $a0, $b1 ) + self::mul( $a1, $b0 );
+        $s2 = $c2 + self::mul( $a0, $b2 ) + self::mul( $a1, $b1 ) + self::mul( $a2, $b0 );
+        $s3 = $c3 + self::mul( $a0, $b3 ) + self::mul( $a1, $b2 ) + self::mul( $a2, $b1 ) + self::mul( $a3, $b0 );
+        $s4 = $c4 + self::mul( $a0, $b4 ) + self::mul( $a1, $b3 ) + self::mul( $a2, $b2 ) + self::mul( $a3, $b1 ) + self::mul( $a4, $b0 );
+        $s5 = $c5 + self::mul( $a0, $b5 ) + self::mul( $a1, $b4 ) + self::mul( $a2, $b3 ) + self::mul( $a3, $b2 ) + self::mul( $a4, $b1 ) + self::mul( $a5, $b0 );
+        $s6 = $c6 + self::mul( $a0, $b6 ) + self::mul( $a1, $b5 ) + self::mul( $a2, $b4 ) + self::mul( $a3, $b3 ) + self::mul( $a4, $b2 ) + self::mul( $a5, $b1 ) + self::mul( $a6, $b0 );
+        $s7 = $c7 + self::mul( $a0, $b7 ) + self::mul( $a1, $b6 ) + self::mul( $a2, $b5 ) + self::mul( $a3, $b4 ) + self::mul( $a4, $b3 ) + self::mul( $a5, $b2 ) + self::mul( $a6, $b1 ) + self::mul( $a7, $b0 );
+        $s8 = $c8 + self::mul( $a0, $b8 ) + self::mul( $a1, $b7 ) + self::mul( $a2, $b6 ) + self::mul( $a3, $b5 ) + self::mul( $a4, $b4 ) + self::mul( $a5, $b3 ) + self::mul( $a6, $b2 ) + self::mul( $a7, $b1 ) + self::mul( $a8, $b0 );
+        $s9 = $c9 + self::mul( $a0, $b9 ) + self::mul( $a1, $b8 ) + self::mul( $a2, $b7 ) + self::mul( $a3, $b6 ) + self::mul( $a4, $b5 ) + self::mul( $a5, $b4 ) + self::mul( $a6, $b3 ) + self::mul( $a7, $b2 ) + self::mul( $a8, $b1 ) + self::mul( $a9, $b0 );
+        $s10 = $c10 + self::mul( $a0, $b10 ) + self::mul( $a1, $b9 ) + self::mul( $a2, $b8 ) + self::mul( $a3, $b7 ) + self::mul( $a4, $b6 ) + self::mul( $a5, $b5 ) + self::mul( $a6, $b4 ) + self::mul( $a7, $b3 ) + self::mul( $a8, $b2 ) + self::mul( $a9, $b1 ) + self::mul( $a10, $b0 );
+        $s11 = $c11 + self::mul( $a0, $b11 ) + self::mul( $a1, $b10 ) + self::mul( $a2, $b9 ) + self::mul( $a3, $b8 ) + self::mul( $a4, $b7 ) + self::mul( $a5, $b6 ) + self::mul( $a6, $b5 ) + self::mul( $a7, $b4 ) + self::mul( $a8, $b3 ) + self::mul( $a9, $b2 ) + self::mul( $a10, $b1 ) + self::mul( $a11, $b0 );
+        $s12 = self::mul( $a1, $b11 ) + self::mul( $a2, $b10 ) + self::mul( $a3, $b9 ) + self::mul( $a4, $b8 ) + self::mul( $a5, $b7 ) + self::mul( $a6, $b6 ) + self::mul( $a7, $b5 ) + self::mul( $a8, $b4 ) + self::mul( $a9, $b3 ) + self::mul( $a10, $b2 ) + self::mul( $a11, $b1 );
+        $s13 = self::mul( $a2, $b11 ) + self::mul( $a3, $b10 ) + self::mul( $a4, $b9 ) + self::mul( $a5, $b8 ) + self::mul( $a6, $b7 ) + self::mul( $a7, $b6 ) + self::mul( $a8, $b5 ) + self::mul( $a9, $b4 ) + self::mul( $a10, $b3 ) + self::mul( $a11, $b2 );
+        $s14 = self::mul( $a3, $b11 ) + self::mul( $a4, $b10 ) + self::mul( $a5, $b9 ) + self::mul( $a6, $b8 ) + self::mul( $a7, $b7 ) + self::mul( $a8, $b6 ) + self::mul( $a9, $b5 ) + self::mul( $a10, $b4 ) + self::mul( $a11, $b3 );
+        $s15 = self::mul( $a4, $b11 ) + self::mul( $a5, $b10 ) + self::mul( $a6, $b9 ) + self::mul( $a7, $b8 ) + self::mul( $a8, $b7 ) + self::mul( $a9, $b6 ) + self::mul( $a10, $b5 ) + self::mul( $a11, $b4 );
+        $s16 = self::mul( $a5, $b11 ) + self::mul( $a6, $b10 ) + self::mul( $a7, $b9 ) + self::mul( $a8, $b8 ) + self::mul( $a9, $b7 ) + self::mul( $a10, $b6 ) + self::mul( $a11, $b5 );
+        $s17 = self::mul( $a6, $b11 ) + self::mul( $a7, $b10 ) + self::mul( $a8, $b9 ) + self::mul( $a9, $b8 ) + self::mul( $a10, $b7 ) + self::mul( $a11, $b6 );
+        $s18 = self::mul( $a7, $b11 ) + self::mul( $a8, $b10 ) + self::mul( $a9, $b9 ) + self::mul( $a10, $b8 ) + self::mul( $a11, $b7 );
+        $s19 = self::mul( $a8, $b11 ) + self::mul( $a9, $b10 ) + self::mul( $a10, $b9 ) + self::mul( $a11, $b8 );
+        $s20 = self::mul( $a9, $b11 ) + self::mul( $a10, $b10 ) + self::mul( $a11, $b9 );
+        $s21 = self::mul( $a10, $b11 ) + self::mul( $a11, $b10 );
+        $s22 = self::mul( $a11, $b11 );
         $s23 = 0;
 
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
-        $carry18 = ($s18 + (1 << 20)) >> 21;
+        $carry18 = ( $s18 + ( 1 << 20 ) ) >> 21;
         $s19 += $carry18;
         $s18 -= $carry18 << 21;
-        $carry20 = ($s20 + (1 << 20)) >> 21;
+        $carry20 = ( $s20 + ( 1 << 20 ) ) >> 21;
         $s21 += $carry20;
         $s20 -= $carry20 << 21;
-        $carry22 = ($s22 + (1 << 20)) >> 21;
+        $carry22 = ( $s22 + ( 1 << 20 ) ) >> 21;
         $s23 += $carry22;
         $s22 -= $carry22 << 21;
 
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
-        $carry17 = ($s17 + (1 << 20)) >> 21;
+        $carry17 = ( $s17 + ( 1 << 20 ) ) >> 21;
         $s18 += $carry17;
         $s17 -= $carry17 << 21;
-        $carry19 = ($s19 + (1 << 20)) >> 21;
+        $carry19 = ( $s19 + ( 1 << 20 ) ) >> 21;
         $s20 += $carry19;
         $s19 -= $carry19 << 21;
-        $carry21 = ($s21 + (1 << 20)) >> 21;
+        $carry21 = ( $s21 + ( 1 << 20 ) ) >> 21;
         $s22 += $carry21;
         $s21 -= $carry21 << 21;
 
-        $s11 += self::mul($s23, 666643, 20);
-        $s12 += self::mul($s23, 470296, 19);
-        $s13 += self::mul($s23, 654183, 20);
-        $s14 -= self::mul($s23, 997805, 20);
-        $s15 += self::mul($s23, 136657, 18);
-        $s16 -= self::mul($s23, 683901, 20);
-
-        $s10 += self::mul($s22, 666643, 20);
-        $s11 += self::mul($s22, 470296, 19);
-        $s12 += self::mul($s22, 654183, 20);
-        $s13 -= self::mul($s22, 997805, 20);
-        $s14 += self::mul($s22, 136657, 18);
-        $s15 -= self::mul($s22, 683901, 20);
-
-        $s9  += self::mul($s21,  666643, 20);
-        $s10 += self::mul($s21,  470296, 19);
-        $s11 += self::mul($s21,  654183, 20);
-        $s12 -= self::mul($s21,  997805, 20);
-        $s13 += self::mul($s21,  136657, 18);
-        $s14 -= self::mul($s21,  683901, 20);
-
-        $s8  += self::mul($s20,  666643, 20);
-        $s9  += self::mul($s20,  470296, 19);
-        $s10 += self::mul($s20,  654183, 20);
-        $s11 -= self::mul($s20,  997805, 20);
-        $s12 += self::mul($s20,  136657, 18);
-        $s13 -= self::mul($s20,  683901, 20);
-
-        $s7  += self::mul($s19,  666643, 20);
-        $s8  += self::mul($s19,  470296, 19);
-        $s9  += self::mul($s19,  654183, 20);
-        $s10 -= self::mul($s19,  997805, 20);
-        $s11 += self::mul($s19,  136657, 18);
-        $s12 -= self::mul($s19,  683901, 20);
-
-        $s6  += self::mul($s18,  666643, 20);
-        $s7  += self::mul($s18,  470296, 19);
-        $s8  += self::mul($s18,  654183, 20);
-        $s9  -= self::mul($s18,  997805, 20);
-        $s10 += self::mul($s18,  136657, 18);
-        $s11 -= self::mul($s18,  683901, 20);
-
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s11 += self::mul( $s23, 666643, 20 );
+        $s12 += self::mul( $s23, 470296, 19 );
+        $s13 += self::mul( $s23, 654183, 20 );
+        $s14 -= self::mul( $s23, 997805, 20 );
+        $s15 += self::mul( $s23, 136657, 18 );
+        $s16 -= self::mul( $s23, 683901, 20 );
+
+        $s10 += self::mul( $s22, 666643, 20 );
+        $s11 += self::mul( $s22, 470296, 19 );
+        $s12 += self::mul( $s22, 654183, 20 );
+        $s13 -= self::mul( $s22, 997805, 20 );
+        $s14 += self::mul( $s22, 136657, 18 );
+        $s15 -= self::mul( $s22, 683901, 20 );
+
+        $s9  += self::mul( $s21, 666643, 20 );
+        $s10 += self::mul( $s21, 470296, 19 );
+        $s11 += self::mul( $s21, 654183, 20 );
+        $s12 -= self::mul( $s21, 997805, 20 );
+        $s13 += self::mul( $s21, 136657, 18 );
+        $s14 -= self::mul( $s21, 683901, 20 );
+
+        $s8  += self::mul( $s20, 666643, 20 );
+        $s9  += self::mul( $s20, 470296, 19 );
+        $s10 += self::mul( $s20, 654183, 20 );
+        $s11 -= self::mul( $s20, 997805, 20 );
+        $s12 += self::mul( $s20, 136657, 18 );
+        $s13 -= self::mul( $s20, 683901, 20 );
+
+        $s7  += self::mul( $s19, 666643, 20 );
+        $s8  += self::mul( $s19, 470296, 19 );
+        $s9  += self::mul( $s19, 654183, 20 );
+        $s10 -= self::mul( $s19, 997805, 20 );
+        $s11 += self::mul( $s19, 136657, 18 );
+        $s12 -= self::mul( $s19, 683901, 20 );
+
+        $s6  += self::mul( $s18, 666643, 20 );
+        $s7  += self::mul( $s18, 470296, 19 );
+        $s8  += self::mul( $s18, 654183, 20 );
+        $s9  -= self::mul( $s18, 997805, 20 );
+        $s10 += self::mul( $s18, 136657, 18 );
+        $s11 -= self::mul( $s18, 683901, 20 );
+
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
 
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
 
-        $s5  += self::mul($s17,  666643, 20);
-        $s6  += self::mul($s17,  470296, 19);
-        $s7  += self::mul($s17,  654183, 20);
-        $s8  -= self::mul($s17,  997805, 20);
-        $s9  += self::mul($s17,  136657, 18);
-        $s10 -= self::mul($s17,  683901, 20);
-
-        $s4 += self::mul($s16,  666643, 20);
-        $s5 += self::mul($s16,  470296, 19);
-        $s6 += self::mul($s16,  654183, 20);
-        $s7 -= self::mul($s16,  997805, 20);
-        $s8 += self::mul($s16,  136657, 18);
-        $s9 -= self::mul($s16,  683901, 20);
-
-        $s3 += self::mul($s15,  666643, 20);
-        $s4 += self::mul($s15,  470296, 19);
-        $s5 += self::mul($s15,  654183, 20);
-        $s6 -= self::mul($s15,  997805, 20);
-        $s7 += self::mul($s15,  136657, 18);
-        $s8 -= self::mul($s15,  683901, 20);
-
-        $s2 += self::mul($s14,  666643, 20);
-        $s3 += self::mul($s14,  470296, 19);
-        $s4 += self::mul($s14,  654183, 20);
-        $s5 -= self::mul($s14,  997805, 20);
-        $s6 += self::mul($s14,  136657, 18);
-        $s7 -= self::mul($s14,  683901, 20);
-
-        $s1 += self::mul($s13,  666643, 20);
-        $s2 += self::mul($s13,  470296, 19);
-        $s3 += self::mul($s13,  654183, 20);
-        $s4 -= self::mul($s13,  997805, 20);
-        $s5 += self::mul($s13,  136657, 18);
-        $s6 -= self::mul($s13,  683901, 20);
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s5  += self::mul( $s17, 666643, 20 );
+        $s6  += self::mul( $s17, 470296, 19 );
+        $s7  += self::mul( $s17, 654183, 20 );
+        $s8  -= self::mul( $s17, 997805, 20 );
+        $s9  += self::mul( $s17, 136657, 18 );
+        $s10 -= self::mul( $s17, 683901, 20 );
+
+        $s4 += self::mul( $s16, 666643, 20 );
+        $s5 += self::mul( $s16, 470296, 19 );
+        $s6 += self::mul( $s16, 654183, 20 );
+        $s7 -= self::mul( $s16, 997805, 20 );
+        $s8 += self::mul( $s16, 136657, 18 );
+        $s9 -= self::mul( $s16, 683901, 20 );
+
+        $s3 += self::mul( $s15, 666643, 20 );
+        $s4 += self::mul( $s15, 470296, 19 );
+        $s5 += self::mul( $s15, 654183, 20 );
+        $s6 -= self::mul( $s15, 997805, 20 );
+        $s7 += self::mul( $s15, 136657, 18 );
+        $s8 -= self::mul( $s15, 683901, 20 );
+
+        $s2 += self::mul( $s14, 666643, 20 );
+        $s3 += self::mul( $s14, 470296, 19 );
+        $s4 += self::mul( $s14, 654183, 20 );
+        $s5 -= self::mul( $s14, 997805, 20 );
+        $s6 += self::mul( $s14, 136657, 18 );
+        $s7 -= self::mul( $s14, 683901, 20 );
+
+        $s1 += self::mul( $s13, 666643, 20 );
+        $s2 += self::mul( $s13, 470296, 19 );
+        $s3 += self::mul( $s13, 654183, 20 );
+        $s4 -= self::mul( $s13, 997805, 20 );
+        $s5 += self::mul( $s13, 136657, 18 );
+        $s6 -= self::mul( $s13, 683901, 20 );
+
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
         $carry0 = $s0 >> 21;
@@ -2164,12 +2164,12 @@ 
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
 
         $carry0 = $s0 >> 21;
         $s1 += $carry0;
@@ -2209,40 +2209,40 @@ 
          * @var array<int, int>
          */
         $arr = array(
-            (int) (0xff & ($s0 >> 0)),
-            (int) (0xff & ($s0 >> 8)),
-            (int) (0xff & (($s0 >> 16) | $s1 << 5)),
-            (int) (0xff & ($s1 >> 3)),
-            (int) (0xff & ($s1 >> 11)),
-            (int) (0xff & (($s1 >> 19) | $s2 << 2)),
-            (int) (0xff & ($s2 >> 6)),
-            (int) (0xff & (($s2 >> 14) | $s3 << 7)),
-            (int) (0xff & ($s3 >> 1)),
-            (int) (0xff & ($s3 >> 9)),
-            (int) (0xff & (($s3 >> 17) | $s4 << 4)),
-            (int) (0xff & ($s4 >> 4)),
-            (int) (0xff & ($s4 >> 12)),
-            (int) (0xff & (($s4 >> 20) | $s5 << 1)),
-            (int) (0xff & ($s5 >> 7)),
-            (int) (0xff & (($s5 >> 15) | $s6 << 6)),
-            (int) (0xff & ($s6 >> 2)),
-            (int) (0xff & ($s6 >> 10)),
-            (int) (0xff & (($s6 >> 18) | $s7 << 3)),
-            (int) (0xff & ($s7 >> 5)),
-            (int) (0xff & ($s7 >> 13)),
-            (int) (0xff & ($s8 >> 0)),
-            (int) (0xff & ($s8 >> 8)),
-            (int) (0xff & (($s8 >> 16) | $s9 << 5)),
-            (int) (0xff & ($s9 >> 3)),
-            (int) (0xff & ($s9 >> 11)),
-            (int) (0xff & (($s9 >> 19) | $s10 << 2)),
-            (int) (0xff & ($s10 >> 6)),
-            (int) (0xff & (($s10 >> 14) | $s11 << 7)),
-            (int) (0xff & ($s11 >> 1)),
-            (int) (0xff & ($s11 >> 9)),
-            0xff & ($s11 >> 17)
+            (int) ( 0xff & ( $s0 >> 0 ) ),
+            (int) ( 0xff & ( $s0 >> 8 ) ),
+            (int) ( 0xff & ( ( $s0 >> 16 ) | $s1 << 5 ) ),
+            (int) ( 0xff & ( $s1 >> 3 ) ),
+            (int) ( 0xff & ( $s1 >> 11 ) ),
+            (int) ( 0xff & ( ( $s1 >> 19 ) | $s2 << 2 ) ),
+            (int) ( 0xff & ( $s2 >> 6 ) ),
+            (int) ( 0xff & ( ( $s2 >> 14 ) | $s3 << 7 ) ),
+            (int) ( 0xff & ( $s3 >> 1 ) ),
+            (int) ( 0xff & ( $s3 >> 9 ) ),
+            (int) ( 0xff & ( ( $s3 >> 17 ) | $s4 << 4 ) ),
+            (int) ( 0xff & ( $s4 >> 4 ) ),
+            (int) ( 0xff & ( $s4 >> 12 ) ),
+            (int) ( 0xff & ( ( $s4 >> 20 ) | $s5 << 1 ) ),
+            (int) ( 0xff & ( $s5 >> 7 ) ),
+            (int) ( 0xff & ( ( $s5 >> 15 ) | $s6 << 6 ) ),
+            (int) ( 0xff & ( $s6 >> 2 ) ),
+            (int) ( 0xff & ( $s6 >> 10 ) ),
+            (int) ( 0xff & ( ( $s6 >> 18 ) | $s7 << 3 ) ),
+            (int) ( 0xff & ( $s7 >> 5 ) ),
+            (int) ( 0xff & ( $s7 >> 13 ) ),
+            (int) ( 0xff & ( $s8 >> 0 ) ),
+            (int) ( 0xff & ( $s8 >> 8 ) ),
+            (int) ( 0xff & ( ( $s8 >> 16 ) | $s9 << 5 ) ),
+            (int) ( 0xff & ( $s9 >> 3 ) ),
+            (int) ( 0xff & ( $s9 >> 11 ) ),
+            (int) ( 0xff & ( ( $s9 >> 19 ) | $s10 << 2 ) ),
+            (int) ( 0xff & ( $s10 >> 6 ) ),
+            (int) ( 0xff & ( ( $s10 >> 14 ) | $s11 << 7 ) ),
+            (int) ( 0xff & ( $s11 >> 1 ) ),
+            (int) ( 0xff & ( $s11 >> 9 ) ),
+            0xff & ( $s11 >> 17 )
         );
-        return self::intArrayToString($arr);
+        return self::intArrayToString( $arr );
     }
 
     /**
@@ -2251,197 +2251,197 @@ 
      * @param string $s
      * @return string
      */
-    public static function sc_reduce($s)
+    public static function sc_reduce( $s )
     {
-        $s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
-        $s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
-        $s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);
-        $s3 = 2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7);
-        $s4 = 2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4);
-        $s5 = 2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1);
-        $s6 = 2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6);
-        $s7 = 2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3);
-        $s8 = 2097151 & self::load_3(self::substr($s, 21, 3));
-        $s9 = 2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5);
-        $s10 = 2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2);
-        $s11 = 2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7);
-        $s12 = 2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4);
-        $s13 = 2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1);
-        $s14 = 2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6);
-        $s15 = 2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3);
-        $s16 = 2097151 & self::load_3(self::substr($s, 42, 3));
-        $s17 = 2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5);
-        $s18 = 2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2);
-        $s19 = 2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7);
-        $s20 = 2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4);
-        $s21 = 2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1);
-        $s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6);
-        $s23 = (self::load_4(self::substr($s, 60, 4)) >> 3);
-
-        $s11 += self::mul($s23,  666643, 20);
-        $s12 += self::mul($s23,  470296, 19);
-        $s13 += self::mul($s23,  654183, 20);
-        $s14 -= self::mul($s23,  997805, 20);
-        $s15 += self::mul($s23,  136657, 18);
-        $s16 -= self::mul($s23,  683901, 20);
-
-        $s10 += self::mul($s22,  666643, 20);
-        $s11 += self::mul($s22,  470296, 19);
-        $s12 += self::mul($s22,  654183, 20);
-        $s13 -= self::mul($s22,  997805, 20);
-        $s14 += self::mul($s22,  136657, 18);
-        $s15 -= self::mul($s22,  683901, 20);
-
-        $s9  += self::mul($s21,  666643, 20);
-        $s10 += self::mul($s21,  470296, 19);
-        $s11 += self::mul($s21,  654183, 20);
-        $s12 -= self::mul($s21,  997805, 20);
-        $s13 += self::mul($s21,  136657, 18);
-        $s14 -= self::mul($s21,  683901, 20);
-
-        $s8  += self::mul($s20,  666643, 20);
-        $s9  += self::mul($s20,  470296, 19);
-        $s10 += self::mul($s20,  654183, 20);
-        $s11 -= self::mul($s20,  997805, 20);
-        $s12 += self::mul($s20,  136657, 18);
-        $s13 -= self::mul($s20,  683901, 20);
-
-        $s7  += self::mul($s19,  666643, 20);
-        $s8  += self::mul($s19,  470296, 19);
-        $s9  += self::mul($s19,  654183, 20);
-        $s10 -= self::mul($s19,  997805, 20);
-        $s11 += self::mul($s19,  136657, 18);
-        $s12 -= self::mul($s19,  683901, 20);
-
-        $s6  += self::mul($s18,  666643, 20);
-        $s7  += self::mul($s18,  470296, 19);
-        $s8  += self::mul($s18,  654183, 20);
-        $s9  -= self::mul($s18,  997805, 20);
-        $s10 += self::mul($s18,  136657, 18);
-        $s11 -= self::mul($s18,  683901, 20);
-
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s0 = 2097151 & self::load_3( self::substr( $s, 0, 3 ) );
+        $s1 = 2097151 & ( self::load_4( self::substr( $s, 2, 4 ) ) >> 5 );
+        $s2 = 2097151 & ( self::load_3( self::substr( $s, 5, 3 ) ) >> 2 );
+        $s3 = 2097151 & ( self::load_4( self::substr( $s, 7, 4 ) ) >> 7 );
+        $s4 = 2097151 & ( self::load_4( self::substr( $s, 10, 4 ) ) >> 4 );
+        $s5 = 2097151 & ( self::load_3( self::substr( $s, 13, 3 ) ) >> 1 );
+        $s6 = 2097151 & ( self::load_4( self::substr( $s, 15, 4 ) ) >> 6 );
+        $s7 = 2097151 & ( self::load_3( self::substr( $s, 18, 4 ) ) >> 3 );
+        $s8 = 2097151 & self::load_3( self::substr( $s, 21, 3 ) );
+        $s9 = 2097151 & ( self::load_4( self::substr( $s, 23, 4 ) ) >> 5 );
+        $s10 = 2097151 & ( self::load_3( self::substr( $s, 26, 3 ) ) >> 2 );
+        $s11 = 2097151 & ( self::load_4( self::substr( $s, 28, 4 ) ) >> 7 );
+        $s12 = 2097151 & ( self::load_4( self::substr( $s, 31, 4 ) ) >> 4 );
+        $s13 = 2097151 & ( self::load_3( self::substr( $s, 34, 3 ) ) >> 1 );
+        $s14 = 2097151 & ( self::load_4( self::substr( $s, 36, 4 ) ) >> 6 );
+        $s15 = 2097151 & ( self::load_3( self::substr( $s, 39, 4 ) ) >> 3 );
+        $s16 = 2097151 & self::load_3( self::substr( $s, 42, 3 ) );
+        $s17 = 2097151 & ( self::load_4( self::substr( $s, 44, 4 ) ) >> 5 );
+        $s18 = 2097151 & ( self::load_3( self::substr( $s, 47, 3 ) ) >> 2 );
+        $s19 = 2097151 & ( self::load_4( self::substr( $s, 49, 4 ) ) >> 7 );
+        $s20 = 2097151 & ( self::load_4( self::substr( $s, 52, 4 ) ) >> 4 );
+        $s21 = 2097151 & ( self::load_3( self::substr( $s, 55, 3 ) ) >> 1 );
+        $s22 = 2097151 & ( self::load_4( self::substr( $s, 57, 4 ) ) >> 6 );
+        $s23 = ( self::load_4( self::substr( $s, 60, 4 ) ) >> 3 );
+
+        $s11 += self::mul( $s23, 666643, 20 );
+        $s12 += self::mul( $s23, 470296, 19 );
+        $s13 += self::mul( $s23, 654183, 20 );
+        $s14 -= self::mul( $s23, 997805, 20 );
+        $s15 += self::mul( $s23, 136657, 18 );
+        $s16 -= self::mul( $s23, 683901, 20 );
+
+        $s10 += self::mul( $s22, 666643, 20 );
+        $s11 += self::mul( $s22, 470296, 19 );
+        $s12 += self::mul( $s22, 654183, 20 );
+        $s13 -= self::mul( $s22, 997805, 20 );
+        $s14 += self::mul( $s22, 136657, 18 );
+        $s15 -= self::mul( $s22, 683901, 20 );
+
+        $s9  += self::mul( $s21, 666643, 20 );
+        $s10 += self::mul( $s21, 470296, 19 );
+        $s11 += self::mul( $s21, 654183, 20 );
+        $s12 -= self::mul( $s21, 997805, 20 );
+        $s13 += self::mul( $s21, 136657, 18 );
+        $s14 -= self::mul( $s21, 683901, 20 );
+
+        $s8  += self::mul( $s20, 666643, 20 );
+        $s9  += self::mul( $s20, 470296, 19 );
+        $s10 += self::mul( $s20, 654183, 20 );
+        $s11 -= self::mul( $s20, 997805, 20 );
+        $s12 += self::mul( $s20, 136657, 18 );
+        $s13 -= self::mul( $s20, 683901, 20 );
+
+        $s7  += self::mul( $s19, 666643, 20 );
+        $s8  += self::mul( $s19, 470296, 19 );
+        $s9  += self::mul( $s19, 654183, 20 );
+        $s10 -= self::mul( $s19, 997805, 20 );
+        $s11 += self::mul( $s19, 136657, 18 );
+        $s12 -= self::mul( $s19, 683901, 20 );
+
+        $s6  += self::mul( $s18, 666643, 20 );
+        $s7  += self::mul( $s18, 470296, 19 );
+        $s8  += self::mul( $s18, 654183, 20 );
+        $s9  -= self::mul( $s18, 997805, 20 );
+        $s10 += self::mul( $s18, 136657, 18 );
+        $s11 -= self::mul( $s18, 683901, 20 );
+
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
 
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
 
-        $s5  += self::mul($s17,  666643, 20);
-        $s6  += self::mul($s17,  470296, 19);
-        $s7  += self::mul($s17,  654183, 20);
-        $s8  -= self::mul($s17,  997805, 20);
-        $s9  += self::mul($s17,  136657, 18);
-        $s10 -= self::mul($s17,  683901, 20);
-
-        $s4 += self::mul($s16,  666643, 20);
-        $s5 += self::mul($s16,  470296, 19);
-        $s6 += self::mul($s16,  654183, 20);
-        $s7 -= self::mul($s16,  997805, 20);
-        $s8 += self::mul($s16,  136657, 18);
-        $s9 -= self::mul($s16,  683901, 20);
-
-        $s3 += self::mul($s15,  666643, 20);
-        $s4 += self::mul($s15,  470296, 19);
-        $s5 += self::mul($s15,  654183, 20);
-        $s6 -= self::mul($s15,  997805, 20);
-        $s7 += self::mul($s15,  136657, 18);
-        $s8 -= self::mul($s15,  683901, 20);
-
-        $s2 += self::mul($s14,  666643, 20);
-        $s3 += self::mul($s14,  470296, 19);
-        $s4 += self::mul($s14,  654183, 20);
-        $s5 -= self::mul($s14,  997805, 20);
-        $s6 += self::mul($s14,  136657, 18);
-        $s7 -= self::mul($s14,  683901, 20);
-
-        $s1 += self::mul($s13,  666643, 20);
-        $s2 += self::mul($s13,  470296, 19);
-        $s3 += self::mul($s13,  654183, 20);
-        $s4 -= self::mul($s13,  997805, 20);
-        $s5 += self::mul($s13,  136657, 18);
-        $s6 -= self::mul($s13,  683901, 20);
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s5  += self::mul( $s17, 666643, 20 );
+        $s6  += self::mul( $s17, 470296, 19 );
+        $s7  += self::mul( $s17, 654183, 20 );
+        $s8  -= self::mul( $s17, 997805, 20 );
+        $s9  += self::mul( $s17, 136657, 18 );
+        $s10 -= self::mul( $s17, 683901, 20 );
+
+        $s4 += self::mul( $s16, 666643, 20 );
+        $s5 += self::mul( $s16, 470296, 19 );
+        $s6 += self::mul( $s16, 654183, 20 );
+        $s7 -= self::mul( $s16, 997805, 20 );
+        $s8 += self::mul( $s16, 136657, 18 );
+        $s9 -= self::mul( $s16, 683901, 20 );
+
+        $s3 += self::mul( $s15, 666643, 20 );
+        $s4 += self::mul( $s15, 470296, 19 );
+        $s5 += self::mul( $s15, 654183, 20 );
+        $s6 -= self::mul( $s15, 997805, 20 );
+        $s7 += self::mul( $s15, 136657, 18 );
+        $s8 -= self::mul( $s15, 683901, 20 );
+
+        $s2 += self::mul( $s14, 666643, 20 );
+        $s3 += self::mul( $s14, 470296, 19 );
+        $s4 += self::mul( $s14, 654183, 20 );
+        $s5 -= self::mul( $s14, 997805, 20 );
+        $s6 += self::mul( $s14, 136657, 18 );
+        $s7 -= self::mul( $s14, 683901, 20 );
+
+        $s1 += self::mul( $s13, 666643, 20 );
+        $s2 += self::mul( $s13, 470296, 19 );
+        $s3 += self::mul( $s13, 654183, 20 );
+        $s4 -= self::mul( $s13, 997805, 20 );
+        $s5 += self::mul( $s13, 136657, 18 );
+        $s6 -= self::mul( $s13, 683901, 20 );
+
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
         $carry0 = $s0 >> 21;
@@ -2481,12 +2481,12 @@ 
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
 
         $carry0 = $s0 >> 21;
         $s1 += $carry0;
@@ -2526,39 +2526,39 @@ 
          * @var array<int, int>
          */
         $arr = array(
-            (int) ($s0 >> 0),
-            (int) ($s0 >> 8),
-            (int) (($s0 >> 16) | $s1 << 5),
-            (int) ($s1 >> 3),
-            (int) ($s1 >> 11),
-            (int) (($s1 >> 19) | $s2 << 2),
-            (int) ($s2 >> 6),
-            (int) (($s2 >> 14) | $s3 << 7),
-            (int) ($s3 >> 1),
-            (int) ($s3 >> 9),
-            (int) (($s3 >> 17) | $s4 << 4),
-            (int) ($s4 >> 4),
-            (int) ($s4 >> 12),
-            (int) (($s4 >> 20) | $s5 << 1),
-            (int) ($s5 >> 7),
-            (int) (($s5 >> 15) | $s6 << 6),
-            (int) ($s6 >> 2),
-            (int) ($s6 >> 10),
-            (int) (($s6 >> 18) | $s7 << 3),
-            (int) ($s7 >> 5),
-            (int) ($s7 >> 13),
-            (int) ($s8 >> 0),
-            (int) ($s8 >> 8),
-            (int) (($s8 >> 16) | $s9 << 5),
-            (int) ($s9 >> 3),
-            (int) ($s9 >> 11),
-            (int) (($s9 >> 19) | $s10 << 2),
-            (int) ($s10 >> 6),
-            (int) (($s10 >> 14) | $s11 << 7),
-            (int) ($s11 >> 1),
-            (int) ($s11 >> 9),
+            (int) ( $s0 >> 0 ),
+            (int) ( $s0 >> 8 ),
+            (int) ( ( $s0 >> 16 ) | $s1 << 5 ),
+            (int) ( $s1 >> 3 ),
+            (int) ( $s1 >> 11 ),
+            (int) ( ( $s1 >> 19 ) | $s2 << 2 ),
+            (int) ( $s2 >> 6 ),
+            (int) ( ( $s2 >> 14 ) | $s3 << 7 ),
+            (int) ( $s3 >> 1 ),
+            (int) ( $s3 >> 9 ),
+            (int) ( ( $s3 >> 17 ) | $s4 << 4 ),
+            (int) ( $s4 >> 4 ),
+            (int) ( $s4 >> 12 ),
+            (int) ( ( $s4 >> 20 ) | $s5 << 1 ),
+            (int) ( $s5 >> 7 ),
+            (int) ( ( $s5 >> 15 ) | $s6 << 6 ),
+            (int) ( $s6 >> 2 ),
+            (int) ( $s6 >> 10 ),
+            (int) ( ( $s6 >> 18 ) | $s7 << 3 ),
+            (int) ( $s7 >> 5 ),
+            (int) ( $s7 >> 13 ),
+            (int) ( $s8 >> 0 ),
+            (int) ( $s8 >> 8 ),
+            (int) ( ( $s8 >> 16 ) | $s9 << 5 ),
+            (int) ( $s9 >> 3 ),
+            (int) ( $s9 >> 11 ),
+            (int) ( ( $s9 >> 19 ) | $s10 << 2 ),
+            (int) ( $s10 >> 6 ),
+            (int) ( ( $s10 >> 14 ) | $s11 << 7 ),
+            (int) ( $s11 >> 1 ),
+            (int) ( $s11 >> 9 ),
             (int) $s11 >> 17
         );
-        return self::intArrayToString($arr);
+        return self::intArrayToString( $arr );
     }
 }

Braces +33 added lines, -66 removed lines

@@ -13,8 +13,7 @@ 
  *
  * @ref https://github.com/jedisct1/libsodium/blob/master/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
  */
-abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Curve25519_H
-{
+abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Curve25519_H {
     /**
      * Get a field element of size 10 with a value of 0
      *
@@ -22,8 +21,7 @@ 
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_0()
-    {
+    public static function fe_0() {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
         );
@@ -36,8 +34,7 @@ 
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_1()
-    {
+    public static function fe_1() {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
         );
@@ -95,8 +92,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         $h = clone $f;
         return $h;
     }
@@ -111,8 +107,7 @@ 
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      * @throws RangeException
      */
-    public static function fe_frombytes($s)
-    {
+    public static function fe_frombytes($s) {
         if (self::strlen($s) !== 32) {
             throw new RangeException('Expected a 32-byte string.');
         }
@@ -183,8 +178,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
      * @return string
      */
-    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
-    {
+    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h) {
         $h[0] = (int) $h[0];
         $h[1] = (int) $h[1];
         $h[2] = (int) $h[2];
@@ -288,8 +282,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return int
      */
-    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         $str = self::fe_tobytes($f);
         return self::chrToInt($str[0]) & 1;
     }
@@ -302,8 +295,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return bool
      */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         static $zero;
         if ($zero === null) {
             $zero = str_repeat("\x00", 32);
@@ -544,8 +536,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         $h = new ParagonIE_Sodium_Core_Curve25519_Fe();
         for ($i = 0; $i < 10; ++$i) {
             $h[$i] = -$f[$i];
@@ -563,8 +554,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         $f0 = (int) $f[0];
         $f1 = (int) $f[1];
         $f2 = (int) $f[2];
@@ -725,8 +715,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f) {
         $f0 = (int) $f[0];
         $f1 = (int) $f[1];
         $f2 = (int) $f[2];
@@ -894,8 +883,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
-    {
+    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z) {
         $z = clone $Z;
         $t0 = self::fe_sq($z);
         $t1 = self::fe_sq($t0);
@@ -954,8 +942,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
-    {
+    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z) {
         # fe_sq(t0, z);
         # fe_sq(t1, t0);
         # fe_sq(t1, t1);
@@ -1080,8 +1067,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
-    {
+    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g) {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(
                 (int) ($f[0] - $g[0]),
@@ -1135,8 +1121,7 @@ 
      * @param string $a
      * @return array<int, mixed>
      */
-    public static function slide($a)
-    {
+    public static function slide($a) {
         if (self::strlen($a) < 256) {
             if (self::strlen($a) < 16) {
                 $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
@@ -1183,8 +1168,7 @@ 
      * @param string $s
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_frombytes_negate_vartime($s)
-    {
+    public static function ge_frombytes_negate_vartime($s) {
         static $d = null;
         if (!$d) {
             $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
@@ -1326,8 +1310,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
-    {
+    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p) {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
         $r->X = self::fe_mul($p->X, $p->T);
         $r->Y = self::fe_mul($p->Y, $p->Z);
@@ -1341,8 +1324,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
-    {
+    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p) {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
         $r->X = self::fe_mul($p->X, $p->T);
         $r->Y = self::fe_mul($p->Y, $p->Z);
@@ -1356,8 +1338,7 @@ 
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p2_0()
-    {
+    public static function ge_p2_0() {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
             self::fe_0(),
             self::fe_1(),
@@ -1371,8 +1352,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
-    {
+    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p) {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
         $r->X = self::fe_sq($p->X);
@@ -1393,8 +1373,7 @@ 
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_p3_0()
-    {
+    public static function ge_p3_0() {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
             self::fe_0(),
             self::fe_1(),
@@ -1409,8 +1388,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
      */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p) {
         static $d2 = null;
         if ($d2 === null) {
             $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
@@ -1429,8 +1407,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p) {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
             $p->X,
             $p->Y,
@@ -1444,8 +1421,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
      * @return string
      */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
-    {
+    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h) {
         $recip = self::fe_invert($h->Z);
         $x = self::fe_mul($h->X, $recip);
         $y = self::fe_mul($h->Y, $recip);
@@ -1462,8 +1438,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p) {
         $q = self::ge_p3_to_p2($p);
         return self::ge_p2_dbl($q);
     }
@@ -1471,8 +1446,7 @@ 
     /**
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
      */
-    public static function ge_precomp_0()
-    {
+    public static function ge_precomp_0() {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
             self::fe_1(),
             self::fe_1(),
@@ -1487,8 +1461,7 @@ 
      * @param int $c
      * @return int
      */
-    public static function equal($b, $c)
-    {
+    public static function equal($b, $c) {
         return (($b ^ $c) - 1 & 0xffffffff) >> 31;
     }
 
@@ -1498,8 +1471,7 @@ 
      * @param int $char
      * @return int (1 = yes, 0 = no)
      */
-    public static function negative($char)
-    {
+    public static function negative($char) {
         if (is_int($char)) {
             return $char < 0 ? 1 : 0;
         }
@@ -1542,8 +1514,7 @@ 
      * @param int $b
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
      */
-    public static function ge_select($pos = 0, $b = 0)
-    {
+    public static function ge_select($pos = 0, $b = 0) {
         static $base = null;
         if ($base === null) {
             $base = array();
@@ -1621,8 +1592,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h
      * @return string
      */
-    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
-    {
+    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h) {
         $recip = self::fe_invert($h->Z);
         $x = self::fe_mul($h->X, $recip);
         $y = self::fe_mul($h->Y, $recip);
@@ -1768,8 +1738,7 @@ 
      * @param string $a
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_scalarmult_base($a)
-    {
+    public static function ge_scalarmult_base($a) {
         $e = array();
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
@@ -1825,8 +1794,7 @@ 
      * @param string $c
      * @return string
      */
-    public static function sc_muladd($a, $b, $c)
-    {
+    public static function sc_muladd($a, $b, $c) {
         $a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
         $a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
         $a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
@@ -2251,8 +2219,7 @@ 
      * @param string $s
      * @return string
      */
-    public static function sc_reduce($s)
-    {
+    public static function sc_reduce($s) {
         $s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
         $s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
         $s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);

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

Doc Comments +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
     /**
      * @internal You should not use this directly from another application
      *
-     * @return array
+     * @return string[]
      */
     public function __debugInfo()
     {

Indentation +104 added lines, -104 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
-    return;
+	return;
 }
 
 /**
@@ -11,116 +11,116 @@ 
  */
 class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
 {
-    /**
-     * @var array
-     */
-    protected $container = array();
+	/**
+	 * @var array
+	 */
+	protected $container = array();
 
-    /**
-     * @var int
-     */
-    protected $size = 10;
+	/**
+	 * @var int
+	 */
+	protected $size = 10;
 
-    /**
-     * ParagonIE_Sodium_Core_Curve25519_Fe constructor.
-     * @param int $size
-     */
-    public function __construct($size = 10)
-    {
-        $this->size = 10;
-    }
+	/**
+	 * ParagonIE_Sodium_Core_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_Core_Curve25519_Fe($count);
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $obj->offsetSet($keys[$i], $array[$i]);
-            }
-        } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $obj->offsetSet($i, $array[$i]);
-            }
-        }
-        return $obj;
-    }
+		$obj = new ParagonIE_Sodium_Core_Curve25519_Fe($count);
+		if ($save_indexes) {
+			for ($i = 0; $i < $count; ++$i) {
+				$obj->offsetSet($keys[$i], $array[$i]);
+			}
+		} else {
+			for ($i = 0; $i < $count; ++$i) {
+				$obj->offsetSet($i, $array[$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 (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$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 (!is_int($value)) {
+			throw new InvalidArgumentException('Expected an integer');
+		}
+		if (is_null($offset)) {
+			$this->container[] = $value;
+		} else {
+			$this->container[$offset] = $value;
+		}
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->container[$offset]);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->container[$offset]);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset])
-            ? $this->container[$offset]
-            : null;
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param mixed $offset
+	 * @return mixed|null
+	 */
+	public function offsetGet($offset)
+	{
+		return isset($this->container[$offset])
+			? $this->container[$offset]
+			: null;
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return array
-     */
-    public function __debugInfo()
-    {
-        return array(implode(', ', $this->container));
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return array
+	 */
+	public function __debugInfo()
+	{
+		return array(implode(', ', $this->container));
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Curve25519_Fe', false ) ) {
     return;
 }
 
@@ -25,7 +25,7 @@ 
      * ParagonIE_Sodium_Core_Curve25519_Fe constructor.
      * @param int $size
      */
-    public function __construct($size = 10)
+    public function __construct( $size = 10 )
     {
         $this->size = 10;
     }
@@ -37,24 +37,24 @@ 
      * @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_Core_Curve25519_Fe($count);
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $obj->offsetSet($keys[$i], $array[$i]);
+        $obj = new ParagonIE_Sodium_Core_Curve25519_Fe( $count );
+        if ( $save_indexes ) {
+            for ( $i = 0; $i < $count; ++$i ) {
+                $obj->offsetSet( $keys[$i], $array[$i] );
             }
         } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $obj->offsetSet($i, $array[$i]);
+            for ( $i = 0; $i < $count; ++$i ) {
+                $obj->offsetSet( $i, $array[$i] );
             }
         }
         return $obj;
@@ -67,12 +67,12 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
+        if ( ! is_int( $value ) ) {
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
-        if (is_null($offset)) {
+        if ( is_null( $offset ) ) {
             $this->container[] = $value;
         } else {
             $this->container[$offset] = $value;
@@ -85,9 +85,9 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[$offset] );
     }
 
     /**
@@ -96,9 +96,9 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[$offset] );
     }
 
     /**
@@ -107,9 +107,9 @@ 
      * @param mixed $offset
      * @return mixed|null
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        return isset($this->container[$offset])
+        return isset( $this->container[$offset] )
             ? $this->container[$offset]
             : null;
     }
@@ -121,6 +121,6 @@ 
      */
     public function __debugInfo()
     {
-        return array(implode(', ', $this->container));
+        return array( implode( ', ', $this->container ) );
     }
 }

Braces +8 added lines, -16 removed lines

@@ -9,8 +9,7 @@ 
  *
  * This represents a Field Element
  */
-class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
-{
+class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess {
     /**
      * @var array
      */
@@ -25,8 +24,7 @@ 
      * ParagonIE_Sodium_Core_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);
@@ -67,8 +64,7 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         if (!is_int($value)) {
             throw new InvalidArgumentException('Expected an integer');
         }
@@ -85,8 +81,7 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         return isset($this->container[$offset]);
     }
 
@@ -96,8 +91,7 @@ 
      * @param mixed $offset
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         unset($this->container[$offset]);
     }
 
@@ -107,8 +101,7 @@ 
      * @param mixed $offset
      * @return mixed|null
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         return isset($this->container[$offset])
             ? $this->container[$offset]
             : null;
@@ -119,8 +112,7 @@ 
      *
      * @return array
      */
-    public function __debugInfo()
-    {
+    public function __debugInfo() {
         return array(implode(', ', $this->container));
     }
 }

src/library/sodium_compat/src/Core/SipHash.php

Doc Comments +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * @internal You should not use this directly from another application
      *
      * @param int[] $v
-     * @return int[]
+     * @return integer[]
      */
     public static function sipRound(array $v)
     {

Indentation +287 added lines, -287 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_SipHash', false)) {
-    return;
+	return;
 }
 
 /**
@@ -11,290 +11,290 @@ 
  */
 class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
 {
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int[] $v
-     * @return int[]
-     */
-    public static function sipRound(array $v)
-    {
-        # v0 += v1;
-        list($v[0], $v[1]) = self::add(
-            array($v[0], $v[1]),
-            array($v[2], $v[3])
-        );
-
-        #  v1=ROTL(v1,13);
-        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
-
-        #  v1 ^= v0;
-        $v[2] ^= $v[0];
-        $v[3] ^= $v[1];
-
-        #  v0=ROTL(v0,32);
-        list($v[0], $v[1]) = self::rotl_64($v[0], $v[1], 32);
-
-        # v2 += v3;
-        list($v[4], $v[5]) = self::add(
-            array($v[4], $v[5]),
-            array($v[6], $v[7])
-        );
-
-        # v3=ROTL(v3,16);
-        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
-
-        #  v3 ^= v2;
-        $v[6] ^= $v[4];
-        $v[7] ^= $v[5];
-
-        # v0 += v3;
-        list($v[0], $v[1]) = self::add(
-            array($v[0], $v[1]),
-            array($v[6], $v[7])
-        );
-
-        # v3=ROTL(v3,21);
-        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 21);
-
-        # v3 ^= v0;
-        $v[6] ^= $v[0];
-        $v[7] ^= $v[1];
-
-        # v2 += v1;
-        list($v[4], $v[5]) = self::add(
-            array($v[4], $v[5]),
-            array($v[2], $v[3])
-        );
-
-        # v1=ROTL(v1,17);
-        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 17);
-
-        #  v1 ^= v2;;
-        $v[2] ^= $v[4];
-        $v[3] ^= $v[5];
-
-        # v2=ROTL(v2,32)
-        list($v[4], $v[5]) = self::rotl_64($v[4], $v[5], 32);
-
-        return $v;
-    }
-
-    /**
-     * Add two 32 bit integers representing a 64-bit integer.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int[] $a
-     * @param int[] $b
-     * @return array<int, mixed>
-     */
-    public static function add(array $a, array $b)
-    {
-        $x1 = $a[1] + $b[1];
-        $c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
-        $x0 = $a[0] + $b[0] + $c;
-        return array(
-            $x0 & 0xffffffff,
-            $x1 & 0xffffffff
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int0
-     * @param int $int1
-     * @param int $c
-     * @return array<int, mixed>
-     */
-    public static function rotl_64($int0, $int1, $c)
-    {
-        $int0 &= 0xffffffff;
-        $int1 &= 0xffffffff;
-        $c &= 63;
-        if ($c === 32) {
-            return array($int1, $int0);
-        }
-        if ($c > 31) {
-            $tmp = $int1;
-            $int1 = $int0;
-            $int0 = $tmp;
-            $c &= 31;
-        }
-        if ($c === 0) {
-            return array($int0, $int1);
-        }
-        return array(
-            0xffffffff & (
-                ($int0 << $c)
-                    |
-                ($int1 >> (32 - $c))
-            ),
-            0xffffffff & (
-                ($int1 << $c)
-                    |
-                ($int0 >> (32 - $c))
-            ),
-        );
-    }
-
-    /**
-     * Implements Siphash-2-4 using only 32-bit numbers.
-     *
-     * When we split an int into two, the higher bits go to the lower index.
-     * e.g. 0xDEADBEEFAB10C92D becomes [
-     *     0 => 0xDEADBEEF,
-     *     1 => 0xAB10C92D
-     * ].
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $in
-     * @param string $key
-     * @return string
-     */
-    public static function sipHash24($in, $key)
-    {
-        $inlen = self::strlen($in);
-
-        # /* "somepseudorandomlygeneratedbytes" */
-        # u64 v0 = 0x736f6d6570736575ULL;
-        # u64 v1 = 0x646f72616e646f6dULL;
-        # u64 v2 = 0x6c7967656e657261ULL;
-        # u64 v3 = 0x7465646279746573ULL;
-        $v = array(
-            0x736f6d65, // 0
-            0x70736575, // 1
-            0x646f7261, // 2
-            0x6e646f6d, // 3
-            0x6c796765, // 4
-            0x6e657261, // 5
-            0x74656462, // 6
-            0x79746573  // 7
-        );
-        // v0 => $v[0], $v[1]
-        // v1 => $v[2], $v[3]
-        // v2 => $v[4], $v[5]
-        // v3 => $v[6], $v[7]
-
-        # u64 k0 = LOAD64_LE( k );
-        # u64 k1 = LOAD64_LE( k + 8 );
-        $k = array(
-            self::load_4(self::substr($key, 4, 4)),
-            self::load_4(self::substr($key, 0, 4)),
-            self::load_4(self::substr($key, 12, 4)),
-            self::load_4(self::substr($key, 8, 4))
-        );
-        // k0 => $k[0], $k[1]
-        // k1 => $k[2], $k[3]
-
-        # b = ( ( u64 )inlen ) << 56;
-        $b = array(
-            $inlen << 24,
-            0
-        );
-        // See docblock for why the 0th index gets the higher bits.
-
-        # v3 ^= k1;
-        $v[6] ^= $k[2];
-        $v[7] ^= $k[3];
-        # v2 ^= k0;
-        $v[4] ^= $k[0];
-        $v[5] ^= $k[1];
-        # v1 ^= k1;
-        $v[2] ^= $k[2];
-        $v[3] ^= $k[3];
-        # v0 ^= k0;
-        $v[0] ^= $k[0];
-        $v[1] ^= $k[1];
-
-        $left = $inlen;
-        # for ( ; in != end; in += 8 )
-        while ($left >= 8) {
-            # m = LOAD64_LE( in );
-            $m = array(
-                self::load_4(self::substr($in, 4, 4)),
-                self::load_4(self::substr($in, 0, 4))
-            );
-
-            # v3 ^= m;
-            $v[6] ^= $m[0];
-            $v[7] ^= $m[1];
-
-            # SIPROUND;
-            # SIPROUND;
-            $v = self::sipRound($v);
-            $v = self::sipRound($v);
-
-            # v0 ^= m;
-            $v[0] ^= $m[0];
-            $v[1] ^= $m[1];
-
-            $in = self::substr($in, 8);
-            $left -= 8;
-        }
-
-        # switch( left )
-        #  {
-        #     case 7: b |= ( ( u64 )in[ 6] )  << 48;
-        #     case 6: b |= ( ( u64 )in[ 5] )  << 40;
-        #     case 5: b |= ( ( u64 )in[ 4] )  << 32;
-        #     case 4: b |= ( ( u64 )in[ 3] )  << 24;
-        #     case 3: b |= ( ( u64 )in[ 2] )  << 16;
-        #     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
-        #     case 1: b |= ( ( u64 )in[ 0] ); break;
-        #     case 0: break;
-        # }
-        switch ($left) {
-            case 7:
-                $b[0] |= self::chrToInt($in[6]) << 16;
-            case 6:
-                $b[0] |= self::chrToInt($in[5]) << 8;
-            case 5:
-                $b[0] |= self::chrToInt($in[4]);
-            case 4:
-                $b[1] |= self::chrToInt($in[3]) << 24;
-            case 3:
-                $b[1] |= self::chrToInt($in[2]) << 16;
-            case 2:
-                $b[1] |= self::chrToInt($in[1]) << 8;
-            case 1:
-                $b[1] |= self::chrToInt($in[0]);
-            case 0:
-                break;
-        }
-        // See docblock for why the 0th index gets the higher bits.
-
-        # v3 ^= b;
-        $v[6] ^= $b[0];
-        $v[7] ^= $b[1];
-
-        # SIPROUND;
-        # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-
-        # v0 ^= b;
-        $v[0] ^= $b[0];
-        $v[1] ^= $b[1];
-
-        // Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
-        # v2 ^= 0xff;
-        $v[5] ^= 0xff;
-
-        # SIPROUND;
-        # SIPROUND;
-        # SIPROUND;
-        # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-
-        # b = v0 ^ v1 ^ v2 ^ v3;
-        # STORE64_LE( out, b );
-        return  self::store32_le($v[1] ^ $v[3] ^ $v[5] ^ $v[7]) .
-            self::store32_le($v[0] ^ $v[2] ^ $v[4] ^ $v[6]);
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int[] $v
+	 * @return int[]
+	 */
+	public static function sipRound(array $v)
+	{
+		# v0 += v1;
+		list($v[0], $v[1]) = self::add(
+			array($v[0], $v[1]),
+			array($v[2], $v[3])
+		);
+
+		#  v1=ROTL(v1,13);
+		list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
+
+		#  v1 ^= v0;
+		$v[2] ^= $v[0];
+		$v[3] ^= $v[1];
+
+		#  v0=ROTL(v0,32);
+		list($v[0], $v[1]) = self::rotl_64($v[0], $v[1], 32);
+
+		# v2 += v3;
+		list($v[4], $v[5]) = self::add(
+			array($v[4], $v[5]),
+			array($v[6], $v[7])
+		);
+
+		# v3=ROTL(v3,16);
+		list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
+
+		#  v3 ^= v2;
+		$v[6] ^= $v[4];
+		$v[7] ^= $v[5];
+
+		# v0 += v3;
+		list($v[0], $v[1]) = self::add(
+			array($v[0], $v[1]),
+			array($v[6], $v[7])
+		);
+
+		# v3=ROTL(v3,21);
+		list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 21);
+
+		# v3 ^= v0;
+		$v[6] ^= $v[0];
+		$v[7] ^= $v[1];
+
+		# v2 += v1;
+		list($v[4], $v[5]) = self::add(
+			array($v[4], $v[5]),
+			array($v[2], $v[3])
+		);
+
+		# v1=ROTL(v1,17);
+		list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 17);
+
+		#  v1 ^= v2;;
+		$v[2] ^= $v[4];
+		$v[3] ^= $v[5];
+
+		# v2=ROTL(v2,32)
+		list($v[4], $v[5]) = self::rotl_64($v[4], $v[5], 32);
+
+		return $v;
+	}
+
+	/**
+	 * Add two 32 bit integers representing a 64-bit integer.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int[] $a
+	 * @param int[] $b
+	 * @return array<int, mixed>
+	 */
+	public static function add(array $a, array $b)
+	{
+		$x1 = $a[1] + $b[1];
+		$c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
+		$x0 = $a[0] + $b[0] + $c;
+		return array(
+			$x0 & 0xffffffff,
+			$x1 & 0xffffffff
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $int0
+	 * @param int $int1
+	 * @param int $c
+	 * @return array<int, mixed>
+	 */
+	public static function rotl_64($int0, $int1, $c)
+	{
+		$int0 &= 0xffffffff;
+		$int1 &= 0xffffffff;
+		$c &= 63;
+		if ($c === 32) {
+			return array($int1, $int0);
+		}
+		if ($c > 31) {
+			$tmp = $int1;
+			$int1 = $int0;
+			$int0 = $tmp;
+			$c &= 31;
+		}
+		if ($c === 0) {
+			return array($int0, $int1);
+		}
+		return array(
+			0xffffffff & (
+				($int0 << $c)
+					|
+				($int1 >> (32 - $c))
+			),
+			0xffffffff & (
+				($int1 << $c)
+					|
+				($int0 >> (32 - $c))
+			),
+		);
+	}
+
+	/**
+	 * Implements Siphash-2-4 using only 32-bit numbers.
+	 *
+	 * When we split an int into two, the higher bits go to the lower index.
+	 * e.g. 0xDEADBEEFAB10C92D becomes [
+	 *     0 => 0xDEADBEEF,
+	 *     1 => 0xAB10C92D
+	 * ].
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $in
+	 * @param string $key
+	 * @return string
+	 */
+	public static function sipHash24($in, $key)
+	{
+		$inlen = self::strlen($in);
+
+		# /* "somepseudorandomlygeneratedbytes" */
+		# u64 v0 = 0x736f6d6570736575ULL;
+		# u64 v1 = 0x646f72616e646f6dULL;
+		# u64 v2 = 0x6c7967656e657261ULL;
+		# u64 v3 = 0x7465646279746573ULL;
+		$v = array(
+			0x736f6d65, // 0
+			0x70736575, // 1
+			0x646f7261, // 2
+			0x6e646f6d, // 3
+			0x6c796765, // 4
+			0x6e657261, // 5
+			0x74656462, // 6
+			0x79746573  // 7
+		);
+		// v0 => $v[0], $v[1]
+		// v1 => $v[2], $v[3]
+		// v2 => $v[4], $v[5]
+		// v3 => $v[6], $v[7]
+
+		# u64 k0 = LOAD64_LE( k );
+		# u64 k1 = LOAD64_LE( k + 8 );
+		$k = array(
+			self::load_4(self::substr($key, 4, 4)),
+			self::load_4(self::substr($key, 0, 4)),
+			self::load_4(self::substr($key, 12, 4)),
+			self::load_4(self::substr($key, 8, 4))
+		);
+		// k0 => $k[0], $k[1]
+		// k1 => $k[2], $k[3]
+
+		# b = ( ( u64 )inlen ) << 56;
+		$b = array(
+			$inlen << 24,
+			0
+		);
+		// See docblock for why the 0th index gets the higher bits.
+
+		# v3 ^= k1;
+		$v[6] ^= $k[2];
+		$v[7] ^= $k[3];
+		# v2 ^= k0;
+		$v[4] ^= $k[0];
+		$v[5] ^= $k[1];
+		# v1 ^= k1;
+		$v[2] ^= $k[2];
+		$v[3] ^= $k[3];
+		# v0 ^= k0;
+		$v[0] ^= $k[0];
+		$v[1] ^= $k[1];
+
+		$left = $inlen;
+		# for ( ; in != end; in += 8 )
+		while ($left >= 8) {
+			# m = LOAD64_LE( in );
+			$m = array(
+				self::load_4(self::substr($in, 4, 4)),
+				self::load_4(self::substr($in, 0, 4))
+			);
+
+			# v3 ^= m;
+			$v[6] ^= $m[0];
+			$v[7] ^= $m[1];
+
+			# SIPROUND;
+			# SIPROUND;
+			$v = self::sipRound($v);
+			$v = self::sipRound($v);
+
+			# v0 ^= m;
+			$v[0] ^= $m[0];
+			$v[1] ^= $m[1];
+
+			$in = self::substr($in, 8);
+			$left -= 8;
+		}
+
+		# switch( left )
+		#  {
+		#     case 7: b |= ( ( u64 )in[ 6] )  << 48;
+		#     case 6: b |= ( ( u64 )in[ 5] )  << 40;
+		#     case 5: b |= ( ( u64 )in[ 4] )  << 32;
+		#     case 4: b |= ( ( u64 )in[ 3] )  << 24;
+		#     case 3: b |= ( ( u64 )in[ 2] )  << 16;
+		#     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
+		#     case 1: b |= ( ( u64 )in[ 0] ); break;
+		#     case 0: break;
+		# }
+		switch ($left) {
+			case 7:
+				$b[0] |= self::chrToInt($in[6]) << 16;
+			case 6:
+				$b[0] |= self::chrToInt($in[5]) << 8;
+			case 5:
+				$b[0] |= self::chrToInt($in[4]);
+			case 4:
+				$b[1] |= self::chrToInt($in[3]) << 24;
+			case 3:
+				$b[1] |= self::chrToInt($in[2]) << 16;
+			case 2:
+				$b[1] |= self::chrToInt($in[1]) << 8;
+			case 1:
+				$b[1] |= self::chrToInt($in[0]);
+			case 0:
+				break;
+		}
+		// See docblock for why the 0th index gets the higher bits.
+
+		# v3 ^= b;
+		$v[6] ^= $b[0];
+		$v[7] ^= $b[1];
+
+		# SIPROUND;
+		# SIPROUND;
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+
+		# v0 ^= b;
+		$v[0] ^= $b[0];
+		$v[1] ^= $b[1];
+
+		// Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
+		# v2 ^= 0xff;
+		$v[5] ^= 0xff;
+
+		# SIPROUND;
+		# SIPROUND;
+		# SIPROUND;
+		# SIPROUND;
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+		$v = self::sipRound($v);
+
+		# b = v0 ^ v1 ^ v2 ^ v3;
+		# STORE64_LE( out, b );
+		return  self::store32_le($v[1] ^ $v[3] ^ $v[5] ^ $v[7]) .
+			self::store32_le($v[0] ^ $v[2] ^ $v[4] ^ $v[6]);
+	}
 }

Spacing +59 added lines, -59 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_SipHash', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_SipHash', false ) ) {
     return;
 }
 
@@ -17,65 +17,65 @@ 
      * @param int[] $v
      * @return int[]
      */
-    public static function sipRound(array $v)
+    public static function sipRound( array $v )
     {
         # v0 += v1;
-        list($v[0], $v[1]) = self::add(
-            array($v[0], $v[1]),
-            array($v[2], $v[3])
+        list( $v[0], $v[1] ) = self::add(
+            array( $v[0], $v[1] ),
+            array( $v[2], $v[3] )
         );
 
         #  v1=ROTL(v1,13);
-        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
+        list( $v[2], $v[3] ) = self::rotl_64( $v[2], $v[3], 13 );
 
         #  v1 ^= v0;
         $v[2] ^= $v[0];
         $v[3] ^= $v[1];
 
         #  v0=ROTL(v0,32);
-        list($v[0], $v[1]) = self::rotl_64($v[0], $v[1], 32);
+        list( $v[0], $v[1] ) = self::rotl_64( $v[0], $v[1], 32 );
 
         # v2 += v3;
-        list($v[4], $v[5]) = self::add(
-            array($v[4], $v[5]),
-            array($v[6], $v[7])
+        list( $v[4], $v[5] ) = self::add(
+            array( $v[4], $v[5] ),
+            array( $v[6], $v[7] )
         );
 
         # v3=ROTL(v3,16);
-        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
+        list( $v[6], $v[7] ) = self::rotl_64( $v[6], $v[7], 16 );
 
         #  v3 ^= v2;
         $v[6] ^= $v[4];
         $v[7] ^= $v[5];
 
         # v0 += v3;
-        list($v[0], $v[1]) = self::add(
-            array($v[0], $v[1]),
-            array($v[6], $v[7])
+        list( $v[0], $v[1] ) = self::add(
+            array( $v[0], $v[1] ),
+            array( $v[6], $v[7] )
         );
 
         # v3=ROTL(v3,21);
-        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 21);
+        list( $v[6], $v[7] ) = self::rotl_64( $v[6], $v[7], 21 );
 
         # v3 ^= v0;
         $v[6] ^= $v[0];
         $v[7] ^= $v[1];
 
         # v2 += v1;
-        list($v[4], $v[5]) = self::add(
-            array($v[4], $v[5]),
-            array($v[2], $v[3])
+        list( $v[4], $v[5] ) = self::add(
+            array( $v[4], $v[5] ),
+            array( $v[2], $v[3] )
         );
 
         # v1=ROTL(v1,17);
-        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 17);
+        list( $v[2], $v[3] ) = self::rotl_64( $v[2], $v[3], 17 );
 
         #  v1 ^= v2;;
         $v[2] ^= $v[4];
         $v[3] ^= $v[5];
 
         # v2=ROTL(v2,32)
-        list($v[4], $v[5]) = self::rotl_64($v[4], $v[5], 32);
+        list( $v[4], $v[5] ) = self::rotl_64( $v[4], $v[5], 32 );
 
         return $v;
     }
@@ -89,7 +89,7 @@ 
      * @param int[] $b
      * @return array<int, mixed>
      */
-    public static function add(array $a, array $b)
+    public static function add( array $a, array $b )
     {
         $x1 = $a[1] + $b[1];
         $c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
@@ -108,33 +108,33 @@ 
      * @param int $c
      * @return array<int, mixed>
      */
-    public static function rotl_64($int0, $int1, $c)
+    public static function rotl_64( $int0, $int1, $c )
     {
         $int0 &= 0xffffffff;
         $int1 &= 0xffffffff;
         $c &= 63;
-        if ($c === 32) {
-            return array($int1, $int0);
+        if ( $c === 32 ) {
+            return array( $int1, $int0 );
         }
-        if ($c > 31) {
+        if ( $c > 31 ) {
             $tmp = $int1;
             $int1 = $int0;
             $int0 = $tmp;
             $c &= 31;
         }
-        if ($c === 0) {
-            return array($int0, $int1);
+        if ( $c === 0 ) {
+            return array( $int0, $int1 );
         }
         return array(
             0xffffffff & (
-                ($int0 << $c)
+                ( $int0 << $c )
                     |
-                ($int1 >> (32 - $c))
+                ( $int1 >> ( 32 - $c ) )
             ),
             0xffffffff & (
-                ($int1 << $c)
+                ( $int1 << $c )
                     |
-                ($int0 >> (32 - $c))
+                ( $int0 >> ( 32 - $c ) )
             ),
         );
     }
@@ -154,9 +154,9 @@ 
      * @param string $key
      * @return string
      */
-    public static function sipHash24($in, $key)
+    public static function sipHash24( $in, $key )
     {
-        $inlen = self::strlen($in);
+        $inlen = self::strlen( $in );
 
         # /* "somepseudorandomlygeneratedbytes" */
         # u64 v0 = 0x736f6d6570736575ULL;
@@ -181,10 +181,10 @@ 
         # u64 k0 = LOAD64_LE( k );
         # u64 k1 = LOAD64_LE( k + 8 );
         $k = array(
-            self::load_4(self::substr($key, 4, 4)),
-            self::load_4(self::substr($key, 0, 4)),
-            self::load_4(self::substr($key, 12, 4)),
-            self::load_4(self::substr($key, 8, 4))
+            self::load_4( self::substr( $key, 4, 4 ) ),
+            self::load_4( self::substr( $key, 0, 4 ) ),
+            self::load_4( self::substr( $key, 12, 4 ) ),
+            self::load_4( self::substr( $key, 8, 4 ) )
         );
         // k0 => $k[0], $k[1]
         // k1 => $k[2], $k[3]
@@ -211,11 +211,11 @@ 
 
         $left = $inlen;
         # for ( ; in != end; in += 8 )
-        while ($left >= 8) {
+        while ( $left >= 8 ) {
             # m = LOAD64_LE( in );
             $m = array(
-                self::load_4(self::substr($in, 4, 4)),
-                self::load_4(self::substr($in, 0, 4))
+                self::load_4( self::substr( $in, 4, 4 ) ),
+                self::load_4( self::substr( $in, 0, 4 ) )
             );
 
             # v3 ^= m;
@@ -224,14 +224,14 @@ 
 
             # SIPROUND;
             # SIPROUND;
-            $v = self::sipRound($v);
-            $v = self::sipRound($v);
+            $v = self::sipRound( $v );
+            $v = self::sipRound( $v );
 
             # v0 ^= m;
             $v[0] ^= $m[0];
             $v[1] ^= $m[1];
 
-            $in = self::substr($in, 8);
+            $in = self::substr( $in, 8 );
             $left -= 8;
         }
 
@@ -246,21 +246,21 @@ 
         #     case 1: b |= ( ( u64 )in[ 0] ); break;
         #     case 0: break;
         # }
-        switch ($left) {
+        switch ( $left ) {
             case 7:
-                $b[0] |= self::chrToInt($in[6]) << 16;
+                $b[0] |= self::chrToInt( $in[6] ) << 16;
             case 6:
-                $b[0] |= self::chrToInt($in[5]) << 8;
+                $b[0] |= self::chrToInt( $in[5] ) << 8;
             case 5:
-                $b[0] |= self::chrToInt($in[4]);
+                $b[0] |= self::chrToInt( $in[4] );
             case 4:
-                $b[1] |= self::chrToInt($in[3]) << 24;
+                $b[1] |= self::chrToInt( $in[3] ) << 24;
             case 3:
-                $b[1] |= self::chrToInt($in[2]) << 16;
+                $b[1] |= self::chrToInt( $in[2] ) << 16;
             case 2:
-                $b[1] |= self::chrToInt($in[1]) << 8;
+                $b[1] |= self::chrToInt( $in[1] ) << 8;
             case 1:
-                $b[1] |= self::chrToInt($in[0]);
+                $b[1] |= self::chrToInt( $in[0] );
             case 0:
                 break;
         }
@@ -272,8 +272,8 @@ 
 
         # SIPROUND;
         # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
 
         # v0 ^= b;
         $v[0] ^= $b[0];
@@ -287,14 +287,14 @@ 
         # SIPROUND;
         # SIPROUND;
         # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
+        $v = self::sipRound( $v );
 
         # b = v0 ^ v1 ^ v2 ^ v3;
         # STORE64_LE( out, b );
-        return  self::store32_le($v[1] ^ $v[3] ^ $v[5] ^ $v[7]) .
-            self::store32_le($v[0] ^ $v[2] ^ $v[4] ^ $v[6]);
+        return  self::store32_le( $v[1] ^ $v[3] ^ $v[5] ^ $v[7] ) .
+            self::store32_le( $v[0] ^ $v[2] ^ $v[4] ^ $v[6] );
     }
 }

Braces +5 added lines, -10 removed lines

@@ -9,16 +9,14 @@ 
  *
  * Only uses 32-bit arithmetic, while the original SipHash used 64-bit integers
  */
-class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
-{
+class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util {
     /**
      * @internal You should not use this directly from another application
      *
      * @param int[] $v
      * @return int[]
      */
-    public static function sipRound(array $v)
-    {
+    public static function sipRound(array $v) {
         # v0 += v1;
         list($v[0], $v[1]) = self::add(
             array($v[0], $v[1]),
@@ -89,8 +87,7 @@ 
      * @param int[] $b
      * @return array<int, mixed>
      */
-    public static function add(array $a, array $b)
-    {
+    public static function add(array $a, array $b) {
         $x1 = $a[1] + $b[1];
         $c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
         $x0 = $a[0] + $b[0] + $c;
@@ -108,8 +105,7 @@ 
      * @param int $c
      * @return array<int, mixed>
      */
-    public static function rotl_64($int0, $int1, $c)
-    {
+    public static function rotl_64($int0, $int1, $c) {
         $int0 &= 0xffffffff;
         $int1 &= 0xffffffff;
         $c &= 63;
@@ -154,8 +150,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function sipHash24($in, $key)
-    {
+    public static function sipHash24($in, $key) {
         $inlen = self::strlen($in);
 
         # /* "somepseudorandomlygeneratedbytes" */

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

Doc Comments +2 added lines, -2 removed lines

@@ -527,7 +527,7 @@ 
      *
      * @internal You should not use this directly from another application
      *
-     * @param int|float $num
+     * @param integer $num
      * @return array<int, int>
      */
     public static function numericTo64BitInteger($num)
@@ -834,7 +834,7 @@ 
      *
      * @internal You should not use this directly from another application
      *
-     * @return bool
+     * @return boolean|null
      */
     protected static function isMbStringOverride()
     {

Indentation +840 added lines, -840 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_Util', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,843 +9,843 @@ 
  */
 abstract class ParagonIE_Sodium_Core_Util
 {
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $binaryString (raw binary)
-     * @return string
-     * @throws TypeError
-     */
-    public static function bin2hex($binaryString)
-    {
-        /* Type checks: */
-        if (!is_string($binaryString)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
-        }
-
-        $hex = '';
-        $len = self::strlen($binaryString);
-        for ($i = 0; $i < $len; ++$i) {
-            $chunk = unpack('C', self::substr($binaryString, $i, 2));
-            $c = $chunk[1] & 0xf;
-            $b = $chunk[1] >> 4;
-            $hex .= pack(
-                'CC',
-                (87 + $b + ((($b - 10) >> 8) & ~38)),
-                (87 + $c + ((($c - 10) >> 8) & ~38))
-            );
-        }
-        return $hex;
-    }
-
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks, returning uppercase letters (as per RFC 4648)
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $bin_string (raw binary)
-     * @return string
-     */
-    public static function bin2hexUpper($bin_string)
-    {
-        $hex = '';
-        $len = self::strlen($bin_string);
-        for ($i = 0; $i < $len; ++$i) {
-            $chunk = unpack('C', self::substr($bin_string, $i, 2));
-            /**
-             * Lower 16 bits
-             *
-             * @var int
-             */
-            $c = $chunk[1] & 0xf;
-
-            /**
-             * Upper 16 bits
-             * @var int
-             */
-            $b = $chunk[1] >> 4;
-
-            /**
-             * Use pack() and binary operators to turn the two integers
-             * into hexadecimal characters. We don't use chr() here, because
-             * it uses a lookup table internally and we want to avoid
-             * cache-timing side-channels.
-             */
-            $hex .= pack(
-                'CC',
-                (55 + $b + ((($b - 10) >> 8) & ~6)),
-                (55 + $c + ((($c - 10) >> 8) & ~6))
-            );
-        }
-        return $hex;
-    }
-
-    /**
-     * Cache-timing-safe variant of ord()
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $chr
-     * @return int
-     * @throws Error
-     */
-    public static function chrToInt($chr)
-    {
-        /* Type checks: */
-        if (!is_string($chr)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
-        }
-        if (self::strlen($chr) !== 1) {
-            throw new Error('chrToInt() expects a string that is exactly 1 character long');
-        }
-        $chunk = unpack('C', $chr);
-        return $chunk[1];
-    }
-
-    /**
-     * Compares two strings.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $left
-     * @param string $right
-     * @param int $len
-     * @return int
-     */
-    public static function compare($left, $right, $len = null)
-    {
-        $leftLen = self::strlen($left);
-        $rightLen = self::strlen($right);
-        if ($len === null) {
-            $len = max($leftLen, $rightLen);
-            $left = str_pad($left, $len, "\x00", STR_PAD_RIGHT);
-            $right = str_pad($right, $len, "\x00", STR_PAD_RIGHT);
-        }
-
-        $gt = 0;
-        $eq = 1;
-        $i = $len;
-        while ($i !== 0) {
-            --$i;
-            $gt |= ((self::chrToInt($right[$i]) - self::chrToInt($left[$i])) >> 8) & $eq;
-            $eq &= ((self::chrToInt($right[$i]) ^ self::chrToInt($left[$i])) - 1) >> 8;
-        }
-        return ($gt + $gt + $eq) - 1;
-    }
-
-    /**
-     * If a variable does not match a given type, throw a TypeError.
-     *
-     * @param mixed $mixedVar
-     * @param string $type
-     * @param int $argumentIndex
-     * @throws TypeError
-     * @throws Error
-     * @return void
-     */
-    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0)
-    {
-        if (func_num_args() === 0) {
-            /* Tautology, by default */
-            return;
-        }
-        if (func_num_args() === 1) {
-            throw new TypeError('Declared void, but passed a variable');
-        }
-        $realType = strtolower(gettype($mixedVar));
-        $type = strtolower($type);
-        switch ($type) {
-            case 'null':
-                if ($mixedVar !== null) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be null, ' . $realType . ' given.');
-                }
-                break;
-            case 'integer':
-            case 'int':
-                $allow = array('int', 'integer');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an integer, ' . $realType . ' given.');
-                }
-                $mixedVar = (int) $mixedVar;
-                break;
-            case 'boolean':
-            case 'bool':
-                $allow = array('bool', 'boolean');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a boolean, ' . $realType . ' given.');
-                }
-                $mixedVar = (bool) $mixedVar;
-                break;
-            case 'string':
-                if (!is_string($mixedVar)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a string, ' . $realType . ' given.');
-                }
-                $mixedVar = (string) $mixedVar;
-                break;
-            case 'decimal':
-            case 'double':
-            case 'float':
-                $allow = array('decimal', 'double', 'float');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a float, ' . $realType . ' given.');
-                }
-                $mixedVar = (float) $mixedVar;
-                break;
-            case 'object':
-                if (!is_object($mixedVar)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an object, ' . $realType . ' given.');
-                }
-                break;
-            case 'array':
-                if (!is_array($mixedVar)) {
-                    if (is_object($mixedVar)) {
-                        if ($mixedVar instanceof ArrayAccess) {
-                            return;
-                        }
-                    }
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an array, ' . $realType . ' given.');
-                }
-                break;
-            default:
-                throw new Error('Unknown type (' . $realType .') does not match expect type (' . $type . ')');
-        }
-    }
-
-    /**
-     * Evaluate whether or not two strings are equal (in constant-time)
-     *
-     * @param string $left
-     * @param string $right
-     * @return bool
-     * @throws TypeError
-     */
-    public static function hashEquals($left, $right)
-    {
-        /* Type checks: */
-        if (!is_string($left)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
-        }
-        if (!is_string($right)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
-        }
-
-        if (is_callable('hash_equals')) {
-            return hash_equals($left, $right);
-        }
-        $d = 0;
-        $len = self::strlen($left);
-        if ($len !== self::strlen($right)) {
-            return false;
-        }
-        for ($i = 0; $i < $len; ++$i) {
-            $d |= self::chrToInt($left[$i]) ^ self::chrToInt($right[$i]);
-        }
-
-        if ($d !== 0) {
-            return false;
-        }
-        return $left === $right;
-    }
-
-    /**
-     * Convert a hexadecimal string into a binary string without cache-timing
-     * leaks
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $hexString
-     * @param bool $strictPadding
-     * @return string (raw binary)
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function hex2bin($hexString, $strictPadding = false)
-    {
-        /* Type checks: */
-        if (!is_string($hexString)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
-        }
-
-        $hex_pos = 0;
-        $bin = '';
-        $c_acc = 0;
-        $hex_len = self::strlen($hexString);
-        $state = 0;
-        if (($hex_len & 1) !== 0) {
-            if ($strictPadding) {
-                throw new RangeException(
-                    'Expected an even number of hexadecimal characters'
-                );
-            } else {
-                $hexString = '0' . $hexString;
-                ++$hex_len;
-            }
-        }
-
-        $chunk = unpack('C*', $hexString);
-        while ($hex_pos < $hex_len) {
-            ++$hex_pos;
-            $c = $chunk[$hex_pos];
-            $c_num = $c ^ 48;
-            $c_num0 = ($c_num - 10) >> 8;
-            $c_alpha = ($c & ~32) - 55;
-            $c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
-            if (($c_num0 | $c_alpha0) === 0) {
-                throw new RangeException(
-                    'hex2bin() only expects hexadecimal characters'
-                );
-            }
-            $c_val = ($c_num0 & $c_num) | ($c_alpha & $c_alpha0);
-            if ($state === 0) {
-                $c_acc = $c_val * 16;
-            } else {
-                $bin .= pack('C', $c_acc | $c_val);
-            }
-            $state ^= 1;
-        }
-        return $bin;
-    }
-
-    /**
-     * Turn an array of integers into a string
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param array<int, int> $ints
-     * @return string
-     */
-    public static function intArrayToString(array $ints)
-    {
-        $args = $ints;
-        foreach ($args as $i => $v) {
-            $args[$i] = $v & 0xff;
-        }
-        array_unshift($args, str_repeat('C', count($ints)));
-        return call_user_func_array('pack', $args);
-    }
-
-    /**
-     * Cache-timing-safe variant of ord()
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int
-     * @return string
-     * @throws TypeError
-     */
-    public static function intToChr($int)
-    {
-        return pack('C', $int);
-    }
-
-    /**
-     * Load a 3 character substring into an integer
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $string
-     * @return int
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function load_3($string)
-    {
-        /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($string) < 3) {
-            throw new RangeException(
-                'String must be 3 bytes or more; ' . self::strlen($string) . ' given.'
-            );
-        }
-        $result = self::chrToInt($string[0]);
-        $result |= self::chrToInt($string[1]) << 8;
-        $result |= self::chrToInt($string[2]) << 16;
-        return $result & 0xffffff;
-    }
-
-    /**
-     * Load a 4 character substring into an integer
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $string
-     * @return int
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function load_4($string)
-    {
-        /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($string) < 4) {
-            throw new RangeException(
-                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
-            );
-        }
-        $result  = (self::chrToInt($string[0]) & 0xff);
-        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
-        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
-        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
-        return $result & 0xffffffff;
-    }
-
-    /**
-     * Load a 8 character substring into an integer
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $string
-     * @return int
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function load64_le($string)
-    {
-        /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
-        }
-
-        /* Input validation: */
-        if (self::strlen($string) < 4) {
-            throw new RangeException(
-                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
-            );
-        }
-        $result  = (self::chrToInt($string[0]) & 0xff);
-        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
-        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
-        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
-        $result |= (self::chrToInt($string[4]) & 0xff) << 32;
-        $result |= (self::chrToInt($string[5]) & 0xff) << 40;
-        $result |= (self::chrToInt($string[6]) & 0xff) << 48;
-        $result |= (self::chrToInt($string[7]) & 0xff) << 56;
-        return (int) $result;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $left
-     * @param string $right
-     * @return int
-     */
-    public static function memcmp($left, $right)
-    {
-        if (self::hashEquals($left, $right)) {
-            return 0;
-        }
-        return -1;
-    }
-
-    /**
-     * Multiply two integers in constant-time
-     *
-     * Micro-architecture timing side-channels caused by how your CPU
-     * implements multiplication are best prevented by never using the
-     * multiplication operators and ensuring that our code always takes
-     * the same number of operations to complete, regardless of the values
-     * of $a and $b.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $a
-     * @param int $b
-     * @param int $size Limits the number of operations (useful for small,
-     *                  constant operands)
-     * @return int
-     */
-    public static function mul($a, $b, $size = 0)
-    {
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return (int) ($a * $b);
-        }
-
-        static $defaultSize = null;
-        if (!$defaultSize) {
-            $defaultSize = (PHP_INT_SIZE << 3) - 1;
-        }
-        if ($size < 1) {
-            $size = $defaultSize;
-        }
-
-        $c = 0;
-
-        /**
-         * Mask is either -1 or 0.
-         *
-         * -1 in binary looks like 0x1111 ... 1111
-         *  0 in binary looks like 0x0000 ... 0000
-         *
-         * @var int
-         */
-        $mask = -(($b >> $size) & 1);
-
-        /**
-         * Ensure $b is a positive integer, without creating
-         * a branching side-channel
-         */
-        $b = ($b & ~$mask) | ($mask & -$b);
-
-        /**
-         * This loop always runs 32 times when PHP_INT_SIZE is 4.
-         * This loop always runs 64 times when PHP_INT_SIZE is 8.
-         */
-        for ($i = $size; $i >= 0; --$i) {
-            $c += (int) ($a & -($b & 1));
-            $a <<= 1;
-            $b >>= 1;
-        }
-
-        /**
-         * If $b was negative, we then apply the same value to $c here.
-         * It doesn't matter much if $a was negative; the $c += above would
-         * have produced a negative integer to begin with. But a negative $b
-         * makes $b >>= 1 never return 0, so we would end up with incorrect
-         * results.
-         *
-         * The end result is what we'd expect from integer multiplication.
-         */
-        return (int) (($c & ~$mask) | ($mask & -$c));
-    }
-
-    /**
-     * Convert any arbitrary numbers into two 32-bit integers that represent
-     * a 64-bit integer.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int|float $num
-     * @return array<int, int>
-     */
-    public static function numericTo64BitInteger($num)
-    {
-        $high = 0;
-        $low = $num & 0xffffffff;
-
-        if ((+(abs($num))) >= 1) {
-            if ($num > 0) {
-                $high = min((+(floor($num/4294967296))), 4294967295);
-            } else {
-                $high = ~~((+(ceil(($num - (+((~~($num)))))/4294967296))));
-            }
-        }
-        return array((int) $high, (int) $low);
-    }
-
-    /**
-     * Store a 24-bit integer into a string, treating it as big-endian.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int
-     * @return string
-     * @throws TypeError
-     */
-    public static function store_3($int)
-    {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-
-        return self::intToChr(($int >> 16) & 0xff) .
-            self::intToChr(($int >> 8)     & 0xff) .
-            self::intToChr($int            & 0xff);
-    }
-
-    /**
-     * Store a 32-bit integer into a string, treating it as little-endian.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int
-     * @return string
-     * @throws TypeError
-     */
-    public static function store32_le($int)
-    {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-
-        return self::intToChr($int      & 0xff) .
-            self::intToChr(($int >> 8)  & 0xff) .
-            self::intToChr(($int >> 16) & 0xff) .
-            self::intToChr(($int >> 24) & 0xff);
-    }
-
-    /**
-     * Store a 32-bit integer into a string, treating it as big-endian.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int
-     * @return string
-     * @throws TypeError
-     */
-    public static function store_4($int)
-    {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-
-        return self::intToChr(($int >> 24) & 0xff) .
-            self::intToChr(($int >> 16)    & 0xff) .
-            self::intToChr(($int >> 8)     & 0xff) .
-            self::intToChr($int            & 0xff);
-    }
-
-    /**
-     * Stores a 64-bit integer as an string, treating it as little-endian.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int
-     * @return string
-     * @throws TypeError
-     */
-    public static function store64_le($int)
-    {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-
-        if (PHP_INT_SIZE === 8) {
-            return self::intToChr($int & 0xff) .
-                self::intToChr(($int >>  8) & 0xff) .
-                self::intToChr(($int >> 16) & 0xff) .
-                self::intToChr(($int >> 24) & 0xff) .
-                self::intToChr(($int >> 32) & 0xff) .
-                self::intToChr(($int >> 40) & 0xff) .
-                self::intToChr(($int >> 48) & 0xff) .
-                self::intToChr(($int >> 56) & 0xff);
-        }
-        if ($int > PHP_INT_MAX) {
-            list($hiB, $int) = self::numericTo64BitInteger($int);
-        } else {
-            $hiB = 0;
-        }
-        return
-            self::intToChr(($int      ) & 0xff) .
-            self::intToChr(($int >>  8) & 0xff) .
-            self::intToChr(($int >> 16) & 0xff) .
-            self::intToChr(($int >> 24) & 0xff) .
-            self::intToChr($hiB & 0xff) .
-            self::intToChr(($hiB >>  8) & 0xff) .
-            self::intToChr(($hiB >> 16) & 0xff) .
-            self::intToChr(($hiB >> 24) & 0xff);
-    }
-
-    /**
-     * Safe string length
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @ref mbstring.func_overload
-     *
-     * @param string $str
-     * @return int
-     * @throws TypeError
-     */
-    public static function strlen($str)
-    {
-        /* Type checks: */
-        if (!is_string($str)) {
-            throw new TypeError('String expected');
-        }
-
-        return (int) (
-        self::isMbStringOverride()
-            ? mb_strlen($str, '8bit')
-            : strlen($str)
-        );
-    }
-
-    /**
-     * Turn a string into an array of integers
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $string
-     * @return array<int, int>
-     * @throws TypeError
-     */
-    public static function stringToIntArray($string)
-    {
-        if (!is_string($string)) {
-            throw new TypeError('String expected');
-        }
-        /**
-         * @var array<int, int>
-         */
-        $values = array_values(
-            unpack('C*', $string)
-        );
-        return $values;
-    }
-
-    /**
-     * Safe substring
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @ref mbstring.func_overload
-     *
-     * @param string $str
-     * @param int $start
-     * @param int $length
-     * @return string
-     * @throws TypeError
-     */
-    public static function substr($str, $start = 0, $length = null)
-    {
-        /* Type checks: */
-        if (!is_string($str)) {
-            throw new TypeError('String expected');
-        }
-
-        if ($length === 0) {
-            return '';
-        }
-
-        if (self::isMbStringOverride()) {
-            if (PHP_VERSION_ID < 50400 && $length === null) {
-                $length = self::strlen($str);
-            }
-            $sub = (string) mb_substr($str, $start, $length, '8bit');
-        } elseif ($length === null) {
-            $sub = (string) substr($str, $start);
-        } else {
-            $sub = (string) substr($str, $start, $length);
-        }
-        if (isset($sub)) {
-            return $sub;
-        }
-        return '';
-    }
-
-    /**
-     * Compare a 16-character byte string in constant time.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param string $b
-     * @return bool
-     * @throws TypeError
-     */
-    public static function verify_16($a, $b)
-    {
-        /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('String expected');
-        }
-        if (!is_string($b)) {
-            throw new TypeError('String expected');
-        }
-        return self::hashEquals(
-            self::substr($a, 0, 16),
-            self::substr($b, 0, 16)
-        );
-    }
-
-    /**
-     * Compare a 32-character byte string in constant time.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param string $b
-     * @return bool
-     * @throws TypeError
-     */
-    public static function verify_32($a, $b)
-    {
-        /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('String expected');
-        }
-        if (!is_string($b)) {
-            throw new TypeError('String expected');
-        }
-        return self::hashEquals(
-            self::substr($a, 0, 32),
-            self::substr($b, 0, 32)
-        );
-    }
-
-    /**
-     * Calculate $a ^ $b for two strings.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param string $b
-     * @return string
-     * @throws TypeError
-     */
-    public static function xorStrings($a, $b)
-    {
-        /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('Argument 1 must be a string');
-        }
-        if (!is_string($b)) {
-            throw new TypeError('Argument 2 must be a string');
-        }
-
-        return $a ^ $b;
-    }
-
-    /**
-     * Returns whether or not mbstring.func_overload is in effect.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return bool
-     */
-    protected static function isMbStringOverride()
-    {
-        static $mbstring = null;
-
-        if ($mbstring === null) {
-            $mbstring = extension_loaded('mbstring')
-                &&
-            (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING);
-        }
-
-        return $mbstring;
-    }
+	/**
+	 * Convert a binary string into a hexadecimal string without cache-timing
+	 * leaks
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $binaryString (raw binary)
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function bin2hex($binaryString)
+	{
+		/* Type checks: */
+		if (!is_string($binaryString)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
+		}
+
+		$hex = '';
+		$len = self::strlen($binaryString);
+		for ($i = 0; $i < $len; ++$i) {
+			$chunk = unpack('C', self::substr($binaryString, $i, 2));
+			$c = $chunk[1] & 0xf;
+			$b = $chunk[1] >> 4;
+			$hex .= pack(
+				'CC',
+				(87 + $b + ((($b - 10) >> 8) & ~38)),
+				(87 + $c + ((($c - 10) >> 8) & ~38))
+			);
+		}
+		return $hex;
+	}
+
+	/**
+	 * Convert a binary string into a hexadecimal string without cache-timing
+	 * leaks, returning uppercase letters (as per RFC 4648)
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $bin_string (raw binary)
+	 * @return string
+	 */
+	public static function bin2hexUpper($bin_string)
+	{
+		$hex = '';
+		$len = self::strlen($bin_string);
+		for ($i = 0; $i < $len; ++$i) {
+			$chunk = unpack('C', self::substr($bin_string, $i, 2));
+			/**
+			 * Lower 16 bits
+			 *
+			 * @var int
+			 */
+			$c = $chunk[1] & 0xf;
+
+			/**
+			 * Upper 16 bits
+			 * @var int
+			 */
+			$b = $chunk[1] >> 4;
+
+			/**
+			 * Use pack() and binary operators to turn the two integers
+			 * into hexadecimal characters. We don't use chr() here, because
+			 * it uses a lookup table internally and we want to avoid
+			 * cache-timing side-channels.
+			 */
+			$hex .= pack(
+				'CC',
+				(55 + $b + ((($b - 10) >> 8) & ~6)),
+				(55 + $c + ((($c - 10) >> 8) & ~6))
+			);
+		}
+		return $hex;
+	}
+
+	/**
+	 * Cache-timing-safe variant of ord()
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $chr
+	 * @return int
+	 * @throws Error
+	 */
+	public static function chrToInt($chr)
+	{
+		/* Type checks: */
+		if (!is_string($chr)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
+		}
+		if (self::strlen($chr) !== 1) {
+			throw new Error('chrToInt() expects a string that is exactly 1 character long');
+		}
+		$chunk = unpack('C', $chr);
+		return $chunk[1];
+	}
+
+	/**
+	 * Compares two strings.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $left
+	 * @param string $right
+	 * @param int $len
+	 * @return int
+	 */
+	public static function compare($left, $right, $len = null)
+	{
+		$leftLen = self::strlen($left);
+		$rightLen = self::strlen($right);
+		if ($len === null) {
+			$len = max($leftLen, $rightLen);
+			$left = str_pad($left, $len, "\x00", STR_PAD_RIGHT);
+			$right = str_pad($right, $len, "\x00", STR_PAD_RIGHT);
+		}
+
+		$gt = 0;
+		$eq = 1;
+		$i = $len;
+		while ($i !== 0) {
+			--$i;
+			$gt |= ((self::chrToInt($right[$i]) - self::chrToInt($left[$i])) >> 8) & $eq;
+			$eq &= ((self::chrToInt($right[$i]) ^ self::chrToInt($left[$i])) - 1) >> 8;
+		}
+		return ($gt + $gt + $eq) - 1;
+	}
+
+	/**
+	 * If a variable does not match a given type, throw a TypeError.
+	 *
+	 * @param mixed $mixedVar
+	 * @param string $type
+	 * @param int $argumentIndex
+	 * @throws TypeError
+	 * @throws Error
+	 * @return void
+	 */
+	public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0)
+	{
+		if (func_num_args() === 0) {
+			/* Tautology, by default */
+			return;
+		}
+		if (func_num_args() === 1) {
+			throw new TypeError('Declared void, but passed a variable');
+		}
+		$realType = strtolower(gettype($mixedVar));
+		$type = strtolower($type);
+		switch ($type) {
+			case 'null':
+				if ($mixedVar !== null) {
+					throw new TypeError('Argument ' . $argumentIndex . ' must be null, ' . $realType . ' given.');
+				}
+				break;
+			case 'integer':
+			case 'int':
+				$allow = array('int', 'integer');
+				if (!in_array($type, $allow)) {
+					throw new TypeError('Argument ' . $argumentIndex . ' must be an integer, ' . $realType . ' given.');
+				}
+				$mixedVar = (int) $mixedVar;
+				break;
+			case 'boolean':
+			case 'bool':
+				$allow = array('bool', 'boolean');
+				if (!in_array($type, $allow)) {
+					throw new TypeError('Argument ' . $argumentIndex . ' must be a boolean, ' . $realType . ' given.');
+				}
+				$mixedVar = (bool) $mixedVar;
+				break;
+			case 'string':
+				if (!is_string($mixedVar)) {
+					throw new TypeError('Argument ' . $argumentIndex . ' must be a string, ' . $realType . ' given.');
+				}
+				$mixedVar = (string) $mixedVar;
+				break;
+			case 'decimal':
+			case 'double':
+			case 'float':
+				$allow = array('decimal', 'double', 'float');
+				if (!in_array($type, $allow)) {
+					throw new TypeError('Argument ' . $argumentIndex . ' must be a float, ' . $realType . ' given.');
+				}
+				$mixedVar = (float) $mixedVar;
+				break;
+			case 'object':
+				if (!is_object($mixedVar)) {
+					throw new TypeError('Argument ' . $argumentIndex . ' must be an object, ' . $realType . ' given.');
+				}
+				break;
+			case 'array':
+				if (!is_array($mixedVar)) {
+					if (is_object($mixedVar)) {
+						if ($mixedVar instanceof ArrayAccess) {
+							return;
+						}
+					}
+					throw new TypeError('Argument ' . $argumentIndex . ' must be an array, ' . $realType . ' given.');
+				}
+				break;
+			default:
+				throw new Error('Unknown type (' . $realType .') does not match expect type (' . $type . ')');
+		}
+	}
+
+	/**
+	 * Evaluate whether or not two strings are equal (in constant-time)
+	 *
+	 * @param string $left
+	 * @param string $right
+	 * @return bool
+	 * @throws TypeError
+	 */
+	public static function hashEquals($left, $right)
+	{
+		/* Type checks: */
+		if (!is_string($left)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
+		}
+		if (!is_string($right)) {
+			throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
+		}
+
+		if (is_callable('hash_equals')) {
+			return hash_equals($left, $right);
+		}
+		$d = 0;
+		$len = self::strlen($left);
+		if ($len !== self::strlen($right)) {
+			return false;
+		}
+		for ($i = 0; $i < $len; ++$i) {
+			$d |= self::chrToInt($left[$i]) ^ self::chrToInt($right[$i]);
+		}
+
+		if ($d !== 0) {
+			return false;
+		}
+		return $left === $right;
+	}
+
+	/**
+	 * Convert a hexadecimal string into a binary string without cache-timing
+	 * leaks
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $hexString
+	 * @param bool $strictPadding
+	 * @return string (raw binary)
+	 * @throws RangeException
+	 * @throws TypeError
+	 */
+	public static function hex2bin($hexString, $strictPadding = false)
+	{
+		/* Type checks: */
+		if (!is_string($hexString)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
+		}
+
+		$hex_pos = 0;
+		$bin = '';
+		$c_acc = 0;
+		$hex_len = self::strlen($hexString);
+		$state = 0;
+		if (($hex_len & 1) !== 0) {
+			if ($strictPadding) {
+				throw new RangeException(
+					'Expected an even number of hexadecimal characters'
+				);
+			} else {
+				$hexString = '0' . $hexString;
+				++$hex_len;
+			}
+		}
+
+		$chunk = unpack('C*', $hexString);
+		while ($hex_pos < $hex_len) {
+			++$hex_pos;
+			$c = $chunk[$hex_pos];
+			$c_num = $c ^ 48;
+			$c_num0 = ($c_num - 10) >> 8;
+			$c_alpha = ($c & ~32) - 55;
+			$c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
+			if (($c_num0 | $c_alpha0) === 0) {
+				throw new RangeException(
+					'hex2bin() only expects hexadecimal characters'
+				);
+			}
+			$c_val = ($c_num0 & $c_num) | ($c_alpha & $c_alpha0);
+			if ($state === 0) {
+				$c_acc = $c_val * 16;
+			} else {
+				$bin .= pack('C', $c_acc | $c_val);
+			}
+			$state ^= 1;
+		}
+		return $bin;
+	}
+
+	/**
+	 * Turn an array of integers into a string
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param array<int, int> $ints
+	 * @return string
+	 */
+	public static function intArrayToString(array $ints)
+	{
+		$args = $ints;
+		foreach ($args as $i => $v) {
+			$args[$i] = $v & 0xff;
+		}
+		array_unshift($args, str_repeat('C', count($ints)));
+		return call_user_func_array('pack', $args);
+	}
+
+	/**
+	 * Cache-timing-safe variant of ord()
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $int
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function intToChr($int)
+	{
+		return pack('C', $int);
+	}
+
+	/**
+	 * Load a 3 character substring into an integer
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $string
+	 * @return int
+	 * @throws RangeException
+	 * @throws TypeError
+	 */
+	public static function load_3($string)
+	{
+		/* Type checks: */
+		if (!is_string($string)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($string) < 3) {
+			throw new RangeException(
+				'String must be 3 bytes or more; ' . self::strlen($string) . ' given.'
+			);
+		}
+		$result = self::chrToInt($string[0]);
+		$result |= self::chrToInt($string[1]) << 8;
+		$result |= self::chrToInt($string[2]) << 16;
+		return $result & 0xffffff;
+	}
+
+	/**
+	 * Load a 4 character substring into an integer
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $string
+	 * @return int
+	 * @throws RangeException
+	 * @throws TypeError
+	 */
+	public static function load_4($string)
+	{
+		/* Type checks: */
+		if (!is_string($string)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($string) < 4) {
+			throw new RangeException(
+				'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+			);
+		}
+		$result  = (self::chrToInt($string[0]) & 0xff);
+		$result |= (self::chrToInt($string[1]) & 0xff) <<  8;
+		$result |= (self::chrToInt($string[2]) & 0xff) << 16;
+		$result |= (self::chrToInt($string[3]) & 0xff) << 24;
+		return $result & 0xffffffff;
+	}
+
+	/**
+	 * Load a 8 character substring into an integer
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $string
+	 * @return int
+	 * @throws RangeException
+	 * @throws TypeError
+	 */
+	public static function load64_le($string)
+	{
+		/* Type checks: */
+		if (!is_string($string)) {
+			throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+		}
+
+		/* Input validation: */
+		if (self::strlen($string) < 4) {
+			throw new RangeException(
+				'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+			);
+		}
+		$result  = (self::chrToInt($string[0]) & 0xff);
+		$result |= (self::chrToInt($string[1]) & 0xff) <<  8;
+		$result |= (self::chrToInt($string[2]) & 0xff) << 16;
+		$result |= (self::chrToInt($string[3]) & 0xff) << 24;
+		$result |= (self::chrToInt($string[4]) & 0xff) << 32;
+		$result |= (self::chrToInt($string[5]) & 0xff) << 40;
+		$result |= (self::chrToInt($string[6]) & 0xff) << 48;
+		$result |= (self::chrToInt($string[7]) & 0xff) << 56;
+		return (int) $result;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $left
+	 * @param string $right
+	 * @return int
+	 */
+	public static function memcmp($left, $right)
+	{
+		if (self::hashEquals($left, $right)) {
+			return 0;
+		}
+		return -1;
+	}
+
+	/**
+	 * Multiply two integers in constant-time
+	 *
+	 * Micro-architecture timing side-channels caused by how your CPU
+	 * implements multiplication are best prevented by never using the
+	 * multiplication operators and ensuring that our code always takes
+	 * the same number of operations to complete, regardless of the values
+	 * of $a and $b.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $a
+	 * @param int $b
+	 * @param int $size Limits the number of operations (useful for small,
+	 *                  constant operands)
+	 * @return int
+	 */
+	public static function mul($a, $b, $size = 0)
+	{
+		if (ParagonIE_Sodium_Compat::$fastMult) {
+			return (int) ($a * $b);
+		}
+
+		static $defaultSize = null;
+		if (!$defaultSize) {
+			$defaultSize = (PHP_INT_SIZE << 3) - 1;
+		}
+		if ($size < 1) {
+			$size = $defaultSize;
+		}
+
+		$c = 0;
+
+		/**
+		 * Mask is either -1 or 0.
+		 *
+		 * -1 in binary looks like 0x1111 ... 1111
+		 *  0 in binary looks like 0x0000 ... 0000
+		 *
+		 * @var int
+		 */
+		$mask = -(($b >> $size) & 1);
+
+		/**
+		 * Ensure $b is a positive integer, without creating
+		 * a branching side-channel
+		 */
+		$b = ($b & ~$mask) | ($mask & -$b);
+
+		/**
+		 * This loop always runs 32 times when PHP_INT_SIZE is 4.
+		 * This loop always runs 64 times when PHP_INT_SIZE is 8.
+		 */
+		for ($i = $size; $i >= 0; --$i) {
+			$c += (int) ($a & -($b & 1));
+			$a <<= 1;
+			$b >>= 1;
+		}
+
+		/**
+		 * If $b was negative, we then apply the same value to $c here.
+		 * It doesn't matter much if $a was negative; the $c += above would
+		 * have produced a negative integer to begin with. But a negative $b
+		 * makes $b >>= 1 never return 0, so we would end up with incorrect
+		 * results.
+		 *
+		 * The end result is what we'd expect from integer multiplication.
+		 */
+		return (int) (($c & ~$mask) | ($mask & -$c));
+	}
+
+	/**
+	 * Convert any arbitrary numbers into two 32-bit integers that represent
+	 * a 64-bit integer.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int|float $num
+	 * @return array<int, int>
+	 */
+	public static function numericTo64BitInteger($num)
+	{
+		$high = 0;
+		$low = $num & 0xffffffff;
+
+		if ((+(abs($num))) >= 1) {
+			if ($num > 0) {
+				$high = min((+(floor($num/4294967296))), 4294967295);
+			} else {
+				$high = ~~((+(ceil(($num - (+((~~($num)))))/4294967296))));
+			}
+		}
+		return array((int) $high, (int) $low);
+	}
+
+	/**
+	 * Store a 24-bit integer into a string, treating it as big-endian.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $int
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function store_3($int)
+	{
+		/* Type checks: */
+		if (!is_int($int)) {
+			if (is_numeric($int)) {
+				$int = (int) $int;
+			} else {
+				throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+			}
+		}
+
+		return self::intToChr(($int >> 16) & 0xff) .
+			self::intToChr(($int >> 8)     & 0xff) .
+			self::intToChr($int            & 0xff);
+	}
+
+	/**
+	 * Store a 32-bit integer into a string, treating it as little-endian.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $int
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function store32_le($int)
+	{
+		/* Type checks: */
+		if (!is_int($int)) {
+			if (is_numeric($int)) {
+				$int = (int) $int;
+			} else {
+				throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+			}
+		}
+
+		return self::intToChr($int      & 0xff) .
+			self::intToChr(($int >> 8)  & 0xff) .
+			self::intToChr(($int >> 16) & 0xff) .
+			self::intToChr(($int >> 24) & 0xff);
+	}
+
+	/**
+	 * Store a 32-bit integer into a string, treating it as big-endian.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $int
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function store_4($int)
+	{
+		/* Type checks: */
+		if (!is_int($int)) {
+			if (is_numeric($int)) {
+				$int = (int) $int;
+			} else {
+				throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+			}
+		}
+
+		return self::intToChr(($int >> 24) & 0xff) .
+			self::intToChr(($int >> 16)    & 0xff) .
+			self::intToChr(($int >> 8)     & 0xff) .
+			self::intToChr($int            & 0xff);
+	}
+
+	/**
+	 * Stores a 64-bit integer as an string, treating it as little-endian.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $int
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function store64_le($int)
+	{
+		/* Type checks: */
+		if (!is_int($int)) {
+			if (is_numeric($int)) {
+				$int = (int) $int;
+			} else {
+				throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+			}
+		}
+
+		if (PHP_INT_SIZE === 8) {
+			return self::intToChr($int & 0xff) .
+				self::intToChr(($int >>  8) & 0xff) .
+				self::intToChr(($int >> 16) & 0xff) .
+				self::intToChr(($int >> 24) & 0xff) .
+				self::intToChr(($int >> 32) & 0xff) .
+				self::intToChr(($int >> 40) & 0xff) .
+				self::intToChr(($int >> 48) & 0xff) .
+				self::intToChr(($int >> 56) & 0xff);
+		}
+		if ($int > PHP_INT_MAX) {
+			list($hiB, $int) = self::numericTo64BitInteger($int);
+		} else {
+			$hiB = 0;
+		}
+		return
+			self::intToChr(($int      ) & 0xff) .
+			self::intToChr(($int >>  8) & 0xff) .
+			self::intToChr(($int >> 16) & 0xff) .
+			self::intToChr(($int >> 24) & 0xff) .
+			self::intToChr($hiB & 0xff) .
+			self::intToChr(($hiB >>  8) & 0xff) .
+			self::intToChr(($hiB >> 16) & 0xff) .
+			self::intToChr(($hiB >> 24) & 0xff);
+	}
+
+	/**
+	 * Safe string length
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @ref mbstring.func_overload
+	 *
+	 * @param string $str
+	 * @return int
+	 * @throws TypeError
+	 */
+	public static function strlen($str)
+	{
+		/* Type checks: */
+		if (!is_string($str)) {
+			throw new TypeError('String expected');
+		}
+
+		return (int) (
+		self::isMbStringOverride()
+			? mb_strlen($str, '8bit')
+			: strlen($str)
+		);
+	}
+
+	/**
+	 * Turn a string into an array of integers
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $string
+	 * @return array<int, int>
+	 * @throws TypeError
+	 */
+	public static function stringToIntArray($string)
+	{
+		if (!is_string($string)) {
+			throw new TypeError('String expected');
+		}
+		/**
+		 * @var array<int, int>
+		 */
+		$values = array_values(
+			unpack('C*', $string)
+		);
+		return $values;
+	}
+
+	/**
+	 * Safe substring
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @ref mbstring.func_overload
+	 *
+	 * @param string $str
+	 * @param int $start
+	 * @param int $length
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function substr($str, $start = 0, $length = null)
+	{
+		/* Type checks: */
+		if (!is_string($str)) {
+			throw new TypeError('String expected');
+		}
+
+		if ($length === 0) {
+			return '';
+		}
+
+		if (self::isMbStringOverride()) {
+			if (PHP_VERSION_ID < 50400 && $length === null) {
+				$length = self::strlen($str);
+			}
+			$sub = (string) mb_substr($str, $start, $length, '8bit');
+		} elseif ($length === null) {
+			$sub = (string) substr($str, $start);
+		} else {
+			$sub = (string) substr($str, $start, $length);
+		}
+		if (isset($sub)) {
+			return $sub;
+		}
+		return '';
+	}
+
+	/**
+	 * Compare a 16-character byte string in constant time.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @param string $b
+	 * @return bool
+	 * @throws TypeError
+	 */
+	public static function verify_16($a, $b)
+	{
+		/* Type checks: */
+		if (!is_string($a)) {
+			throw new TypeError('String expected');
+		}
+		if (!is_string($b)) {
+			throw new TypeError('String expected');
+		}
+		return self::hashEquals(
+			self::substr($a, 0, 16),
+			self::substr($b, 0, 16)
+		);
+	}
+
+	/**
+	 * Compare a 32-character byte string in constant time.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @param string $b
+	 * @return bool
+	 * @throws TypeError
+	 */
+	public static function verify_32($a, $b)
+	{
+		/* Type checks: */
+		if (!is_string($a)) {
+			throw new TypeError('String expected');
+		}
+		if (!is_string($b)) {
+			throw new TypeError('String expected');
+		}
+		return self::hashEquals(
+			self::substr($a, 0, 32),
+			self::substr($b, 0, 32)
+		);
+	}
+
+	/**
+	 * Calculate $a ^ $b for two strings.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @param string $b
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function xorStrings($a, $b)
+	{
+		/* Type checks: */
+		if (!is_string($a)) {
+			throw new TypeError('Argument 1 must be a string');
+		}
+		if (!is_string($b)) {
+			throw new TypeError('Argument 2 must be a string');
+		}
+
+		return $a ^ $b;
+	}
+
+	/**
+	 * Returns whether or not mbstring.func_overload is in effect.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return bool
+	 */
+	protected static function isMbStringOverride()
+	{
+		static $mbstring = null;
+
+		if ($mbstring === null) {
+			$mbstring = extension_loaded('mbstring')
+				&&
+			(ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING);
+		}
+
+		return $mbstring;
+	}
 }

Spacing +230 added lines, -230 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Util', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Util', false ) ) {
     return;
 }
 
@@ -19,23 +19,23 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function bin2hex($binaryString)
+    public static function bin2hex( $binaryString )
     {
         /* Type checks: */
-        if (!is_string($binaryString)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
+        if ( ! is_string( $binaryString ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $binaryString ) . ' given.' );
         }
 
         $hex = '';
-        $len = self::strlen($binaryString);
-        for ($i = 0; $i < $len; ++$i) {
-            $chunk = unpack('C', self::substr($binaryString, $i, 2));
+        $len = self::strlen( $binaryString );
+        for ( $i = 0; $i < $len; ++$i ) {
+            $chunk = unpack( 'C', self::substr( $binaryString, $i, 2 ) );
             $c = $chunk[1] & 0xf;
             $b = $chunk[1] >> 4;
             $hex .= pack(
                 'CC',
-                (87 + $b + ((($b - 10) >> 8) & ~38)),
-                (87 + $c + ((($c - 10) >> 8) & ~38))
+                ( 87 + $b + ( ( ( $b - 10 ) >> 8 ) & ~38 ) ),
+                ( 87 + $c + ( ( ( $c - 10 ) >> 8 ) & ~38 ) )
             );
         }
         return $hex;
@@ -50,12 +50,12 @@ 
      * @param string $bin_string (raw binary)
      * @return string
      */
-    public static function bin2hexUpper($bin_string)
+    public static function bin2hexUpper( $bin_string )
     {
         $hex = '';
-        $len = self::strlen($bin_string);
-        for ($i = 0; $i < $len; ++$i) {
-            $chunk = unpack('C', self::substr($bin_string, $i, 2));
+        $len = self::strlen( $bin_string );
+        for ( $i = 0; $i < $len; ++$i ) {
+            $chunk = unpack( 'C', self::substr( $bin_string, $i, 2 ) );
             /**
              * Lower 16 bits
              *
@@ -77,8 +77,8 @@ 
              */
             $hex .= pack(
                 'CC',
-                (55 + $b + ((($b - 10) >> 8) & ~6)),
-                (55 + $c + ((($c - 10) >> 8) & ~6))
+                ( 55 + $b + ( ( ( $b - 10 ) >> 8 ) & ~6 ) ),
+                ( 55 + $c + ( ( ( $c - 10 ) >> 8 ) & ~6 ) )
             );
         }
         return $hex;
@@ -93,16 +93,16 @@ 
      * @return int
      * @throws Error
      */
-    public static function chrToInt($chr)
+    public static function chrToInt( $chr )
     {
         /* Type checks: */
-        if (!is_string($chr)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
+        if ( ! is_string( $chr ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $chr ) . ' given.' );
         }
-        if (self::strlen($chr) !== 1) {
-            throw new Error('chrToInt() expects a string that is exactly 1 character long');
+        if ( self::strlen( $chr ) !== 1 ) {
+            throw new Error( 'chrToInt() expects a string that is exactly 1 character long' );
         }
-        $chunk = unpack('C', $chr);
+        $chunk = unpack( 'C', $chr );
         return $chunk[1];
     }
 
@@ -116,25 +116,25 @@ 
      * @param int $len
      * @return int
      */
-    public static function compare($left, $right, $len = null)
+    public static function compare( $left, $right, $len = null )
     {
-        $leftLen = self::strlen($left);
-        $rightLen = self::strlen($right);
-        if ($len === null) {
-            $len = max($leftLen, $rightLen);
-            $left = str_pad($left, $len, "\x00", STR_PAD_RIGHT);
-            $right = str_pad($right, $len, "\x00", STR_PAD_RIGHT);
+        $leftLen = self::strlen( $left );
+        $rightLen = self::strlen( $right );
+        if ( $len === null ) {
+            $len = max( $leftLen, $rightLen );
+            $left = str_pad( $left, $len, "\x00", STR_PAD_RIGHT );
+            $right = str_pad( $right, $len, "\x00", STR_PAD_RIGHT );
         }
 
         $gt = 0;
         $eq = 1;
         $i = $len;
-        while ($i !== 0) {
+        while ( $i !== 0 ) {
             --$i;
-            $gt |= ((self::chrToInt($right[$i]) - self::chrToInt($left[$i])) >> 8) & $eq;
-            $eq &= ((self::chrToInt($right[$i]) ^ self::chrToInt($left[$i])) - 1) >> 8;
+            $gt |= ( ( self::chrToInt( $right[$i] ) - self::chrToInt( $left[$i] ) ) >> 8 ) & $eq;
+            $eq &= ( ( self::chrToInt( $right[$i] ) ^ self::chrToInt( $left[$i] ) ) - 1 ) >> 8;
         }
-        return ($gt + $gt + $eq) - 1;
+        return ( $gt + $gt + $eq ) - 1;
     }
 
     /**
@@ -147,71 +147,71 @@ 
      * @throws Error
      * @return void
      */
-    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0)
+    public static function declareScalarType( &$mixedVar = null, $type = 'void', $argumentIndex = 0 )
     {
-        if (func_num_args() === 0) {
+        if ( func_num_args() === 0 ) {
             /* Tautology, by default */
             return;
         }
-        if (func_num_args() === 1) {
-            throw new TypeError('Declared void, but passed a variable');
+        if ( func_num_args() === 1 ) {
+            throw new TypeError( 'Declared void, but passed a variable' );
         }
-        $realType = strtolower(gettype($mixedVar));
-        $type = strtolower($type);
-        switch ($type) {
+        $realType = strtolower( gettype( $mixedVar ) );
+        $type = strtolower( $type );
+        switch ( $type ) {
             case 'null':
-                if ($mixedVar !== null) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be null, ' . $realType . ' given.');
+                if ( $mixedVar !== null ) {
+                    throw new TypeError( 'Argument ' . $argumentIndex . ' must be null, ' . $realType . ' given.' );
                 }
                 break;
             case 'integer':
             case 'int':
-                $allow = array('int', 'integer');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an integer, ' . $realType . ' given.');
+                $allow = array( 'int', 'integer' );
+                if ( ! in_array( $type, $allow ) ) {
+                    throw new TypeError( 'Argument ' . $argumentIndex . ' must be an integer, ' . $realType . ' given.' );
                 }
                 $mixedVar = (int) $mixedVar;
                 break;
             case 'boolean':
             case 'bool':
-                $allow = array('bool', 'boolean');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a boolean, ' . $realType . ' given.');
+                $allow = array( 'bool', 'boolean' );
+                if ( ! in_array( $type, $allow ) ) {
+                    throw new TypeError( 'Argument ' . $argumentIndex . ' must be a boolean, ' . $realType . ' given.' );
                 }
                 $mixedVar = (bool) $mixedVar;
                 break;
             case 'string':
-                if (!is_string($mixedVar)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a string, ' . $realType . ' given.');
+                if ( ! is_string( $mixedVar ) ) {
+                    throw new TypeError( 'Argument ' . $argumentIndex . ' must be a string, ' . $realType . ' given.' );
                 }
                 $mixedVar = (string) $mixedVar;
                 break;
             case 'decimal':
             case 'double':
             case 'float':
-                $allow = array('decimal', 'double', 'float');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a float, ' . $realType . ' given.');
+                $allow = array( 'decimal', 'double', 'float' );
+                if ( ! in_array( $type, $allow ) ) {
+                    throw new TypeError( 'Argument ' . $argumentIndex . ' must be a float, ' . $realType . ' given.' );
                 }
                 $mixedVar = (float) $mixedVar;
                 break;
             case 'object':
-                if (!is_object($mixedVar)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an object, ' . $realType . ' given.');
+                if ( ! is_object( $mixedVar ) ) {
+                    throw new TypeError( 'Argument ' . $argumentIndex . ' must be an object, ' . $realType . ' given.' );
                 }
                 break;
             case 'array':
-                if (!is_array($mixedVar)) {
-                    if (is_object($mixedVar)) {
-                        if ($mixedVar instanceof ArrayAccess) {
+                if ( ! is_array( $mixedVar ) ) {
+                    if ( is_object( $mixedVar ) ) {
+                        if ( $mixedVar instanceof ArrayAccess ) {
                             return;
                         }
                     }
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an array, ' . $realType . ' given.');
+                    throw new TypeError( 'Argument ' . $argumentIndex . ' must be an array, ' . $realType . ' given.' );
                 }
                 break;
             default:
-                throw new Error('Unknown type (' . $realType .') does not match expect type (' . $type . ')');
+                throw new Error( 'Unknown type (' . $realType . ') does not match expect type (' . $type . ')' );
         }
     }
 
@@ -223,29 +223,29 @@ 
      * @return bool
      * @throws TypeError
      */
-    public static function hashEquals($left, $right)
+    public static function hashEquals( $left, $right )
     {
         /* Type checks: */
-        if (!is_string($left)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
+        if ( ! is_string( $left ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $left ) . ' given.' );
         }
-        if (!is_string($right)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
+        if ( ! is_string( $right ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $right ) . ' given.' );
         }
 
-        if (is_callable('hash_equals')) {
-            return hash_equals($left, $right);
+        if ( is_callable( 'hash_equals' ) ) {
+            return hash_equals( $left, $right );
         }
         $d = 0;
-        $len = self::strlen($left);
-        if ($len !== self::strlen($right)) {
+        $len = self::strlen( $left );
+        if ( $len !== self::strlen( $right ) ) {
             return false;
         }
-        for ($i = 0; $i < $len; ++$i) {
-            $d |= self::chrToInt($left[$i]) ^ self::chrToInt($right[$i]);
+        for ( $i = 0; $i < $len; ++$i ) {
+            $d |= self::chrToInt( $left[$i] ) ^ self::chrToInt( $right[$i] );
         }
 
-        if ($d !== 0) {
+        if ( $d !== 0 ) {
             return false;
         }
         return $left === $right;
@@ -263,20 +263,20 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function hex2bin($hexString, $strictPadding = false)
+    public static function hex2bin( $hexString, $strictPadding = false )
     {
         /* Type checks: */
-        if (!is_string($hexString)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
+        if ( ! is_string( $hexString ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $hexString ) . ' given.' );
         }
 
         $hex_pos = 0;
         $bin = '';
         $c_acc = 0;
-        $hex_len = self::strlen($hexString);
+        $hex_len = self::strlen( $hexString );
         $state = 0;
-        if (($hex_len & 1) !== 0) {
-            if ($strictPadding) {
+        if ( ( $hex_len & 1 ) !== 0 ) {
+            if ( $strictPadding ) {
                 throw new RangeException(
                     'Expected an even number of hexadecimal characters'
                 );
@@ -286,24 +286,24 @@ 
             }
         }
 
-        $chunk = unpack('C*', $hexString);
-        while ($hex_pos < $hex_len) {
+        $chunk = unpack( 'C*', $hexString );
+        while ( $hex_pos < $hex_len ) {
             ++$hex_pos;
             $c = $chunk[$hex_pos];
             $c_num = $c ^ 48;
-            $c_num0 = ($c_num - 10) >> 8;
-            $c_alpha = ($c & ~32) - 55;
-            $c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
-            if (($c_num0 | $c_alpha0) === 0) {
+            $c_num0 = ( $c_num - 10 ) >> 8;
+            $c_alpha = ( $c & ~32 ) - 55;
+            $c_alpha0 = ( ( $c_alpha - 10 ) ^ ( $c_alpha - 16 ) ) >> 8;
+            if ( ( $c_num0 | $c_alpha0 ) === 0 ) {
                 throw new RangeException(
                     'hex2bin() only expects hexadecimal characters'
                 );
             }
-            $c_val = ($c_num0 & $c_num) | ($c_alpha & $c_alpha0);
-            if ($state === 0) {
+            $c_val = ( $c_num0 & $c_num ) | ( $c_alpha & $c_alpha0 );
+            if ( $state === 0 ) {
                 $c_acc = $c_val * 16;
             } else {
-                $bin .= pack('C', $c_acc | $c_val);
+                $bin .= pack( 'C', $c_acc | $c_val );
             }
             $state ^= 1;
         }
@@ -318,14 +318,14 @@ 
      * @param array<int, int> $ints
      * @return string
      */
-    public static function intArrayToString(array $ints)
+    public static function intArrayToString( array $ints )
     {
         $args = $ints;
-        foreach ($args as $i => $v) {
+        foreach ( $args as $i => $v ) {
             $args[$i] = $v & 0xff;
         }
-        array_unshift($args, str_repeat('C', count($ints)));
-        return call_user_func_array('pack', $args);
+        array_unshift( $args, str_repeat( 'C', count( $ints ) ) );
+        return call_user_func_array( 'pack', $args );
     }
 
     /**
@@ -337,9 +337,9 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function intToChr($int)
+    public static function intToChr( $int )
     {
-        return pack('C', $int);
+        return pack( 'C', $int );
     }
 
     /**
@@ -352,22 +352,22 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_3($string)
+    public static function load_3( $string )
     {
         /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        if ( ! is_string( $string ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $string ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($string) < 3) {
+        if ( self::strlen( $string ) < 3 ) {
             throw new RangeException(
-                'String must be 3 bytes or more; ' . self::strlen($string) . ' given.'
+                'String must be 3 bytes or more; ' . self::strlen( $string ) . ' given.'
             );
         }
-        $result = self::chrToInt($string[0]);
-        $result |= self::chrToInt($string[1]) << 8;
-        $result |= self::chrToInt($string[2]) << 16;
+        $result = self::chrToInt( $string[0] );
+        $result |= self::chrToInt( $string[1] ) << 8;
+        $result |= self::chrToInt( $string[2] ) << 16;
         return $result & 0xffffff;
     }
 
@@ -381,23 +381,23 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_4($string)
+    public static function load_4( $string )
     {
         /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        if ( ! is_string( $string ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $string ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($string) < 4) {
+        if ( self::strlen( $string ) < 4 ) {
             throw new RangeException(
-                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+                'String must be 4 bytes or more; ' . self::strlen( $string ) . ' given.'
             );
         }
-        $result  = (self::chrToInt($string[0]) & 0xff);
-        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
-        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
-        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
+        $result  = ( self::chrToInt( $string[0] ) & 0xff );
+        $result |= ( self::chrToInt( $string[1] ) & 0xff ) << 8;
+        $result |= ( self::chrToInt( $string[2] ) & 0xff ) << 16;
+        $result |= ( self::chrToInt( $string[3] ) & 0xff ) << 24;
         return $result & 0xffffffff;
     }
 
@@ -411,27 +411,27 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load64_le($string)
+    public static function load64_le( $string )
     {
         /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        if ( ! is_string( $string ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $string ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($string) < 4) {
+        if ( self::strlen( $string ) < 4 ) {
             throw new RangeException(
-                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+                'String must be 4 bytes or more; ' . self::strlen( $string ) . ' given.'
             );
         }
-        $result  = (self::chrToInt($string[0]) & 0xff);
-        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
-        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
-        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
-        $result |= (self::chrToInt($string[4]) & 0xff) << 32;
-        $result |= (self::chrToInt($string[5]) & 0xff) << 40;
-        $result |= (self::chrToInt($string[6]) & 0xff) << 48;
-        $result |= (self::chrToInt($string[7]) & 0xff) << 56;
+        $result  = ( self::chrToInt( $string[0] ) & 0xff );
+        $result |= ( self::chrToInt( $string[1] ) & 0xff ) << 8;
+        $result |= ( self::chrToInt( $string[2] ) & 0xff ) << 16;
+        $result |= ( self::chrToInt( $string[3] ) & 0xff ) << 24;
+        $result |= ( self::chrToInt( $string[4] ) & 0xff ) << 32;
+        $result |= ( self::chrToInt( $string[5] ) & 0xff ) << 40;
+        $result |= ( self::chrToInt( $string[6] ) & 0xff ) << 48;
+        $result |= ( self::chrToInt( $string[7] ) & 0xff ) << 56;
         return (int) $result;
     }
 
@@ -442,9 +442,9 @@ 
      * @param string $right
      * @return int
      */
-    public static function memcmp($left, $right)
+    public static function memcmp( $left, $right )
     {
-        if (self::hashEquals($left, $right)) {
+        if ( self::hashEquals( $left, $right ) ) {
             return 0;
         }
         return -1;
@@ -467,17 +467,17 @@ 
      *                  constant operands)
      * @return int
      */
-    public static function mul($a, $b, $size = 0)
+    public static function mul( $a, $b, $size = 0 )
     {
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return (int) ($a * $b);
+        if ( ParagonIE_Sodium_Compat::$fastMult ) {
+            return (int) ( $a * $b );
         }
 
         static $defaultSize = null;
-        if (!$defaultSize) {
-            $defaultSize = (PHP_INT_SIZE << 3) - 1;
+        if ( ! $defaultSize ) {
+            $defaultSize = ( PHP_INT_SIZE << 3 ) - 1;
         }
-        if ($size < 1) {
+        if ( $size < 1 ) {
             $size = $defaultSize;
         }
 
@@ -491,20 +491,20 @@ 
          *
          * @var int
          */
-        $mask = -(($b >> $size) & 1);
+        $mask = -( ( $b >> $size ) & 1 );
 
         /**
          * Ensure $b is a positive integer, without creating
          * a branching side-channel
          */
-        $b = ($b & ~$mask) | ($mask & -$b);
+        $b = ( $b & ~$mask ) | ( $mask & -$b );
 
         /**
          * This loop always runs 32 times when PHP_INT_SIZE is 4.
          * This loop always runs 64 times when PHP_INT_SIZE is 8.
          */
-        for ($i = $size; $i >= 0; --$i) {
-            $c += (int) ($a & -($b & 1));
+        for ( $i = $size; $i >= 0; --$i ) {
+            $c += (int) ( $a & -( $b & 1 ) );
             $a <<= 1;
             $b >>= 1;
         }
@@ -518,7 +518,7 @@ 
          *
          * The end result is what we'd expect from integer multiplication.
          */
-        return (int) (($c & ~$mask) | ($mask & -$c));
+        return (int) ( ( $c & ~$mask ) | ( $mask & -$c ) );
     }
 
     /**
@@ -530,19 +530,19 @@ 
      * @param int|float $num
      * @return array<int, int>
      */
-    public static function numericTo64BitInteger($num)
+    public static function numericTo64BitInteger( $num )
     {
         $high = 0;
         $low = $num & 0xffffffff;
 
-        if ((+(abs($num))) >= 1) {
-            if ($num > 0) {
-                $high = min((+(floor($num/4294967296))), 4294967295);
+        if ( (+( abs( $num ) )) >= 1 ) {
+            if ( $num > 0 ) {
+                $high = min( (+( floor( $num / 4294967296 ) )), 4294967295 );
             } else {
-                $high = ~~((+(ceil(($num - (+((~~($num)))))/4294967296))));
+                $high = ~~( (+( ceil( ( $num - (+( ( ~~( $num ) ) )) ) / 4294967296 ) )) );
             }
         }
-        return array((int) $high, (int) $low);
+        return array( (int) $high, (int) $low );
     }
 
     /**
@@ -554,20 +554,20 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store_3($int)
+    public static function store_3( $int )
     {
         /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
+        if ( ! is_int( $int ) ) {
+            if ( is_numeric( $int ) ) {
                 $int = (int) $int;
             } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+                throw new TypeError( 'Argument 1 must be an integer, ' . gettype( $int ) . ' given.' );
             }
         }
 
-        return self::intToChr(($int >> 16) & 0xff) .
-            self::intToChr(($int >> 8)     & 0xff) .
-            self::intToChr($int            & 0xff);
+        return self::intToChr( ( $int >> 16 ) & 0xff ) .
+            self::intToChr( ( $int >> 8 ) & 0xff ) .
+            self::intToChr( $int & 0xff );
     }
 
     /**
@@ -579,21 +579,21 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store32_le($int)
+    public static function store32_le( $int )
     {
         /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
+        if ( ! is_int( $int ) ) {
+            if ( is_numeric( $int ) ) {
                 $int = (int) $int;
             } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+                throw new TypeError( 'Argument 1 must be an integer, ' . gettype( $int ) . ' given.' );
             }
         }
 
-        return self::intToChr($int      & 0xff) .
-            self::intToChr(($int >> 8)  & 0xff) .
-            self::intToChr(($int >> 16) & 0xff) .
-            self::intToChr(($int >> 24) & 0xff);
+        return self::intToChr( $int & 0xff ) .
+            self::intToChr( ( $int >> 8 ) & 0xff ) .
+            self::intToChr( ( $int >> 16 ) & 0xff ) .
+            self::intToChr( ( $int >> 24 ) & 0xff );
     }
 
     /**
@@ -605,21 +605,21 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store_4($int)
+    public static function store_4( $int )
     {
         /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
+        if ( ! is_int( $int ) ) {
+            if ( is_numeric( $int ) ) {
                 $int = (int) $int;
             } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+                throw new TypeError( 'Argument 1 must be an integer, ' . gettype( $int ) . ' given.' );
             }
         }
 
-        return self::intToChr(($int >> 24) & 0xff) .
-            self::intToChr(($int >> 16)    & 0xff) .
-            self::intToChr(($int >> 8)     & 0xff) .
-            self::intToChr($int            & 0xff);
+        return self::intToChr( ( $int >> 24 ) & 0xff ) .
+            self::intToChr( ( $int >> 16 ) & 0xff ) .
+            self::intToChr( ( $int >> 8 ) & 0xff ) .
+            self::intToChr( $int & 0xff );
     }
 
     /**
@@ -631,41 +631,41 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store64_le($int)
+    public static function store64_le( $int )
     {
         /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
+        if ( ! is_int( $int ) ) {
+            if ( is_numeric( $int ) ) {
                 $int = (int) $int;
             } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+                throw new TypeError( 'Argument 1 must be an integer, ' . gettype( $int ) . ' given.' );
             }
         }
 
-        if (PHP_INT_SIZE === 8) {
-            return self::intToChr($int & 0xff) .
-                self::intToChr(($int >>  8) & 0xff) .
-                self::intToChr(($int >> 16) & 0xff) .
-                self::intToChr(($int >> 24) & 0xff) .
-                self::intToChr(($int >> 32) & 0xff) .
-                self::intToChr(($int >> 40) & 0xff) .
-                self::intToChr(($int >> 48) & 0xff) .
-                self::intToChr(($int >> 56) & 0xff);
+        if ( PHP_INT_SIZE === 8 ) {
+            return self::intToChr( $int & 0xff ) .
+                self::intToChr( ( $int >> 8 ) & 0xff ) .
+                self::intToChr( ( $int >> 16 ) & 0xff ) .
+                self::intToChr( ( $int >> 24 ) & 0xff ) .
+                self::intToChr( ( $int >> 32 ) & 0xff ) .
+                self::intToChr( ( $int >> 40 ) & 0xff ) .
+                self::intToChr( ( $int >> 48 ) & 0xff ) .
+                self::intToChr( ( $int >> 56 ) & 0xff );
         }
-        if ($int > PHP_INT_MAX) {
-            list($hiB, $int) = self::numericTo64BitInteger($int);
+        if ( $int > PHP_INT_MAX ) {
+            list( $hiB, $int ) = self::numericTo64BitInteger( $int );
         } else {
             $hiB = 0;
         }
         return
-            self::intToChr(($int      ) & 0xff) .
-            self::intToChr(($int >>  8) & 0xff) .
-            self::intToChr(($int >> 16) & 0xff) .
-            self::intToChr(($int >> 24) & 0xff) .
-            self::intToChr($hiB & 0xff) .
-            self::intToChr(($hiB >>  8) & 0xff) .
-            self::intToChr(($hiB >> 16) & 0xff) .
-            self::intToChr(($hiB >> 24) & 0xff);
+            self::intToChr( ( $int ) & 0xff ) .
+            self::intToChr( ( $int >> 8 ) & 0xff ) .
+            self::intToChr( ( $int >> 16 ) & 0xff ) .
+            self::intToChr( ( $int >> 24 ) & 0xff ) .
+            self::intToChr( $hiB & 0xff ) .
+            self::intToChr( ( $hiB >> 8 ) & 0xff ) .
+            self::intToChr( ( $hiB >> 16 ) & 0xff ) .
+            self::intToChr( ( $hiB >> 24 ) & 0xff );
     }
 
     /**
@@ -679,17 +679,17 @@ 
      * @return int
      * @throws TypeError
      */
-    public static function strlen($str)
+    public static function strlen( $str )
     {
         /* Type checks: */
-        if (!is_string($str)) {
-            throw new TypeError('String expected');
+        if ( ! is_string( $str ) ) {
+            throw new TypeError( 'String expected' );
         }
 
         return (int) (
         self::isMbStringOverride()
-            ? mb_strlen($str, '8bit')
-            : strlen($str)
+            ? mb_strlen( $str, '8bit' )
+            : strlen( $str )
         );
     }
 
@@ -702,16 +702,16 @@ 
      * @return array<int, int>
      * @throws TypeError
      */
-    public static function stringToIntArray($string)
+    public static function stringToIntArray( $string )
     {
-        if (!is_string($string)) {
-            throw new TypeError('String expected');
+        if ( ! is_string( $string ) ) {
+            throw new TypeError( 'String expected' );
         }
         /**
          * @var array<int, int>
          */
         $values = array_values(
-            unpack('C*', $string)
+            unpack( 'C*', $string )
         );
         return $values;
     }
@@ -729,28 +729,28 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function substr($str, $start = 0, $length = null)
+    public static function substr( $str, $start = 0, $length = null )
     {
         /* Type checks: */
-        if (!is_string($str)) {
-            throw new TypeError('String expected');
+        if ( ! is_string( $str ) ) {
+            throw new TypeError( 'String expected' );
         }
 
-        if ($length === 0) {
+        if ( $length === 0 ) {
             return '';
         }
 
-        if (self::isMbStringOverride()) {
-            if (PHP_VERSION_ID < 50400 && $length === null) {
-                $length = self::strlen($str);
+        if ( self::isMbStringOverride() ) {
+            if ( PHP_VERSION_ID < 50400 && $length === null ) {
+                $length = self::strlen( $str );
             }
-            $sub = (string) mb_substr($str, $start, $length, '8bit');
-        } elseif ($length === null) {
-            $sub = (string) substr($str, $start);
+            $sub = (string) mb_substr( $str, $start, $length, '8bit' );
+        } elseif ( $length === null ) {
+            $sub = (string) substr( $str, $start );
         } else {
-            $sub = (string) substr($str, $start, $length);
+            $sub = (string) substr( $str, $start, $length );
         }
-        if (isset($sub)) {
+        if ( isset( $sub ) ) {
             return $sub;
         }
         return '';
@@ -766,18 +766,18 @@ 
      * @return bool
      * @throws TypeError
      */
-    public static function verify_16($a, $b)
+    public static function verify_16( $a, $b )
     {
         /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('String expected');
+        if ( ! is_string( $a ) ) {
+            throw new TypeError( 'String expected' );
         }
-        if (!is_string($b)) {
-            throw new TypeError('String expected');
+        if ( ! is_string( $b ) ) {
+            throw new TypeError( 'String expected' );
         }
         return self::hashEquals(
-            self::substr($a, 0, 16),
-            self::substr($b, 0, 16)
+            self::substr( $a, 0, 16 ),
+            self::substr( $b, 0, 16 )
         );
     }
 
@@ -791,18 +791,18 @@ 
      * @return bool
      * @throws TypeError
      */
-    public static function verify_32($a, $b)
+    public static function verify_32( $a, $b )
     {
         /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('String expected');
+        if ( ! is_string( $a ) ) {
+            throw new TypeError( 'String expected' );
         }
-        if (!is_string($b)) {
-            throw new TypeError('String expected');
+        if ( ! is_string( $b ) ) {
+            throw new TypeError( 'String expected' );
         }
         return self::hashEquals(
-            self::substr($a, 0, 32),
-            self::substr($b, 0, 32)
+            self::substr( $a, 0, 32 ),
+            self::substr( $b, 0, 32 )
         );
     }
 
@@ -816,14 +816,14 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function xorStrings($a, $b)
+    public static function xorStrings( $a, $b )
     {
         /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('Argument 1 must be a string');
+        if ( ! is_string( $a ) ) {
+            throw new TypeError( 'Argument 1 must be a string' );
         }
-        if (!is_string($b)) {
-            throw new TypeError('Argument 2 must be a string');
+        if ( ! is_string( $b ) ) {
+            throw new TypeError( 'Argument 2 must be a string' );
         }
 
         return $a ^ $b;
@@ -840,10 +840,10 @@ 
     {
         static $mbstring = null;
 
-        if ($mbstring === null) {
-            $mbstring = extension_loaded('mbstring')
+        if ( $mbstring === null ) {
+            $mbstring = extension_loaded( 'mbstring' )
                 &&
-            (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING);
+            ( ini_get( 'mbstring.func_overload' ) & MB_OVERLOAD_STRING );
         }
 
         return $mbstring;

Braces +27 added lines, -54 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_Util
  */
-abstract class ParagonIE_Sodium_Core_Util
-{
+abstract class ParagonIE_Sodium_Core_Util {
     /**
      * Convert a binary string into a hexadecimal string without cache-timing
      * leaks
@@ -19,8 +18,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function bin2hex($binaryString)
-    {
+    public static function bin2hex($binaryString) {
         /* Type checks: */
         if (!is_string($binaryString)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
@@ -50,8 +48,7 @@ 
      * @param string $bin_string (raw binary)
      * @return string
      */
-    public static function bin2hexUpper($bin_string)
-    {
+    public static function bin2hexUpper($bin_string) {
         $hex = '';
         $len = self::strlen($bin_string);
         for ($i = 0; $i < $len; ++$i) {
@@ -93,8 +90,7 @@ 
      * @return int
      * @throws Error
      */
-    public static function chrToInt($chr)
-    {
+    public static function chrToInt($chr) {
         /* Type checks: */
         if (!is_string($chr)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
@@ -116,8 +112,7 @@ 
      * @param int $len
      * @return int
      */
-    public static function compare($left, $right, $len = null)
-    {
+    public static function compare($left, $right, $len = null) {
         $leftLen = self::strlen($left);
         $rightLen = self::strlen($right);
         if ($len === null) {
@@ -147,8 +142,7 @@ 
      * @throws Error
      * @return void
      */
-    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0)
-    {
+    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0) {
         if (func_num_args() === 0) {
             /* Tautology, by default */
             return;
@@ -223,8 +217,7 @@ 
      * @return bool
      * @throws TypeError
      */
-    public static function hashEquals($left, $right)
-    {
+    public static function hashEquals($left, $right) {
         /* Type checks: */
         if (!is_string($left)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
@@ -263,8 +256,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function hex2bin($hexString, $strictPadding = false)
-    {
+    public static function hex2bin($hexString, $strictPadding = false) {
         /* Type checks: */
         if (!is_string($hexString)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
@@ -318,8 +310,7 @@ 
      * @param array<int, int> $ints
      * @return string
      */
-    public static function intArrayToString(array $ints)
-    {
+    public static function intArrayToString(array $ints) {
         $args = $ints;
         foreach ($args as $i => $v) {
             $args[$i] = $v & 0xff;
@@ -337,8 +328,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function intToChr($int)
-    {
+    public static function intToChr($int) {
         return pack('C', $int);
     }
 
@@ -352,8 +342,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_3($string)
-    {
+    public static function load_3($string) {
         /* Type checks: */
         if (!is_string($string)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
@@ -381,8 +370,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_4($string)
-    {
+    public static function load_4($string) {
         /* Type checks: */
         if (!is_string($string)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
@@ -411,8 +399,7 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load64_le($string)
-    {
+    public static function load64_le($string) {
         /* Type checks: */
         if (!is_string($string)) {
             throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
@@ -442,8 +429,7 @@ 
      * @param string $right
      * @return int
      */
-    public static function memcmp($left, $right)
-    {
+    public static function memcmp($left, $right) {
         if (self::hashEquals($left, $right)) {
             return 0;
         }
@@ -467,8 +453,7 @@ 
      *                  constant operands)
      * @return int
      */
-    public static function mul($a, $b, $size = 0)
-    {
+    public static function mul($a, $b, $size = 0) {
         if (ParagonIE_Sodium_Compat::$fastMult) {
             return (int) ($a * $b);
         }
@@ -530,8 +515,7 @@ 
      * @param int|float $num
      * @return array<int, int>
      */
-    public static function numericTo64BitInteger($num)
-    {
+    public static function numericTo64BitInteger($num) {
         $high = 0;
         $low = $num & 0xffffffff;
 
@@ -554,8 +538,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store_3($int)
-    {
+    public static function store_3($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -579,8 +562,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store32_le($int)
-    {
+    public static function store32_le($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -605,8 +587,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store_4($int)
-    {
+    public static function store_4($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -631,8 +612,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function store64_le($int)
-    {
+    public static function store64_le($int) {
         /* Type checks: */
         if (!is_int($int)) {
             if (is_numeric($int)) {
@@ -679,8 +659,7 @@ 
      * @return int
      * @throws TypeError
      */
-    public static function strlen($str)
-    {
+    public static function strlen($str) {
         /* Type checks: */
         if (!is_string($str)) {
             throw new TypeError('String expected');
@@ -702,8 +681,7 @@ 
      * @return array<int, int>
      * @throws TypeError
      */
-    public static function stringToIntArray($string)
-    {
+    public static function stringToIntArray($string) {
         if (!is_string($string)) {
             throw new TypeError('String expected');
         }
@@ -729,8 +707,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function substr($str, $start = 0, $length = null)
-    {
+    public static function substr($str, $start = 0, $length = null) {
         /* Type checks: */
         if (!is_string($str)) {
             throw new TypeError('String expected');
@@ -766,8 +743,7 @@ 
      * @return bool
      * @throws TypeError
      */
-    public static function verify_16($a, $b)
-    {
+    public static function verify_16($a, $b) {
         /* Type checks: */
         if (!is_string($a)) {
             throw new TypeError('String expected');
@@ -791,8 +767,7 @@ 
      * @return bool
      * @throws TypeError
      */
-    public static function verify_32($a, $b)
-    {
+    public static function verify_32($a, $b) {
         /* Type checks: */
         if (!is_string($a)) {
             throw new TypeError('String expected');
@@ -816,8 +791,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function xorStrings($a, $b)
-    {
+    public static function xorStrings($a, $b) {
         /* Type checks: */
         if (!is_string($a)) {
             throw new TypeError('Argument 1 must be a string');
@@ -836,8 +810,7 @@ 
      *
      * @return bool
      */
-    protected static function isMbStringOverride()
-    {
+    protected static function isMbStringOverride() {
         static $mbstring = null;
 
         if ($mbstring === null) {

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

Doc Comments +1 added lines, -1 removed lines

@@ -1960,7 +1960,7 @@
     /**
      * @internal You should not use this directly from another application
      *
-     * @param string $a
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $a
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A
      * @param string $b
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2

Indentation +3339 added lines, -3339 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Curve25519', false)) {
-    return;
+	return;
 }
 
 /**
@@ -15,253 +15,253 @@ 
  */
 abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core32_Curve25519_H
 {
-    /**
-     * Get a field element of size 10 with a value of 0
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_0()
-    {
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            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(),
-                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()
-            )
-        );
-    }
-
-    /**
-     * Get a field element of size 10 with a value of 1
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_1()
-    {
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                ParagonIE_Sodium_Core32_Int32::fromInt(1),
-                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(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32()
-            )
-        );
-    }
-
-    /**
-     * Add two field elements.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_add(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g
-    ) {
-        $arr = array();
-        for ($i = 0; $i < 10; ++$i) {
-            $arr[$i] = $f[$i]->addInt32($g[$i]);
-        }
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($arr);
-    }
-
-    /**
-     * Constant-time conditional move.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @param int $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws TypeError
-     */
-    public static function fe_cmov(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g,
-        $b = 0
-    ) {
-        $h = array();
-        for ($i = 0; $i < 10; ++$i) {
-            if (!($f[$i] instanceof  ParagonIE_Sodium_Core32_Int32)) {
-                throw new TypeError();
-            }
-            $h[$i] = $f[$i]->xorInt32(
-                $f[$i]->xorInt32($g[$i])->mask($b)
-            );
-        }
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
-    }
-
-    /**
-     * Create a copy of a field element.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_copy(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $h = clone $f;
-        return $h;
-    }
-
-    /**
-     * Give: 32-byte string.
-     * Receive: A field element object to use for internal calculations.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws RangeException
-     */
-    public static function fe_frombytes($s)
-    {
-        if (self::strlen($s) !== 32) {
-            throw new RangeException('Expected a 32-byte string.');
-        }
-        /** @var ParagonIE_Sodium_Core32_Int32 $h0 */
-        $h0 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_4($s)
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h1 */
-        $h1 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 4, 3)) << 6
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h2 */
-        $h2 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 7, 3)) << 5
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h3 */
-        $h3 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 10, 3)) << 3
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h4 */
-        $h4 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 13, 3)) << 2
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h5 */
-        $h5 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_4(self::substr($s, 16, 4))
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h6 */
-        $h6 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 20, 3)) << 7
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h7 */
-        $h7 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 23, 3)) << 5
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h8 */
-        $h8 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 26, 3)) << 4
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h9 */
-        $h9 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2
-        );
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt32($carry9->mulInt(19));
-        $h9 = $h9->subInt32($carry9->shiftLeft(25));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt32($carry1);
-        $h1 = $h1->subInt32($carry1->shiftLeft(25));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt32($carry3);
-        $h3 = $h3->subInt32($carry3->shiftLeft(25));
-
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt32($carry5);
-        $h5 = $h5->subInt32($carry5->shiftLeft(25));
-
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt32($carry7);
-        $h7 = $h7->subInt32($carry7->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt32($carry0);
-        $h0 = $h0->subInt32($carry0->shiftLeft(26));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt32($carry2);
-        $h2 = $h2->subInt32($carry2->shiftLeft(26));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt32($carry4);
-        $h4 = $h4->subInt32($carry4->shiftLeft(26));
-
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt32($carry6);
-        $h6 = $h6->subInt32($carry6->shiftLeft(26));
-
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt32($carry8);
-        $h8 = $h8->subInt32($carry8->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array($h0, $h1, $h2,$h3, $h4, $h5, $h6, $h7, $h8, $h9)
-        );
-    }
-
-    /**
-     * Convert a field element to a byte string.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $h
-     * @return string
-     */
-    public static function fe_tobytes(ParagonIE_Sodium_Core32_Curve25519_Fe $h)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64[] $f
-         * @var ParagonIE_Sodium_Core32_Int64 $q
-         */
-        $f = array();
-
-        for ($i = 0; $i < 10; ++$i) {
-            $f[$i] = $h[$i]->toInt64();
-        }
-
-        $q = $f[9]->mulInt(19, 5)->addInt(1 << 14)->shiftRight(25)
-            ->addInt64($f[0])->shiftRight(26)
-            ->addInt64($f[1])->shiftRight(25)
-            ->addInt64($f[2])->shiftRight(26)
-            ->addInt64($f[3])->shiftRight(25)
-            ->addInt64($f[4])->shiftRight(26)
-            ->addInt64($f[5])->shiftRight(25)
-            ->addInt64($f[6])->shiftRight(26)
-            ->addInt64($f[7])->shiftRight(25)
-            ->addInt64($f[8])->shiftRight(26)
-            ->addInt64($f[9])->shiftRight(25);
-
-
-        /*
+	/**
+	 * Get a field element of size 10 with a value of 0
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_0()
+	{
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+			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(),
+				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()
+			)
+		);
+	}
+
+	/**
+	 * Get a field element of size 10 with a value of 1
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_1()
+	{
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+			array(
+				ParagonIE_Sodium_Core32_Int32::fromInt(1),
+				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(),
+				new ParagonIE_Sodium_Core32_Int32(),
+				new ParagonIE_Sodium_Core32_Int32(),
+				new ParagonIE_Sodium_Core32_Int32(),
+				new ParagonIE_Sodium_Core32_Int32()
+			)
+		);
+	}
+
+	/**
+	 * Add two field elements.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_add(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $g
+	) {
+		$arr = array();
+		for ($i = 0; $i < 10; ++$i) {
+			$arr[$i] = $f[$i]->addInt32($g[$i]);
+		}
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($arr);
+	}
+
+	/**
+	 * Constant-time conditional move.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+	 * @param int $b
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 * @throws TypeError
+	 */
+	public static function fe_cmov(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $g,
+		$b = 0
+	) {
+		$h = array();
+		for ($i = 0; $i < 10; ++$i) {
+			if (!($f[$i] instanceof  ParagonIE_Sodium_Core32_Int32)) {
+				throw new TypeError();
+			}
+			$h[$i] = $f[$i]->xorInt32(
+				$f[$i]->xorInt32($g[$i])->mask($b)
+			);
+		}
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
+	}
+
+	/**
+	 * Create a copy of a field element.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_copy(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+	{
+		$h = clone $f;
+		return $h;
+	}
+
+	/**
+	 * Give: 32-byte string.
+	 * Receive: A field element object to use for internal calculations.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $s
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 * @throws RangeException
+	 */
+	public static function fe_frombytes($s)
+	{
+		if (self::strlen($s) !== 32) {
+			throw new RangeException('Expected a 32-byte string.');
+		}
+		/** @var ParagonIE_Sodium_Core32_Int32 $h0 */
+		$h0 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_4($s)
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h1 */
+		$h1 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_3(self::substr($s, 4, 3)) << 6
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h2 */
+		$h2 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_3(self::substr($s, 7, 3)) << 5
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h3 */
+		$h3 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_3(self::substr($s, 10, 3)) << 3
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h4 */
+		$h4 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_3(self::substr($s, 13, 3)) << 2
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h5 */
+		$h5 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_4(self::substr($s, 16, 4))
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h6 */
+		$h6 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_3(self::substr($s, 20, 3)) << 7
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h7 */
+		$h7 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_3(self::substr($s, 23, 3)) << 5
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h8 */
+		$h8 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			self::load_3(self::substr($s, 26, 3)) << 4
+		);
+		/** @var ParagonIE_Sodium_Core32_Int32 $h9 */
+		$h9 = ParagonIE_Sodium_Core32_Int32::fromInt(
+			(self::load_3(self::substr($s, 29, 3)) & 8388607) << 2
+		);
+
+		$carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+		$h0 = $h0->addInt32($carry9->mulInt(19));
+		$h9 = $h9->subInt32($carry9->shiftLeft(25));
+
+		$carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+		$h2 = $h2->addInt32($carry1);
+		$h1 = $h1->subInt32($carry1->shiftLeft(25));
+
+		$carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+		$h4 = $h4->addInt32($carry3);
+		$h3 = $h3->subInt32($carry3->shiftLeft(25));
+
+		$carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+		$h6 = $h6->addInt32($carry5);
+		$h5 = $h5->subInt32($carry5->shiftLeft(25));
+
+		$carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+		$h8 = $h8->addInt32($carry7);
+		$h7 = $h7->subInt32($carry7->shiftLeft(25));
+
+		$carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+		$h1 = $h1->addInt32($carry0);
+		$h0 = $h0->subInt32($carry0->shiftLeft(26));
+
+		$carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+		$h3 = $h3->addInt32($carry2);
+		$h2 = $h2->subInt32($carry2->shiftLeft(26));
+
+		$carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+		$h5 = $h5->addInt32($carry4);
+		$h4 = $h4->subInt32($carry4->shiftLeft(26));
+
+		$carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+		$h7 = $h7->addInt32($carry6);
+		$h6 = $h6->subInt32($carry6->shiftLeft(26));
+
+		$carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+		$h9 = $h9->addInt32($carry8);
+		$h8 = $h8->subInt32($carry8->shiftLeft(26));
+
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+			array($h0, $h1, $h2,$h3, $h4, $h5, $h6, $h7, $h8, $h9)
+		);
+	}
+
+	/**
+	 * Convert a field element to a byte string.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $h
+	 * @return string
+	 */
+	public static function fe_tobytes(ParagonIE_Sodium_Core32_Curve25519_Fe $h)
+	{
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64[] $f
+		 * @var ParagonIE_Sodium_Core32_Int64 $q
+		 */
+		$f = array();
+
+		for ($i = 0; $i < 10; ++$i) {
+			$f[$i] = $h[$i]->toInt64();
+		}
+
+		$q = $f[9]->mulInt(19, 5)->addInt(1 << 14)->shiftRight(25)
+			->addInt64($f[0])->shiftRight(26)
+			->addInt64($f[1])->shiftRight(25)
+			->addInt64($f[2])->shiftRight(26)
+			->addInt64($f[3])->shiftRight(25)
+			->addInt64($f[4])->shiftRight(26)
+			->addInt64($f[5])->shiftRight(25)
+			->addInt64($f[6])->shiftRight(26)
+			->addInt64($f[7])->shiftRight(25)
+			->addInt64($f[8])->shiftRight(26)
+			->addInt64($f[9])->shiftRight(25);
+
+
+		/*
         $q = (self::mul(19, $f[9]) + (1 << 24)) >> 25;
         $q = ($f[0] + $q) >> 26;
         $q = ($f[1] + $q) >> 25;
@@ -276,3106 +276,3106 @@ 
 
         $f[0] += self::mul(19, $q);
         */
-        $f[0] = $f[0]->addInt64($q->mulInt(19, 5));
-
-        $carry0 = $f[0]->shiftRight(26);
-        $f[1] = $f[1]->addInt64($carry0);
-        $f[0] = $f[0]->subInt64($carry0->shiftLeft(26));
-
-        $carry1 = $f[1]->shiftRight(25);
-        $f[2] = $f[2]->addInt64($carry1);
-        $f[1] = $f[1]->subInt64($carry1->shiftLeft(25));
-
-        $carry2 = $f[2]->shiftRight(26);
-        $f[3] = $f[3]->addInt64($carry2);
-        $f[2] = $f[2]->subInt64($carry2->shiftLeft(26));
-
-        $carry3 = $f[3]->shiftRight(25);
-        $f[4] = $f[4]->addInt64($carry3);
-        $f[3] = $f[3]->subInt64($carry3->shiftLeft(25));
-
-        $carry4 = $f[4]->shiftRight(26);
-        $f[5] = $f[5]->addInt64($carry4);
-        $f[4] = $f[4]->subInt64($carry4->shiftLeft(26));
-
-        $carry5 = $f[5]->shiftRight(25);
-        $f[6] = $f[6]->addInt64($carry5);
-        $f[5] = $f[5]->subInt64($carry5->shiftLeft(25));
-
-        $carry6 = $f[6]->shiftRight(26);
-        $f[7] = $f[7]->addInt64($carry6);
-        $f[6] = $f[6]->subInt64($carry6->shiftLeft(26));
-
-        $carry7 = $f[7]->shiftRight(25);
-        $f[8] = $f[8]->addInt64($carry7);
-        $f[7] = $f[7]->subInt64($carry7->shiftLeft(25));
-
-        $carry8 = $f[8]->shiftRight(26);
-        $f[9] = $f[9]->addInt64($carry8);
-        $f[8] = $f[8]->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $f[9]->shiftRight(25);
-        $f[9] = $f[9]->subInt64($carry9->shiftLeft(25));
-
-        /**
-         * @var int $h0
-         * @var int $h1
-         * @var int $h2
-         * @var int $h3
-         * @var int $h4
-         * @var int $h5
-         * @var int $h6
-         * @var int $h7
-         * @var int $h8
-         * @var int $h9
-         */
-        $h0 = $f[0]->toInt32()->toInt();
-        $h1 = $f[1]->toInt32()->toInt();
-        $h2 = $f[2]->toInt32()->toInt();
-        $h3 = $f[3]->toInt32()->toInt();
-        $h4 = $f[4]->toInt32()->toInt();
-        $h5 = $f[5]->toInt32()->toInt();
-        $h6 = $f[6]->toInt32()->toInt();
-        $h7 = $f[7]->toInt32()->toInt();
-        $h8 = $f[8]->toInt32()->toInt();
-        $h9 = $f[9]->toInt32()->toInt();
-
-        /**
-         * @var array<int, int>
-         */
-        $s = array(
-            (int) (($h0 >> 0) & 0xff),
-            (int) (($h0 >> 8) & 0xff),
-            (int) (($h0 >> 16) & 0xff),
-            (int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
-            (int) (($h1 >> 6) & 0xff),
-            (int) (($h1 >> 14) & 0xff),
-            (int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
-            (int) (($h2 >> 5) & 0xff),
-            (int) (($h2 >> 13) & 0xff),
-            (int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
-            (int) (($h3 >> 3) & 0xff),
-            (int) (($h3 >> 11) & 0xff),
-            (int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
-            (int) (($h4 >> 2) & 0xff),
-            (int) (($h4 >> 10) & 0xff),
-            (int) (($h4 >> 18) & 0xff),
-            (int) (($h5 >> 0) & 0xff),
-            (int) (($h5 >> 8) & 0xff),
-            (int) (($h5 >> 16) & 0xff),
-            (int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
-            (int) (($h6 >> 7) & 0xff),
-            (int) (($h6 >> 15) & 0xff),
-            (int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
-            (int) (($h7 >> 5) & 0xff),
-            (int) (($h7 >> 13) & 0xff),
-            (int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
-            (int) (($h8 >> 4) & 0xff),
-            (int) (($h8 >> 12) & 0xff),
-            (int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
-            (int) (($h9 >> 2) & 0xff),
-            (int) (($h9 >> 10) & 0xff),
-            (int) (($h9 >> 18) & 0xff)
-        );
-        return self::intArrayToString($s);
-    }
-
-    /**
-     * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return int
-     */
-    public static function fe_isnegative(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $str = self::fe_tobytes($f);
-        return self::chrToInt($str[0]) & 1;
-    }
-
-    /**
-     * Returns 0 if this field element results in all NUL bytes.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return bool
-     */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        static $zero;
-        if ($zero === null) {
-            $zero = str_repeat("\x00", 32);
-        }
-        $str = self::fe_tobytes($f);
-        return !self::verify_32($str, $zero);
-    }
-
-    /**
-     * Multiply two field elements
-     *
-     * h = f * g
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @security Is multiplication a source of timing leaks? If so, can we do
-     *           anything to prevent that from happening?
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_mul(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g
-    ) {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32[] $f
-         * @var ParagonIE_Sodium_Core32_Int32[] $g
-         * @var ParagonIE_Sodium_Core32_Int64 $f0
-         * @var ParagonIE_Sodium_Core32_Int64 $f1
-         * @var ParagonIE_Sodium_Core32_Int64 $f2
-         * @var ParagonIE_Sodium_Core32_Int64 $f3
-         * @var ParagonIE_Sodium_Core32_Int64 $f4
-         * @var ParagonIE_Sodium_Core32_Int64 $f5
-         * @var ParagonIE_Sodium_Core32_Int64 $f6
-         * @var ParagonIE_Sodium_Core32_Int64 $f7
-         * @var ParagonIE_Sodium_Core32_Int64 $f8
-         * @var ParagonIE_Sodium_Core32_Int64 $f9
-         * @var ParagonIE_Sodium_Core32_Int64 $g0
-         * @var ParagonIE_Sodium_Core32_Int64 $g1
-         * @var ParagonIE_Sodium_Core32_Int64 $g2
-         * @var ParagonIE_Sodium_Core32_Int64 $g3
-         * @var ParagonIE_Sodium_Core32_Int64 $g4
-         * @var ParagonIE_Sodium_Core32_Int64 $g5
-         * @var ParagonIE_Sodium_Core32_Int64 $g6
-         * @var ParagonIE_Sodium_Core32_Int64 $g7
-         * @var ParagonIE_Sodium_Core32_Int64 $g8
-         * @var ParagonIE_Sodium_Core32_Int64 $g9
-         */
-        $f0 = $f[0]->toInt64();
-        $f1 = $f[1]->toInt64();
-        $f2 = $f[2]->toInt64();
-        $f3 = $f[3]->toInt64();
-        $f4 = $f[4]->toInt64();
-        $f5 = $f[5]->toInt64();
-        $f6 = $f[6]->toInt64();
-        $f7 = $f[7]->toInt64();
-        $f8 = $f[8]->toInt64();
-        $f9 = $f[9]->toInt64();
-        $g0 = $g[0]->toInt64();
-        $g1 = $g[1]->toInt64();
-        $g2 = $g[2]->toInt64();
-        $g3 = $g[3]->toInt64();
-        $g4 = $g[4]->toInt64();
-        $g5 = $g[5]->toInt64();
-        $g6 = $g[6]->toInt64();
-        $g7 = $g[7]->toInt64();
-        $g8 = $g[8]->toInt64();
-        $g9 = $g[9]->toInt64();
-        $g1_19 = $g1->mulInt(19, 5); /* 2^4 <= 19 <= 2^5, but we only want 5 bits */
-        $g2_19 = $g2->mulInt(19, 5);
-        $g3_19 = $g3->mulInt(19, 5);
-        $g4_19 = $g4->mulInt(19, 5);
-        $g5_19 = $g5->mulInt(19, 5);
-        $g6_19 = $g6->mulInt(19, 5);
-        $g7_19 = $g7->mulInt(19, 5);
-        $g8_19 = $g8->mulInt(19, 5);
-        $g9_19 = $g9->mulInt(19, 5);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f1_2 */
-        $f1_2 = $f1->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f3_2 */
-        $f3_2 = $f3->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f5_2 */
-        $f5_2 = $f5->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f7_2 */
-        $f7_2 = $f7->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f9_2 */
-        $f9_2 = $f9->shiftLeft(1);
-        $f0g0    = $f0->mulInt64($g0);
-        $f0g1    = $f0->mulInt64($g1);
-        $f0g2    = $f0->mulInt64($g2);
-        $f0g3    = $f0->mulInt64($g3);
-        $f0g4    = $f0->mulInt64($g4);
-        $f0g5    = $f0->mulInt64($g5);
-        $f0g6    = $f0->mulInt64($g6);
-        $f0g7    = $f0->mulInt64($g7);
-        $f0g8    = $f0->mulInt64($g8);
-        $f0g9    = $f0->mulInt64($g9);
-        $f1g0    = $f1->mulInt64($g0);
-        $f1g1_2  = $f1_2->mulInt64($g1);
-        $f1g2    = $f1->mulInt64($g2);
-        $f1g3_2  = $f1_2->mulInt64($g3);
-        $f1g4    = $f1->mulInt64($g4);
-        $f1g5_2  = $f1_2->mulInt64($g5);
-        $f1g6    = $f1->mulInt64($g6);
-        $f1g7_2  = $f1_2->mulInt64($g7);
-        $f1g8    = $f1->mulInt64($g8);
-        $f1g9_38 = $f1_2->mulInt64($g9_19);
-        $f2g0    = $f2->mulInt64($g0);
-        $f2g1    = $f2->mulInt64($g1);
-        $f2g2    = $f2->mulInt64($g2);
-        $f2g3    = $f2->mulInt64($g3);
-        $f2g4    = $f2->mulInt64($g4);
-        $f2g5    = $f2->mulInt64($g5);
-        $f2g6    = $f2->mulInt64($g6);
-        $f2g7    = $f2->mulInt64($g7);
-        $f2g8_19 = $f2->mulInt64($g8_19);
-        $f2g9_19 = $f2->mulInt64($g9_19);
-        $f3g0    = $f3->mulInt64($g0);
-        $f3g1_2  = $f3_2->mulInt64($g1);
-        $f3g2    = $f3->mulInt64($g2);
-        $f3g3_2  = $f3_2->mulInt64($g3);
-        $f3g4    = $f3->mulInt64($g4);
-        $f3g5_2  = $f3_2->mulInt64($g5);
-        $f3g6    = $f3->mulInt64($g6);
-        $f3g7_38 = $f3_2->mulInt64($g7_19);
-        $f3g8_19 = $f3->mulInt64($g8_19);
-        $f3g9_38 = $f3_2->mulInt64($g9_19);
-        $f4g0    = $f4->mulInt64($g0);
-        $f4g1    = $f4->mulInt64($g1);
-        $f4g2    = $f4->mulInt64($g2);
-        $f4g3    = $f4->mulInt64($g3);
-        $f4g4    = $f4->mulInt64($g4);
-        $f4g5    = $f4->mulInt64($g5);
-        $f4g6_19 = $f4->mulInt64($g6_19);
-        $f4g7_19 = $f4->mulInt64($g7_19);
-        $f4g8_19 = $f4->mulInt64($g8_19);
-        $f4g9_19 = $f4->mulInt64($g9_19);
-        $f5g0    = $f5->mulInt64($g0);
-        $f5g1_2  = $f5_2->mulInt64($g1);
-        $f5g2    = $f5->mulInt64($g2);
-        $f5g3_2  = $f5_2->mulInt64($g3);
-        $f5g4    = $f5->mulInt64($g4);
-        $f5g5_38 = $f5_2->mulInt64($g5_19);
-        $f5g6_19 = $f5->mulInt64($g6_19);
-        $f5g7_38 = $f5_2->mulInt64($g7_19);
-        $f5g8_19 = $f5->mulInt64($g8_19);
-        $f5g9_38 = $f5_2->mulInt64($g9_19);
-        $f6g0    = $f6->mulInt64($g0);
-        $f6g1    = $f6->mulInt64($g1);
-        $f6g2    = $f6->mulInt64($g2);
-        $f6g3    = $f6->mulInt64($g3);
-        $f6g4_19 = $f6->mulInt64($g4_19);
-        $f6g5_19 = $f6->mulInt64($g5_19);
-        $f6g6_19 = $f6->mulInt64($g6_19);
-        $f6g7_19 = $f6->mulInt64($g7_19);
-        $f6g8_19 = $f6->mulInt64($g8_19);
-        $f6g9_19 = $f6->mulInt64($g9_19);
-        $f7g0    = $f7->mulInt64($g0);
-        $f7g1_2  = $f7_2->mulInt64($g1);
-        $f7g2    = $f7->mulInt64($g2);
-        $f7g3_38 = $f7_2->mulInt64($g3_19);
-        $f7g4_19 = $f7->mulInt64($g4_19);
-        $f7g5_38 = $f7_2->mulInt64($g5_19);
-        $f7g6_19 = $f7->mulInt64($g6_19);
-        $f7g7_38 = $f7_2->mulInt64($g7_19);
-        $f7g8_19 = $f7->mulInt64($g8_19);
-        $f7g9_38 = $f7_2->mulInt64($g9_19);
-        $f8g0    = $f8->mulInt64($g0);
-        $f8g1    = $f8->mulInt64($g1);
-        $f8g2_19 = $f8->mulInt64($g2_19);
-        $f8g3_19 = $f8->mulInt64($g3_19);
-        $f8g4_19 = $f8->mulInt64($g4_19);
-        $f8g5_19 = $f8->mulInt64($g5_19);
-        $f8g6_19 = $f8->mulInt64($g6_19);
-        $f8g7_19 = $f8->mulInt64($g7_19);
-        $f8g8_19 = $f8->mulInt64($g8_19);
-        $f8g9_19 = $f8->mulInt64($g9_19);
-        $f9g0    = $f9->mulInt64($g0);
-        $f9g1_38 = $f9_2->mulInt64($g1_19);
-        $f9g2_19 = $f9->mulInt64($g2_19);
-        $f9g3_38 = $f9_2->mulInt64($g3_19);
-        $f9g4_19 = $f9->mulInt64($g4_19);
-        $f9g5_38 = $f9_2->mulInt64($g5_19);
-        $f9g6_19 = $f9->mulInt64($g6_19);
-        $f9g7_38 = $f9_2->mulInt64($g7_19);
-        $f9g8_19 = $f9->mulInt64($g8_19);
-        $f9g9_38 = $f9_2->mulInt64($g9_19);
-
-        // $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
-        $h0 = $f0g0->addInt64($f1g9_38)->addInt64($f2g8_19)->addInt64($f3g7_38)
-            ->addInt64($f4g6_19)->addInt64($f5g5_38)->addInt64($f6g4_19)
-            ->addInt64($f7g3_38)->addInt64($f8g2_19)->addInt64($f9g1_38);
-
-        // $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
-        $h1 = $f0g1->addInt64($f1g0)->addInt64($f2g9_19)->addInt64($f3g8_19)
-            ->addInt64($f4g7_19)->addInt64($f5g6_19)->addInt64($f6g5_19)
-            ->addInt64($f7g4_19)->addInt64($f8g3_19)->addInt64($f9g2_19);
-
-        // $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
-        $h2 = $f0g2->addInt64($f1g1_2)->addInt64($f2g0)->addInt64($f3g9_38)
-            ->addInt64($f4g8_19)->addInt64($f5g7_38)->addInt64($f6g6_19)
-            ->addInt64($f7g5_38)->addInt64($f8g4_19)->addInt64($f9g3_38);
-
-        // $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
-        $h3 = $f0g3->addInt64($f1g2)->addInt64($f2g1)->addInt64($f3g0)
-            ->addInt64($f4g9_19)->addInt64($f5g8_19)->addInt64($f6g7_19)
-            ->addInt64($f7g6_19)->addInt64($f8g5_19)->addInt64($f9g4_19);
-
-        // $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
-        $h4 = $f0g4->addInt64($f1g3_2)->addInt64($f2g2)->addInt64($f3g1_2)
-            ->addInt64($f4g0)->addInt64($f5g9_38)->addInt64($f6g8_19)
-            ->addInt64($f7g7_38)->addInt64($f8g6_19)->addInt64($f9g5_38);
-
-        // $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
-        $h5 = $f0g5->addInt64($f1g4)->addInt64($f2g3)->addInt64($f3g2)
-            ->addInt64($f4g1)->addInt64($f5g0)->addInt64($f6g9_19)
-            ->addInt64($f7g8_19)->addInt64($f8g7_19)->addInt64($f9g6_19);
-
-        // $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
-        $h6 = $f0g6->addInt64($f1g5_2)->addInt64($f2g4)->addInt64($f3g3_2)
-            ->addInt64($f4g2)->addInt64($f5g1_2)->addInt64($f6g0)
-            ->addInt64($f7g9_38)->addInt64($f8g8_19)->addInt64($f9g7_38);
-
-        // $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
-        $h7 = $f0g7->addInt64($f1g6)->addInt64($f2g5)->addInt64($f3g4)
-            ->addInt64($f4g3)->addInt64($f5g2)->addInt64($f6g1)
-            ->addInt64($f7g0)->addInt64($f8g9_19)->addInt64($f9g8_19);
-
-        // $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
-        $h8 = $f0g8->addInt64($f1g7_2)->addInt64($f2g6)->addInt64($f3g5_2)
-            ->addInt64($f4g4)->addInt64($f5g3_2)->addInt64($f6g2)
-            ->addInt64($f7g1_2)->addInt64($f8g0)->addInt64($f9g9_38);
-
-        // $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
-        $h9 = $f0g9->addInt64($f1g8)->addInt64($f2g7)->addInt64($f3g6)
-            ->addInt64($f4g5)->addInt64($f5g4)->addInt64($f6g3)
-            ->addInt64($f7g2)->addInt64($f8g1)->addInt64($f9g0);
-
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $h0
-         * @var ParagonIE_Sodium_Core32_Int64 $h1
-         * @var ParagonIE_Sodium_Core32_Int64 $h2
-         * @var ParagonIE_Sodium_Core32_Int64 $h3
-         * @var ParagonIE_Sodium_Core32_Int64 $h4
-         * @var ParagonIE_Sodium_Core32_Int64 $h5
-         * @var ParagonIE_Sodium_Core32_Int64 $h6
-         * @var ParagonIE_Sodium_Core32_Int64 $h7
-         * @var ParagonIE_Sodium_Core32_Int64 $h8
-         * @var ParagonIE_Sodium_Core32_Int64 $h9
-         * @var ParagonIE_Sodium_Core32_Int64 $carry0
-         * @var ParagonIE_Sodium_Core32_Int64 $carry1
-         * @var ParagonIE_Sodium_Core32_Int64 $carry2
-         * @var ParagonIE_Sodium_Core32_Int64 $carry3
-         * @var ParagonIE_Sodium_Core32_Int64 $carry4
-         * @var ParagonIE_Sodium_Core32_Int64 $carry5
-         * @var ParagonIE_Sodium_Core32_Int64 $carry6
-         * @var ParagonIE_Sodium_Core32_Int64 $carry7
-         * @var ParagonIE_Sodium_Core32_Int64 $carry8
-         * @var ParagonIE_Sodium_Core32_Int64 $carry9
-         */
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $h0->toInt32(),
-                $h1->toInt32(),
-                $h2->toInt32(),
-                $h3->toInt32(),
-                $h4->toInt32(),
-                $h5->toInt32(),
-                $h6->toInt32(),
-                $h7->toInt32(),
-                $h8->toInt32(),
-                $h9->toInt32()
-            )
-        );
-    }
-
-    /**
-     * Get the negative values for each piece of the field element.
-     *
-     * h = -f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_neg(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $h = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        for ($i = 0; $i < 10; ++$i) {
-            $h[$i] = $h[$i]->subInt32($f[$i]);
-        }
-        return $h;
-    }
-
-    /**
-     * Square a field element
-     *
-     * h = f * f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $f0
-         * @var ParagonIE_Sodium_Core32_Int64 $f1
-         * @var ParagonIE_Sodium_Core32_Int64 $f2
-         * @var ParagonIE_Sodium_Core32_Int64 $f3
-         * @var ParagonIE_Sodium_Core32_Int64 $f4
-         * @var ParagonIE_Sodium_Core32_Int64 $f5
-         * @var ParagonIE_Sodium_Core32_Int64 $f6
-         * @var ParagonIE_Sodium_Core32_Int64 $f7
-         * @var ParagonIE_Sodium_Core32_Int64 $f8
-         * @var ParagonIE_Sodium_Core32_Int64 $f9
-         */
-        $f0 = $f[0]->toInt64();
-        $f1 = $f[1]->toInt64();
-        $f2 = $f[2]->toInt64();
-        $f3 = $f[3]->toInt64();
-        $f4 = $f[4]->toInt64();
-        $f5 = $f[5]->toInt64();
-        $f6 = $f[6]->toInt64();
-        $f7 = $f[7]->toInt64();
-        $f8 = $f[8]->toInt64();
-        $f9 = $f[9]->toInt64();
-
-        /** @var ParagonIE_Sodium_Core32_Int64 $f0_2 */
-        $f0_2 = $f0->shiftLeft(1);
-        $f1_2 = $f1->shiftLeft(1);
-        $f2_2 = $f2->shiftLeft(1);
-        $f3_2 = $f3->shiftLeft(1);
-        $f4_2 = $f4->shiftLeft(1);
-        $f5_2 = $f5->shiftLeft(1);
-        $f6_2 = $f6->shiftLeft(1);
-        $f7_2 = $f7->shiftLeft(1);
-        $f5_38 = $f5->mulInt(38, 6);
-        $f6_19 = $f6->mulInt(19, 5);
-        $f7_38 = $f7->mulInt(38, 6);
-        $f8_19 = $f8->mulInt(19, 5);
-        $f9_38 = $f9->mulInt(38, 6);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f0f0*/
-        $f0f0    = $f0->mulInt64($f0);
-        $f0f1_2  = $f0_2->mulInt64($f1);
-        $f0f2_2 =  $f0_2->mulInt64($f2);
-        $f0f3_2 =  $f0_2->mulInt64($f3);
-        $f0f4_2 =  $f0_2->mulInt64($f4);
-        $f0f5_2 =  $f0_2->mulInt64($f5);
-        $f0f6_2 =  $f0_2->mulInt64($f6);
-        $f0f7_2 =  $f0_2->mulInt64($f7);
-        $f0f8_2 =  $f0_2->mulInt64($f8);
-        $f0f9_2 =  $f0_2->mulInt64($f9);
-        $f1f1_2 = $f1_2->mulInt64($f1);
-        $f1f2_2 = $f1_2->mulInt64($f2);
-        $f1f3_4 = $f1_2->mulInt64($f3_2);
-        $f1f4_2 = $f1_2->mulInt64($f4);
-        $f1f5_4 = $f1_2->mulInt64($f5_2);
-        $f1f6_2 = $f1_2->mulInt64($f6);
-        $f1f7_4 = $f1_2->mulInt64($f7_2);
-        $f1f8_2 = $f1_2->mulInt64($f8);
-        $f1f9_76 = $f1_2->mulInt64($f9_38);
-        $f2f2 = $f2->mulInt64($f2);
-        $f2f3_2 = $f2_2->mulInt64($f3);
-        $f2f4_2 = $f2_2->mulInt64($f4);
-        $f2f5_2 = $f2_2->mulInt64($f5);
-        $f2f6_2 = $f2_2->mulInt64($f6);
-        $f2f7_2 = $f2_2->mulInt64($f7);
-        $f2f8_38 = $f2_2->mulInt64($f8_19);
-        $f2f9_38 = $f2->mulInt64($f9_38);
-        $f3f3_2 = $f3_2->mulInt64($f3);
-        $f3f4_2 = $f3_2->mulInt64($f4);
-        $f3f5_4 = $f3_2->mulInt64($f5_2);
-        $f3f6_2 = $f3_2->mulInt64($f6);
-        $f3f7_76 = $f3_2->mulInt64($f7_38);
-        $f3f8_38 = $f3_2->mulInt64($f8_19);
-        $f3f9_76 = $f3_2->mulInt64($f9_38);
-        $f4f4 = $f4->mulInt64($f4);
-        $f4f5_2 = $f4_2->mulInt64($f5);
-        $f4f6_38 = $f4_2->mulInt64($f6_19);
-        $f4f7_38 = $f4->mulInt64($f7_38);
-        $f4f8_38 = $f4_2->mulInt64($f8_19);
-        $f4f9_38 = $f4->mulInt64($f9_38);
-        $f5f5_38 = $f5->mulInt64($f5_38);
-        $f5f6_38 = $f5_2->mulInt64($f6_19);
-        $f5f7_76 = $f5_2->mulInt64($f7_38);
-        $f5f8_38 = $f5_2->mulInt64($f8_19);
-        $f5f9_76 = $f5_2->mulInt64($f9_38);
-        $f6f6_19 = $f6->mulInt64($f6_19);
-        $f6f7_38 = $f6->mulInt64($f7_38);
-        $f6f8_38 = $f6_2->mulInt64($f8_19);
-        $f6f9_38 = $f6->mulInt64($f9_38);
-        $f7f7_38 = $f7->mulInt64($f7_38);
-        $f7f8_38 = $f7_2->mulInt64($f8_19);
-        $f7f9_76 = $f7_2->mulInt64($f9_38);
-        $f8f8_19 = $f8->mulInt64($f8_19);
-        $f8f9_38 = $f8->mulInt64($f9_38);
-        $f9f9_38 = $f9->mulInt64($f9_38);
-
-        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
-        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
-        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
-        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
-        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
-        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
-        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
-        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
-        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
-        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
-
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $h0
-         * @var ParagonIE_Sodium_Core32_Int64 $h1
-         * @var ParagonIE_Sodium_Core32_Int64 $h2
-         * @var ParagonIE_Sodium_Core32_Int64 $h3
-         * @var ParagonIE_Sodium_Core32_Int64 $h4
-         * @var ParagonIE_Sodium_Core32_Int64 $h5
-         * @var ParagonIE_Sodium_Core32_Int64 $h6
-         * @var ParagonIE_Sodium_Core32_Int64 $h7
-         * @var ParagonIE_Sodium_Core32_Int64 $h8
-         * @var ParagonIE_Sodium_Core32_Int64 $h9
-         */
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $h0->toInt32(),
-                $h1->toInt32(),
-                $h2->toInt32(),
-                $h3->toInt32(),
-                $h4->toInt32(),
-                $h5->toInt32(),
-                $h6->toInt32(),
-                $h7->toInt32(),
-                $h8->toInt32(),
-                $h9->toInt32()
-            )
-        );
-    }
-
-    /**
-     * Square and double a field element
-     *
-     * h = 2 * f * f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $f0
-         * @var ParagonIE_Sodium_Core32_Int64 $f1
-         * @var ParagonIE_Sodium_Core32_Int64 $f2
-         * @var ParagonIE_Sodium_Core32_Int64 $f3
-         * @var ParagonIE_Sodium_Core32_Int64 $f4
-         * @var ParagonIE_Sodium_Core32_Int64 $f5
-         * @var ParagonIE_Sodium_Core32_Int64 $f6
-         * @var ParagonIE_Sodium_Core32_Int64 $f7
-         * @var ParagonIE_Sodium_Core32_Int64 $f8
-         * @var ParagonIE_Sodium_Core32_Int64 $f9
-         * @var ParagonIE_Sodium_Core32_Int64 $h0
-         */
-        $f0 = $f[0]->toInt64();
-        $f1 = $f[1]->toInt64();
-        $f2 = $f[2]->toInt64();
-        $f3 = $f[3]->toInt64();
-        $f4 = $f[4]->toInt64();
-        $f5 = $f[5]->toInt64();
-        $f6 = $f[6]->toInt64();
-        $f7 = $f[7]->toInt64();
-        $f8 = $f[8]->toInt64();
-        $f9 = $f[9]->toInt64();
-
-        $f0_2 = $f0->shiftLeft(1);
-        $f1_2 = $f1->shiftLeft(1);
-        $f2_2 = $f2->shiftLeft(1);
-        $f3_2 = $f3->shiftLeft(1);
-        $f4_2 = $f4->shiftLeft(1);
-        $f5_2 = $f5->shiftLeft(1);
-        $f6_2 = $f6->shiftLeft(1);
-        $f7_2 = $f7->shiftLeft(1);
-        $f5_38 = $f5->mulInt(38, 6); /* 1.959375*2^30 */
-        $f6_19 = $f6->mulInt(19, 5); /* 1.959375*2^30 */
-        $f7_38 = $f7->mulInt(38, 6); /* 1.959375*2^30 */
-        $f8_19 = $f8->mulInt(19, 5); /* 1.959375*2^30 */
-        $f9_38 = $f9->mulInt(38, 6); /* 1.959375*2^30 */
-        $f0f0 = $f0->mulInt64($f0);
-        $f0f1_2 = $f0_2->mulInt64($f1);
-        $f0f2_2 = $f0_2->mulInt64($f2);
-        $f0f3_2 = $f0_2->mulInt64($f3);
-        $f0f4_2 = $f0_2->mulInt64($f4);
-        $f0f5_2 = $f0_2->mulInt64($f5);
-        $f0f6_2 = $f0_2->mulInt64($f6);
-        $f0f7_2 = $f0_2->mulInt64($f7);
-        $f0f8_2 = $f0_2->mulInt64($f8);
-        $f0f9_2 = $f0_2->mulInt64($f9);
-        $f1f1_2 = $f1_2->mulInt64($f1);
-        $f1f2_2 = $f1_2->mulInt64($f2);
-        $f1f3_4 = $f1_2->mulInt64($f3_2);
-        $f1f4_2 = $f1_2->mulInt64($f4);
-        $f1f5_4 = $f1_2->mulInt64($f5_2);
-        $f1f6_2 = $f1_2->mulInt64($f6);
-        $f1f7_4 = $f1_2->mulInt64($f7_2);
-        $f1f8_2 = $f1_2->mulInt64($f8);
-        $f1f9_76 = $f1_2->mulInt64($f9_38);
-        $f2f2 = $f2->mulInt64($f2);
-        $f2f3_2 = $f2_2->mulInt64($f3);
-        $f2f4_2 = $f2_2->mulInt64($f4);
-        $f2f5_2 = $f2_2->mulInt64($f5);
-        $f2f6_2 = $f2_2->mulInt64($f6);
-        $f2f7_2 = $f2_2->mulInt64($f7);
-        $f2f8_38 = $f2_2->mulInt64($f8_19);
-        $f2f9_38 = $f2->mulInt64($f9_38);
-        $f3f3_2 = $f3_2->mulInt64($f3);
-        $f3f4_2 = $f3_2->mulInt64($f4);
-        $f3f5_4 = $f3_2->mulInt64($f5_2);
-        $f3f6_2 = $f3_2->mulInt64($f6);
-        $f3f7_76 = $f3_2->mulInt64($f7_38);
-        $f3f8_38 = $f3_2->mulInt64($f8_19);
-        $f3f9_76 = $f3_2->mulInt64($f9_38);
-        $f4f4 = $f4->mulInt64($f4);
-        $f4f5_2 = $f4_2->mulInt64($f5);
-        $f4f6_38 = $f4_2->mulInt64($f6_19);
-        $f4f7_38 = $f4->mulInt64($f7_38);
-        $f4f8_38 = $f4_2->mulInt64($f8_19);
-        $f4f9_38 = $f4->mulInt64($f9_38);
-        $f5f5_38 = $f5->mulInt64($f5_38);
-        $f5f6_38 = $f5_2->mulInt64($f6_19);
-        $f5f7_76 = $f5_2->mulInt64($f7_38);
-        $f5f8_38 = $f5_2->mulInt64($f8_19);
-        $f5f9_76 = $f5_2->mulInt64($f9_38);
-        $f6f6_19 = $f6->mulInt64($f6_19);
-        $f6f7_38 = $f6->mulInt64($f7_38);
-        $f6f8_38 = $f6_2->mulInt64($f8_19);
-        $f6f9_38 = $f6->mulInt64($f9_38);
-        $f7f7_38 = $f7->mulInt64($f7_38);
-        $f7f8_38 = $f7_2->mulInt64($f8_19);
-        $f7f9_76 = $f7_2->mulInt64($f9_38);
-        $f8f8_19 = $f8->mulInt64($f8_19);
-        $f8f9_38 = $f8->mulInt64($f9_38);
-        $f9f9_38 = $f9->mulInt64($f9_38);
-
-        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
-        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
-        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
-        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
-        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
-        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
-        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
-        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
-        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
-        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
-
-        /*
+		$f[0] = $f[0]->addInt64($q->mulInt(19, 5));
+
+		$carry0 = $f[0]->shiftRight(26);
+		$f[1] = $f[1]->addInt64($carry0);
+		$f[0] = $f[0]->subInt64($carry0->shiftLeft(26));
+
+		$carry1 = $f[1]->shiftRight(25);
+		$f[2] = $f[2]->addInt64($carry1);
+		$f[1] = $f[1]->subInt64($carry1->shiftLeft(25));
+
+		$carry2 = $f[2]->shiftRight(26);
+		$f[3] = $f[3]->addInt64($carry2);
+		$f[2] = $f[2]->subInt64($carry2->shiftLeft(26));
+
+		$carry3 = $f[3]->shiftRight(25);
+		$f[4] = $f[4]->addInt64($carry3);
+		$f[3] = $f[3]->subInt64($carry3->shiftLeft(25));
+
+		$carry4 = $f[4]->shiftRight(26);
+		$f[5] = $f[5]->addInt64($carry4);
+		$f[4] = $f[4]->subInt64($carry4->shiftLeft(26));
+
+		$carry5 = $f[5]->shiftRight(25);
+		$f[6] = $f[6]->addInt64($carry5);
+		$f[5] = $f[5]->subInt64($carry5->shiftLeft(25));
+
+		$carry6 = $f[6]->shiftRight(26);
+		$f[7] = $f[7]->addInt64($carry6);
+		$f[6] = $f[6]->subInt64($carry6->shiftLeft(26));
+
+		$carry7 = $f[7]->shiftRight(25);
+		$f[8] = $f[8]->addInt64($carry7);
+		$f[7] = $f[7]->subInt64($carry7->shiftLeft(25));
+
+		$carry8 = $f[8]->shiftRight(26);
+		$f[9] = $f[9]->addInt64($carry8);
+		$f[8] = $f[8]->subInt64($carry8->shiftLeft(26));
+
+		$carry9 = $f[9]->shiftRight(25);
+		$f[9] = $f[9]->subInt64($carry9->shiftLeft(25));
+
+		/**
+		 * @var int $h0
+		 * @var int $h1
+		 * @var int $h2
+		 * @var int $h3
+		 * @var int $h4
+		 * @var int $h5
+		 * @var int $h6
+		 * @var int $h7
+		 * @var int $h8
+		 * @var int $h9
+		 */
+		$h0 = $f[0]->toInt32()->toInt();
+		$h1 = $f[1]->toInt32()->toInt();
+		$h2 = $f[2]->toInt32()->toInt();
+		$h3 = $f[3]->toInt32()->toInt();
+		$h4 = $f[4]->toInt32()->toInt();
+		$h5 = $f[5]->toInt32()->toInt();
+		$h6 = $f[6]->toInt32()->toInt();
+		$h7 = $f[7]->toInt32()->toInt();
+		$h8 = $f[8]->toInt32()->toInt();
+		$h9 = $f[9]->toInt32()->toInt();
+
+		/**
+		 * @var array<int, int>
+		 */
+		$s = array(
+			(int) (($h0 >> 0) & 0xff),
+			(int) (($h0 >> 8) & 0xff),
+			(int) (($h0 >> 16) & 0xff),
+			(int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
+			(int) (($h1 >> 6) & 0xff),
+			(int) (($h1 >> 14) & 0xff),
+			(int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
+			(int) (($h2 >> 5) & 0xff),
+			(int) (($h2 >> 13) & 0xff),
+			(int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
+			(int) (($h3 >> 3) & 0xff),
+			(int) (($h3 >> 11) & 0xff),
+			(int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
+			(int) (($h4 >> 2) & 0xff),
+			(int) (($h4 >> 10) & 0xff),
+			(int) (($h4 >> 18) & 0xff),
+			(int) (($h5 >> 0) & 0xff),
+			(int) (($h5 >> 8) & 0xff),
+			(int) (($h5 >> 16) & 0xff),
+			(int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
+			(int) (($h6 >> 7) & 0xff),
+			(int) (($h6 >> 15) & 0xff),
+			(int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
+			(int) (($h7 >> 5) & 0xff),
+			(int) (($h7 >> 13) & 0xff),
+			(int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
+			(int) (($h8 >> 4) & 0xff),
+			(int) (($h8 >> 12) & 0xff),
+			(int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
+			(int) (($h9 >> 2) & 0xff),
+			(int) (($h9 >> 10) & 0xff),
+			(int) (($h9 >> 18) & 0xff)
+		);
+		return self::intArrayToString($s);
+	}
+
+	/**
+	 * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @return int
+	 */
+	public static function fe_isnegative(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+	{
+		$str = self::fe_tobytes($f);
+		return self::chrToInt($str[0]) & 1;
+	}
+
+	/**
+	 * Returns 0 if this field element results in all NUL bytes.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @return bool
+	 */
+	public static function fe_isnonzero(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+	{
+		static $zero;
+		if ($zero === null) {
+			$zero = str_repeat("\x00", 32);
+		}
+		$str = self::fe_tobytes($f);
+		return !self::verify_32($str, $zero);
+	}
+
+	/**
+	 * Multiply two field elements
+	 *
+	 * h = f * g
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @security Is multiplication a source of timing leaks? If so, can we do
+	 *           anything to prevent that from happening?
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_mul(
+		ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+		ParagonIE_Sodium_Core32_Curve25519_Fe $g
+	) {
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int32[] $f
+		 * @var ParagonIE_Sodium_Core32_Int32[] $g
+		 * @var ParagonIE_Sodium_Core32_Int64 $f0
+		 * @var ParagonIE_Sodium_Core32_Int64 $f1
+		 * @var ParagonIE_Sodium_Core32_Int64 $f2
+		 * @var ParagonIE_Sodium_Core32_Int64 $f3
+		 * @var ParagonIE_Sodium_Core32_Int64 $f4
+		 * @var ParagonIE_Sodium_Core32_Int64 $f5
+		 * @var ParagonIE_Sodium_Core32_Int64 $f6
+		 * @var ParagonIE_Sodium_Core32_Int64 $f7
+		 * @var ParagonIE_Sodium_Core32_Int64 $f8
+		 * @var ParagonIE_Sodium_Core32_Int64 $f9
+		 * @var ParagonIE_Sodium_Core32_Int64 $g0
+		 * @var ParagonIE_Sodium_Core32_Int64 $g1
+		 * @var ParagonIE_Sodium_Core32_Int64 $g2
+		 * @var ParagonIE_Sodium_Core32_Int64 $g3
+		 * @var ParagonIE_Sodium_Core32_Int64 $g4
+		 * @var ParagonIE_Sodium_Core32_Int64 $g5
+		 * @var ParagonIE_Sodium_Core32_Int64 $g6
+		 * @var ParagonIE_Sodium_Core32_Int64 $g7
+		 * @var ParagonIE_Sodium_Core32_Int64 $g8
+		 * @var ParagonIE_Sodium_Core32_Int64 $g9
+		 */
+		$f0 = $f[0]->toInt64();
+		$f1 = $f[1]->toInt64();
+		$f2 = $f[2]->toInt64();
+		$f3 = $f[3]->toInt64();
+		$f4 = $f[4]->toInt64();
+		$f5 = $f[5]->toInt64();
+		$f6 = $f[6]->toInt64();
+		$f7 = $f[7]->toInt64();
+		$f8 = $f[8]->toInt64();
+		$f9 = $f[9]->toInt64();
+		$g0 = $g[0]->toInt64();
+		$g1 = $g[1]->toInt64();
+		$g2 = $g[2]->toInt64();
+		$g3 = $g[3]->toInt64();
+		$g4 = $g[4]->toInt64();
+		$g5 = $g[5]->toInt64();
+		$g6 = $g[6]->toInt64();
+		$g7 = $g[7]->toInt64();
+		$g8 = $g[8]->toInt64();
+		$g9 = $g[9]->toInt64();
+		$g1_19 = $g1->mulInt(19, 5); /* 2^4 <= 19 <= 2^5, but we only want 5 bits */
+		$g2_19 = $g2->mulInt(19, 5);
+		$g3_19 = $g3->mulInt(19, 5);
+		$g4_19 = $g4->mulInt(19, 5);
+		$g5_19 = $g5->mulInt(19, 5);
+		$g6_19 = $g6->mulInt(19, 5);
+		$g7_19 = $g7->mulInt(19, 5);
+		$g8_19 = $g8->mulInt(19, 5);
+		$g9_19 = $g9->mulInt(19, 5);
+		/** @var ParagonIE_Sodium_Core32_Int64 $f1_2 */
+		$f1_2 = $f1->shiftLeft(1);
+		/** @var ParagonIE_Sodium_Core32_Int64 $f3_2 */
+		$f3_2 = $f3->shiftLeft(1);
+		/** @var ParagonIE_Sodium_Core32_Int64 $f5_2 */
+		$f5_2 = $f5->shiftLeft(1);
+		/** @var ParagonIE_Sodium_Core32_Int64 $f7_2 */
+		$f7_2 = $f7->shiftLeft(1);
+		/** @var ParagonIE_Sodium_Core32_Int64 $f9_2 */
+		$f9_2 = $f9->shiftLeft(1);
+		$f0g0    = $f0->mulInt64($g0);
+		$f0g1    = $f0->mulInt64($g1);
+		$f0g2    = $f0->mulInt64($g2);
+		$f0g3    = $f0->mulInt64($g3);
+		$f0g4    = $f0->mulInt64($g4);
+		$f0g5    = $f0->mulInt64($g5);
+		$f0g6    = $f0->mulInt64($g6);
+		$f0g7    = $f0->mulInt64($g7);
+		$f0g8    = $f0->mulInt64($g8);
+		$f0g9    = $f0->mulInt64($g9);
+		$f1g0    = $f1->mulInt64($g0);
+		$f1g1_2  = $f1_2->mulInt64($g1);
+		$f1g2    = $f1->mulInt64($g2);
+		$f1g3_2  = $f1_2->mulInt64($g3);
+		$f1g4    = $f1->mulInt64($g4);
+		$f1g5_2  = $f1_2->mulInt64($g5);
+		$f1g6    = $f1->mulInt64($g6);
+		$f1g7_2  = $f1_2->mulInt64($g7);
+		$f1g8    = $f1->mulInt64($g8);
+		$f1g9_38 = $f1_2->mulInt64($g9_19);
+		$f2g0    = $f2->mulInt64($g0);
+		$f2g1    = $f2->mulInt64($g1);
+		$f2g2    = $f2->mulInt64($g2);
+		$f2g3    = $f2->mulInt64($g3);
+		$f2g4    = $f2->mulInt64($g4);
+		$f2g5    = $f2->mulInt64($g5);
+		$f2g6    = $f2->mulInt64($g6);
+		$f2g7    = $f2->mulInt64($g7);
+		$f2g8_19 = $f2->mulInt64($g8_19);
+		$f2g9_19 = $f2->mulInt64($g9_19);
+		$f3g0    = $f3->mulInt64($g0);
+		$f3g1_2  = $f3_2->mulInt64($g1);
+		$f3g2    = $f3->mulInt64($g2);
+		$f3g3_2  = $f3_2->mulInt64($g3);
+		$f3g4    = $f3->mulInt64($g4);
+		$f3g5_2  = $f3_2->mulInt64($g5);
+		$f3g6    = $f3->mulInt64($g6);
+		$f3g7_38 = $f3_2->mulInt64($g7_19);
+		$f3g8_19 = $f3->mulInt64($g8_19);
+		$f3g9_38 = $f3_2->mulInt64($g9_19);
+		$f4g0    = $f4->mulInt64($g0);
+		$f4g1    = $f4->mulInt64($g1);
+		$f4g2    = $f4->mulInt64($g2);
+		$f4g3    = $f4->mulInt64($g3);
+		$f4g4    = $f4->mulInt64($g4);
+		$f4g5    = $f4->mulInt64($g5);
+		$f4g6_19 = $f4->mulInt64($g6_19);
+		$f4g7_19 = $f4->mulInt64($g7_19);
+		$f4g8_19 = $f4->mulInt64($g8_19);
+		$f4g9_19 = $f4->mulInt64($g9_19);
+		$f5g0    = $f5->mulInt64($g0);
+		$f5g1_2  = $f5_2->mulInt64($g1);
+		$f5g2    = $f5->mulInt64($g2);
+		$f5g3_2  = $f5_2->mulInt64($g3);
+		$f5g4    = $f5->mulInt64($g4);
+		$f5g5_38 = $f5_2->mulInt64($g5_19);
+		$f5g6_19 = $f5->mulInt64($g6_19);
+		$f5g7_38 = $f5_2->mulInt64($g7_19);
+		$f5g8_19 = $f5->mulInt64($g8_19);
+		$f5g9_38 = $f5_2->mulInt64($g9_19);
+		$f6g0    = $f6->mulInt64($g0);
+		$f6g1    = $f6->mulInt64($g1);
+		$f6g2    = $f6->mulInt64($g2);
+		$f6g3    = $f6->mulInt64($g3);
+		$f6g4_19 = $f6->mulInt64($g4_19);
+		$f6g5_19 = $f6->mulInt64($g5_19);
+		$f6g6_19 = $f6->mulInt64($g6_19);
+		$f6g7_19 = $f6->mulInt64($g7_19);
+		$f6g8_19 = $f6->mulInt64($g8_19);
+		$f6g9_19 = $f6->mulInt64($g9_19);
+		$f7g0    = $f7->mulInt64($g0);
+		$f7g1_2  = $f7_2->mulInt64($g1);
+		$f7g2    = $f7->mulInt64($g2);
+		$f7g3_38 = $f7_2->mulInt64($g3_19);
+		$f7g4_19 = $f7->mulInt64($g4_19);
+		$f7g5_38 = $f7_2->mulInt64($g5_19);
+		$f7g6_19 = $f7->mulInt64($g6_19);
+		$f7g7_38 = $f7_2->mulInt64($g7_19);
+		$f7g8_19 = $f7->mulInt64($g8_19);
+		$f7g9_38 = $f7_2->mulInt64($g9_19);
+		$f8g0    = $f8->mulInt64($g0);
+		$f8g1    = $f8->mulInt64($g1);
+		$f8g2_19 = $f8->mulInt64($g2_19);
+		$f8g3_19 = $f8->mulInt64($g3_19);
+		$f8g4_19 = $f8->mulInt64($g4_19);
+		$f8g5_19 = $f8->mulInt64($g5_19);
+		$f8g6_19 = $f8->mulInt64($g6_19);
+		$f8g7_19 = $f8->mulInt64($g7_19);
+		$f8g8_19 = $f8->mulInt64($g8_19);
+		$f8g9_19 = $f8->mulInt64($g9_19);
+		$f9g0    = $f9->mulInt64($g0);
+		$f9g1_38 = $f9_2->mulInt64($g1_19);
+		$f9g2_19 = $f9->mulInt64($g2_19);
+		$f9g3_38 = $f9_2->mulInt64($g3_19);
+		$f9g4_19 = $f9->mulInt64($g4_19);
+		$f9g5_38 = $f9_2->mulInt64($g5_19);
+		$f9g6_19 = $f9->mulInt64($g6_19);
+		$f9g7_38 = $f9_2->mulInt64($g7_19);
+		$f9g8_19 = $f9->mulInt64($g8_19);
+		$f9g9_38 = $f9_2->mulInt64($g9_19);
+
+		// $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
+		$h0 = $f0g0->addInt64($f1g9_38)->addInt64($f2g8_19)->addInt64($f3g7_38)
+			->addInt64($f4g6_19)->addInt64($f5g5_38)->addInt64($f6g4_19)
+			->addInt64($f7g3_38)->addInt64($f8g2_19)->addInt64($f9g1_38);
+
+		// $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
+		$h1 = $f0g1->addInt64($f1g0)->addInt64($f2g9_19)->addInt64($f3g8_19)
+			->addInt64($f4g7_19)->addInt64($f5g6_19)->addInt64($f6g5_19)
+			->addInt64($f7g4_19)->addInt64($f8g3_19)->addInt64($f9g2_19);
+
+		// $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
+		$h2 = $f0g2->addInt64($f1g1_2)->addInt64($f2g0)->addInt64($f3g9_38)
+			->addInt64($f4g8_19)->addInt64($f5g7_38)->addInt64($f6g6_19)
+			->addInt64($f7g5_38)->addInt64($f8g4_19)->addInt64($f9g3_38);
+
+		// $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
+		$h3 = $f0g3->addInt64($f1g2)->addInt64($f2g1)->addInt64($f3g0)
+			->addInt64($f4g9_19)->addInt64($f5g8_19)->addInt64($f6g7_19)
+			->addInt64($f7g6_19)->addInt64($f8g5_19)->addInt64($f9g4_19);
+
+		// $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
+		$h4 = $f0g4->addInt64($f1g3_2)->addInt64($f2g2)->addInt64($f3g1_2)
+			->addInt64($f4g0)->addInt64($f5g9_38)->addInt64($f6g8_19)
+			->addInt64($f7g7_38)->addInt64($f8g6_19)->addInt64($f9g5_38);
+
+		// $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
+		$h5 = $f0g5->addInt64($f1g4)->addInt64($f2g3)->addInt64($f3g2)
+			->addInt64($f4g1)->addInt64($f5g0)->addInt64($f6g9_19)
+			->addInt64($f7g8_19)->addInt64($f8g7_19)->addInt64($f9g6_19);
+
+		// $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
+		$h6 = $f0g6->addInt64($f1g5_2)->addInt64($f2g4)->addInt64($f3g3_2)
+			->addInt64($f4g2)->addInt64($f5g1_2)->addInt64($f6g0)
+			->addInt64($f7g9_38)->addInt64($f8g8_19)->addInt64($f9g7_38);
+
+		// $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
+		$h7 = $f0g7->addInt64($f1g6)->addInt64($f2g5)->addInt64($f3g4)
+			->addInt64($f4g3)->addInt64($f5g2)->addInt64($f6g1)
+			->addInt64($f7g0)->addInt64($f8g9_19)->addInt64($f9g8_19);
+
+		// $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
+		$h8 = $f0g8->addInt64($f1g7_2)->addInt64($f2g6)->addInt64($f3g5_2)
+			->addInt64($f4g4)->addInt64($f5g3_2)->addInt64($f6g2)
+			->addInt64($f7g1_2)->addInt64($f8g0)->addInt64($f9g9_38);
+
+		// $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
+		$h9 = $f0g9->addInt64($f1g8)->addInt64($f2g7)->addInt64($f3g6)
+			->addInt64($f4g5)->addInt64($f5g4)->addInt64($f6g3)
+			->addInt64($f7g2)->addInt64($f8g1)->addInt64($f9g0);
+
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64 $h0
+		 * @var ParagonIE_Sodium_Core32_Int64 $h1
+		 * @var ParagonIE_Sodium_Core32_Int64 $h2
+		 * @var ParagonIE_Sodium_Core32_Int64 $h3
+		 * @var ParagonIE_Sodium_Core32_Int64 $h4
+		 * @var ParagonIE_Sodium_Core32_Int64 $h5
+		 * @var ParagonIE_Sodium_Core32_Int64 $h6
+		 * @var ParagonIE_Sodium_Core32_Int64 $h7
+		 * @var ParagonIE_Sodium_Core32_Int64 $h8
+		 * @var ParagonIE_Sodium_Core32_Int64 $h9
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry0
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry1
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry2
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry3
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry4
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry5
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry6
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry7
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry8
+		 * @var ParagonIE_Sodium_Core32_Int64 $carry9
+		 */
+		$carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+		$h1 = $h1->addInt64($carry0);
+		$h0 = $h0->subInt64($carry0->shiftLeft(26));
+		$carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+		$h5 = $h5->addInt64($carry4);
+		$h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+		$carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+		$h2 = $h2->addInt64($carry1);
+		$h1 = $h1->subInt64($carry1->shiftLeft(25));
+		$carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+		$h6 = $h6->addInt64($carry5);
+		$h5 = $h5->subInt64($carry5->shiftLeft(25));
+
+		$carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+		$h3 = $h3->addInt64($carry2);
+		$h2 = $h2->subInt64($carry2->shiftLeft(26));
+		$carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+		$h7 = $h7->addInt64($carry6);
+		$h6 = $h6->subInt64($carry6->shiftLeft(26));
+
+		$carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+		$h4 = $h4->addInt64($carry3);
+		$h3 = $h3->subInt64($carry3->shiftLeft(25));
+		$carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+		$h8 = $h8->addInt64($carry7);
+		$h7 = $h7->subInt64($carry7->shiftLeft(25));
+
+		$carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+		$h5 = $h5->addInt64($carry4);
+		$h4 = $h4->subInt64($carry4->shiftLeft(26));
+		$carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+		$h9 = $h9->addInt64($carry8);
+		$h8 = $h8->subInt64($carry8->shiftLeft(26));
+
+		$carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+		$h0 = $h0->addInt64($carry9->mulInt(19));
+		$h9 = $h9->subInt64($carry9->shiftLeft(25));
+
+		$carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+		$h1 = $h1->addInt64($carry0);
+		$h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+			array(
+				$h0->toInt32(),
+				$h1->toInt32(),
+				$h2->toInt32(),
+				$h3->toInt32(),
+				$h4->toInt32(),
+				$h5->toInt32(),
+				$h6->toInt32(),
+				$h7->toInt32(),
+				$h8->toInt32(),
+				$h9->toInt32()
+			)
+		);
+	}
+
+	/**
+	 * Get the negative values for each piece of the field element.
+	 *
+	 * h = -f
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_neg(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+	{
+		$h = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+		for ($i = 0; $i < 10; ++$i) {
+			$h[$i] = $h[$i]->subInt32($f[$i]);
+		}
+		return $h;
+	}
+
+	/**
+	 * Square a field element
+	 *
+	 * h = f * f
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+	{
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64 $f0
+		 * @var ParagonIE_Sodium_Core32_Int64 $f1
+		 * @var ParagonIE_Sodium_Core32_Int64 $f2
+		 * @var ParagonIE_Sodium_Core32_Int64 $f3
+		 * @var ParagonIE_Sodium_Core32_Int64 $f4
+		 * @var ParagonIE_Sodium_Core32_Int64 $f5
+		 * @var ParagonIE_Sodium_Core32_Int64 $f6
+		 * @var ParagonIE_Sodium_Core32_Int64 $f7
+		 * @var ParagonIE_Sodium_Core32_Int64 $f8
+		 * @var ParagonIE_Sodium_Core32_Int64 $f9
+		 */
+		$f0 = $f[0]->toInt64();
+		$f1 = $f[1]->toInt64();
+		$f2 = $f[2]->toInt64();
+		$f3 = $f[3]->toInt64();
+		$f4 = $f[4]->toInt64();
+		$f5 = $f[5]->toInt64();
+		$f6 = $f[6]->toInt64();
+		$f7 = $f[7]->toInt64();
+		$f8 = $f[8]->toInt64();
+		$f9 = $f[9]->toInt64();
+
+		/** @var ParagonIE_Sodium_Core32_Int64 $f0_2 */
+		$f0_2 = $f0->shiftLeft(1);
+		$f1_2 = $f1->shiftLeft(1);
+		$f2_2 = $f2->shiftLeft(1);
+		$f3_2 = $f3->shiftLeft(1);
+		$f4_2 = $f4->shiftLeft(1);
+		$f5_2 = $f5->shiftLeft(1);
+		$f6_2 = $f6->shiftLeft(1);
+		$f7_2 = $f7->shiftLeft(1);
+		$f5_38 = $f5->mulInt(38, 6);
+		$f6_19 = $f6->mulInt(19, 5);
+		$f7_38 = $f7->mulInt(38, 6);
+		$f8_19 = $f8->mulInt(19, 5);
+		$f9_38 = $f9->mulInt(38, 6);
+		/** @var ParagonIE_Sodium_Core32_Int64 $f0f0*/
+		$f0f0    = $f0->mulInt64($f0);
+		$f0f1_2  = $f0_2->mulInt64($f1);
+		$f0f2_2 =  $f0_2->mulInt64($f2);
+		$f0f3_2 =  $f0_2->mulInt64($f3);
+		$f0f4_2 =  $f0_2->mulInt64($f4);
+		$f0f5_2 =  $f0_2->mulInt64($f5);
+		$f0f6_2 =  $f0_2->mulInt64($f6);
+		$f0f7_2 =  $f0_2->mulInt64($f7);
+		$f0f8_2 =  $f0_2->mulInt64($f8);
+		$f0f9_2 =  $f0_2->mulInt64($f9);
+		$f1f1_2 = $f1_2->mulInt64($f1);
+		$f1f2_2 = $f1_2->mulInt64($f2);
+		$f1f3_4 = $f1_2->mulInt64($f3_2);
+		$f1f4_2 = $f1_2->mulInt64($f4);
+		$f1f5_4 = $f1_2->mulInt64($f5_2);
+		$f1f6_2 = $f1_2->mulInt64($f6);
+		$f1f7_4 = $f1_2->mulInt64($f7_2);
+		$f1f8_2 = $f1_2->mulInt64($f8);
+		$f1f9_76 = $f1_2->mulInt64($f9_38);
+		$f2f2 = $f2->mulInt64($f2);
+		$f2f3_2 = $f2_2->mulInt64($f3);
+		$f2f4_2 = $f2_2->mulInt64($f4);
+		$f2f5_2 = $f2_2->mulInt64($f5);
+		$f2f6_2 = $f2_2->mulInt64($f6);
+		$f2f7_2 = $f2_2->mulInt64($f7);
+		$f2f8_38 = $f2_2->mulInt64($f8_19);
+		$f2f9_38 = $f2->mulInt64($f9_38);
+		$f3f3_2 = $f3_2->mulInt64($f3);
+		$f3f4_2 = $f3_2->mulInt64($f4);
+		$f3f5_4 = $f3_2->mulInt64($f5_2);
+		$f3f6_2 = $f3_2->mulInt64($f6);
+		$f3f7_76 = $f3_2->mulInt64($f7_38);
+		$f3f8_38 = $f3_2->mulInt64($f8_19);
+		$f3f9_76 = $f3_2->mulInt64($f9_38);
+		$f4f4 = $f4->mulInt64($f4);
+		$f4f5_2 = $f4_2->mulInt64($f5);
+		$f4f6_38 = $f4_2->mulInt64($f6_19);
+		$f4f7_38 = $f4->mulInt64($f7_38);
+		$f4f8_38 = $f4_2->mulInt64($f8_19);
+		$f4f9_38 = $f4->mulInt64($f9_38);
+		$f5f5_38 = $f5->mulInt64($f5_38);
+		$f5f6_38 = $f5_2->mulInt64($f6_19);
+		$f5f7_76 = $f5_2->mulInt64($f7_38);
+		$f5f8_38 = $f5_2->mulInt64($f8_19);
+		$f5f9_76 = $f5_2->mulInt64($f9_38);
+		$f6f6_19 = $f6->mulInt64($f6_19);
+		$f6f7_38 = $f6->mulInt64($f7_38);
+		$f6f8_38 = $f6_2->mulInt64($f8_19);
+		$f6f9_38 = $f6->mulInt64($f9_38);
+		$f7f7_38 = $f7->mulInt64($f7_38);
+		$f7f8_38 = $f7_2->mulInt64($f8_19);
+		$f7f9_76 = $f7_2->mulInt64($f9_38);
+		$f8f8_19 = $f8->mulInt64($f8_19);
+		$f8f9_38 = $f8->mulInt64($f9_38);
+		$f9f9_38 = $f9->mulInt64($f9_38);
+
+		$h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
+		$h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
+		$h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
+		$h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
+		$h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
+		$h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
+		$h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
+		$h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
+		$h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
+		$h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
+
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64 $h0
+		 * @var ParagonIE_Sodium_Core32_Int64 $h1
+		 * @var ParagonIE_Sodium_Core32_Int64 $h2
+		 * @var ParagonIE_Sodium_Core32_Int64 $h3
+		 * @var ParagonIE_Sodium_Core32_Int64 $h4
+		 * @var ParagonIE_Sodium_Core32_Int64 $h5
+		 * @var ParagonIE_Sodium_Core32_Int64 $h6
+		 * @var ParagonIE_Sodium_Core32_Int64 $h7
+		 * @var ParagonIE_Sodium_Core32_Int64 $h8
+		 * @var ParagonIE_Sodium_Core32_Int64 $h9
+		 */
+
+		$carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+		$h1 = $h1->addInt64($carry0);
+		$h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+		$carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+		$h5 = $h5->addInt64($carry4);
+		$h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+		$carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+		$h2 = $h2->addInt64($carry1);
+		$h1 = $h1->subInt64($carry1->shiftLeft(25));
+
+		$carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+		$h6 = $h6->addInt64($carry5);
+		$h5 = $h5->subInt64($carry5->shiftLeft(25));
+
+		$carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+		$h3 = $h3->addInt64($carry2);
+		$h2 = $h2->subInt64($carry2->shiftLeft(26));
+
+		$carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+		$h7 = $h7->addInt64($carry6);
+		$h6 = $h6->subInt64($carry6->shiftLeft(26));
+
+		$carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+		$h4 = $h4->addInt64($carry3);
+		$h3 = $h3->subInt64($carry3->shiftLeft(25));
+
+		$carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+		$h8 = $h8->addInt64($carry7);
+		$h7 = $h7->subInt64($carry7->shiftLeft(25));
+
+		$carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+		$h5 = $h5->addInt64($carry4);
+		$h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+		$carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+		$h9 = $h9->addInt64($carry8);
+		$h8 = $h8->subInt64($carry8->shiftLeft(26));
+
+		$carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+		$h0 = $h0->addInt64($carry9->mulInt(19));
+		$h9 = $h9->subInt64($carry9->shiftLeft(25));
+
+		$carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+		$h1 = $h1->addInt64($carry0);
+		$h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+			array(
+				$h0->toInt32(),
+				$h1->toInt32(),
+				$h2->toInt32(),
+				$h3->toInt32(),
+				$h4->toInt32(),
+				$h5->toInt32(),
+				$h6->toInt32(),
+				$h7->toInt32(),
+				$h8->toInt32(),
+				$h9->toInt32()
+			)
+		);
+	}
+
+	/**
+	 * Square and double a field element
+	 *
+	 * h = 2 * f * f
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+	{
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64 $f0
+		 * @var ParagonIE_Sodium_Core32_Int64 $f1
+		 * @var ParagonIE_Sodium_Core32_Int64 $f2
+		 * @var ParagonIE_Sodium_Core32_Int64 $f3
+		 * @var ParagonIE_Sodium_Core32_Int64 $f4
+		 * @var ParagonIE_Sodium_Core32_Int64 $f5
+		 * @var ParagonIE_Sodium_Core32_Int64 $f6
+		 * @var ParagonIE_Sodium_Core32_Int64 $f7
+		 * @var ParagonIE_Sodium_Core32_Int64 $f8
+		 * @var ParagonIE_Sodium_Core32_Int64 $f9
+		 * @var ParagonIE_Sodium_Core32_Int64 $h0
+		 */
+		$f0 = $f[0]->toInt64();
+		$f1 = $f[1]->toInt64();
+		$f2 = $f[2]->toInt64();
+		$f3 = $f[3]->toInt64();
+		$f4 = $f[4]->toInt64();
+		$f5 = $f[5]->toInt64();
+		$f6 = $f[6]->toInt64();
+		$f7 = $f[7]->toInt64();
+		$f8 = $f[8]->toInt64();
+		$f9 = $f[9]->toInt64();
+
+		$f0_2 = $f0->shiftLeft(1);
+		$f1_2 = $f1->shiftLeft(1);
+		$f2_2 = $f2->shiftLeft(1);
+		$f3_2 = $f3->shiftLeft(1);
+		$f4_2 = $f4->shiftLeft(1);
+		$f5_2 = $f5->shiftLeft(1);
+		$f6_2 = $f6->shiftLeft(1);
+		$f7_2 = $f7->shiftLeft(1);
+		$f5_38 = $f5->mulInt(38, 6); /* 1.959375*2^30 */
+		$f6_19 = $f6->mulInt(19, 5); /* 1.959375*2^30 */
+		$f7_38 = $f7->mulInt(38, 6); /* 1.959375*2^30 */
+		$f8_19 = $f8->mulInt(19, 5); /* 1.959375*2^30 */
+		$f9_38 = $f9->mulInt(38, 6); /* 1.959375*2^30 */
+		$f0f0 = $f0->mulInt64($f0);
+		$f0f1_2 = $f0_2->mulInt64($f1);
+		$f0f2_2 = $f0_2->mulInt64($f2);
+		$f0f3_2 = $f0_2->mulInt64($f3);
+		$f0f4_2 = $f0_2->mulInt64($f4);
+		$f0f5_2 = $f0_2->mulInt64($f5);
+		$f0f6_2 = $f0_2->mulInt64($f6);
+		$f0f7_2 = $f0_2->mulInt64($f7);
+		$f0f8_2 = $f0_2->mulInt64($f8);
+		$f0f9_2 = $f0_2->mulInt64($f9);
+		$f1f1_2 = $f1_2->mulInt64($f1);
+		$f1f2_2 = $f1_2->mulInt64($f2);
+		$f1f3_4 = $f1_2->mulInt64($f3_2);
+		$f1f4_2 = $f1_2->mulInt64($f4);
+		$f1f5_4 = $f1_2->mulInt64($f5_2);
+		$f1f6_2 = $f1_2->mulInt64($f6);
+		$f1f7_4 = $f1_2->mulInt64($f7_2);
+		$f1f8_2 = $f1_2->mulInt64($f8);
+		$f1f9_76 = $f1_2->mulInt64($f9_38);
+		$f2f2 = $f2->mulInt64($f2);
+		$f2f3_2 = $f2_2->mulInt64($f3);
+		$f2f4_2 = $f2_2->mulInt64($f4);
+		$f2f5_2 = $f2_2->mulInt64($f5);
+		$f2f6_2 = $f2_2->mulInt64($f6);
+		$f2f7_2 = $f2_2->mulInt64($f7);
+		$f2f8_38 = $f2_2->mulInt64($f8_19);
+		$f2f9_38 = $f2->mulInt64($f9_38);
+		$f3f3_2 = $f3_2->mulInt64($f3);
+		$f3f4_2 = $f3_2->mulInt64($f4);
+		$f3f5_4 = $f3_2->mulInt64($f5_2);
+		$f3f6_2 = $f3_2->mulInt64($f6);
+		$f3f7_76 = $f3_2->mulInt64($f7_38);
+		$f3f8_38 = $f3_2->mulInt64($f8_19);
+		$f3f9_76 = $f3_2->mulInt64($f9_38);
+		$f4f4 = $f4->mulInt64($f4);
+		$f4f5_2 = $f4_2->mulInt64($f5);
+		$f4f6_38 = $f4_2->mulInt64($f6_19);
+		$f4f7_38 = $f4->mulInt64($f7_38);
+		$f4f8_38 = $f4_2->mulInt64($f8_19);
+		$f4f9_38 = $f4->mulInt64($f9_38);
+		$f5f5_38 = $f5->mulInt64($f5_38);
+		$f5f6_38 = $f5_2->mulInt64($f6_19);
+		$f5f7_76 = $f5_2->mulInt64($f7_38);
+		$f5f8_38 = $f5_2->mulInt64($f8_19);
+		$f5f9_76 = $f5_2->mulInt64($f9_38);
+		$f6f6_19 = $f6->mulInt64($f6_19);
+		$f6f7_38 = $f6->mulInt64($f7_38);
+		$f6f8_38 = $f6_2->mulInt64($f8_19);
+		$f6f9_38 = $f6->mulInt64($f9_38);
+		$f7f7_38 = $f7->mulInt64($f7_38);
+		$f7f8_38 = $f7_2->mulInt64($f8_19);
+		$f7f9_76 = $f7_2->mulInt64($f9_38);
+		$f8f8_19 = $f8->mulInt64($f8_19);
+		$f8f9_38 = $f8->mulInt64($f9_38);
+		$f9f9_38 = $f9->mulInt64($f9_38);
+
+		$h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
+		$h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
+		$h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
+		$h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
+		$h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
+		$h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
+		$h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
+		$h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
+		$h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
+		$h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
+
+		/*
         $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19);
         $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38);
         $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38);
          */
 
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $h0
-         * @var ParagonIE_Sodium_Core32_Int64 $h1
-         * @var ParagonIE_Sodium_Core32_Int64 $h2
-         * @var ParagonIE_Sodium_Core32_Int64 $h3
-         * @var ParagonIE_Sodium_Core32_Int64 $h4
-         * @var ParagonIE_Sodium_Core32_Int64 $h5
-         * @var ParagonIE_Sodium_Core32_Int64 $h6
-         * @var ParagonIE_Sodium_Core32_Int64 $h7
-         * @var ParagonIE_Sodium_Core32_Int64 $h8
-         * @var ParagonIE_Sodium_Core32_Int64 $h9
-         */
-        $h0 = $h0->shiftLeft(1);
-        $h1 = $h1->shiftLeft(1);
-        $h2 = $h2->shiftLeft(1);
-        $h3 = $h3->shiftLeft(1);
-        $h4 = $h4->shiftLeft(1);
-        $h5 = $h5->shiftLeft(1);
-        $h6 = $h6->shiftLeft(1);
-        $h7 = $h7->shiftLeft(1);
-        $h8 = $h8->shiftLeft(1);
-        $h9 = $h9->shiftLeft(1);
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $h0->toInt32(),
-                $h1->toInt32(),
-                $h2->toInt32(),
-                $h3->toInt32(),
-                $h4->toInt32(),
-                $h5->toInt32(),
-                $h6->toInt32(),
-                $h7->toInt32(),
-                $h8->toInt32(),
-                $h9->toInt32()
-            )
-        );
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64 $h0
+		 * @var ParagonIE_Sodium_Core32_Int64 $h1
+		 * @var ParagonIE_Sodium_Core32_Int64 $h2
+		 * @var ParagonIE_Sodium_Core32_Int64 $h3
+		 * @var ParagonIE_Sodium_Core32_Int64 $h4
+		 * @var ParagonIE_Sodium_Core32_Int64 $h5
+		 * @var ParagonIE_Sodium_Core32_Int64 $h6
+		 * @var ParagonIE_Sodium_Core32_Int64 $h7
+		 * @var ParagonIE_Sodium_Core32_Int64 $h8
+		 * @var ParagonIE_Sodium_Core32_Int64 $h9
+		 */
+		$h0 = $h0->shiftLeft(1);
+		$h1 = $h1->shiftLeft(1);
+		$h2 = $h2->shiftLeft(1);
+		$h3 = $h3->shiftLeft(1);
+		$h4 = $h4->shiftLeft(1);
+		$h5 = $h5->shiftLeft(1);
+		$h6 = $h6->shiftLeft(1);
+		$h7 = $h7->shiftLeft(1);
+		$h8 = $h8->shiftLeft(1);
+		$h9 = $h9->shiftLeft(1);
+
+		$carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+		$h1 = $h1->addInt64($carry0);
+		$h0 = $h0->subInt64($carry0->shiftLeft(26));
+		$carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+		$h5 = $h5->addInt64($carry4);
+		$h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+		$carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+		$h2 = $h2->addInt64($carry1);
+		$h1 = $h1->subInt64($carry1->shiftLeft(25));
+		$carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+		$h6 = $h6->addInt64($carry5);
+		$h5 = $h5->subInt64($carry5->shiftLeft(25));
+
+		$carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+		$h3 = $h3->addInt64($carry2);
+		$h2 = $h2->subInt64($carry2->shiftLeft(26));
+		$carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+		$h7 = $h7->addInt64($carry6);
+		$h6 = $h6->subInt64($carry6->shiftLeft(26));
+
+		$carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+		$h4 = $h4->addInt64($carry3);
+		$h3 = $h3->subInt64($carry3->shiftLeft(25));
+		$carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+		$h8 = $h8->addInt64($carry7);
+		$h7 = $h7->subInt64($carry7->shiftLeft(25));
+
+		$carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+		$h5 = $h5->addInt64($carry4);
+		$h4 = $h4->subInt64($carry4->shiftLeft(26));
+		$carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+		$h9 = $h9->addInt64($carry8);
+		$h8 = $h8->subInt64($carry8->shiftLeft(26));
+
+		$carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+		$h0 = $h0->addInt64($carry9->mulInt(19));
+		$h9 = $h9->subInt64($carry9->shiftLeft(25));
+
+		$carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+		$h1 = $h1->addInt64($carry0);
+		$h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+			array(
+				$h0->toInt32(),
+				$h1->toInt32(),
+				$h2->toInt32(),
+				$h3->toInt32(),
+				$h4->toInt32(),
+				$h5->toInt32(),
+				$h6->toInt32(),
+				$h7->toInt32(),
+				$h8->toInt32(),
+				$h9->toInt32()
+			)
+		);
 /*
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array($h0, $h1, $h2, $h3, $h4, $h5, $h6, $h7, $h8, $h9)
         );
 */
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $Z
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_invert(ParagonIE_Sodium_Core32_Curve25519_Fe $Z)
-    {
-        $z = clone $Z;
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t2 = self::fe_sq($t0);
-        $t1 = self::fe_mul($t1, $t2);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 20; ++$i) {
-            $t3 = self::fe_sq($t3);
-        }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 100; ++$i) {
-            $t3 = self::fe_sq($t3);
-        }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-        return self::fe_mul($t1, $t0);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $z
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_pow22523(ParagonIE_Sodium_Core32_Curve25519_Fe $z)
-    {
-        # fe_sq(t0, z);
-        # fe_sq(t1, t0);
-        # fe_sq(t1, t1);
-        # fe_mul(t1, z, t1);
-        # fe_mul(t0, t0, t1);
-        # fe_sq(t0, t0);
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 5; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
-
-        # for (i = 1; i < 20; ++i) {
-        #     fe_sq(t2, t2);
-        # }
-        for ($i = 1; $i < 20; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
-
-        # for (i = 1; i < 100; ++i) {
-        #     fe_sq(t2, t2);
-        # }
-        for ($i = 1; $i < 100; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t0, t0);
-        # fe_sq(t0, t0);
-        # fe_mul(out, t0, z);
-        $t0 = self::fe_mul($t1, $t0);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_sq($t0);
-        return self::fe_mul($t0, $z);
-    }
-
-    /**
-     * Subtract two field elements.
-     *
-     * h = f - g
-     *
-     * Preconditions:
-     * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-     * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-     *
-     * Postconditions:
-     * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_sub(ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g)
-    {
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $f[0]->subInt32($g[0]),
-                $f[1]->subInt32($g[1]),
-                $f[2]->subInt32($g[2]),
-                $f[3]->subInt32($g[3]),
-                $f[4]->subInt32($g[4]),
-                $f[5]->subInt32($g[5]),
-                $f[6]->subInt32($g[6]),
-                $f[7]->subInt32($g[7]),
-                $f[8]->subInt32($g[8]),
-                $f[9]->subInt32($g[9])
-            )
-        );
-    }
-
-    /**
-     * Add two group elements.
-     *
-     * r = p + q
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     */
-    public static function ge_add(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-    ) {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YplusX);
-        $r->Y = self::fe_mul($r->Y, $q->YminusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0   = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
-     * @param string $a
-     * @return array<int, mixed>
-     */
-    public static function slide($a)
-    {
-        if (self::strlen($a) < 256) {
-            if (self::strlen($a) < 16) {
-                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
-            }
-        }
-        $r = array();
-        for ($i = 0; $i < 256; ++$i) {
-            $r[$i] = 1 & (
-                self::chrToInt($a[$i >> 3])
-                    >>
-                ($i & 7)
-            );
-        }
-
-        for ($i = 0;$i < 256;++$i) {
-            if ($r[$i]) {
-                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
-                    if ($r[$i + $b]) {
-                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
-                            $r[$i] += $r[$i + $b] << $b;
-                            $r[$i + $b] = 0;
-                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
-                            $r[$i] -= $r[$i + $b] << $b;
-                            for ($k = $i + $b; $k < 256; ++$k) {
-                                if (!$r[$k]) {
-                                    $r[$k] = 1;
-                                    break;
-                                }
-                                $r[$k] = 0;
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     */
-    public static function ge_frombytes_negate_vartime($s)
-    {
-        static $d = null;
-        if (!$d) {
-            $d = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                array(
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[0]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[1]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[2]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[3]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[4]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[5]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[6]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[7]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[8]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[9])
-                )
-            );
-        }
-
-        # fe_frombytes(h->Y,s);
-        # fe_1(h->Z);
-        $h = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
-            self::fe_0(),
-            self::fe_frombytes($s),
-            self::fe_1()
-        );
-
-        # fe_sq(u,h->Y);
-        # fe_mul(v,u,d);
-        # fe_sub(u,u,h->Z);       /* u = y^2-1 */
-        # fe_add(v,v,h->Z);       /* v = dy^2+1 */
-        $u = self::fe_sq($h->Y);
-        $v = self::fe_mul($u, $d);
-        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
-        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
-
-        # fe_sq(v3,v);
-        # fe_mul(v3,v3,v);        /* v3 = v^3 */
-        # fe_sq(h->X,v3);
-        # fe_mul(h->X,h->X,v);
-        # fe_mul(h->X,h->X,u);    /* x = uv^7 */
-        $v3 = self::fe_sq($v);
-        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
-        $h->X = self::fe_sq($v3);
-        $h->X = self::fe_mul($h->X, $v);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
-
-        # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
-        # fe_mul(h->X,h->X,v3);
-        # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
-        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
-        $h->X = self::fe_mul($h->X, $v3);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
-
-        # fe_sq(vxx,h->X);
-        # fe_mul(vxx,vxx,v);
-        # fe_sub(check,vxx,u);    /* vx^2-u */
-        $vxx = self::fe_sq($h->X);
-        $vxx = self::fe_mul($vxx, $v);
-        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
-
-        # if (fe_isnonzero(check)) {
-        #     fe_add(check,vxx,u);  /* vx^2+u */
-        #     if (fe_isnonzero(check)) {
-        #         return -1;
-        #     }
-        #     fe_mul(h->X,h->X,sqrtm1);
-        # }
-        if (self::fe_isnonzero($check)) {
-            $check = self::fe_add($vxx, $u); /* vx^2 + u */
-            if (self::fe_isnonzero($check)) {
-                throw new RangeException('Internal check failed.');
-            }
-            $h->X = self::fe_mul(
-                $h->X,
-                ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(self::$sqrtm1)
-            );
-        }
-
-        # if (fe_isnegative(h->X) == (s[31] >> 7)) {
-        #     fe_neg(h->X,h->X);
-        # }
-        $i = self::chrToInt($s[31]);
-        if (self::fe_isnegative($h->X) === ($i >> 7)) {
-            $h->X = self::fe_neg($h->X);
-        }
-
-        # fe_mul(h->T,h->X,h->Y);
-        $h->T = self::fe_mul($h->X, $h->Y);
-        return $h;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     */
-    public static function ge_madd(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-    ) {
-        $r = clone $R;
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yplusx);
-        $r->Y = self::fe_mul($r->Y, $q->yminusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     */
-    public static function ge_msub(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-    ) {
-        $r = clone $R;
-
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yminusx);
-        $r->Y = self::fe_mul($r->Y, $q->yplusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add($p->Z, $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
-    {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P2();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
-    {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        $r->T = self::fe_mul($p->X, $p->Y);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     */
-    public static function ge_p2_0()
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
-            self::fe_0(),
-            self::fe_1(),
-            self::fe_1()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p)
-    {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-
-        $r->X = self::fe_sq($p->X);
-        $r->Z = self::fe_sq($p->Y);
-        $r->T = self::fe_sq2($p->Z);
-        $r->Y = self::fe_add($p->X, $p->Y);
-        $t0   = self::fe_sq($r->Y);
-        $r->Y = self::fe_add($r->Z, $r->X);
-        $r->Z = self::fe_sub($r->Z, $r->X);
-        $r->X = self::fe_sub($t0, $r->Y);
-        $r->T = self::fe_sub($r->T, $r->Z);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     */
-    public static function ge_p3_0()
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
-            self::fe_0(),
-            self::fe_1(),
-            self::fe_1(),
-            self::fe_0()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
-     */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
-        static $d2 = null;
-        if ($d2 === null) {
-            $d2 = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                array(
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[0]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[1]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[2]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[3]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[4]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[5]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[6]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[7]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[8]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[9])
-                )
-            );
-        }
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached();
-        $r->YplusX = self::fe_add($p->Y, $p->X);
-        $r->YminusX = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_copy($p->Z);
-        $r->T2d = self::fe_mul($p->T, $d2);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
-            $p->X,
-            $p->Y,
-            $p->Z
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h
-     * @return string
-     */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h)
-    {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
-        );
-        return $s;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
-        $q = self::ge_p3_to_p2($p);
-        return self::ge_p2_dbl($q);
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-     */
-    public static function ge_precomp_0()
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_1(),
-            self::fe_1(),
-            self::fe_0()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $b
-     * @param int $c
-     * @return int
-     */
-    public static function equal($b, $c)
-    {
-        return (($b ^ $c) - 1 & 0xffffffff) >> 31;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $char
-     * @return int (1 = yes, 0 = no)
-     */
-    public static function negative($char)
-    {
-        if (is_int($char)) {
-            return $char < 0 ? 1 : 0;
-        }
-        $x = self::chrToInt(self::substr($char, 0, 1));
-        if (PHP_INT_SIZE === 8) {
-            return $x >> 63;
-        }
-        return $x >> 31;
-    }
-
-    /**
-     * Conditional move
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u
-     * @param int $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-     */
-    public static function cmov(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u,
-        $b
-    ) {
-        if (!is_int($b)) {
-            throw new InvalidArgumentException('Expected an integer.');
-        }
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_cmov($t->yplusx, $u->yplusx, $b),
-            self::fe_cmov($t->yminusx, $u->yminusx, $b),
-            self::fe_cmov($t->xy2d, $u->xy2d, $b)
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $pos
-     * @param int $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-     */
-    public static function ge_select($pos = 0, $b = 0)
-    {
-        static $base = null;
-        if ($base === null) {
-            $base = array();
-            foreach (self::$base as $i => $bas) {
-                for ($j = 0; $j < 8; ++$j) {
-                    $base[$i][$j] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                            array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][9])
-                            )
-                        ),
-                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                            array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][9])
-                            )
-                        ),
-                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                            array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][9])
-                            )
-                        )
-                    );
-                }
-            }
-        }
-        if (!is_int($pos)) {
-            throw new InvalidArgumentException('Position must be an integer');
-        }
-        if ($pos < 0 || $pos > 31) {
-            throw new RangeException('Position is out of range [0, 31]');
-        }
-
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
-
-        $t = self::ge_precomp_0();
-        for ($i = 0; $i < 8; ++$i) {
-            $t = self::cmov(
-                $t,
-                $base[$pos][$i],
-                self::equal($babs, $i + 1)
-            );
-        }
-        $minusT = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_copy($t->yminusx),
-            self::fe_copy($t->yplusx),
-            self::fe_neg($t->xy2d)
-        );
-        return self::cmov($t, $minusT, -$bnegative);
-    }
-
-    /**
-     * Subtract two group elements.
-     *
-     * r = p - q
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     */
-    public static function ge_sub(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-    ) {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YminusX);
-        $r->Y = self::fe_mul($r->Y, $q->YplusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0 = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * Convert a group element to a byte string.
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h
-     * @return string
-     */
-    public static function ge_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h)
-    {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
-        );
-        return $s;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A
-     * @param string $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     */
-    public static function ge_double_scalarmult_vartime(
-        $a,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A,
-        $b
-    ) {
-        /**
-         * @var ParagonIE_Sodium_Core32_Curve25519_Ge_Cached[]
-         */
-        $Ai = array();
-
-        /**
-         * @var ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp[]
-         */
-        static $Bi = array();
-        if (!$Bi) {
-            for ($i = 0; $i < 8; ++$i) {
-
-                $Bi[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                        array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][9])
-                        )
-                    ),
-                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                        array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][9])
-                        )
-                    ),
-                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                        array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][9])
-                        )
-                    )
-                );
-            }
-        }
-        for ($i = 0; $i < 8; ++$i) {
-            $Ai[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached(
-                self::fe_0(),
-                self::fe_0(),
-                self::fe_0(),
-                self::fe_0()
-            );
-        }
-
-        # slide(aslide,a);
-        # slide(bslide,b);
-        $aslide = self::slide($a);
-        $bslide = self::slide($b);
-
-        # ge_p3_to_cached(&Ai[0],A);
-        # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
-        $Ai[0] = self::ge_p3_to_cached($A);
-        $t = self::ge_p3_dbl($A);
-        $A2 = self::ge_p1p1_to_p3($t);
-
-        # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
-        # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
-        # ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
-        # ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
-        # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
-        # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
-        # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
-        for ($i = 0; $i < 7; ++$i) {
-            $t = self::ge_add($A2, $Ai[$i]);
-            $u = self::ge_p1p1_to_p3($t);
-            $Ai[$i + 1] = self::ge_p3_to_cached($u);
-        }
-
-        # ge_p2_0(r);
-        $r = self::ge_p2_0();
-
-        # for (i = 255;i >= 0;--i) {
-        #     if (aslide[i] || bslide[i]) break;
-        # }
-        $i = 255;
-        for (; $i >= 0; --$i) {
-            if ($aslide[$i] || $bslide[$i]) {
-                break;
-            }
-        }
-
-        # for (;i >= 0;--i) {
-        for (; $i >= 0; --$i) {
-            # ge_p2_dbl(&t,r);
-            $t = self::ge_p2_dbl($r);
-
-            # if (aslide[i] > 0) {
-            if ($aslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_add(&t,&u,&Ai[aslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_add(
-                    $u,
-                    $Ai[(int) floor($aslide[$i] / 2)]
-                );
-                # } else if (aslide[i] < 0) {
-            } elseif ($aslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_sub(
-                    $u,
-                    $Ai[(int) floor(-$aslide[$i] / 2)]
-                );
-            }
-
-            # if (bslide[i] > 0) {
-            if ($bslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_madd(&t,&u,&Bi[bslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_madd(
-                    $t,
-                    $u,
-                    $Bi[(int) floor($bslide[$i] / 2)]
-                );
-                # } else if (bslide[i] < 0) {
-            } elseif ($bslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_msub(
-                    $t,
-                    $u,
-                    $Bi[(int) floor(-$bslide[$i] / 2)]
-                );
-            }
-            # ge_p1p1_to_p2(r,&t);
-            $r = self::ge_p1p1_to_p2($t);
-        }
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     */
-    public static function ge_scalarmult_base($a)
-    {
-        $e = array();
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-
-        for ($i = 0; $i < 32; ++$i) {
-            $e[$i << 1] = self::chrToInt($a[$i]) & 15;
-            $e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
-        }
-
-        $carry = 0;
-        for ($i = 0; $i < 63; ++$i) {
-            $e[$i] += $carry;
-            $carry = $e[$i] + 8;
-            $carry >>= 4;
-            $e[$i] -= $carry << 4;
-        }
-        $e[63] += $carry;
-
-        $h = self::ge_p3_0();
-
-        for ($i = 1; $i < 64; $i += 2) {
-            $t = self::ge_select((int) floor($i / 2), $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
-        }
-
-        $r = self::ge_p3_dbl($h);
-
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-
-        $h = self::ge_p1p1_to_p3($r);
-
-        for ($i = 0; $i < 64; $i += 2) {
-            $t = self::ge_select($i >> 1, $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
-        }
-        return $h;
-    }
-
-    /**
-     * Calculates (ab + c) mod l
-     * where l = 2^252 + 27742317777372353535851937790883648493
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param string $b
-     * @param string $c
-     * @return string
-     */
-    public static function sc_muladd($a, $b, $c)
-    {
-        $a0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 0, 3)))->toInt64();
-        $a1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5))->toInt64();
-        $a2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2))->toInt64();
-        $a3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7))->toInt64();
-        $a4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4))->toInt64();
-        $a5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1))->toInt64();
-        $a6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6))->toInt64();
-        $a7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3))->toInt64();
-        $a8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 21, 3)))->toInt64();
-        $a9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5))->toInt64();
-        $a10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2))->toInt64();
-        $a11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($a, 28, 4)) >> 7))->toInt64();
-        $b0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 0, 3)))->toInt64();
-        $b1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5))->toInt64();
-        $b2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2))->toInt64();
-        $b3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7))->toInt64();
-        $b4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4))->toInt64();
-        $b5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1))->toInt64();
-        $b6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6))->toInt64();
-        $b7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3))->toInt64();
-        $b8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 21, 3)))->toInt64();
-        $b9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5))->toInt64();
-        $b10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2))->toInt64();
-        $b11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($b, 28, 4)) >> 7))->toInt64();
-        $c0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 0, 3)))->toInt64();
-        $c1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5))->toInt64();
-        $c2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2))->toInt64();
-        $c3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7))->toInt64();
-        $c4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4))->toInt64();
-        $c5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1))->toInt64();
-        $c6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6))->toInt64();
-        $c7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3))->toInt64();
-        $c8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 21, 3)))->toInt64();
-        $c9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5))->toInt64();
-        $c10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2))->toInt64();
-        $c11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($c, 28, 4)) >> 7))->toInt64();
-
-        /* Can't really avoid the pyramid here: */
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $s0
-         * @var ParagonIE_Sodium_Core32_Int64 $s1
-         * @var ParagonIE_Sodium_Core32_Int64 $s2
-         * @var ParagonIE_Sodium_Core32_Int64 $s3
-         * @var ParagonIE_Sodium_Core32_Int64 $s4
-         * @var ParagonIE_Sodium_Core32_Int64 $s5
-         * @var ParagonIE_Sodium_Core32_Int64 $s6
-         * @var ParagonIE_Sodium_Core32_Int64 $s7
-         * @var ParagonIE_Sodium_Core32_Int64 $s8
-         * @var ParagonIE_Sodium_Core32_Int64 $s9
-         * @var ParagonIE_Sodium_Core32_Int64 $s10
-         * @var ParagonIE_Sodium_Core32_Int64 $s11
-         * @var ParagonIE_Sodium_Core32_Int64 $s12
-         * @var ParagonIE_Sodium_Core32_Int64 $s13
-         * @var ParagonIE_Sodium_Core32_Int64 $s14
-         * @var ParagonIE_Sodium_Core32_Int64 $s15
-         * @var ParagonIE_Sodium_Core32_Int64 $s16
-         * @var ParagonIE_Sodium_Core32_Int64 $s17
-         * @var ParagonIE_Sodium_Core32_Int64 $s18
-         * @var ParagonIE_Sodium_Core32_Int64 $s19
-         * @var ParagonIE_Sodium_Core32_Int64 $s20
-         * @var ParagonIE_Sodium_Core32_Int64 $s21
-         * @var ParagonIE_Sodium_Core32_Int64 $s22
-         * @var ParagonIE_Sodium_Core32_Int64 $s23
-         */
-
-        $s0 = $c0->addInt64($a0->mulInt64($b0));
-        $s1 = $c1->addInt64($a0->mulInt64($b1))->addInt64($a1->mulInt64($b0));
-        $s2 = $c2->addInt64($a0->mulInt64($b2))->addInt64($a1->mulInt64($b1))->addInt64($a2->mulInt64($b0));
-        $s3 = $c3->addInt64($a0->mulInt64($b3))->addInt64($a1->mulInt64($b2))->addInt64($a2->mulInt64($b1))->addInt64($a3->mulInt64($b0));
-        $s4 = $c4->addInt64($a0->mulInt64($b4))->addInt64($a1->mulInt64($b3))->addInt64($a2->mulInt64($b2))->addInt64($a3->mulInt64($b1))->addInt64($a4->mulInt64($b0));
-        $s5 = $c5->addInt64($a0->mulInt64($b5))->addInt64($a1->mulInt64($b4))->addInt64($a2->mulInt64($b3))->addInt64($a3->mulInt64($b2))->addInt64($a4->mulInt64($b1))->addInt64($a5->mulInt64($b0));
-        $s6 = $c6->addInt64($a0->mulInt64($b6))->addInt64($a1->mulInt64($b5))->addInt64($a2->mulInt64($b4))->addInt64($a3->mulInt64($b3))->addInt64($a4->mulInt64($b2))->addInt64($a5->mulInt64($b1))
-                 ->addInt64($a6->mulInt64($b0));
-        $s7 = $c7->addInt64($a0->mulInt64($b7))->addInt64($a1->mulInt64($b6))->addInt64($a2->mulInt64($b5))->addInt64($a3->mulInt64($b4))->addInt64($a4->mulInt64($b3))->addInt64($a5->mulInt64($b2))
-                 ->addInt64($a6->mulInt64($b1))->addInt64($a7->mulInt64($b0));
-        $s8 = $c8->addInt64($a0->mulInt64($b8))->addInt64($a1->mulInt64($b7))->addInt64($a2->mulInt64($b6))->addInt64($a3->mulInt64($b5))->addInt64($a4->mulInt64($b4))->addInt64($a5->mulInt64($b3))
-                 ->addInt64($a6->mulInt64($b2))->addInt64($a7->mulInt64($b1))->addInt64($a8->mulInt64($b0));
-        $s9 = $c9->addInt64($a0->mulInt64($b9))->addInt64($a1->mulInt64($b8))->addInt64($a2->mulInt64($b7))->addInt64($a3->mulInt64($b6))->addInt64($a4->mulInt64($b5))->addInt64($a5->mulInt64($b4))
-                 ->addInt64($a6->mulInt64($b3))->addInt64($a7->mulInt64($b2))->addInt64($a8->mulInt64($b1))->addInt64($a9->mulInt64($b0));
-        $s10 = $c10->addInt64($a0->mulInt64($b10))->addInt64($a1->mulInt64($b9))->addInt64($a2->mulInt64($b8))->addInt64($a3->mulInt64($b7))->addInt64($a4->mulInt64($b6))->addInt64($a5->mulInt64($b5))
-                   ->addInt64($a6->mulInt64($b4))->addInt64($a7->mulInt64($b3))->addInt64($a8->mulInt64($b2))->addInt64($a9->mulInt64($b1))->addInt64($a10->mulInt64($b0));
-        $s11 = $c11->addInt64($a0->mulInt64($b11))->addInt64($a1->mulInt64($b10))->addInt64($a2->mulInt64($b9))->addInt64($a3->mulInt64($b8))->addInt64($a4->mulInt64($b7))->addInt64($a5->mulInt64($b6))
-                   ->addInt64($a6->mulInt64($b5))->addInt64($a7->mulInt64($b4))->addInt64($a8->mulInt64($b3))->addInt64($a9->mulInt64($b2))->addInt64($a10->mulInt64($b1))->addInt64($a11->mulInt64($b0));
-        $s12 = $a1->mulInt64($b11)->addInt64($a2->mulInt64($b10))->addInt64($a3->mulInt64($b9))->addInt64($a4->mulInt64($b8))->addInt64($a5->mulInt64($b7))->addInt64($a6->mulInt64($b6))
-                  ->addInt64($a7->mulInt64($b5))->addInt64($a8->mulInt64($b4))->addInt64($a9->mulInt64($b3))->addInt64($a10->mulInt64($b2))->addInt64($a11->mulInt64($b1));
-        $s13 = $a2->mulInt64($b11)->addInt64($a3->mulInt64($b10))->addInt64($a4->mulInt64($b9))->addInt64($a5->mulInt64($b8))->addInt64($a6->mulInt64($b7))->addInt64($a7->mulInt64($b6))
-                  ->addInt64($a8->mulInt64($b5))->addInt64($a9->mulInt64($b4))->addInt64($a10->mulInt64($b3))->addInt64($a11->mulInt64($b2));
-        $s14 = $a3->mulInt64($b11)->addInt64($a4->mulInt64($b10))->addInt64($a5->mulInt64($b9))->addInt64($a6->mulInt64($b8))->addInt64($a7->mulInt64($b7))->addInt64($a8->mulInt64($b6))
-                  ->addInt64($a9->mulInt64($b5))->addInt64($a10->mulInt64($b4))->addInt64($a11->mulInt64($b3));
-        $s15 = $a4->mulInt64($b11)->addInt64($a5->mulInt64($b10))->addInt64($a6->mulInt64($b9))->addInt64($a7->mulInt64($b8))->addInt64($a8->mulInt64($b7))->addInt64($a9->mulInt64($b6))
-                  ->addInt64($a10->mulInt64($b5))->addInt64($a11->mulInt64($b4));
-        $s16 = $a5->mulInt64($b11)->addInt64($a6->mulInt64($b10))->addInt64($a7->mulInt64($b9))->addInt64($a8->mulInt64($b8))->addInt64($a9->mulInt64($b7))->addInt64($a10->mulInt64($b6))
-                   ->addInt64($a11->mulInt64($b5));
-        $s17 = $a6->mulInt64($b11)->addInt64($a7->mulInt64($b10))->addInt64($a8->mulInt64($b9))->addInt64($a9->mulInt64($b8))->addInt64($a10->mulInt64($b7))->addInt64($a11->mulInt64($b6));
-        $s18 = $a7->mulInt64($b11)->addInt64($a8->mulInt64($b10))->addInt64($a9->mulInt64($b9))->addInt64($a10->mulInt64($b8))->addInt64($a11->mulInt64($b7));
-        $s19 = $a8->mulInt64($b11)->addInt64($a9->mulInt64($b10))->addInt64($a10->mulInt64($b9))->addInt64($a11->mulInt64($b8));
-        $s20 = $a9->mulInt64($b11)->addInt64($a10->mulInt64($b10))->addInt64($a11->mulInt64($b9));
-        $s21 = $a10->mulInt64($b11)->addInt64($a11->mulInt64($b10));
-        $s22 = $a11->mulInt64($b11);
-        $s23 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-        $carry18 = $s18->addInt(1 << 20)->shiftRight(21);
-        $s19 = $s19->addInt64($carry18);
-        $s18 = $s18->subInt64($carry18->shiftLeft(21));
-        $carry20 = $s20->addInt(1 << 20)->shiftRight(21);
-        $s21 = $s21->addInt64($carry20);
-        $s20 = $s20->subInt64($carry20->shiftLeft(21));
-        $carry22 = $s22->addInt(1 << 20)->shiftRight(21);
-        $s23 = $s23->addInt64($carry22);
-        $s22 = $s22->subInt64($carry22->shiftLeft(21));
-
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-        $carry17 = $s17->addInt(1 << 20)->shiftRight(21);
-        $s18 = $s18->addInt64($carry17);
-        $s17 = $s17->subInt64($carry17->shiftLeft(21));
-        $carry19 = $s19->addInt(1 << 20)->shiftRight(21);
-        $s20 = $s20->addInt64($carry19);
-        $s19 = $s19->subInt64($carry19->shiftLeft(21));
-        $carry21 = $s21->addInt(1 << 20)->shiftRight(21);
-        $s22 = $s22->addInt64($carry21);
-        $s21 = $s21->subInt64($carry21->shiftLeft(21));
-
-        $s11 = $s11->addInt64($s23->mulInt(666643));
-        $s12 = $s12->addInt64($s23->mulInt(470296));
-        $s13 = $s13->addInt64($s23->mulInt(654183));
-        $s14 = $s14->subInt64($s23->mulInt(997805));
-        $s15 = $s15->addInt64($s23->mulInt(136657));
-        $s16 = $s16->subInt64($s23->mulInt(683901));
-
-        $s10 = $s10->addInt64($s22->mulInt(666643));
-        $s11 = $s11->addInt64($s22->mulInt(470296));
-        $s12 = $s12->addInt64($s22->mulInt(654183));
-        $s13 = $s13->subInt64($s22->mulInt(997805));
-        $s14 = $s14->addInt64($s22->mulInt(136657));
-        $s15 = $s15->subInt64($s22->mulInt(683901));
-
-        $s9  =  $s9->addInt64($s21->mulInt(666643));
-        $s10 = $s10->addInt64($s21->mulInt(470296));
-        $s11 = $s11->addInt64($s21->mulInt(654183));
-        $s12 = $s12->subInt64($s21->mulInt(997805));
-        $s13 = $s13->addInt64($s21->mulInt(136657));
-        $s14 = $s14->subInt64($s21->mulInt(683901));
-
-        $s8  =  $s8->addInt64($s20->mulInt(666643));
-        $s9  =  $s9->addInt64($s20->mulInt(470296));
-        $s10 = $s10->addInt64($s20->mulInt(654183));
-        $s11 = $s11->subInt64($s20->mulInt(997805));
-        $s12 = $s12->addInt64($s20->mulInt(136657));
-        $s13 = $s13->subInt64($s20->mulInt(683901));
-
-        $s7  =  $s7->addInt64($s19->mulInt(666643));
-        $s8  =  $s8->addInt64($s19->mulInt(470296));
-        $s9  =  $s9->addInt64($s19->mulInt(654183));
-        $s10 = $s10->subInt64($s19->mulInt(997805));
-        $s11 = $s11->addInt64($s19->mulInt(136657));
-        $s12 = $s12->subInt64($s19->mulInt(683901));
-
-        $s6  =  $s6->addInt64($s18->mulInt(666643));
-        $s7  =  $s7->addInt64($s18->mulInt(470296));
-        $s8  =  $s8->addInt64($s18->mulInt(654183));
-        $s9  =  $s9->subInt64($s18->mulInt(997805));
-        $s10 = $s10->addInt64($s18->mulInt(136657));
-        $s11 = $s11->subInt64($s18->mulInt(683901));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt64($s17->mulInt(666643));
-        $s6  =  $s6->addInt64($s17->mulInt(470296));
-        $s7  =  $s7->addInt64($s17->mulInt(654183));
-        $s8  =  $s8->subInt64($s17->mulInt(997805));
-        $s9  =  $s9->addInt64($s17->mulInt(136657));
-        $s10 = $s10->subInt64($s17->mulInt(683901));
-
-        $s4  =  $s4->addInt64($s16->mulInt(666643));
-        $s5  =  $s5->addInt64($s16->mulInt(470296));
-        $s6  =  $s6->addInt64($s16->mulInt(654183));
-        $s7  =  $s7->subInt64($s16->mulInt(997805));
-        $s8  =  $s8->addInt64($s16->mulInt(136657));
-        $s9  =  $s9->subInt64($s16->mulInt(683901));
-
-        $s3  =  $s3->addInt64($s15->mulInt(666643));
-        $s4  =  $s4->addInt64($s15->mulInt(470296));
-        $s5  =  $s5->addInt64($s15->mulInt(654183));
-        $s6  =  $s6->subInt64($s15->mulInt(997805));
-        $s7  =  $s7->addInt64($s15->mulInt(136657));
-        $s8  =  $s8->subInt64($s15->mulInt(683901));
-
-        $s2  =  $s2->addInt64($s14->mulInt(666643));
-        $s3  =  $s3->addInt64($s14->mulInt(470296));
-        $s4  =  $s4->addInt64($s14->mulInt(654183));
-        $s5  =  $s5->subInt64($s14->mulInt(997805));
-        $s6  =  $s6->addInt64($s14->mulInt(136657));
-        $s7  =  $s7->subInt64($s14->mulInt(683901));
-
-        $s1  =  $s1->addInt64($s13->mulInt(666643));
-        $s2  =  $s2->addInt64($s13->mulInt(470296));
-        $s3  =  $s3->addInt64($s13->mulInt(654183));
-        $s4  =  $s4->subInt64($s13->mulInt(997805));
-        $s5  =  $s5->addInt64($s13->mulInt(136657));
-        $s6  =  $s6->subInt64($s13->mulInt(683901));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s10->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $S0  =  $s0->toInt32()->toInt();
-        $S1  =  $s1->toInt32()->toInt();
-        $S2  =  $s2->toInt32()->toInt();
-        $S3  =  $s3->toInt32()->toInt();
-        $S4  =  $s4->toInt32()->toInt();
-        $S5  =  $s5->toInt32()->toInt();
-        $S6  =  $s6->toInt32()->toInt();
-        $S7  =  $s7->toInt32()->toInt();
-        $S8  =  $s8->toInt32()->toInt();
-        $S9  =  $s9->toInt32()->toInt();
-        $S10 = $s10->toInt32()->toInt();
-        $S11 = $s11->toInt32()->toInt();
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $Z
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_invert(ParagonIE_Sodium_Core32_Curve25519_Fe $Z)
+	{
+		$z = clone $Z;
+		$t0 = self::fe_sq($z);
+		$t1 = self::fe_sq($t0);
+		$t1 = self::fe_sq($t1);
+		$t1 = self::fe_mul($z, $t1);
+		$t0 = self::fe_mul($t0, $t1);
+		$t2 = self::fe_sq($t0);
+		$t1 = self::fe_mul($t1, $t2);
+		$t2 = self::fe_sq($t1);
+		for ($i = 1; $i < 5; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t1 = self::fe_mul($t2, $t1);
+		$t2 = self::fe_sq($t1);
+		for ($i = 1; $i < 10; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t2 = self::fe_mul($t2, $t1);
+		$t3 = self::fe_sq($t2);
+		for ($i = 1; $i < 20; ++$i) {
+			$t3 = self::fe_sq($t3);
+		}
+		$t2 = self::fe_mul($t3, $t2);
+		$t2 = self::fe_sq($t2);
+		for ($i = 1; $i < 10; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t1 = self::fe_mul($t2, $t1);
+		$t2 = self::fe_sq($t1);
+		for ($i = 1; $i < 50; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t2 = self::fe_mul($t2, $t1);
+		$t3 = self::fe_sq($t2);
+		for ($i = 1; $i < 100; ++$i) {
+			$t3 = self::fe_sq($t3);
+		}
+		$t2 = self::fe_mul($t3, $t2);
+		$t2 = self::fe_sq($t2);
+		for ($i = 1; $i < 50; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+		$t1 = self::fe_mul($t2, $t1);
+		$t1 = self::fe_sq($t1);
+		for ($i = 1; $i < 5; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+		return self::fe_mul($t1, $t0);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $z
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_pow22523(ParagonIE_Sodium_Core32_Curve25519_Fe $z)
+	{
+		# fe_sq(t0, z);
+		# fe_sq(t1, t0);
+		# fe_sq(t1, t1);
+		# fe_mul(t1, z, t1);
+		# fe_mul(t0, t0, t1);
+		# fe_sq(t0, t0);
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t1, t0);
+		$t0 = self::fe_sq($z);
+		$t1 = self::fe_sq($t0);
+		$t1 = self::fe_sq($t1);
+		$t1 = self::fe_mul($z, $t1);
+		$t0 = self::fe_mul($t0, $t1);
+		$t0 = self::fe_sq($t0);
+		$t0 = self::fe_mul($t1, $t0);
+		$t1 = self::fe_sq($t0);
+
+		# for (i = 1; i < 5; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 5; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t1, t0);
+		$t0 = self::fe_mul($t1, $t0);
+		$t1 = self::fe_sq($t0);
+
+		# for (i = 1; i < 10; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 10; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t1, t1, t0);
+		# fe_sq(t2, t1);
+		$t1 = self::fe_mul($t1, $t0);
+		$t2 = self::fe_sq($t1);
+
+		# for (i = 1; i < 20; ++i) {
+		#     fe_sq(t2, t2);
+		# }
+		for ($i = 1; $i < 20; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+
+		# fe_mul(t1, t2, t1);
+		# fe_sq(t1, t1);
+		$t1 = self::fe_mul($t2, $t1);
+		$t1 = self::fe_sq($t1);
+
+		# for (i = 1; i < 10; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 10; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t1, t0);
+		$t0 = self::fe_mul($t1, $t0);
+		$t1 = self::fe_sq($t0);
+
+		# for (i = 1; i < 50; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 50; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t1, t1, t0);
+		# fe_sq(t2, t1);
+		$t1 = self::fe_mul($t1, $t0);
+		$t2 = self::fe_sq($t1);
+
+		# for (i = 1; i < 100; ++i) {
+		#     fe_sq(t2, t2);
+		# }
+		for ($i = 1; $i < 100; ++$i) {
+			$t2 = self::fe_sq($t2);
+		}
+
+		# fe_mul(t1, t2, t1);
+		# fe_sq(t1, t1);
+		$t1 = self::fe_mul($t2, $t1);
+		$t1 = self::fe_sq($t1);
+
+		# for (i = 1; i < 50; ++i) {
+		#     fe_sq(t1, t1);
+		# }
+		for ($i = 1; $i < 50; ++$i) {
+			$t1 = self::fe_sq($t1);
+		}
+
+		# fe_mul(t0, t1, t0);
+		# fe_sq(t0, t0);
+		# fe_sq(t0, t0);
+		# fe_mul(out, t0, z);
+		$t0 = self::fe_mul($t1, $t0);
+		$t0 = self::fe_sq($t0);
+		$t0 = self::fe_sq($t0);
+		return self::fe_mul($t0, $z);
+	}
+
+	/**
+	 * Subtract two field elements.
+	 *
+	 * h = f - g
+	 *
+	 * Preconditions:
+	 * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+	 * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+	 *
+	 * Postconditions:
+	 * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+	 */
+	public static function fe_sub(ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g)
+	{
+		return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+			array(
+				$f[0]->subInt32($g[0]),
+				$f[1]->subInt32($g[1]),
+				$f[2]->subInt32($g[2]),
+				$f[3]->subInt32($g[3]),
+				$f[4]->subInt32($g[4]),
+				$f[5]->subInt32($g[5]),
+				$f[6]->subInt32($g[6]),
+				$f[7]->subInt32($g[7]),
+				$f[8]->subInt32($g[8]),
+				$f[9]->subInt32($g[9])
+			)
+		);
+	}
+
+	/**
+	 * Add two group elements.
+	 *
+	 * r = p + q
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+	 */
+	public static function ge_add(
+		ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+	) {
+		$r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->YplusX);
+		$r->Y = self::fe_mul($r->Y, $q->YminusX);
+		$r->T = self::fe_mul($q->T2d, $p->T);
+		$r->X = self::fe_mul($p->Z, $q->Z);
+		$t0   = self::fe_add($r->X, $r->X);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_add($t0, $r->T);
+		$r->T = self::fe_sub($t0, $r->T);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
+	 * @param string $a
+	 * @return array<int, mixed>
+	 */
+	public static function slide($a)
+	{
+		if (self::strlen($a) < 256) {
+			if (self::strlen($a) < 16) {
+				$a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+			}
+		}
+		$r = array();
+		for ($i = 0; $i < 256; ++$i) {
+			$r[$i] = 1 & (
+				self::chrToInt($a[$i >> 3])
+					>>
+				($i & 7)
+			);
+		}
+
+		for ($i = 0;$i < 256;++$i) {
+			if ($r[$i]) {
+				for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
+					if ($r[$i + $b]) {
+						if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
+							$r[$i] += $r[$i + $b] << $b;
+							$r[$i + $b] = 0;
+						} elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
+							$r[$i] -= $r[$i + $b] << $b;
+							for ($k = $i + $b; $k < 256; ++$k) {
+								if (!$r[$k]) {
+									$r[$k] = 1;
+									break;
+								}
+								$r[$k] = 0;
+							}
+						} else {
+							break;
+						}
+					}
+				}
+			}
+		}
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $s
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+	 */
+	public static function ge_frombytes_negate_vartime($s)
+	{
+		static $d = null;
+		if (!$d) {
+			$d = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+				array(
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[0]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[1]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[2]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[3]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[4]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[5]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[6]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[7]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[8]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[9])
+				)
+			);
+		}
+
+		# fe_frombytes(h->Y,s);
+		# fe_1(h->Z);
+		$h = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
+			self::fe_0(),
+			self::fe_frombytes($s),
+			self::fe_1()
+		);
+
+		# fe_sq(u,h->Y);
+		# fe_mul(v,u,d);
+		# fe_sub(u,u,h->Z);       /* u = y^2-1 */
+		# fe_add(v,v,h->Z);       /* v = dy^2+1 */
+		$u = self::fe_sq($h->Y);
+		$v = self::fe_mul($u, $d);
+		$u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
+		$v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+
+		# fe_sq(v3,v);
+		# fe_mul(v3,v3,v);        /* v3 = v^3 */
+		# fe_sq(h->X,v3);
+		# fe_mul(h->X,h->X,v);
+		# fe_mul(h->X,h->X,u);    /* x = uv^7 */
+		$v3 = self::fe_sq($v);
+		$v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
+		$h->X = self::fe_sq($v3);
+		$h->X = self::fe_mul($h->X, $v);
+		$h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+
+		# fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
+		# fe_mul(h->X,h->X,v3);
+		# fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
+		$h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
+		$h->X = self::fe_mul($h->X, $v3);
+		$h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+
+		# fe_sq(vxx,h->X);
+		# fe_mul(vxx,vxx,v);
+		# fe_sub(check,vxx,u);    /* vx^2-u */
+		$vxx = self::fe_sq($h->X);
+		$vxx = self::fe_mul($vxx, $v);
+		$check = self::fe_sub($vxx, $u); /* vx^2 - u */
+
+		# if (fe_isnonzero(check)) {
+		#     fe_add(check,vxx,u);  /* vx^2+u */
+		#     if (fe_isnonzero(check)) {
+		#         return -1;
+		#     }
+		#     fe_mul(h->X,h->X,sqrtm1);
+		# }
+		if (self::fe_isnonzero($check)) {
+			$check = self::fe_add($vxx, $u); /* vx^2 + u */
+			if (self::fe_isnonzero($check)) {
+				throw new RangeException('Internal check failed.');
+			}
+			$h->X = self::fe_mul(
+				$h->X,
+				ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(self::$sqrtm1)
+			);
+		}
+
+		# if (fe_isnegative(h->X) == (s[31] >> 7)) {
+		#     fe_neg(h->X,h->X);
+		# }
+		$i = self::chrToInt($s[31]);
+		if (self::fe_isnegative($h->X) === ($i >> 7)) {
+			$h->X = self::fe_neg($h->X);
+		}
+
+		# fe_mul(h->T,h->X,h->Y);
+		$h->T = self::fe_mul($h->X, $h->Y);
+		return $h;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+	 */
+	public static function ge_madd(
+		ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+	) {
+		$r = clone $R;
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->yplusx);
+		$r->Y = self::fe_mul($r->Y, $q->yminusx);
+		$r->T = self::fe_mul($q->xy2d, $p->T);
+		$t0 = self::fe_add(clone $p->Z, clone $p->Z);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_add($t0, $r->T);
+		$r->T = self::fe_sub($t0, $r->T);
+
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+	 */
+	public static function ge_msub(
+		ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+	) {
+		$r = clone $R;
+
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->yminusx);
+		$r->Y = self::fe_mul($r->Y, $q->yplusx);
+		$r->T = self::fe_mul($q->xy2d, $p->T);
+		$t0 = self::fe_add($p->Z, $p->Z);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_sub($t0, $r->T);
+		$r->T = self::fe_add($t0, $r->T);
+
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+	 */
+	public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
+	{
+		$r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P2();
+		$r->X = self::fe_mul($p->X, $p->T);
+		$r->Y = self::fe_mul($p->Y, $p->Z);
+		$r->Z = self::fe_mul($p->Z, $p->T);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+	 */
+	public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
+	{
+		$r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3();
+		$r->X = self::fe_mul($p->X, $p->T);
+		$r->Y = self::fe_mul($p->Y, $p->Z);
+		$r->Z = self::fe_mul($p->Z, $p->T);
+		$r->T = self::fe_mul($p->X, $p->Y);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+	 */
+	public static function ge_p2_0()
+	{
+		return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
+			self::fe_0(),
+			self::fe_1(),
+			self::fe_1()
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+	 */
+	public static function ge_p2_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p)
+	{
+		$r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+
+		$r->X = self::fe_sq($p->X);
+		$r->Z = self::fe_sq($p->Y);
+		$r->T = self::fe_sq2($p->Z);
+		$r->Y = self::fe_add($p->X, $p->Y);
+		$t0   = self::fe_sq($r->Y);
+		$r->Y = self::fe_add($r->Z, $r->X);
+		$r->Z = self::fe_sub($r->Z, $r->X);
+		$r->X = self::fe_sub($t0, $r->Y);
+		$r->T = self::fe_sub($r->T, $r->Z);
+
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+	 */
+	public static function ge_p3_0()
+	{
+		return new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
+			self::fe_0(),
+			self::fe_1(),
+			self::fe_1(),
+			self::fe_0()
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
+	 */
+	public static function ge_p3_to_cached(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+	{
+		static $d2 = null;
+		if ($d2 === null) {
+			$d2 = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+				array(
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[0]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[1]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[2]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[3]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[4]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[5]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[6]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[7]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[8]),
+					ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[9])
+				)
+			);
+		}
+		$r = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached();
+		$r->YplusX = self::fe_add($p->Y, $p->X);
+		$r->YminusX = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_copy($p->Z);
+		$r->T2d = self::fe_mul($p->T, $d2);
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+	 */
+	public static function ge_p3_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+	{
+		return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
+			$p->X,
+			$p->Y,
+			$p->Z
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h
+	 * @return string
+	 */
+	public static function ge_p3_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h)
+	{
+		$recip = self::fe_invert($h->Z);
+		$x = self::fe_mul($h->X, $recip);
+		$y = self::fe_mul($h->Y, $recip);
+		$s = self::fe_tobytes($y);
+		$s[31] = self::intToChr(
+			self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+		);
+		return $s;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+	 */
+	public static function ge_p3_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+	{
+		$q = self::ge_p3_to_p2($p);
+		return self::ge_p2_dbl($q);
+	}
+
+	/**
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+	 */
+	public static function ge_precomp_0()
+	{
+		return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+			self::fe_1(),
+			self::fe_1(),
+			self::fe_0()
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $b
+	 * @param int $c
+	 * @return int
+	 */
+	public static function equal($b, $c)
+	{
+		return (($b ^ $c) - 1 & 0xffffffff) >> 31;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $char
+	 * @return int (1 = yes, 0 = no)
+	 */
+	public static function negative($char)
+	{
+		if (is_int($char)) {
+			return $char < 0 ? 1 : 0;
+		}
+		$x = self::chrToInt(self::substr($char, 0, 1));
+		if (PHP_INT_SIZE === 8) {
+			return $x >> 63;
+		}
+		return $x >> 31;
+	}
+
+	/**
+	 * Conditional move
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u
+	 * @param int $b
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+	 */
+	public static function cmov(
+		ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u,
+		$b
+	) {
+		if (!is_int($b)) {
+			throw new InvalidArgumentException('Expected an integer.');
+		}
+		return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+			self::fe_cmov($t->yplusx, $u->yplusx, $b),
+			self::fe_cmov($t->yminusx, $u->yminusx, $b),
+			self::fe_cmov($t->xy2d, $u->xy2d, $b)
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $pos
+	 * @param int $b
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+	 */
+	public static function ge_select($pos = 0, $b = 0)
+	{
+		static $base = null;
+		if ($base === null) {
+			$base = array();
+			foreach (self::$base as $i => $bas) {
+				for ($j = 0; $j < 8; ++$j) {
+					$base[$i][$j] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+						ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+							array(
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][0]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][1]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][2]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][3]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][4]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][5]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][6]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][7]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][8]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][9])
+							)
+						),
+						ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+							array(
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][0]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][1]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][2]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][3]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][4]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][5]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][6]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][7]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][8]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][9])
+							)
+						),
+						ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+							array(
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][0]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][1]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][2]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][3]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][4]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][5]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][6]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][7]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][8]),
+								ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][9])
+							)
+						)
+					);
+				}
+			}
+		}
+		if (!is_int($pos)) {
+			throw new InvalidArgumentException('Position must be an integer');
+		}
+		if ($pos < 0 || $pos > 31) {
+			throw new RangeException('Position is out of range [0, 31]');
+		}
+
+		$bnegative = self::negative($b);
+		$babs = $b - (((-$bnegative) & $b) << 1);
+
+		$t = self::ge_precomp_0();
+		for ($i = 0; $i < 8; ++$i) {
+			$t = self::cmov(
+				$t,
+				$base[$pos][$i],
+				self::equal($babs, $i + 1)
+			);
+		}
+		$minusT = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+			self::fe_copy($t->yminusx),
+			self::fe_copy($t->yplusx),
+			self::fe_neg($t->xy2d)
+		);
+		return self::cmov($t, $minusT, -$bnegative);
+	}
+
+	/**
+	 * Subtract two group elements.
+	 *
+	 * r = p - q
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+	 */
+	public static function ge_sub(
+		ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+	) {
+		$r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+
+		$r->X = self::fe_add($p->Y, $p->X);
+		$r->Y = self::fe_sub($p->Y, $p->X);
+		$r->Z = self::fe_mul($r->X, $q->YminusX);
+		$r->Y = self::fe_mul($r->Y, $q->YplusX);
+		$r->T = self::fe_mul($q->T2d, $p->T);
+		$r->X = self::fe_mul($p->Z, $q->Z);
+		$t0 = self::fe_add($r->X, $r->X);
+		$r->X = self::fe_sub($r->Z, $r->Y);
+		$r->Y = self::fe_add($r->Z, $r->Y);
+		$r->Z = self::fe_sub($t0, $r->T);
+		$r->T = self::fe_add($t0, $r->T);
+
+		return $r;
+	}
+
+	/**
+	 * Convert a group element to a byte string.
+	 *
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h
+	 * @return string
+	 */
+	public static function ge_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h)
+	{
+		$recip = self::fe_invert($h->Z);
+		$x = self::fe_mul($h->X, $recip);
+		$y = self::fe_mul($h->Y, $recip);
+		$s = self::fe_tobytes($y);
+		$s[31] = self::intToChr(
+			self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+		);
+		return $s;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A
+	 * @param string $b
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+	 */
+	public static function ge_double_scalarmult_vartime(
+		$a,
+		ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A,
+		$b
+	) {
+		/**
+		 * @var ParagonIE_Sodium_Core32_Curve25519_Ge_Cached[]
+		 */
+		$Ai = array();
+
+		/**
+		 * @var ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp[]
+		 */
+		static $Bi = array();
+		if (!$Bi) {
+			for ($i = 0; $i < 8; ++$i) {
+
+				$Bi[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+					ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+						array(
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][0]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][1]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][2]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][3]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][4]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][5]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][6]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][7]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][8]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][9])
+						)
+					),
+					ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+						array(
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][0]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][1]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][2]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][3]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][4]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][5]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][6]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][7]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][8]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][9])
+						)
+					),
+					ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+						array(
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][0]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][1]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][2]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][3]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][4]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][5]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][6]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][7]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][8]),
+							ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][9])
+						)
+					)
+				);
+			}
+		}
+		for ($i = 0; $i < 8; ++$i) {
+			$Ai[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached(
+				self::fe_0(),
+				self::fe_0(),
+				self::fe_0(),
+				self::fe_0()
+			);
+		}
+
+		# slide(aslide,a);
+		# slide(bslide,b);
+		$aslide = self::slide($a);
+		$bslide = self::slide($b);
+
+		# ge_p3_to_cached(&Ai[0],A);
+		# ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
+		$Ai[0] = self::ge_p3_to_cached($A);
+		$t = self::ge_p3_dbl($A);
+		$A2 = self::ge_p1p1_to_p3($t);
+
+		# ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
+		# ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
+		# ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
+		# ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
+		# ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
+		# ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
+		# ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
+		for ($i = 0; $i < 7; ++$i) {
+			$t = self::ge_add($A2, $Ai[$i]);
+			$u = self::ge_p1p1_to_p3($t);
+			$Ai[$i + 1] = self::ge_p3_to_cached($u);
+		}
+
+		# ge_p2_0(r);
+		$r = self::ge_p2_0();
+
+		# for (i = 255;i >= 0;--i) {
+		#     if (aslide[i] || bslide[i]) break;
+		# }
+		$i = 255;
+		for (; $i >= 0; --$i) {
+			if ($aslide[$i] || $bslide[$i]) {
+				break;
+			}
+		}
+
+		# for (;i >= 0;--i) {
+		for (; $i >= 0; --$i) {
+			# ge_p2_dbl(&t,r);
+			$t = self::ge_p2_dbl($r);
+
+			# if (aslide[i] > 0) {
+			if ($aslide[$i] > 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_add(&t,&u,&Ai[aslide[i]/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_add(
+					$u,
+					$Ai[(int) floor($aslide[$i] / 2)]
+				);
+				# } else if (aslide[i] < 0) {
+			} elseif ($aslide[$i] < 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_sub(
+					$u,
+					$Ai[(int) floor(-$aslide[$i] / 2)]
+				);
+			}
+
+			# if (bslide[i] > 0) {
+			if ($bslide[$i] > 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_madd(&t,&u,&Bi[bslide[i]/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_madd(
+					$t,
+					$u,
+					$Bi[(int) floor($bslide[$i] / 2)]
+				);
+				# } else if (bslide[i] < 0) {
+			} elseif ($bslide[$i] < 0) {
+				# ge_p1p1_to_p3(&u,&t);
+				# ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
+				$u = self::ge_p1p1_to_p3($t);
+				$t = self::ge_msub(
+					$t,
+					$u,
+					$Bi[(int) floor(-$bslide[$i] / 2)]
+				);
+			}
+			# ge_p1p1_to_p2(r,&t);
+			$r = self::ge_p1p1_to_p2($t);
+		}
+		return $r;
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+	 */
+	public static function ge_scalarmult_base($a)
+	{
+		$e = array();
+		$r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+
+		for ($i = 0; $i < 32; ++$i) {
+			$e[$i << 1] = self::chrToInt($a[$i]) & 15;
+			$e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
+		}
+
+		$carry = 0;
+		for ($i = 0; $i < 63; ++$i) {
+			$e[$i] += $carry;
+			$carry = $e[$i] + 8;
+			$carry >>= 4;
+			$e[$i] -= $carry << 4;
+		}
+		$e[63] += $carry;
+
+		$h = self::ge_p3_0();
+
+		for ($i = 1; $i < 64; $i += 2) {
+			$t = self::ge_select((int) floor($i / 2), $e[$i]);
+			$r = self::ge_madd($r, $h, $t);
+			$h = self::ge_p1p1_to_p3($r);
+		}
+
+		$r = self::ge_p3_dbl($h);
+
+		$s = self::ge_p1p1_to_p2($r);
+		$r = self::ge_p2_dbl($s);
+		$s = self::ge_p1p1_to_p2($r);
+		$r = self::ge_p2_dbl($s);
+		$s = self::ge_p1p1_to_p2($r);
+		$r = self::ge_p2_dbl($s);
+
+		$h = self::ge_p1p1_to_p3($r);
+
+		for ($i = 0; $i < 64; $i += 2) {
+			$t = self::ge_select($i >> 1, $e[$i]);
+			$r = self::ge_madd($r, $h, $t);
+			$h = self::ge_p1p1_to_p3($r);
+		}
+		return $h;
+	}
+
+	/**
+	 * Calculates (ab + c) mod l
+	 * where l = 2^252 + 27742317777372353535851937790883648493
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $a
+	 * @param string $b
+	 * @param string $c
+	 * @return string
+	 */
+	public static function sc_muladd($a, $b, $c)
+	{
+		$a0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 0, 3)))->toInt64();
+		$a1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5))->toInt64();
+		$a2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2))->toInt64();
+		$a3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7))->toInt64();
+		$a4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4))->toInt64();
+		$a5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1))->toInt64();
+		$a6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6))->toInt64();
+		$a7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3))->toInt64();
+		$a8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 21, 3)))->toInt64();
+		$a9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5))->toInt64();
+		$a10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2))->toInt64();
+		$a11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($a, 28, 4)) >> 7))->toInt64();
+		$b0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 0, 3)))->toInt64();
+		$b1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5))->toInt64();
+		$b2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2))->toInt64();
+		$b3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7))->toInt64();
+		$b4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4))->toInt64();
+		$b5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1))->toInt64();
+		$b6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6))->toInt64();
+		$b7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3))->toInt64();
+		$b8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 21, 3)))->toInt64();
+		$b9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5))->toInt64();
+		$b10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2))->toInt64();
+		$b11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($b, 28, 4)) >> 7))->toInt64();
+		$c0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 0, 3)))->toInt64();
+		$c1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5))->toInt64();
+		$c2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2))->toInt64();
+		$c3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7))->toInt64();
+		$c4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4))->toInt64();
+		$c5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1))->toInt64();
+		$c6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6))->toInt64();
+		$c7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3))->toInt64();
+		$c8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 21, 3)))->toInt64();
+		$c9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5))->toInt64();
+		$c10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2))->toInt64();
+		$c11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($c, 28, 4)) >> 7))->toInt64();
+
+		/* Can't really avoid the pyramid here: */
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64 $s0
+		 * @var ParagonIE_Sodium_Core32_Int64 $s1
+		 * @var ParagonIE_Sodium_Core32_Int64 $s2
+		 * @var ParagonIE_Sodium_Core32_Int64 $s3
+		 * @var ParagonIE_Sodium_Core32_Int64 $s4
+		 * @var ParagonIE_Sodium_Core32_Int64 $s5
+		 * @var ParagonIE_Sodium_Core32_Int64 $s6
+		 * @var ParagonIE_Sodium_Core32_Int64 $s7
+		 * @var ParagonIE_Sodium_Core32_Int64 $s8
+		 * @var ParagonIE_Sodium_Core32_Int64 $s9
+		 * @var ParagonIE_Sodium_Core32_Int64 $s10
+		 * @var ParagonIE_Sodium_Core32_Int64 $s11
+		 * @var ParagonIE_Sodium_Core32_Int64 $s12
+		 * @var ParagonIE_Sodium_Core32_Int64 $s13
+		 * @var ParagonIE_Sodium_Core32_Int64 $s14
+		 * @var ParagonIE_Sodium_Core32_Int64 $s15
+		 * @var ParagonIE_Sodium_Core32_Int64 $s16
+		 * @var ParagonIE_Sodium_Core32_Int64 $s17
+		 * @var ParagonIE_Sodium_Core32_Int64 $s18
+		 * @var ParagonIE_Sodium_Core32_Int64 $s19
+		 * @var ParagonIE_Sodium_Core32_Int64 $s20
+		 * @var ParagonIE_Sodium_Core32_Int64 $s21
+		 * @var ParagonIE_Sodium_Core32_Int64 $s22
+		 * @var ParagonIE_Sodium_Core32_Int64 $s23
+		 */
+
+		$s0 = $c0->addInt64($a0->mulInt64($b0));
+		$s1 = $c1->addInt64($a0->mulInt64($b1))->addInt64($a1->mulInt64($b0));
+		$s2 = $c2->addInt64($a0->mulInt64($b2))->addInt64($a1->mulInt64($b1))->addInt64($a2->mulInt64($b0));
+		$s3 = $c3->addInt64($a0->mulInt64($b3))->addInt64($a1->mulInt64($b2))->addInt64($a2->mulInt64($b1))->addInt64($a3->mulInt64($b0));
+		$s4 = $c4->addInt64($a0->mulInt64($b4))->addInt64($a1->mulInt64($b3))->addInt64($a2->mulInt64($b2))->addInt64($a3->mulInt64($b1))->addInt64($a4->mulInt64($b0));
+		$s5 = $c5->addInt64($a0->mulInt64($b5))->addInt64($a1->mulInt64($b4))->addInt64($a2->mulInt64($b3))->addInt64($a3->mulInt64($b2))->addInt64($a4->mulInt64($b1))->addInt64($a5->mulInt64($b0));
+		$s6 = $c6->addInt64($a0->mulInt64($b6))->addInt64($a1->mulInt64($b5))->addInt64($a2->mulInt64($b4))->addInt64($a3->mulInt64($b3))->addInt64($a4->mulInt64($b2))->addInt64($a5->mulInt64($b1))
+				 ->addInt64($a6->mulInt64($b0));
+		$s7 = $c7->addInt64($a0->mulInt64($b7))->addInt64($a1->mulInt64($b6))->addInt64($a2->mulInt64($b5))->addInt64($a3->mulInt64($b4))->addInt64($a4->mulInt64($b3))->addInt64($a5->mulInt64($b2))
+				 ->addInt64($a6->mulInt64($b1))->addInt64($a7->mulInt64($b0));
+		$s8 = $c8->addInt64($a0->mulInt64($b8))->addInt64($a1->mulInt64($b7))->addInt64($a2->mulInt64($b6))->addInt64($a3->mulInt64($b5))->addInt64($a4->mulInt64($b4))->addInt64($a5->mulInt64($b3))
+				 ->addInt64($a6->mulInt64($b2))->addInt64($a7->mulInt64($b1))->addInt64($a8->mulInt64($b0));
+		$s9 = $c9->addInt64($a0->mulInt64($b9))->addInt64($a1->mulInt64($b8))->addInt64($a2->mulInt64($b7))->addInt64($a3->mulInt64($b6))->addInt64($a4->mulInt64($b5))->addInt64($a5->mulInt64($b4))
+				 ->addInt64($a6->mulInt64($b3))->addInt64($a7->mulInt64($b2))->addInt64($a8->mulInt64($b1))->addInt64($a9->mulInt64($b0));
+		$s10 = $c10->addInt64($a0->mulInt64($b10))->addInt64($a1->mulInt64($b9))->addInt64($a2->mulInt64($b8))->addInt64($a3->mulInt64($b7))->addInt64($a4->mulInt64($b6))->addInt64($a5->mulInt64($b5))
+				   ->addInt64($a6->mulInt64($b4))->addInt64($a7->mulInt64($b3))->addInt64($a8->mulInt64($b2))->addInt64($a9->mulInt64($b1))->addInt64($a10->mulInt64($b0));
+		$s11 = $c11->addInt64($a0->mulInt64($b11))->addInt64($a1->mulInt64($b10))->addInt64($a2->mulInt64($b9))->addInt64($a3->mulInt64($b8))->addInt64($a4->mulInt64($b7))->addInt64($a5->mulInt64($b6))
+				   ->addInt64($a6->mulInt64($b5))->addInt64($a7->mulInt64($b4))->addInt64($a8->mulInt64($b3))->addInt64($a9->mulInt64($b2))->addInt64($a10->mulInt64($b1))->addInt64($a11->mulInt64($b0));
+		$s12 = $a1->mulInt64($b11)->addInt64($a2->mulInt64($b10))->addInt64($a3->mulInt64($b9))->addInt64($a4->mulInt64($b8))->addInt64($a5->mulInt64($b7))->addInt64($a6->mulInt64($b6))
+				  ->addInt64($a7->mulInt64($b5))->addInt64($a8->mulInt64($b4))->addInt64($a9->mulInt64($b3))->addInt64($a10->mulInt64($b2))->addInt64($a11->mulInt64($b1));
+		$s13 = $a2->mulInt64($b11)->addInt64($a3->mulInt64($b10))->addInt64($a4->mulInt64($b9))->addInt64($a5->mulInt64($b8))->addInt64($a6->mulInt64($b7))->addInt64($a7->mulInt64($b6))
+				  ->addInt64($a8->mulInt64($b5))->addInt64($a9->mulInt64($b4))->addInt64($a10->mulInt64($b3))->addInt64($a11->mulInt64($b2));
+		$s14 = $a3->mulInt64($b11)->addInt64($a4->mulInt64($b10))->addInt64($a5->mulInt64($b9))->addInt64($a6->mulInt64($b8))->addInt64($a7->mulInt64($b7))->addInt64($a8->mulInt64($b6))
+				  ->addInt64($a9->mulInt64($b5))->addInt64($a10->mulInt64($b4))->addInt64($a11->mulInt64($b3));
+		$s15 = $a4->mulInt64($b11)->addInt64($a5->mulInt64($b10))->addInt64($a6->mulInt64($b9))->addInt64($a7->mulInt64($b8))->addInt64($a8->mulInt64($b7))->addInt64($a9->mulInt64($b6))
+				  ->addInt64($a10->mulInt64($b5))->addInt64($a11->mulInt64($b4));
+		$s16 = $a5->mulInt64($b11)->addInt64($a6->mulInt64($b10))->addInt64($a7->mulInt64($b9))->addInt64($a8->mulInt64($b8))->addInt64($a9->mulInt64($b7))->addInt64($a10->mulInt64($b6))
+				   ->addInt64($a11->mulInt64($b5));
+		$s17 = $a6->mulInt64($b11)->addInt64($a7->mulInt64($b10))->addInt64($a8->mulInt64($b9))->addInt64($a9->mulInt64($b8))->addInt64($a10->mulInt64($b7))->addInt64($a11->mulInt64($b6));
+		$s18 = $a7->mulInt64($b11)->addInt64($a8->mulInt64($b10))->addInt64($a9->mulInt64($b9))->addInt64($a10->mulInt64($b8))->addInt64($a11->mulInt64($b7));
+		$s19 = $a8->mulInt64($b11)->addInt64($a9->mulInt64($b10))->addInt64($a10->mulInt64($b9))->addInt64($a11->mulInt64($b8));
+		$s20 = $a9->mulInt64($b11)->addInt64($a10->mulInt64($b10))->addInt64($a11->mulInt64($b9));
+		$s21 = $a10->mulInt64($b11)->addInt64($a11->mulInt64($b10));
+		$s22 = $a11->mulInt64($b11);
+		$s23 = new ParagonIE_Sodium_Core32_Int64();
+
+		$carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+		$s1 = $s1->addInt64($carry0);
+		$s0 = $s0->subInt64($carry0->shiftLeft(21));
+		$carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+		$s3 = $s3->addInt64($carry2);
+		$s2 = $s2->subInt64($carry2->shiftLeft(21));
+		$carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+		$s5 = $s5->addInt64($carry4);
+		$s4 = $s4->subInt64($carry4->shiftLeft(21));
+		$carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+		$carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+		$s13 = $s13->addInt64($carry12);
+		$s12 = $s12->subInt64($carry12->shiftLeft(21));
+		$carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+		$s15 = $s15->addInt64($carry14);
+		$s14 = $s14->subInt64($carry14->shiftLeft(21));
+		$carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+		$s17 = $s17->addInt64($carry16);
+		$s16 = $s16->subInt64($carry16->shiftLeft(21));
+		$carry18 = $s18->addInt(1 << 20)->shiftRight(21);
+		$s19 = $s19->addInt64($carry18);
+		$s18 = $s18->subInt64($carry18->shiftLeft(21));
+		$carry20 = $s20->addInt(1 << 20)->shiftRight(21);
+		$s21 = $s21->addInt64($carry20);
+		$s20 = $s20->subInt64($carry20->shiftLeft(21));
+		$carry22 = $s22->addInt(1 << 20)->shiftRight(21);
+		$s23 = $s23->addInt64($carry22);
+		$s22 = $s22->subInt64($carry22->shiftLeft(21));
+
+		$carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+		$s2 = $s2->addInt64($carry1);
+		$s1 = $s1->subInt64($carry1->shiftLeft(21));
+		$carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+		$s4 = $s4->addInt64($carry3);
+		$s3 = $s3->subInt64($carry3->shiftLeft(21));
+		$carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+		$s6 = $s6->addInt64($carry5);
+		$s5 = $s5->subInt64($carry5->shiftLeft(21));
+		$carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+		$s12 = $s12->addInt64($carry11);
+		$s11 = $s11->subInt64($carry11->shiftLeft(21));
+		$carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+		$s14 = $s14->addInt64($carry13);
+		$s13 = $s13->subInt64($carry13->shiftLeft(21));
+		$carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+		$s16 = $s16->addInt64($carry15);
+		$s15 = $s15->subInt64($carry15->shiftLeft(21));
+		$carry17 = $s17->addInt(1 << 20)->shiftRight(21);
+		$s18 = $s18->addInt64($carry17);
+		$s17 = $s17->subInt64($carry17->shiftLeft(21));
+		$carry19 = $s19->addInt(1 << 20)->shiftRight(21);
+		$s20 = $s20->addInt64($carry19);
+		$s19 = $s19->subInt64($carry19->shiftLeft(21));
+		$carry21 = $s21->addInt(1 << 20)->shiftRight(21);
+		$s22 = $s22->addInt64($carry21);
+		$s21 = $s21->subInt64($carry21->shiftLeft(21));
+
+		$s11 = $s11->addInt64($s23->mulInt(666643));
+		$s12 = $s12->addInt64($s23->mulInt(470296));
+		$s13 = $s13->addInt64($s23->mulInt(654183));
+		$s14 = $s14->subInt64($s23->mulInt(997805));
+		$s15 = $s15->addInt64($s23->mulInt(136657));
+		$s16 = $s16->subInt64($s23->mulInt(683901));
+
+		$s10 = $s10->addInt64($s22->mulInt(666643));
+		$s11 = $s11->addInt64($s22->mulInt(470296));
+		$s12 = $s12->addInt64($s22->mulInt(654183));
+		$s13 = $s13->subInt64($s22->mulInt(997805));
+		$s14 = $s14->addInt64($s22->mulInt(136657));
+		$s15 = $s15->subInt64($s22->mulInt(683901));
+
+		$s9  =  $s9->addInt64($s21->mulInt(666643));
+		$s10 = $s10->addInt64($s21->mulInt(470296));
+		$s11 = $s11->addInt64($s21->mulInt(654183));
+		$s12 = $s12->subInt64($s21->mulInt(997805));
+		$s13 = $s13->addInt64($s21->mulInt(136657));
+		$s14 = $s14->subInt64($s21->mulInt(683901));
+
+		$s8  =  $s8->addInt64($s20->mulInt(666643));
+		$s9  =  $s9->addInt64($s20->mulInt(470296));
+		$s10 = $s10->addInt64($s20->mulInt(654183));
+		$s11 = $s11->subInt64($s20->mulInt(997805));
+		$s12 = $s12->addInt64($s20->mulInt(136657));
+		$s13 = $s13->subInt64($s20->mulInt(683901));
+
+		$s7  =  $s7->addInt64($s19->mulInt(666643));
+		$s8  =  $s8->addInt64($s19->mulInt(470296));
+		$s9  =  $s9->addInt64($s19->mulInt(654183));
+		$s10 = $s10->subInt64($s19->mulInt(997805));
+		$s11 = $s11->addInt64($s19->mulInt(136657));
+		$s12 = $s12->subInt64($s19->mulInt(683901));
+
+		$s6  =  $s6->addInt64($s18->mulInt(666643));
+		$s7  =  $s7->addInt64($s18->mulInt(470296));
+		$s8  =  $s8->addInt64($s18->mulInt(654183));
+		$s9  =  $s9->subInt64($s18->mulInt(997805));
+		$s10 = $s10->addInt64($s18->mulInt(136657));
+		$s11 = $s11->subInt64($s18->mulInt(683901));
+
+		$carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+		$carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+		$s13 = $s13->addInt64($carry12);
+		$s12 = $s12->subInt64($carry12->shiftLeft(21));
+		$carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+		$s15 = $s15->addInt64($carry14);
+		$s14 = $s14->subInt64($carry14->shiftLeft(21));
+		$carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+		$s17 = $s17->addInt64($carry16);
+		$s16 = $s16->subInt64($carry16->shiftLeft(21));
+
+		$carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+		$s12 = $s12->addInt64($carry11);
+		$s11 = $s11->subInt64($carry11->shiftLeft(21));
+		$carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+		$s14 = $s14->addInt64($carry13);
+		$s13 = $s13->subInt64($carry13->shiftLeft(21));
+		$carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+		$s16 = $s16->addInt64($carry15);
+		$s15 = $s15->subInt64($carry15->shiftLeft(21));
+
+		$s5  =  $s5->addInt64($s17->mulInt(666643));
+		$s6  =  $s6->addInt64($s17->mulInt(470296));
+		$s7  =  $s7->addInt64($s17->mulInt(654183));
+		$s8  =  $s8->subInt64($s17->mulInt(997805));
+		$s9  =  $s9->addInt64($s17->mulInt(136657));
+		$s10 = $s10->subInt64($s17->mulInt(683901));
+
+		$s4  =  $s4->addInt64($s16->mulInt(666643));
+		$s5  =  $s5->addInt64($s16->mulInt(470296));
+		$s6  =  $s6->addInt64($s16->mulInt(654183));
+		$s7  =  $s7->subInt64($s16->mulInt(997805));
+		$s8  =  $s8->addInt64($s16->mulInt(136657));
+		$s9  =  $s9->subInt64($s16->mulInt(683901));
+
+		$s3  =  $s3->addInt64($s15->mulInt(666643));
+		$s4  =  $s4->addInt64($s15->mulInt(470296));
+		$s5  =  $s5->addInt64($s15->mulInt(654183));
+		$s6  =  $s6->subInt64($s15->mulInt(997805));
+		$s7  =  $s7->addInt64($s15->mulInt(136657));
+		$s8  =  $s8->subInt64($s15->mulInt(683901));
+
+		$s2  =  $s2->addInt64($s14->mulInt(666643));
+		$s3  =  $s3->addInt64($s14->mulInt(470296));
+		$s4  =  $s4->addInt64($s14->mulInt(654183));
+		$s5  =  $s5->subInt64($s14->mulInt(997805));
+		$s6  =  $s6->addInt64($s14->mulInt(136657));
+		$s7  =  $s7->subInt64($s14->mulInt(683901));
+
+		$s1  =  $s1->addInt64($s13->mulInt(666643));
+		$s2  =  $s2->addInt64($s13->mulInt(470296));
+		$s3  =  $s3->addInt64($s13->mulInt(654183));
+		$s4  =  $s4->subInt64($s13->mulInt(997805));
+		$s5  =  $s5->addInt64($s13->mulInt(136657));
+		$s6  =  $s6->subInt64($s13->mulInt(683901));
+
+		$s0  =  $s0->addInt64($s12->mulInt(666643));
+		$s1  =  $s1->addInt64($s12->mulInt(470296));
+		$s2  =  $s2->addInt64($s12->mulInt(654183));
+		$s3  =  $s3->subInt64($s12->mulInt(997805));
+		$s4  =  $s4->addInt64($s12->mulInt(136657));
+		$s5  =  $s5->subInt64($s12->mulInt(683901));
+		$s12 = new ParagonIE_Sodium_Core32_Int64();
+
+		$carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+		$s1 = $s1->addInt64($carry0);
+		$s0 = $s0->subInt64($carry0->shiftLeft(21));
+		$carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+		$s3 = $s3->addInt64($carry2);
+		$s2 = $s2->subInt64($carry2->shiftLeft(21));
+		$carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+		$s5 = $s5->addInt64($carry4);
+		$s4 = $s4->subInt64($carry4->shiftLeft(21));
+		$carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+
+		$carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+		$s2 = $s2->addInt64($carry1);
+		$s1 = $s1->subInt64($carry1->shiftLeft(21));
+		$carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+		$s4 = $s4->addInt64($carry3);
+		$s3 = $s3->subInt64($carry3->shiftLeft(21));
+		$carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+		$s6 = $s6->addInt64($carry5);
+		$s5 = $s5->subInt64($carry5->shiftLeft(21));
+		$carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+		$s12 = $s12->addInt64($carry11);
+		$s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+		$s0  =  $s0->addInt64($s12->mulInt(666643));
+		$s1  =  $s1->addInt64($s12->mulInt(470296));
+		$s2  =  $s2->addInt64($s12->mulInt(654183));
+		$s3  =  $s3->subInt64($s12->mulInt(997805));
+		$s4  =  $s4->addInt64($s12->mulInt(136657));
+		$s5  =  $s5->subInt64($s12->mulInt(683901));
+		$s12 = new ParagonIE_Sodium_Core32_Int64();
+
+		$carry0 = $s0->shiftRight(21);
+		$s1 = $s1->addInt64($carry0);
+		$s0 = $s0->subInt64($carry0->shiftLeft(21));
+		$carry1 = $s1->shiftRight(21);
+		$s2 = $s2->addInt64($carry1);
+		$s1 = $s1->subInt64($carry1->shiftLeft(21));
+		$carry2 = $s2->shiftRight(21);
+		$s3 = $s3->addInt64($carry2);
+		$s2 = $s2->subInt64($carry2->shiftLeft(21));
+		$carry3 = $s3->shiftRight(21);
+		$s4 = $s4->addInt64($carry3);
+		$s3 = $s3->subInt64($carry3->shiftLeft(21));
+		$carry4 = $s4->shiftRight(21);
+		$s5 = $s5->addInt64($carry4);
+		$s4 = $s4->subInt64($carry4->shiftLeft(21));
+		$carry5 = $s5->shiftRight(21);
+		$s6 = $s6->addInt64($carry5);
+		$s5 = $s5->subInt64($carry5->shiftLeft(21));
+		$carry6 = $s6->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry7 = $s7->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry8 = $s8->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry9 = $s9->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry10 = $s10->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+		$carry11 = $s11->shiftRight(21);
+		$s12 = $s12->addInt64($carry11);
+		$s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+		$s0  =  $s0->addInt64($s12->mulInt(666643));
+		$s1  =  $s1->addInt64($s12->mulInt(470296));
+		$s2  =  $s2->addInt64($s12->mulInt(654183));
+		$s3  =  $s3->subInt64($s12->mulInt(997805));
+		$s4  =  $s4->addInt64($s12->mulInt(136657));
+		$s5  =  $s5->subInt64($s12->mulInt(683901));
+
+		$carry0 = $s0->shiftRight(21);
+		$s1 = $s1->addInt64($carry0);
+		$s0 = $s0->subInt64($carry0->shiftLeft(21));
+		$carry1 = $s1->shiftRight(21);
+		$s2 = $s2->addInt64($carry1);
+		$s1 = $s1->subInt64($carry1->shiftLeft(21));
+		$carry2 = $s2->shiftRight(21);
+		$s3 = $s3->addInt64($carry2);
+		$s2 = $s2->subInt64($carry2->shiftLeft(21));
+		$carry3 = $s3->shiftRight(21);
+		$s4 = $s4->addInt64($carry3);
+		$s3 = $s3->subInt64($carry3->shiftLeft(21));
+		$carry4 = $s4->shiftRight(21);
+		$s5 = $s5->addInt64($carry4);
+		$s4 = $s4->subInt64($carry4->shiftLeft(21));
+		$carry5 = $s5->shiftRight(21);
+		$s6 = $s6->addInt64($carry5);
+		$s5 = $s5->subInt64($carry5->shiftLeft(21));
+		$carry6 = $s6->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry7 = $s7->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry8 = $s10->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry9 = $s9->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry10 = $s10->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+
+		$S0  =  $s0->toInt32()->toInt();
+		$S1  =  $s1->toInt32()->toInt();
+		$S2  =  $s2->toInt32()->toInt();
+		$S3  =  $s3->toInt32()->toInt();
+		$S4  =  $s4->toInt32()->toInt();
+		$S5  =  $s5->toInt32()->toInt();
+		$S6  =  $s6->toInt32()->toInt();
+		$S7  =  $s7->toInt32()->toInt();
+		$S8  =  $s8->toInt32()->toInt();
+		$S9  =  $s9->toInt32()->toInt();
+		$S10 = $s10->toInt32()->toInt();
+		$S11 = $s11->toInt32()->toInt();
         
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) (0xff & ($S0 >> 0)),
-            (int) (0xff & ($S0 >> 8)),
-            (int) (0xff & (($S0 >> 16) | self::mul($S1, 1 << 5))),
-            (int) (0xff & ($S1 >> 3)),
-            (int) (0xff & ($S1 >> 11)),
-            (int) (0xff & (($S1 >> 19) | self::mul($S2, 1 << 2))),
-            (int) (0xff & ($S2 >> 6)),
-            (int) (0xff & (($S2 >> 14) | self::mul($S3, 1 << 7))),
-            (int) (0xff & ($S3 >> 1)),
-            (int) (0xff & ($S3 >> 9)),
-            (int) (0xff & (($S3 >> 17) | self::mul($S4, 1 << 4))),
-            (int) (0xff & ($S4 >> 4)),
-            (int) (0xff & ($S4 >> 12)),
-            (int) (0xff & (($S4 >> 20) | self::mul($S5, 1 << 1))),
-            (int) (0xff & ($S5 >> 7)),
-            (int) (0xff & (($S5 >> 15) | self::mul($S6, 1 << 6))),
-            (int) (0xff & ($S6 >> 2)),
-            (int) (0xff & ($S6 >> 10)),
-            (int) (0xff & (($S6 >> 18) | self::mul($S7, 1 << 3))),
-            (int) (0xff & ($S7 >> 5)),
-            (int) (0xff & ($S7 >> 13)),
-            (int) (0xff & ($S8 >> 0)),
-            (int) (0xff & ($S8 >> 8)),
-            (int) (0xff & (($S8 >> 16) | self::mul($S9, 1 << 5))),
-            (int) (0xff & ($S9 >> 3)),
-            (int) (0xff & ($S9 >> 11)),
-            (int) (0xff & (($S9 >> 19) | self::mul($S10, 1 << 2))),
-            (int) (0xff & ($S10 >> 6)),
-            (int) (0xff & (($S10 >> 14) | self::mul($S11, 1 << 7))),
-            (int) (0xff & ($S11 >> 1)),
-            (int) (0xff & ($S11 >> 9)),
-            (int) (0xff & ($S11 >> 17))
-        );
-        return self::intArrayToString($arr);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return string
-     */
-    public static function sc_reduce($s)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $s0
-         * @var ParagonIE_Sodium_Core32_Int64 $s1
-         * @var ParagonIE_Sodium_Core32_Int64 $s2
-         * @var ParagonIE_Sodium_Core32_Int64 $s3
-         * @var ParagonIE_Sodium_Core32_Int64 $s4
-         * @var ParagonIE_Sodium_Core32_Int64 $s5
-         * @var ParagonIE_Sodium_Core32_Int64 $s6
-         * @var ParagonIE_Sodium_Core32_Int64 $s7
-         * @var ParagonIE_Sodium_Core32_Int64 $s8
-         * @var ParagonIE_Sodium_Core32_Int64 $s9
-         * @var ParagonIE_Sodium_Core32_Int64 $s10
-         * @var ParagonIE_Sodium_Core32_Int64 $s11
-         * @var ParagonIE_Sodium_Core32_Int64 $s12
-         * @var ParagonIE_Sodium_Core32_Int64 $s13
-         * @var ParagonIE_Sodium_Core32_Int64 $s14
-         * @var ParagonIE_Sodium_Core32_Int64 $s15
-         * @var ParagonIE_Sodium_Core32_Int64 $s16
-         * @var ParagonIE_Sodium_Core32_Int64 $s17
-         * @var ParagonIE_Sodium_Core32_Int64 $s18
-         * @var ParagonIE_Sodium_Core32_Int64 $s19
-         * @var ParagonIE_Sodium_Core32_Int64 $s20
-         * @var ParagonIE_Sodium_Core32_Int64 $s21
-         * @var ParagonIE_Sodium_Core32_Int64 $s22
-         * @var ParagonIE_Sodium_Core32_Int64 $s23
-         */
-        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)))->toInt64();
-        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5))->toInt64();
-        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2))->toInt64();
-        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7))->toInt64();
-        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4))->toInt64();
-        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1))->toInt64();
-        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6))->toInt64();
-        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3))->toInt64();
-        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)))->toInt64();
-        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5))->toInt64();
-        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2))->toInt64();
-        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7))->toInt64();
-        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4))->toInt64();
-        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1))->toInt64();
-        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6))->toInt64();
-        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3))->toInt64();
-        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)))->toInt64();
-        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5))->toInt64();
-        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2))->toInt64();
-        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7))->toInt64();
-        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4))->toInt64();
-        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1))->toInt64();
-        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6))->toInt64();
-        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($s, 60, 4)) >> 3))->toInt64();
-
-        $s11 = $s11->addInt64($s23->mulInt(666643));
-        $s12 = $s12->addInt64($s23->mulInt(470296));
-        $s13 = $s13->addInt64($s23->mulInt(654183));
-        $s14 = $s14->subInt64($s23->mulInt(997805));
-        $s15 = $s15->addInt64($s23->mulInt(136657));
-        $s16 = $s16->subInt64($s23->mulInt(683901));
-
-        $s10 = $s10->addInt64($s22->mulInt(666643));
-        $s11 = $s11->addInt64($s22->mulInt(470296));
-        $s12 = $s12->addInt64($s22->mulInt(654183));
-        $s13 = $s13->subInt64($s22->mulInt(997805));
-        $s14 = $s14->addInt64($s22->mulInt(136657));
-        $s15 = $s15->subInt64($s22->mulInt(683901));
-
-        $s9  =  $s9->addInt64($s21->mulInt(666643));
-        $s10 = $s10->addInt64($s21->mulInt(470296));
-        $s11 = $s11->addInt64($s21->mulInt(654183));
-        $s12 = $s12->subInt64($s21->mulInt(997805));
-        $s13 = $s13->addInt64($s21->mulInt(136657));
-        $s14 = $s14->subInt64($s21->mulInt(683901));
-
-        $s8  =  $s8->addInt64($s20->mulInt(666643));
-        $s9  =  $s9->addInt64($s20->mulInt(470296));
-        $s10 = $s10->addInt64($s20->mulInt(654183));
-        $s11 = $s11->subInt64($s20->mulInt(997805));
-        $s12 = $s12->addInt64($s20->mulInt(136657));
-        $s13 = $s13->subInt64($s20->mulInt(683901));
-
-        $s7  =  $s7->addInt64($s19->mulInt(666643));
-        $s8  =  $s8->addInt64($s19->mulInt(470296));
-        $s9  =  $s9->addInt64($s19->mulInt(654183));
-        $s10 = $s10->subInt64($s19->mulInt(997805));
-        $s11 = $s11->addInt64($s19->mulInt(136657));
-        $s12 = $s12->subInt64($s19->mulInt(683901));
-
-        $s6  =  $s6->addInt64($s18->mulInt(666643));
-        $s7  =  $s7->addInt64($s18->mulInt(470296));
-        $s8  =  $s8->addInt64($s18->mulInt(654183));
-        $s9  =  $s9->subInt64($s18->mulInt(997805));
-        $s10 = $s10->addInt64($s18->mulInt(136657));
-        $s11 = $s11->subInt64($s18->mulInt(683901));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt64($s17->mulInt(666643));
-        $s6  =  $s6->addInt64($s17->mulInt(470296));
-        $s7  =  $s7->addInt64($s17->mulInt(654183));
-        $s8  =  $s8->subInt64($s17->mulInt(997805));
-        $s9  =  $s9->addInt64($s17->mulInt(136657));
-        $s10 = $s10->subInt64($s17->mulInt(683901));
-
-        $s4  =  $s4->addInt64($s16->mulInt(666643));
-        $s5  =  $s5->addInt64($s16->mulInt(470296));
-        $s6  =  $s6->addInt64($s16->mulInt(654183));
-        $s7  =  $s7->subInt64($s16->mulInt(997805));
-        $s8  =  $s8->addInt64($s16->mulInt(136657));
-        $s9  =  $s9->subInt64($s16->mulInt(683901));
-
-        $s3  =  $s3->addInt64($s15->mulInt(666643));
-        $s4  =  $s4->addInt64($s15->mulInt(470296));
-        $s5  =  $s5->addInt64($s15->mulInt(654183));
-        $s6  =  $s6->subInt64($s15->mulInt(997805));
-        $s7  =  $s7->addInt64($s15->mulInt(136657));
-        $s8  =  $s8->subInt64($s15->mulInt(683901));
-
-        $s2  =  $s2->addInt64($s14->mulInt(666643));
-        $s3  =  $s3->addInt64($s14->mulInt(470296));
-        $s4  =  $s4->addInt64($s14->mulInt(654183));
-        $s5  =  $s5->subInt64($s14->mulInt(997805));
-        $s6  =  $s6->addInt64($s14->mulInt(136657));
-        $s7  =  $s7->subInt64($s14->mulInt(683901));
-
-        $s1  =  $s1->addInt64($s13->mulInt(666643));
-        $s2  =  $s2->addInt64($s13->mulInt(470296));
-        $s3  =  $s3->addInt64($s13->mulInt(654183));
-        $s4  =  $s4->subInt64($s13->mulInt(997805));
-        $s5  =  $s5->addInt64($s13->mulInt(136657));
-        $s6  =  $s6->subInt64($s13->mulInt(683901));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $S0 = $s0->toInt32()->toInt();
-        $S1 = $s1->toInt32()->toInt();
-        $S2 = $s2->toInt32()->toInt();
-        $S3 = $s3->toInt32()->toInt();
-        $S4 = $s4->toInt32()->toInt();
-        $S5 = $s5->toInt32()->toInt();
-        $S6 = $s6->toInt32()->toInt();
-        $S7 = $s7->toInt32()->toInt();
-        $S8 = $s8->toInt32()->toInt();
-        $S9 = $s9->toInt32()->toInt();
-        $S10 = $s10->toInt32()->toInt();
-        $S11 = $s11->toInt32()->toInt();
-
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) ($S0 >> 0),
-            (int) ($S0 >> 8),
-            (int) (($S0 >> 16) | self::mul($S1, 1 << 5)),
-            (int) ($S1 >> 3),
-            (int) ($S1 >> 11),
-            (int) (($S1 >> 19) | self::mul($S2, 1 << 2)),
-            (int) ($S2 >> 6),
-            (int) (($S2 >> 14) | self::mul($S3, 1 << 7)),
-            (int) ($S3 >> 1),
-            (int) ($S3 >> 9),
-            (int) (($S3 >> 17) | self::mul($S4, 1 << 4)),
-            (int) ($S4 >> 4),
-            (int) ($S4 >> 12),
-            (int) (($S4 >> 20) | self::mul($S5, 1 << 1)),
-            (int) ($S5 >> 7),
-            (int) (($S5 >> 15) | self::mul($S6, 1 << 6)),
-            (int) ($S6 >> 2),
-            (int) ($S6 >> 10),
-            (int) (($S6 >> 18) | self::mul($S7, 1 << 3)),
-            (int) ($S7 >> 5),
-            (int) ($S7 >> 13),
-            (int) ($S8 >> 0),
-            (int) ($S8 >> 8),
-            (int) (($S8 >> 16) | self::mul($S9, 1 << 5)),
-            (int) ($S9 >> 3),
-            (int) ($S9 >> 11),
-            (int) (($S9 >> 19) | self::mul($S10, 1 << 2)),
-            (int) ($S10 >> 6),
-            (int) (($S10 >> 14) | self::mul($S11, 1 << 7)),
-            (int) ($S11 >> 1),
-            (int) ($S11 >> 9),
-            (int) $S11 >> 17
-        );
-        return self::intArrayToString($arr);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return string
-     */
-    public static function sc_reduce_old($s)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32 $s0
-         * @var ParagonIE_Sodium_Core32_Int32 $s1
-         * @var ParagonIE_Sodium_Core32_Int32 $s2
-         * @var ParagonIE_Sodium_Core32_Int32 $s3
-         * @var ParagonIE_Sodium_Core32_Int32 $s4
-         * @var ParagonIE_Sodium_Core32_Int32 $s5
-         * @var ParagonIE_Sodium_Core32_Int32 $s6
-         * @var ParagonIE_Sodium_Core32_Int32 $s7
-         * @var ParagonIE_Sodium_Core32_Int32 $s8
-         * @var ParagonIE_Sodium_Core32_Int32 $s9
-         * @var ParagonIE_Sodium_Core32_Int32 $s10
-         * @var ParagonIE_Sodium_Core32_Int32 $s11
-         * @var ParagonIE_Sodium_Core32_Int32 $s12
-         * @var ParagonIE_Sodium_Core32_Int32 $s13
-         * @var ParagonIE_Sodium_Core32_Int32 $s14
-         * @var ParagonIE_Sodium_Core32_Int32 $s15
-         * @var ParagonIE_Sodium_Core32_Int32 $s16
-         * @var ParagonIE_Sodium_Core32_Int32 $s17
-         * @var ParagonIE_Sodium_Core32_Int32 $s18
-         * @var ParagonIE_Sodium_Core32_Int32 $s19
-         * @var ParagonIE_Sodium_Core32_Int32 $s20
-         * @var ParagonIE_Sodium_Core32_Int32 $s21
-         * @var ParagonIE_Sodium_Core32_Int32 $s22
-         * @var ParagonIE_Sodium_Core32_Int32 $s23
-         */
-        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)));
-        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5));
-        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2));
-        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7));
-        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4));
-        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1));
-        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6));
-        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3));
-        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)));
-        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5));
-        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2));
-        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7));
-        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4));
-        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1));
-        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6));
-        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3));
-        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)));
-        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5));
-        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2));
-        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7));
-        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4));
-        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1));
-        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6));
-        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt(self::load_4(self::substr($s, 60, 4)) >> 3);
-
-        $s11 = $s11->addInt32($s23->mulInt(666643));
-        $s12 = $s12->addInt32($s23->mulInt(470296));
-        $s13 = $s13->addInt32($s23->mulInt(654183));
-        $s14 = $s14->subInt32($s23->mulInt(997805));
-        $s15 = $s15->addInt32($s23->mulInt(136657));
-        $s16 = $s16->subInt32($s23->mulInt(683901));
-
-        $s10 = $s10->addInt32($s22->mulInt(666643));
-        $s11 = $s11->addInt32($s22->mulInt(470296));
-        $s12 = $s12->addInt32($s22->mulInt(654183));
-        $s13 = $s13->subInt32($s22->mulInt(997805));
-        $s14 = $s14->addInt32($s22->mulInt(136657));
-        $s15 = $s15->subInt32($s22->mulInt(683901));
-
-        $s9  =  $s9->addInt32($s21->mulInt(666643));
-        $s10 = $s10->addInt32($s21->mulInt(470296));
-        $s11 = $s11->addInt32($s21->mulInt(654183));
-        $s12 = $s12->subInt32($s21->mulInt(997805));
-        $s13 = $s13->addInt32($s21->mulInt(136657));
-        $s14 = $s14->subInt32($s21->mulInt(683901));
-
-        $s8  =  $s8->addInt32($s20->mulInt(666643));
-        $s9  =  $s9->addInt32($s20->mulInt(470296));
-        $s10 = $s10->addInt32($s20->mulInt(654183));
-        $s11 = $s11->subInt32($s20->mulInt(997805));
-        $s12 = $s12->addInt32($s20->mulInt(136657));
-        $s13 = $s13->subInt32($s20->mulInt(683901));
-
-        $s7  =  $s7->addInt32($s19->mulInt(666643));
-        $s8  =  $s8->addInt32($s19->mulInt(470296));
-        $s9  =  $s9->addInt32($s19->mulInt(654183));
-        $s10 = $s10->subInt32($s19->mulInt(997805));
-        $s11 = $s11->addInt32($s19->mulInt(136657));
-        $s12 = $s12->subInt32($s19->mulInt(683901));
-
-        $s6  =  $s6->addInt32($s18->mulInt(666643));
-        $s7  =  $s7->addInt32($s18->mulInt(470296));
-        $s8  =  $s8->addInt32($s18->mulInt(654183));
-        $s9  =  $s9->subInt32($s18->mulInt(997805));
-        $s10 = $s10->addInt32($s18->mulInt(136657));
-        $s11 = $s11->subInt32($s18->mulInt(683901));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
-
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt32($carry12);
-        $s12 = $s12->subInt32($carry12->shiftLeft(21));
-
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt32($carry14);
-        $s14 = $s14->subInt32($carry14->shiftLeft(21));
-
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt32($carry16);
-        $s16 = $s16->subInt32($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt32($carry11);
-        $s11 = $s11->subInt32($carry11->shiftLeft(21));
-
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt32($carry13);
-        $s13 = $s13->subInt32($carry13->shiftLeft(21));
-
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt32($carry15);
-        $s15 = $s15->subInt32($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt32($s17->mulInt(666643));
-        $s6  =  $s6->addInt32($s17->mulInt(470296));
-        $s7  =  $s7->addInt32($s17->mulInt(654183));
-        $s8  =  $s8->subInt32($s17->mulInt(997805));
-        $s9  =  $s9->addInt32($s17->mulInt(136657));
-        $s10 = $s10->subInt32($s17->mulInt(683901));
-
-        $s4  =  $s4->addInt32($s16->mulInt(666643));
-        $s5  =  $s5->addInt32($s16->mulInt(470296));
-        $s6  =  $s6->addInt32($s16->mulInt(654183));
-        $s7  =  $s7->subInt32($s16->mulInt(997805));
-        $s8  =  $s8->addInt32($s16->mulInt(136657));
-        $s9  =  $s9->subInt32($s16->mulInt(683901));
-
-        $s3  =  $s3->addInt32($s15->mulInt(666643));
-        $s4  =  $s4->addInt32($s15->mulInt(470296));
-        $s5  =  $s5->addInt32($s15->mulInt(654183));
-        $s6  =  $s6->subInt32($s15->mulInt(997805));
-        $s7  =  $s7->addInt32($s15->mulInt(136657));
-        $s8  =  $s8->subInt32($s15->mulInt(683901));
-
-        $s2  =  $s2->addInt32($s14->mulInt(666643));
-        $s3  =  $s3->addInt32($s14->mulInt(470296));
-        $s4  =  $s4->addInt32($s14->mulInt(654183));
-        $s5  =  $s5->subInt32($s14->mulInt(997805));
-        $s6  =  $s6->addInt32($s14->mulInt(136657));
-        $s7  =  $s7->subInt32($s14->mulInt(683901));
-
-        $s1  =  $s1->addInt32($s13->mulInt(666643));
-        $s2  =  $s2->addInt32($s13->mulInt(470296));
-        $s3  =  $s3->addInt32($s13->mulInt(654183));
-        $s4  =  $s4->subInt32($s13->mulInt(997805));
-        $s5  =  $s5->addInt32($s13->mulInt(136657));
-        $s6  =  $s6->subInt32($s13->mulInt(683901));
-
-        $s0  =  $s0->addInt32($s12->mulInt(666643));
-        $s1  =  $s1->addInt32($s12->mulInt(470296));
-        $s2  =  $s2->addInt32($s12->mulInt(654183));
-        $s3  =  $s3->subInt32($s12->mulInt(997805));
-        $s4  =  $s4->addInt32($s12->mulInt(136657));
-        $s5  =  $s5->subInt32($s12->mulInt(683901));
-        $s12 = new ParagonIE_Sodium_Core32_Int32();
-
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt32($carry0);
-        $s0 = $s0->subInt32($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt32($carry2);
-        $s2 = $s2->subInt32($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt32($carry4);
-        $s4 = $s4->subInt32($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt32($carry1);
-        $s1 = $s1->subInt32($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt32($carry3);
-        $s3 = $s3->subInt32($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt32($carry5);
-        $s5 = $s5->subInt32($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt32($carry11);
-        $s11 = $s11->subInt32($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt32($s12->mulInt(666643));
-        $s1  =  $s1->addInt32($s12->mulInt(470296));
-        $s2  =  $s2->addInt32($s12->mulInt(654183));
-        $s3  =  $s3->subInt32($s12->mulInt(997805));
-        $s4  =  $s4->addInt32($s12->mulInt(136657));
-        $s5  =  $s5->subInt32($s12->mulInt(683901));
-        $s12 = new ParagonIE_Sodium_Core32_Int32();
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt32($carry0);
-        $s0 = $s0->subInt32($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt32($carry1);
-        $s1 = $s1->subInt32($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt32($carry2);
-        $s2 = $s2->subInt32($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt32($carry3);
-        $s3 = $s3->subInt32($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt32($carry4);
-        $s4 = $s4->subInt32($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt32($carry5);
-        $s5 = $s5->subInt32($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt32($carry11);
-        $s11 = $s11->subInt32($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt32($s12->mulInt(666643));
-        $s1  =  $s1->addInt32($s12->mulInt(470296));
-        $s2  =  $s2->addInt32($s12->mulInt(654183));
-        $s3  =  $s3->subInt32($s12->mulInt(997805));
-        $s4  =  $s4->addInt32($s12->mulInt(136657));
-        $s5  =  $s5->subInt32($s12->mulInt(683901));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt32($carry0);
-        $s0 = $s0->subInt32($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt32($carry1);
-        $s1 = $s1->subInt32($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt32($carry2);
-        $s2 = $s2->subInt32($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt32($carry3);
-        $s3 = $s3->subInt32($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt32($carry4);
-        $s4 = $s4->subInt32($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt32($carry5);
-        $s5 = $s5->subInt32($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
-
-        $S0 = $s0->toInt();
-        $S1 = $s1->toInt();
-        $S2 = $s2->toInt();
-        $S3 = $s3->toInt();
-        $S4 = $s4->toInt();
-        $S5 = $s5->toInt();
-        $S6 = $s6->toInt();
-        $S7 = $s7->toInt();
-        $S8 = $s8->toInt();
-        $S9 = $s9->toInt();
-        $S10 = $s10->toInt();
-        $S11 = $s11->toInt();
-
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) ($S0 >> 0),
-            (int) ($S0 >> 8),
-            (int) (($S0 >> 16) | self::mul($S1, 1 << 5)),
-            (int) ($S1 >> 3),
-            (int) ($S1 >> 11),
-            (int) (($S1 >> 19) | self::mul($S2, 1 << 2)),
-            (int) ($S2 >> 6),
-            (int) (($S2 >> 14) | self::mul($S3, 1 << 7)),
-            (int) ($S3 >> 1),
-            (int) ($S3 >> 9),
-            (int) (($S3 >> 17) | self::mul($S4, 1 << 4)),
-            (int) ($S4 >> 4),
-            (int) ($S4 >> 12),
-            (int) (($S4 >> 20) | self::mul($S5, 1 << 1)),
-            (int) ($S5 >> 7),
-            (int) (($S5 >> 15) | self::mul($S6, 1 << 6)),
-            (int) ($S6 >> 2),
-            (int) ($S6 >> 10),
-            (int) (($S6 >> 18) | self::mul($S7, 1 << 3)),
-            (int) ($S7 >> 5),
-            (int) ($S7 >> 13),
-            (int) ($S8 >> 0),
-            (int) ($S8 >> 8),
-            (int) (($S8 >> 16) | self::mul($S9, 1 << 5)),
-            (int) ($S9 >> 3),
-            (int) ($S9 >> 11),
-            (int) (($S9 >> 19) | self::mul($S10, 1 << 2)),
-            (int) ($S10 >> 6),
-            (int) (($S10 >> 14) | self::mul($S11, 1 << 7)),
-            (int) ($S11 >> 1),
-            (int) ($S11 >> 9),
-            (int) $S11 >> 17
-        );
-        return self::intArrayToString($arr);
-    }
+		/**
+		 * @var array<int, int>
+		 */
+		$arr = array(
+			(int) (0xff & ($S0 >> 0)),
+			(int) (0xff & ($S0 >> 8)),
+			(int) (0xff & (($S0 >> 16) | self::mul($S1, 1 << 5))),
+			(int) (0xff & ($S1 >> 3)),
+			(int) (0xff & ($S1 >> 11)),
+			(int) (0xff & (($S1 >> 19) | self::mul($S2, 1 << 2))),
+			(int) (0xff & ($S2 >> 6)),
+			(int) (0xff & (($S2 >> 14) | self::mul($S3, 1 << 7))),
+			(int) (0xff & ($S3 >> 1)),
+			(int) (0xff & ($S3 >> 9)),
+			(int) (0xff & (($S3 >> 17) | self::mul($S4, 1 << 4))),
+			(int) (0xff & ($S4 >> 4)),
+			(int) (0xff & ($S4 >> 12)),
+			(int) (0xff & (($S4 >> 20) | self::mul($S5, 1 << 1))),
+			(int) (0xff & ($S5 >> 7)),
+			(int) (0xff & (($S5 >> 15) | self::mul($S6, 1 << 6))),
+			(int) (0xff & ($S6 >> 2)),
+			(int) (0xff & ($S6 >> 10)),
+			(int) (0xff & (($S6 >> 18) | self::mul($S7, 1 << 3))),
+			(int) (0xff & ($S7 >> 5)),
+			(int) (0xff & ($S7 >> 13)),
+			(int) (0xff & ($S8 >> 0)),
+			(int) (0xff & ($S8 >> 8)),
+			(int) (0xff & (($S8 >> 16) | self::mul($S9, 1 << 5))),
+			(int) (0xff & ($S9 >> 3)),
+			(int) (0xff & ($S9 >> 11)),
+			(int) (0xff & (($S9 >> 19) | self::mul($S10, 1 << 2))),
+			(int) (0xff & ($S10 >> 6)),
+			(int) (0xff & (($S10 >> 14) | self::mul($S11, 1 << 7))),
+			(int) (0xff & ($S11 >> 1)),
+			(int) (0xff & ($S11 >> 9)),
+			(int) (0xff & ($S11 >> 17))
+		);
+		return self::intArrayToString($arr);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $s
+	 * @return string
+	 */
+	public static function sc_reduce($s)
+	{
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int64 $s0
+		 * @var ParagonIE_Sodium_Core32_Int64 $s1
+		 * @var ParagonIE_Sodium_Core32_Int64 $s2
+		 * @var ParagonIE_Sodium_Core32_Int64 $s3
+		 * @var ParagonIE_Sodium_Core32_Int64 $s4
+		 * @var ParagonIE_Sodium_Core32_Int64 $s5
+		 * @var ParagonIE_Sodium_Core32_Int64 $s6
+		 * @var ParagonIE_Sodium_Core32_Int64 $s7
+		 * @var ParagonIE_Sodium_Core32_Int64 $s8
+		 * @var ParagonIE_Sodium_Core32_Int64 $s9
+		 * @var ParagonIE_Sodium_Core32_Int64 $s10
+		 * @var ParagonIE_Sodium_Core32_Int64 $s11
+		 * @var ParagonIE_Sodium_Core32_Int64 $s12
+		 * @var ParagonIE_Sodium_Core32_Int64 $s13
+		 * @var ParagonIE_Sodium_Core32_Int64 $s14
+		 * @var ParagonIE_Sodium_Core32_Int64 $s15
+		 * @var ParagonIE_Sodium_Core32_Int64 $s16
+		 * @var ParagonIE_Sodium_Core32_Int64 $s17
+		 * @var ParagonIE_Sodium_Core32_Int64 $s18
+		 * @var ParagonIE_Sodium_Core32_Int64 $s19
+		 * @var ParagonIE_Sodium_Core32_Int64 $s20
+		 * @var ParagonIE_Sodium_Core32_Int64 $s21
+		 * @var ParagonIE_Sodium_Core32_Int64 $s22
+		 * @var ParagonIE_Sodium_Core32_Int64 $s23
+		 */
+		$s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)))->toInt64();
+		$s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5))->toInt64();
+		$s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2))->toInt64();
+		$s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7))->toInt64();
+		$s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4))->toInt64();
+		$s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1))->toInt64();
+		$s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6))->toInt64();
+		$s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3))->toInt64();
+		$s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)))->toInt64();
+		$s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5))->toInt64();
+		$s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2))->toInt64();
+		$s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7))->toInt64();
+		$s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4))->toInt64();
+		$s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1))->toInt64();
+		$s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6))->toInt64();
+		$s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3))->toInt64();
+		$s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)))->toInt64();
+		$s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5))->toInt64();
+		$s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2))->toInt64();
+		$s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7))->toInt64();
+		$s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4))->toInt64();
+		$s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1))->toInt64();
+		$s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6))->toInt64();
+		$s23 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($s, 60, 4)) >> 3))->toInt64();
+
+		$s11 = $s11->addInt64($s23->mulInt(666643));
+		$s12 = $s12->addInt64($s23->mulInt(470296));
+		$s13 = $s13->addInt64($s23->mulInt(654183));
+		$s14 = $s14->subInt64($s23->mulInt(997805));
+		$s15 = $s15->addInt64($s23->mulInt(136657));
+		$s16 = $s16->subInt64($s23->mulInt(683901));
+
+		$s10 = $s10->addInt64($s22->mulInt(666643));
+		$s11 = $s11->addInt64($s22->mulInt(470296));
+		$s12 = $s12->addInt64($s22->mulInt(654183));
+		$s13 = $s13->subInt64($s22->mulInt(997805));
+		$s14 = $s14->addInt64($s22->mulInt(136657));
+		$s15 = $s15->subInt64($s22->mulInt(683901));
+
+		$s9  =  $s9->addInt64($s21->mulInt(666643));
+		$s10 = $s10->addInt64($s21->mulInt(470296));
+		$s11 = $s11->addInt64($s21->mulInt(654183));
+		$s12 = $s12->subInt64($s21->mulInt(997805));
+		$s13 = $s13->addInt64($s21->mulInt(136657));
+		$s14 = $s14->subInt64($s21->mulInt(683901));
+
+		$s8  =  $s8->addInt64($s20->mulInt(666643));
+		$s9  =  $s9->addInt64($s20->mulInt(470296));
+		$s10 = $s10->addInt64($s20->mulInt(654183));
+		$s11 = $s11->subInt64($s20->mulInt(997805));
+		$s12 = $s12->addInt64($s20->mulInt(136657));
+		$s13 = $s13->subInt64($s20->mulInt(683901));
+
+		$s7  =  $s7->addInt64($s19->mulInt(666643));
+		$s8  =  $s8->addInt64($s19->mulInt(470296));
+		$s9  =  $s9->addInt64($s19->mulInt(654183));
+		$s10 = $s10->subInt64($s19->mulInt(997805));
+		$s11 = $s11->addInt64($s19->mulInt(136657));
+		$s12 = $s12->subInt64($s19->mulInt(683901));
+
+		$s6  =  $s6->addInt64($s18->mulInt(666643));
+		$s7  =  $s7->addInt64($s18->mulInt(470296));
+		$s8  =  $s8->addInt64($s18->mulInt(654183));
+		$s9  =  $s9->subInt64($s18->mulInt(997805));
+		$s10 = $s10->addInt64($s18->mulInt(136657));
+		$s11 = $s11->subInt64($s18->mulInt(683901));
+
+		$carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+		$carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+		$s13 = $s13->addInt64($carry12);
+		$s12 = $s12->subInt64($carry12->shiftLeft(21));
+		$carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+		$s15 = $s15->addInt64($carry14);
+		$s14 = $s14->subInt64($carry14->shiftLeft(21));
+		$carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+		$s17 = $s17->addInt64($carry16);
+		$s16 = $s16->subInt64($carry16->shiftLeft(21));
+
+		$carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+		$s12 = $s12->addInt64($carry11);
+		$s11 = $s11->subInt64($carry11->shiftLeft(21));
+		$carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+		$s14 = $s14->addInt64($carry13);
+		$s13 = $s13->subInt64($carry13->shiftLeft(21));
+		$carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+		$s16 = $s16->addInt64($carry15);
+		$s15 = $s15->subInt64($carry15->shiftLeft(21));
+
+		$s5  =  $s5->addInt64($s17->mulInt(666643));
+		$s6  =  $s6->addInt64($s17->mulInt(470296));
+		$s7  =  $s7->addInt64($s17->mulInt(654183));
+		$s8  =  $s8->subInt64($s17->mulInt(997805));
+		$s9  =  $s9->addInt64($s17->mulInt(136657));
+		$s10 = $s10->subInt64($s17->mulInt(683901));
+
+		$s4  =  $s4->addInt64($s16->mulInt(666643));
+		$s5  =  $s5->addInt64($s16->mulInt(470296));
+		$s6  =  $s6->addInt64($s16->mulInt(654183));
+		$s7  =  $s7->subInt64($s16->mulInt(997805));
+		$s8  =  $s8->addInt64($s16->mulInt(136657));
+		$s9  =  $s9->subInt64($s16->mulInt(683901));
+
+		$s3  =  $s3->addInt64($s15->mulInt(666643));
+		$s4  =  $s4->addInt64($s15->mulInt(470296));
+		$s5  =  $s5->addInt64($s15->mulInt(654183));
+		$s6  =  $s6->subInt64($s15->mulInt(997805));
+		$s7  =  $s7->addInt64($s15->mulInt(136657));
+		$s8  =  $s8->subInt64($s15->mulInt(683901));
+
+		$s2  =  $s2->addInt64($s14->mulInt(666643));
+		$s3  =  $s3->addInt64($s14->mulInt(470296));
+		$s4  =  $s4->addInt64($s14->mulInt(654183));
+		$s5  =  $s5->subInt64($s14->mulInt(997805));
+		$s6  =  $s6->addInt64($s14->mulInt(136657));
+		$s7  =  $s7->subInt64($s14->mulInt(683901));
+
+		$s1  =  $s1->addInt64($s13->mulInt(666643));
+		$s2  =  $s2->addInt64($s13->mulInt(470296));
+		$s3  =  $s3->addInt64($s13->mulInt(654183));
+		$s4  =  $s4->subInt64($s13->mulInt(997805));
+		$s5  =  $s5->addInt64($s13->mulInt(136657));
+		$s6  =  $s6->subInt64($s13->mulInt(683901));
+
+		$s0  =  $s0->addInt64($s12->mulInt(666643));
+		$s1  =  $s1->addInt64($s12->mulInt(470296));
+		$s2  =  $s2->addInt64($s12->mulInt(654183));
+		$s3  =  $s3->subInt64($s12->mulInt(997805));
+		$s4  =  $s4->addInt64($s12->mulInt(136657));
+		$s5  =  $s5->subInt64($s12->mulInt(683901));
+		$s12 = new ParagonIE_Sodium_Core32_Int64();
+
+		$carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+		$s1 = $s1->addInt64($carry0);
+		$s0 = $s0->subInt64($carry0->shiftLeft(21));
+		$carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+		$s3 = $s3->addInt64($carry2);
+		$s2 = $s2->subInt64($carry2->shiftLeft(21));
+		$carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+		$s5 = $s5->addInt64($carry4);
+		$s4 = $s4->subInt64($carry4->shiftLeft(21));
+		$carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+		$carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+		$s2 = $s2->addInt64($carry1);
+		$s1 = $s1->subInt64($carry1->shiftLeft(21));
+		$carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+		$s4 = $s4->addInt64($carry3);
+		$s3 = $s3->subInt64($carry3->shiftLeft(21));
+		$carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+		$s6 = $s6->addInt64($carry5);
+		$s5 = $s5->subInt64($carry5->shiftLeft(21));
+		$carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+		$s12 = $s12->addInt64($carry11);
+		$s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+		$s0  =  $s0->addInt64($s12->mulInt(666643));
+		$s1  =  $s1->addInt64($s12->mulInt(470296));
+		$s2  =  $s2->addInt64($s12->mulInt(654183));
+		$s3  =  $s3->subInt64($s12->mulInt(997805));
+		$s4  =  $s4->addInt64($s12->mulInt(136657));
+		$s5  =  $s5->subInt64($s12->mulInt(683901));
+		$s12 = new ParagonIE_Sodium_Core32_Int64();
+
+		$carry0 = $s0->shiftRight(21);
+		$s1 = $s1->addInt64($carry0);
+		$s0 = $s0->subInt64($carry0->shiftLeft(21));
+		$carry1 = $s1->shiftRight(21);
+		$s2 = $s2->addInt64($carry1);
+		$s1 = $s1->subInt64($carry1->shiftLeft(21));
+		$carry2 = $s2->shiftRight(21);
+		$s3 = $s3->addInt64($carry2);
+		$s2 = $s2->subInt64($carry2->shiftLeft(21));
+		$carry3 = $s3->shiftRight(21);
+		$s4 = $s4->addInt64($carry3);
+		$s3 = $s3->subInt64($carry3->shiftLeft(21));
+		$carry4 = $s4->shiftRight(21);
+		$s5 = $s5->addInt64($carry4);
+		$s4 = $s4->subInt64($carry4->shiftLeft(21));
+		$carry5 = $s5->shiftRight(21);
+		$s6 = $s6->addInt64($carry5);
+		$s5 = $s5->subInt64($carry5->shiftLeft(21));
+		$carry6 = $s6->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry7 = $s7->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry8 = $s8->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry9 = $s9->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry10 = $s10->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+		$carry11 = $s11->shiftRight(21);
+		$s12 = $s12->addInt64($carry11);
+		$s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+		$s0  =  $s0->addInt64($s12->mulInt(666643));
+		$s1  =  $s1->addInt64($s12->mulInt(470296));
+		$s2  =  $s2->addInt64($s12->mulInt(654183));
+		$s3  =  $s3->subInt64($s12->mulInt(997805));
+		$s4  =  $s4->addInt64($s12->mulInt(136657));
+		$s5  =  $s5->subInt64($s12->mulInt(683901));
+
+		$carry0 = $s0->shiftRight(21);
+		$s1 = $s1->addInt64($carry0);
+		$s0 = $s0->subInt64($carry0->shiftLeft(21));
+		$carry1 = $s1->shiftRight(21);
+		$s2 = $s2->addInt64($carry1);
+		$s1 = $s1->subInt64($carry1->shiftLeft(21));
+		$carry2 = $s2->shiftRight(21);
+		$s3 = $s3->addInt64($carry2);
+		$s2 = $s2->subInt64($carry2->shiftLeft(21));
+		$carry3 = $s3->shiftRight(21);
+		$s4 = $s4->addInt64($carry3);
+		$s3 = $s3->subInt64($carry3->shiftLeft(21));
+		$carry4 = $s4->shiftRight(21);
+		$s5 = $s5->addInt64($carry4);
+		$s4 = $s4->subInt64($carry4->shiftLeft(21));
+		$carry5 = $s5->shiftRight(21);
+		$s6 = $s6->addInt64($carry5);
+		$s5 = $s5->subInt64($carry5->shiftLeft(21));
+		$carry6 = $s6->shiftRight(21);
+		$s7 = $s7->addInt64($carry6);
+		$s6 = $s6->subInt64($carry6->shiftLeft(21));
+		$carry7 = $s7->shiftRight(21);
+		$s8 = $s8->addInt64($carry7);
+		$s7 = $s7->subInt64($carry7->shiftLeft(21));
+		$carry8 = $s8->shiftRight(21);
+		$s9 = $s9->addInt64($carry8);
+		$s8 = $s8->subInt64($carry8->shiftLeft(21));
+		$carry9 = $s9->shiftRight(21);
+		$s10 = $s10->addInt64($carry9);
+		$s9 = $s9->subInt64($carry9->shiftLeft(21));
+		$carry10 = $s10->shiftRight(21);
+		$s11 = $s11->addInt64($carry10);
+		$s10 = $s10->subInt64($carry10->shiftLeft(21));
+
+		$S0 = $s0->toInt32()->toInt();
+		$S1 = $s1->toInt32()->toInt();
+		$S2 = $s2->toInt32()->toInt();
+		$S3 = $s3->toInt32()->toInt();
+		$S4 = $s4->toInt32()->toInt();
+		$S5 = $s5->toInt32()->toInt();
+		$S6 = $s6->toInt32()->toInt();
+		$S7 = $s7->toInt32()->toInt();
+		$S8 = $s8->toInt32()->toInt();
+		$S9 = $s9->toInt32()->toInt();
+		$S10 = $s10->toInt32()->toInt();
+		$S11 = $s11->toInt32()->toInt();
+
+		/**
+		 * @var array<int, int>
+		 */
+		$arr = array(
+			(int) ($S0 >> 0),
+			(int) ($S0 >> 8),
+			(int) (($S0 >> 16) | self::mul($S1, 1 << 5)),
+			(int) ($S1 >> 3),
+			(int) ($S1 >> 11),
+			(int) (($S1 >> 19) | self::mul($S2, 1 << 2)),
+			(int) ($S2 >> 6),
+			(int) (($S2 >> 14) | self::mul($S3, 1 << 7)),
+			(int) ($S3 >> 1),
+			(int) ($S3 >> 9),
+			(int) (($S3 >> 17) | self::mul($S4, 1 << 4)),
+			(int) ($S4 >> 4),
+			(int) ($S4 >> 12),
+			(int) (($S4 >> 20) | self::mul($S5, 1 << 1)),
+			(int) ($S5 >> 7),
+			(int) (($S5 >> 15) | self::mul($S6, 1 << 6)),
+			(int) ($S6 >> 2),
+			(int) ($S6 >> 10),
+			(int) (($S6 >> 18) | self::mul($S7, 1 << 3)),
+			(int) ($S7 >> 5),
+			(int) ($S7 >> 13),
+			(int) ($S8 >> 0),
+			(int) ($S8 >> 8),
+			(int) (($S8 >> 16) | self::mul($S9, 1 << 5)),
+			(int) ($S9 >> 3),
+			(int) ($S9 >> 11),
+			(int) (($S9 >> 19) | self::mul($S10, 1 << 2)),
+			(int) ($S10 >> 6),
+			(int) (($S10 >> 14) | self::mul($S11, 1 << 7)),
+			(int) ($S11 >> 1),
+			(int) ($S11 >> 9),
+			(int) $S11 >> 17
+		);
+		return self::intArrayToString($arr);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $s
+	 * @return string
+	 */
+	public static function sc_reduce_old($s)
+	{
+		/**
+		 * @var ParagonIE_Sodium_Core32_Int32 $s0
+		 * @var ParagonIE_Sodium_Core32_Int32 $s1
+		 * @var ParagonIE_Sodium_Core32_Int32 $s2
+		 * @var ParagonIE_Sodium_Core32_Int32 $s3
+		 * @var ParagonIE_Sodium_Core32_Int32 $s4
+		 * @var ParagonIE_Sodium_Core32_Int32 $s5
+		 * @var ParagonIE_Sodium_Core32_Int32 $s6
+		 * @var ParagonIE_Sodium_Core32_Int32 $s7
+		 * @var ParagonIE_Sodium_Core32_Int32 $s8
+		 * @var ParagonIE_Sodium_Core32_Int32 $s9
+		 * @var ParagonIE_Sodium_Core32_Int32 $s10
+		 * @var ParagonIE_Sodium_Core32_Int32 $s11
+		 * @var ParagonIE_Sodium_Core32_Int32 $s12
+		 * @var ParagonIE_Sodium_Core32_Int32 $s13
+		 * @var ParagonIE_Sodium_Core32_Int32 $s14
+		 * @var ParagonIE_Sodium_Core32_Int32 $s15
+		 * @var ParagonIE_Sodium_Core32_Int32 $s16
+		 * @var ParagonIE_Sodium_Core32_Int32 $s17
+		 * @var ParagonIE_Sodium_Core32_Int32 $s18
+		 * @var ParagonIE_Sodium_Core32_Int32 $s19
+		 * @var ParagonIE_Sodium_Core32_Int32 $s20
+		 * @var ParagonIE_Sodium_Core32_Int32 $s21
+		 * @var ParagonIE_Sodium_Core32_Int32 $s22
+		 * @var ParagonIE_Sodium_Core32_Int32 $s23
+		 */
+		$s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)));
+		$s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5));
+		$s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2));
+		$s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7));
+		$s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4));
+		$s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1));
+		$s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6));
+		$s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3));
+		$s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)));
+		$s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5));
+		$s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2));
+		$s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7));
+		$s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4));
+		$s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1));
+		$s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6));
+		$s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3));
+		$s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)));
+		$s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5));
+		$s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2));
+		$s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7));
+		$s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4));
+		$s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1));
+		$s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6));
+		$s23 = ParagonIE_Sodium_Core32_Int32::fromInt(self::load_4(self::substr($s, 60, 4)) >> 3);
+
+		$s11 = $s11->addInt32($s23->mulInt(666643));
+		$s12 = $s12->addInt32($s23->mulInt(470296));
+		$s13 = $s13->addInt32($s23->mulInt(654183));
+		$s14 = $s14->subInt32($s23->mulInt(997805));
+		$s15 = $s15->addInt32($s23->mulInt(136657));
+		$s16 = $s16->subInt32($s23->mulInt(683901));
+
+		$s10 = $s10->addInt32($s22->mulInt(666643));
+		$s11 = $s11->addInt32($s22->mulInt(470296));
+		$s12 = $s12->addInt32($s22->mulInt(654183));
+		$s13 = $s13->subInt32($s22->mulInt(997805));
+		$s14 = $s14->addInt32($s22->mulInt(136657));
+		$s15 = $s15->subInt32($s22->mulInt(683901));
+
+		$s9  =  $s9->addInt32($s21->mulInt(666643));
+		$s10 = $s10->addInt32($s21->mulInt(470296));
+		$s11 = $s11->addInt32($s21->mulInt(654183));
+		$s12 = $s12->subInt32($s21->mulInt(997805));
+		$s13 = $s13->addInt32($s21->mulInt(136657));
+		$s14 = $s14->subInt32($s21->mulInt(683901));
+
+		$s8  =  $s8->addInt32($s20->mulInt(666643));
+		$s9  =  $s9->addInt32($s20->mulInt(470296));
+		$s10 = $s10->addInt32($s20->mulInt(654183));
+		$s11 = $s11->subInt32($s20->mulInt(997805));
+		$s12 = $s12->addInt32($s20->mulInt(136657));
+		$s13 = $s13->subInt32($s20->mulInt(683901));
+
+		$s7  =  $s7->addInt32($s19->mulInt(666643));
+		$s8  =  $s8->addInt32($s19->mulInt(470296));
+		$s9  =  $s9->addInt32($s19->mulInt(654183));
+		$s10 = $s10->subInt32($s19->mulInt(997805));
+		$s11 = $s11->addInt32($s19->mulInt(136657));
+		$s12 = $s12->subInt32($s19->mulInt(683901));
+
+		$s6  =  $s6->addInt32($s18->mulInt(666643));
+		$s7  =  $s7->addInt32($s18->mulInt(470296));
+		$s8  =  $s8->addInt32($s18->mulInt(654183));
+		$s9  =  $s9->subInt32($s18->mulInt(997805));
+		$s10 = $s10->addInt32($s18->mulInt(136657));
+		$s11 = $s11->subInt32($s18->mulInt(683901));
+
+		$carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+		$s7 = $s7->addInt32($carry6);
+		$s6 = $s6->subInt32($carry6->shiftLeft(21));
+
+		$carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+		$s9 = $s9->addInt32($carry8);
+		$s8 = $s8->subInt32($carry8->shiftLeft(21));
+
+		$carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+		$s11 = $s11->addInt32($carry10);
+		$s10 = $s10->subInt32($carry10->shiftLeft(21));
+
+		$carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+		$s13 = $s13->addInt32($carry12);
+		$s12 = $s12->subInt32($carry12->shiftLeft(21));
+
+		$carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+		$s15 = $s15->addInt32($carry14);
+		$s14 = $s14->subInt32($carry14->shiftLeft(21));
+
+		$carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+		$s17 = $s17->addInt32($carry16);
+		$s16 = $s16->subInt32($carry16->shiftLeft(21));
+
+		$carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+		$s8 = $s8->addInt32($carry7);
+		$s7 = $s7->subInt32($carry7->shiftLeft(21));
+
+		$carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+		$s10 = $s10->addInt32($carry9);
+		$s9 = $s9->subInt32($carry9->shiftLeft(21));
+
+		$carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+		$s12 = $s12->addInt32($carry11);
+		$s11 = $s11->subInt32($carry11->shiftLeft(21));
+
+		$carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+		$s14 = $s14->addInt32($carry13);
+		$s13 = $s13->subInt32($carry13->shiftLeft(21));
+
+		$carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+		$s16 = $s16->addInt32($carry15);
+		$s15 = $s15->subInt32($carry15->shiftLeft(21));
+
+		$s5  =  $s5->addInt32($s17->mulInt(666643));
+		$s6  =  $s6->addInt32($s17->mulInt(470296));
+		$s7  =  $s7->addInt32($s17->mulInt(654183));
+		$s8  =  $s8->subInt32($s17->mulInt(997805));
+		$s9  =  $s9->addInt32($s17->mulInt(136657));
+		$s10 = $s10->subInt32($s17->mulInt(683901));
+
+		$s4  =  $s4->addInt32($s16->mulInt(666643));
+		$s5  =  $s5->addInt32($s16->mulInt(470296));
+		$s6  =  $s6->addInt32($s16->mulInt(654183));
+		$s7  =  $s7->subInt32($s16->mulInt(997805));
+		$s8  =  $s8->addInt32($s16->mulInt(136657));
+		$s9  =  $s9->subInt32($s16->mulInt(683901));
+
+		$s3  =  $s3->addInt32($s15->mulInt(666643));
+		$s4  =  $s4->addInt32($s15->mulInt(470296));
+		$s5  =  $s5->addInt32($s15->mulInt(654183));
+		$s6  =  $s6->subInt32($s15->mulInt(997805));
+		$s7  =  $s7->addInt32($s15->mulInt(136657));
+		$s8  =  $s8->subInt32($s15->mulInt(683901));
+
+		$s2  =  $s2->addInt32($s14->mulInt(666643));
+		$s3  =  $s3->addInt32($s14->mulInt(470296));
+		$s4  =  $s4->addInt32($s14->mulInt(654183));
+		$s5  =  $s5->subInt32($s14->mulInt(997805));
+		$s6  =  $s6->addInt32($s14->mulInt(136657));
+		$s7  =  $s7->subInt32($s14->mulInt(683901));
+
+		$s1  =  $s1->addInt32($s13->mulInt(666643));
+		$s2  =  $s2->addInt32($s13->mulInt(470296));
+		$s3  =  $s3->addInt32($s13->mulInt(654183));
+		$s4  =  $s4->subInt32($s13->mulInt(997805));
+		$s5  =  $s5->addInt32($s13->mulInt(136657));
+		$s6  =  $s6->subInt32($s13->mulInt(683901));
+
+		$s0  =  $s0->addInt32($s12->mulInt(666643));
+		$s1  =  $s1->addInt32($s12->mulInt(470296));
+		$s2  =  $s2->addInt32($s12->mulInt(654183));
+		$s3  =  $s3->subInt32($s12->mulInt(997805));
+		$s4  =  $s4->addInt32($s12->mulInt(136657));
+		$s5  =  $s5->subInt32($s12->mulInt(683901));
+		$s12 = new ParagonIE_Sodium_Core32_Int32();
+
+		$carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+		$s1 = $s1->addInt32($carry0);
+		$s0 = $s0->subInt32($carry0->shiftLeft(21));
+		$carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+		$s3 = $s3->addInt32($carry2);
+		$s2 = $s2->subInt32($carry2->shiftLeft(21));
+		$carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+		$s5 = $s5->addInt32($carry4);
+		$s4 = $s4->subInt32($carry4->shiftLeft(21));
+		$carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+		$s7 = $s7->addInt32($carry6);
+		$s6 = $s6->subInt32($carry6->shiftLeft(21));
+		$carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+		$s9 = $s9->addInt32($carry8);
+		$s8 = $s8->subInt32($carry8->shiftLeft(21));
+		$carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+		$s11 = $s11->addInt32($carry10);
+		$s10 = $s10->subInt32($carry10->shiftLeft(21));
+		$carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+		$s2 = $s2->addInt32($carry1);
+		$s1 = $s1->subInt32($carry1->shiftLeft(21));
+		$carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+		$s4 = $s4->addInt32($carry3);
+		$s3 = $s3->subInt32($carry3->shiftLeft(21));
+		$carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+		$s6 = $s6->addInt32($carry5);
+		$s5 = $s5->subInt32($carry5->shiftLeft(21));
+		$carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+		$s8 = $s8->addInt32($carry7);
+		$s7 = $s7->subInt32($carry7->shiftLeft(21));
+		$carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+		$s10 = $s10->addInt32($carry9);
+		$s9 = $s9->subInt32($carry9->shiftLeft(21));
+		$carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+		$s12 = $s12->addInt32($carry11);
+		$s11 = $s11->subInt32($carry11->shiftLeft(21));
+
+		$s0  =  $s0->addInt32($s12->mulInt(666643));
+		$s1  =  $s1->addInt32($s12->mulInt(470296));
+		$s2  =  $s2->addInt32($s12->mulInt(654183));
+		$s3  =  $s3->subInt32($s12->mulInt(997805));
+		$s4  =  $s4->addInt32($s12->mulInt(136657));
+		$s5  =  $s5->subInt32($s12->mulInt(683901));
+		$s12 = new ParagonIE_Sodium_Core32_Int32();
+
+		$carry0 = $s0->shiftRight(21);
+		$s1 = $s1->addInt32($carry0);
+		$s0 = $s0->subInt32($carry0->shiftLeft(21));
+		$carry1 = $s1->shiftRight(21);
+		$s2 = $s2->addInt32($carry1);
+		$s1 = $s1->subInt32($carry1->shiftLeft(21));
+		$carry2 = $s2->shiftRight(21);
+		$s3 = $s3->addInt32($carry2);
+		$s2 = $s2->subInt32($carry2->shiftLeft(21));
+		$carry3 = $s3->shiftRight(21);
+		$s4 = $s4->addInt32($carry3);
+		$s3 = $s3->subInt32($carry3->shiftLeft(21));
+		$carry4 = $s4->shiftRight(21);
+		$s5 = $s5->addInt32($carry4);
+		$s4 = $s4->subInt32($carry4->shiftLeft(21));
+		$carry5 = $s5->shiftRight(21);
+		$s6 = $s6->addInt32($carry5);
+		$s5 = $s5->subInt32($carry5->shiftLeft(21));
+		$carry6 = $s6->shiftRight(21);
+		$s7 = $s7->addInt32($carry6);
+		$s6 = $s6->subInt32($carry6->shiftLeft(21));
+		$carry7 = $s7->shiftRight(21);
+		$s8 = $s8->addInt32($carry7);
+		$s7 = $s7->subInt32($carry7->shiftLeft(21));
+		$carry8 = $s8->shiftRight(21);
+		$s9 = $s9->addInt32($carry8);
+		$s8 = $s8->subInt32($carry8->shiftLeft(21));
+		$carry9 = $s9->shiftRight(21);
+		$s10 = $s10->addInt32($carry9);
+		$s9 = $s9->subInt32($carry9->shiftLeft(21));
+		$carry10 = $s10->shiftRight(21);
+		$s11 = $s11->addInt32($carry10);
+		$s10 = $s10->subInt32($carry10->shiftLeft(21));
+		$carry11 = $s11->shiftRight(21);
+		$s12 = $s12->addInt32($carry11);
+		$s11 = $s11->subInt32($carry11->shiftLeft(21));
+
+		$s0  =  $s0->addInt32($s12->mulInt(666643));
+		$s1  =  $s1->addInt32($s12->mulInt(470296));
+		$s2  =  $s2->addInt32($s12->mulInt(654183));
+		$s3  =  $s3->subInt32($s12->mulInt(997805));
+		$s4  =  $s4->addInt32($s12->mulInt(136657));
+		$s5  =  $s5->subInt32($s12->mulInt(683901));
+
+		$carry0 = $s0->shiftRight(21);
+		$s1 = $s1->addInt32($carry0);
+		$s0 = $s0->subInt32($carry0->shiftLeft(21));
+		$carry1 = $s1->shiftRight(21);
+		$s2 = $s2->addInt32($carry1);
+		$s1 = $s1->subInt32($carry1->shiftLeft(21));
+		$carry2 = $s2->shiftRight(21);
+		$s3 = $s3->addInt32($carry2);
+		$s2 = $s2->subInt32($carry2->shiftLeft(21));
+		$carry3 = $s3->shiftRight(21);
+		$s4 = $s4->addInt32($carry3);
+		$s3 = $s3->subInt32($carry3->shiftLeft(21));
+		$carry4 = $s4->shiftRight(21);
+		$s5 = $s5->addInt32($carry4);
+		$s4 = $s4->subInt32($carry4->shiftLeft(21));
+		$carry5 = $s5->shiftRight(21);
+		$s6 = $s6->addInt32($carry5);
+		$s5 = $s5->subInt32($carry5->shiftLeft(21));
+		$carry6 = $s6->shiftRight(21);
+		$s7 = $s7->addInt32($carry6);
+		$s6 = $s6->subInt32($carry6->shiftLeft(21));
+		$carry7 = $s7->shiftRight(21);
+		$s8 = $s8->addInt32($carry7);
+		$s7 = $s7->subInt32($carry7->shiftLeft(21));
+		$carry8 = $s8->shiftRight(21);
+		$s9 = $s9->addInt32($carry8);
+		$s8 = $s8->subInt32($carry8->shiftLeft(21));
+		$carry9 = $s9->shiftRight(21);
+		$s10 = $s10->addInt32($carry9);
+		$s9 = $s9->subInt32($carry9->shiftLeft(21));
+		$carry10 = $s10->shiftRight(21);
+		$s11 = $s11->addInt32($carry10);
+		$s10 = $s10->subInt32($carry10->shiftLeft(21));
+
+		$S0 = $s0->toInt();
+		$S1 = $s1->toInt();
+		$S2 = $s2->toInt();
+		$S3 = $s3->toInt();
+		$S4 = $s4->toInt();
+		$S5 = $s5->toInt();
+		$S6 = $s6->toInt();
+		$S7 = $s7->toInt();
+		$S8 = $s8->toInt();
+		$S9 = $s9->toInt();
+		$S10 = $s10->toInt();
+		$S11 = $s11->toInt();
+
+		/**
+		 * @var array<int, int>
+		 */
+		$arr = array(
+			(int) ($S0 >> 0),
+			(int) ($S0 >> 8),
+			(int) (($S0 >> 16) | self::mul($S1, 1 << 5)),
+			(int) ($S1 >> 3),
+			(int) ($S1 >> 11),
+			(int) (($S1 >> 19) | self::mul($S2, 1 << 2)),
+			(int) ($S2 >> 6),
+			(int) (($S2 >> 14) | self::mul($S3, 1 << 7)),
+			(int) ($S3 >> 1),
+			(int) ($S3 >> 9),
+			(int) (($S3 >> 17) | self::mul($S4, 1 << 4)),
+			(int) ($S4 >> 4),
+			(int) ($S4 >> 12),
+			(int) (($S4 >> 20) | self::mul($S5, 1 << 1)),
+			(int) ($S5 >> 7),
+			(int) (($S5 >> 15) | self::mul($S6, 1 << 6)),
+			(int) ($S6 >> 2),
+			(int) ($S6 >> 10),
+			(int) (($S6 >> 18) | self::mul($S7, 1 << 3)),
+			(int) ($S7 >> 5),
+			(int) ($S7 >> 13),
+			(int) ($S8 >> 0),
+			(int) ($S8 >> 8),
+			(int) (($S8 >> 16) | self::mul($S9, 1 << 5)),
+			(int) ($S9 >> 3),
+			(int) ($S9 >> 11),
+			(int) (($S9 >> 19) | self::mul($S10, 1 << 2)),
+			(int) ($S10 >> 6),
+			(int) (($S10 >> 14) | self::mul($S11, 1 << 7)),
+			(int) ($S11 >> 1),
+			(int) ($S11 >> 9),
+			(int) $S11 >> 17
+		);
+		return self::intArrayToString($arr);
+	}
 }

Spacing +1972 added lines, -1972 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519', false ) ) {
     return;
 }
 
@@ -51,7 +51,7 @@ 
     {
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
-                ParagonIE_Sodium_Core32_Int32::fromInt(1),
+                ParagonIE_Sodium_Core32_Int32::fromInt( 1 ),
                 new ParagonIE_Sodium_Core32_Int32(),
                 new ParagonIE_Sodium_Core32_Int32(),
                 new ParagonIE_Sodium_Core32_Int32(),
@@ -79,10 +79,10 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Fe $g
     ) {
         $arr = array();
-        for ($i = 0; $i < 10; ++$i) {
-            $arr[$i] = $f[$i]->addInt32($g[$i]);
+        for ( $i = 0; $i < 10; ++$i ) {
+            $arr[$i] = $f[$i]->addInt32( $g[$i] );
         }
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($arr);
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray( $arr );
     }
 
     /**
@@ -102,15 +102,15 @@ 
         $b = 0
     ) {
         $h = array();
-        for ($i = 0; $i < 10; ++$i) {
-            if (!($f[$i] instanceof  ParagonIE_Sodium_Core32_Int32)) {
+        for ( $i = 0; $i < 10; ++$i ) {
+            if ( ! ( $f[$i] instanceof  ParagonIE_Sodium_Core32_Int32 ) ) {
                 throw new TypeError();
             }
             $h[$i] = $f[$i]->xorInt32(
-                $f[$i]->xorInt32($g[$i])->mask($b)
+                $f[$i]->xorInt32( $g[$i] )->mask( $b )
             );
         }
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray( $h );
     }
 
     /**
@@ -121,7 +121,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_copy(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    public static function fe_copy( ParagonIE_Sodium_Core32_Curve25519_Fe $f )
     {
         $h = clone $f;
         return $h;
@@ -137,94 +137,94 @@ 
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      * @throws RangeException
      */
-    public static function fe_frombytes($s)
+    public static function fe_frombytes( $s )
     {
-        if (self::strlen($s) !== 32) {
-            throw new RangeException('Expected a 32-byte string.');
+        if ( self::strlen( $s ) !== 32 ) {
+            throw new RangeException( 'Expected a 32-byte string.' );
         }
         /** @var ParagonIE_Sodium_Core32_Int32 $h0 */
         $h0 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_4($s)
+            self::load_4( $s )
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h1 */
         $h1 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 4, 3)) << 6
+            self::load_3( self::substr( $s, 4, 3 ) ) << 6
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h2 */
         $h2 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 7, 3)) << 5
+            self::load_3( self::substr( $s, 7, 3 ) ) << 5
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h3 */
         $h3 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 10, 3)) << 3
+            self::load_3( self::substr( $s, 10, 3 ) ) << 3
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h4 */
         $h4 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 13, 3)) << 2
+            self::load_3( self::substr( $s, 13, 3 ) ) << 2
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h5 */
         $h5 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_4(self::substr($s, 16, 4))
+            self::load_4( self::substr( $s, 16, 4 ) )
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h6 */
         $h6 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 20, 3)) << 7
+            self::load_3( self::substr( $s, 20, 3 ) ) << 7
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h7 */
         $h7 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 23, 3)) << 5
+            self::load_3( self::substr( $s, 23, 3 ) ) << 5
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h8 */
         $h8 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 26, 3)) << 4
+            self::load_3( self::substr( $s, 26, 3 ) ) << 4
         );
         /** @var ParagonIE_Sodium_Core32_Int32 $h9 */
         $h9 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2
+            ( self::load_3( self::substr( $s, 29, 3 ) ) & 8388607 ) << 2
         );
 
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt32($carry9->mulInt(19));
-        $h9 = $h9->subInt32($carry9->shiftLeft(25));
+        $carry9 = $h9->addInt( 1 << 24 )->shiftRight( 25 );
+        $h0 = $h0->addInt32( $carry9->mulInt( 19 ) );
+        $h9 = $h9->subInt32( $carry9->shiftLeft( 25 ) );
 
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt32($carry1);
-        $h1 = $h1->subInt32($carry1->shiftLeft(25));
+        $carry1 = $h1->addInt( 1 << 24 )->shiftRight( 25 );
+        $h2 = $h2->addInt32( $carry1 );
+        $h1 = $h1->subInt32( $carry1->shiftLeft( 25 ) );
 
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt32($carry3);
-        $h3 = $h3->subInt32($carry3->shiftLeft(25));
+        $carry3 = $h3->addInt( 1 << 24 )->shiftRight( 25 );
+        $h4 = $h4->addInt32( $carry3 );
+        $h3 = $h3->subInt32( $carry3->shiftLeft( 25 ) );
 
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt32($carry5);
-        $h5 = $h5->subInt32($carry5->shiftLeft(25));
+        $carry5 = $h5->addInt( 1 << 24 )->shiftRight( 25 );
+        $h6 = $h6->addInt32( $carry5 );
+        $h5 = $h5->subInt32( $carry5->shiftLeft( 25 ) );
 
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt32($carry7);
-        $h7 = $h7->subInt32($carry7->shiftLeft(25));
+        $carry7 = $h7->addInt( 1 << 24 )->shiftRight( 25 );
+        $h8 = $h8->addInt32( $carry7 );
+        $h7 = $h7->subInt32( $carry7->shiftLeft( 25 ) );
 
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt32($carry0);
-        $h0 = $h0->subInt32($carry0->shiftLeft(26));
+        $carry0 = $h0->addInt( 1 << 25 )->shiftRight( 26 );
+        $h1 = $h1->addInt32( $carry0 );
+        $h0 = $h0->subInt32( $carry0->shiftLeft( 26 ) );
 
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt32($carry2);
-        $h2 = $h2->subInt32($carry2->shiftLeft(26));
+        $carry2 = $h2->addInt( 1 << 25 )->shiftRight( 26 );
+        $h3 = $h3->addInt32( $carry2 );
+        $h2 = $h2->subInt32( $carry2->shiftLeft( 26 ) );
 
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt32($carry4);
-        $h4 = $h4->subInt32($carry4->shiftLeft(26));
+        $carry4 = $h4->addInt( 1 << 25 )->shiftRight( 26 );
+        $h5 = $h5->addInt32( $carry4 );
+        $h4 = $h4->subInt32( $carry4->shiftLeft( 26 ) );
 
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt32($carry6);
-        $h6 = $h6->subInt32($carry6->shiftLeft(26));
+        $carry6 = $h6->addInt( 1 << 25 )->shiftRight( 26 );
+        $h7 = $h7->addInt32( $carry6 );
+        $h6 = $h6->subInt32( $carry6->shiftLeft( 26 ) );
 
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt32($carry8);
-        $h8 = $h8->subInt32($carry8->shiftLeft(26));
+        $carry8 = $h8->addInt( 1 << 25 )->shiftRight( 26 );
+        $h9 = $h9->addInt32( $carry8 );
+        $h8 = $h8->subInt32( $carry8->shiftLeft( 26 ) );
 
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array($h0, $h1, $h2,$h3, $h4, $h5, $h6, $h7, $h8, $h9)
+            array( $h0, $h1, $h2, $h3, $h4, $h5, $h6, $h7, $h8, $h9 )
         );
     }
 
@@ -236,7 +236,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $h
      * @return string
      */
-    public static function fe_tobytes(ParagonIE_Sodium_Core32_Curve25519_Fe $h)
+    public static function fe_tobytes( ParagonIE_Sodium_Core32_Curve25519_Fe $h )
     {
         /**
          * @var ParagonIE_Sodium_Core32_Int64[] $f
@@ -244,21 +244,21 @@ 
          */
         $f = array();
 
-        for ($i = 0; $i < 10; ++$i) {
+        for ( $i = 0; $i < 10; ++$i ) {
             $f[$i] = $h[$i]->toInt64();
         }
 
-        $q = $f[9]->mulInt(19, 5)->addInt(1 << 14)->shiftRight(25)
-            ->addInt64($f[0])->shiftRight(26)
-            ->addInt64($f[1])->shiftRight(25)
-            ->addInt64($f[2])->shiftRight(26)
-            ->addInt64($f[3])->shiftRight(25)
-            ->addInt64($f[4])->shiftRight(26)
-            ->addInt64($f[5])->shiftRight(25)
-            ->addInt64($f[6])->shiftRight(26)
-            ->addInt64($f[7])->shiftRight(25)
-            ->addInt64($f[8])->shiftRight(26)
-            ->addInt64($f[9])->shiftRight(25);
+        $q = $f[9]->mulInt( 19, 5 )->addInt( 1 << 14 )->shiftRight( 25 )
+            ->addInt64( $f[0] )->shiftRight( 26 )
+            ->addInt64( $f[1] )->shiftRight( 25 )
+            ->addInt64( $f[2] )->shiftRight( 26 )
+            ->addInt64( $f[3] )->shiftRight( 25 )
+            ->addInt64( $f[4] )->shiftRight( 26 )
+            ->addInt64( $f[5] )->shiftRight( 25 )
+            ->addInt64( $f[6] )->shiftRight( 26 )
+            ->addInt64( $f[7] )->shiftRight( 25 )
+            ->addInt64( $f[8] )->shiftRight( 26 )
+            ->addInt64( $f[9] )->shiftRight( 25 );
 
 
         /*
@@ -276,46 +276,46 @@ 
 
         $f[0] += self::mul(19, $q);
         */
-        $f[0] = $f[0]->addInt64($q->mulInt(19, 5));
+        $f[0] = $f[0]->addInt64( $q->mulInt( 19, 5 ) );
 
-        $carry0 = $f[0]->shiftRight(26);
-        $f[1] = $f[1]->addInt64($carry0);
-        $f[0] = $f[0]->subInt64($carry0->shiftLeft(26));
+        $carry0 = $f[0]->shiftRight( 26 );
+        $f[1] = $f[1]->addInt64( $carry0 );
+        $f[0] = $f[0]->subInt64( $carry0->shiftLeft( 26 ) );
 
-        $carry1 = $f[1]->shiftRight(25);
-        $f[2] = $f[2]->addInt64($carry1);
-        $f[1] = $f[1]->subInt64($carry1->shiftLeft(25));
+        $carry1 = $f[1]->shiftRight( 25 );
+        $f[2] = $f[2]->addInt64( $carry1 );
+        $f[1] = $f[1]->subInt64( $carry1->shiftLeft( 25 ) );
 
-        $carry2 = $f[2]->shiftRight(26);
-        $f[3] = $f[3]->addInt64($carry2);
-        $f[2] = $f[2]->subInt64($carry2->shiftLeft(26));
+        $carry2 = $f[2]->shiftRight( 26 );
+        $f[3] = $f[3]->addInt64( $carry2 );
+        $f[2] = $f[2]->subInt64( $carry2->shiftLeft( 26 ) );
 
-        $carry3 = $f[3]->shiftRight(25);
-        $f[4] = $f[4]->addInt64($carry3);
-        $f[3] = $f[3]->subInt64($carry3->shiftLeft(25));
+        $carry3 = $f[3]->shiftRight( 25 );
+        $f[4] = $f[4]->addInt64( $carry3 );
+        $f[3] = $f[3]->subInt64( $carry3->shiftLeft( 25 ) );
 
-        $carry4 = $f[4]->shiftRight(26);
-        $f[5] = $f[5]->addInt64($carry4);
-        $f[4] = $f[4]->subInt64($carry4->shiftLeft(26));
+        $carry4 = $f[4]->shiftRight( 26 );
+        $f[5] = $f[5]->addInt64( $carry4 );
+        $f[4] = $f[4]->subInt64( $carry4->shiftLeft( 26 ) );
 
-        $carry5 = $f[5]->shiftRight(25);
-        $f[6] = $f[6]->addInt64($carry5);
-        $f[5] = $f[5]->subInt64($carry5->shiftLeft(25));
+        $carry5 = $f[5]->shiftRight( 25 );
+        $f[6] = $f[6]->addInt64( $carry5 );
+        $f[5] = $f[5]->subInt64( $carry5->shiftLeft( 25 ) );
 
-        $carry6 = $f[6]->shiftRight(26);
-        $f[7] = $f[7]->addInt64($carry6);
-        $f[6] = $f[6]->subInt64($carry6->shiftLeft(26));
+        $carry6 = $f[6]->shiftRight( 26 );
+        $f[7] = $f[7]->addInt64( $carry6 );
+        $f[6] = $f[6]->subInt64( $carry6->shiftLeft( 26 ) );
 
-        $carry7 = $f[7]->shiftRight(25);
-        $f[8] = $f[8]->addInt64($carry7);
-        $f[7] = $f[7]->subInt64($carry7->shiftLeft(25));
+        $carry7 = $f[7]->shiftRight( 25 );
+        $f[8] = $f[8]->addInt64( $carry7 );
+        $f[7] = $f[7]->subInt64( $carry7->shiftLeft( 25 ) );
 
-        $carry8 = $f[8]->shiftRight(26);
-        $f[9] = $f[9]->addInt64($carry8);
-        $f[8] = $f[8]->subInt64($carry8->shiftLeft(26));
+        $carry8 = $f[8]->shiftRight( 26 );
+        $f[9] = $f[9]->addInt64( $carry8 );
+        $f[8] = $f[8]->subInt64( $carry8->shiftLeft( 26 ) );
 
-        $carry9 = $f[9]->shiftRight(25);
-        $f[9] = $f[9]->subInt64($carry9->shiftLeft(25));
+        $carry9 = $f[9]->shiftRight( 25 );
+        $f[9] = $f[9]->subInt64( $carry9->shiftLeft( 25 ) );
 
         /**
          * @var int $h0
@@ -344,40 +344,40 @@ 
          * @var array<int, int>
          */
         $s = array(
-            (int) (($h0 >> 0) & 0xff),
-            (int) (($h0 >> 8) & 0xff),
-            (int) (($h0 >> 16) & 0xff),
-            (int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
-            (int) (($h1 >> 6) & 0xff),
-            (int) (($h1 >> 14) & 0xff),
-            (int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
-            (int) (($h2 >> 5) & 0xff),
-            (int) (($h2 >> 13) & 0xff),
-            (int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
-            (int) (($h3 >> 3) & 0xff),
-            (int) (($h3 >> 11) & 0xff),
-            (int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
-            (int) (($h4 >> 2) & 0xff),
-            (int) (($h4 >> 10) & 0xff),
-            (int) (($h4 >> 18) & 0xff),
-            (int) (($h5 >> 0) & 0xff),
-            (int) (($h5 >> 8) & 0xff),
-            (int) (($h5 >> 16) & 0xff),
-            (int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
-            (int) (($h6 >> 7) & 0xff),
-            (int) (($h6 >> 15) & 0xff),
-            (int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
-            (int) (($h7 >> 5) & 0xff),
-            (int) (($h7 >> 13) & 0xff),
-            (int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
-            (int) (($h8 >> 4) & 0xff),
-            (int) (($h8 >> 12) & 0xff),
-            (int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
-            (int) (($h9 >> 2) & 0xff),
-            (int) (($h9 >> 10) & 0xff),
-            (int) (($h9 >> 18) & 0xff)
+            (int) ( ( $h0 >> 0 ) & 0xff ),
+            (int) ( ( $h0 >> 8 ) & 0xff ),
+            (int) ( ( $h0 >> 16 ) & 0xff ),
+            (int) ( ( ( $h0 >> 24 ) | ( $h1 << 2 ) ) & 0xff ),
+            (int) ( ( $h1 >> 6 ) & 0xff ),
+            (int) ( ( $h1 >> 14 ) & 0xff ),
+            (int) ( ( ( $h1 >> 22 ) | ( $h2 << 3 ) ) & 0xff ),
+            (int) ( ( $h2 >> 5 ) & 0xff ),
+            (int) ( ( $h2 >> 13 ) & 0xff ),
+            (int) ( ( ( $h2 >> 21 ) | ( $h3 << 5 ) ) & 0xff ),
+            (int) ( ( $h3 >> 3 ) & 0xff ),
+            (int) ( ( $h3 >> 11 ) & 0xff ),
+            (int) ( ( ( $h3 >> 19 ) | ( $h4 << 6 ) ) & 0xff ),
+            (int) ( ( $h4 >> 2 ) & 0xff ),
+            (int) ( ( $h4 >> 10 ) & 0xff ),
+            (int) ( ( $h4 >> 18 ) & 0xff ),
+            (int) ( ( $h5 >> 0 ) & 0xff ),
+            (int) ( ( $h5 >> 8 ) & 0xff ),
+            (int) ( ( $h5 >> 16 ) & 0xff ),
+            (int) ( ( ( $h5 >> 24 ) | ( $h6 << 1 ) ) & 0xff ),
+            (int) ( ( $h6 >> 7 ) & 0xff ),
+            (int) ( ( $h6 >> 15 ) & 0xff ),
+            (int) ( ( ( $h6 >> 23 ) | ( $h7 << 3 ) ) & 0xff ),
+            (int) ( ( $h7 >> 5 ) & 0xff ),
+            (int) ( ( $h7 >> 13 ) & 0xff ),
+            (int) ( ( ( $h7 >> 21 ) | ( $h8 << 4 ) ) & 0xff ),
+            (int) ( ( $h8 >> 4 ) & 0xff ),
+            (int) ( ( $h8 >> 12 ) & 0xff ),
+            (int) ( ( ( $h8 >> 20 ) | ( $h9 << 6 ) ) & 0xff ),
+            (int) ( ( $h9 >> 2 ) & 0xff ),
+            (int) ( ( $h9 >> 10 ) & 0xff ),
+            (int) ( ( $h9 >> 18 ) & 0xff )
         );
-        return self::intArrayToString($s);
+        return self::intArrayToString( $s );
     }
 
     /**
@@ -388,10 +388,10 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return int
      */
-    public static function fe_isnegative(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    public static function fe_isnegative( ParagonIE_Sodium_Core32_Curve25519_Fe $f )
     {
-        $str = self::fe_tobytes($f);
-        return self::chrToInt($str[0]) & 1;
+        $str = self::fe_tobytes( $f );
+        return self::chrToInt( $str[0] ) & 1;
     }
 
     /**
@@ -402,14 +402,14 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return bool
      */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    public static function fe_isnonzero( ParagonIE_Sodium_Core32_Curve25519_Fe $f )
     {
         static $zero;
-        if ($zero === null) {
-            $zero = str_repeat("\x00", 32);
+        if ( $zero === null ) {
+            $zero = str_repeat( "\x00", 32 );
         }
-        $str = self::fe_tobytes($f);
-        return !self::verify_32($str, $zero);
+        $str = self::fe_tobytes( $f );
+        return ! self::verify_32( $str, $zero );
     }
 
     /**
@@ -474,175 +474,175 @@ 
         $g7 = $g[7]->toInt64();
         $g8 = $g[8]->toInt64();
         $g9 = $g[9]->toInt64();
-        $g1_19 = $g1->mulInt(19, 5); /* 2^4 <= 19 <= 2^5, but we only want 5 bits */
-        $g2_19 = $g2->mulInt(19, 5);
-        $g3_19 = $g3->mulInt(19, 5);
-        $g4_19 = $g4->mulInt(19, 5);
-        $g5_19 = $g5->mulInt(19, 5);
-        $g6_19 = $g6->mulInt(19, 5);
-        $g7_19 = $g7->mulInt(19, 5);
-        $g8_19 = $g8->mulInt(19, 5);
-        $g9_19 = $g9->mulInt(19, 5);
+        $g1_19 = $g1->mulInt( 19, 5 ); /* 2^4 <= 19 <= 2^5, but we only want 5 bits */
+        $g2_19 = $g2->mulInt( 19, 5 );
+        $g3_19 = $g3->mulInt( 19, 5 );
+        $g4_19 = $g4->mulInt( 19, 5 );
+        $g5_19 = $g5->mulInt( 19, 5 );
+        $g6_19 = $g6->mulInt( 19, 5 );
+        $g7_19 = $g7->mulInt( 19, 5 );
+        $g8_19 = $g8->mulInt( 19, 5 );
+        $g9_19 = $g9->mulInt( 19, 5 );
         /** @var ParagonIE_Sodium_Core32_Int64 $f1_2 */
-        $f1_2 = $f1->shiftLeft(1);
+        $f1_2 = $f1->shiftLeft( 1 );
         /** @var ParagonIE_Sodium_Core32_Int64 $f3_2 */
-        $f3_2 = $f3->shiftLeft(1);
+        $f3_2 = $f3->shiftLeft( 1 );
         /** @var ParagonIE_Sodium_Core32_Int64 $f5_2 */
-        $f5_2 = $f5->shiftLeft(1);
+        $f5_2 = $f5->shiftLeft( 1 );
         /** @var ParagonIE_Sodium_Core32_Int64 $f7_2 */
-        $f7_2 = $f7->shiftLeft(1);
+        $f7_2 = $f7->shiftLeft( 1 );
         /** @var ParagonIE_Sodium_Core32_Int64 $f9_2 */
-        $f9_2 = $f9->shiftLeft(1);
-        $f0g0    = $f0->mulInt64($g0);
-        $f0g1    = $f0->mulInt64($g1);
-        $f0g2    = $f0->mulInt64($g2);
-        $f0g3    = $f0->mulInt64($g3);
-        $f0g4    = $f0->mulInt64($g4);
-        $f0g5    = $f0->mulInt64($g5);
-        $f0g6    = $f0->mulInt64($g6);
-        $f0g7    = $f0->mulInt64($g7);
-        $f0g8    = $f0->mulInt64($g8);
-        $f0g9    = $f0->mulInt64($g9);
-        $f1g0    = $f1->mulInt64($g0);
-        $f1g1_2  = $f1_2->mulInt64($g1);
-        $f1g2    = $f1->mulInt64($g2);
-        $f1g3_2  = $f1_2->mulInt64($g3);
-        $f1g4    = $f1->mulInt64($g4);
-        $f1g5_2  = $f1_2->mulInt64($g5);
-        $f1g6    = $f1->mulInt64($g6);
-        $f1g7_2  = $f1_2->mulInt64($g7);
-        $f1g8    = $f1->mulInt64($g8);
-        $f1g9_38 = $f1_2->mulInt64($g9_19);
-        $f2g0    = $f2->mulInt64($g0);
-        $f2g1    = $f2->mulInt64($g1);
-        $f2g2    = $f2->mulInt64($g2);
-        $f2g3    = $f2->mulInt64($g3);
-        $f2g4    = $f2->mulInt64($g4);
-        $f2g5    = $f2->mulInt64($g5);
-        $f2g6    = $f2->mulInt64($g6);
-        $f2g7    = $f2->mulInt64($g7);
-        $f2g8_19 = $f2->mulInt64($g8_19);
-        $f2g9_19 = $f2->mulInt64($g9_19);
-        $f3g0    = $f3->mulInt64($g0);
-        $f3g1_2  = $f3_2->mulInt64($g1);
-        $f3g2    = $f3->mulInt64($g2);
-        $f3g3_2  = $f3_2->mulInt64($g3);
-        $f3g4    = $f3->mulInt64($g4);
-        $f3g5_2  = $f3_2->mulInt64($g5);
-        $f3g6    = $f3->mulInt64($g6);
-        $f3g7_38 = $f3_2->mulInt64($g7_19);
-        $f3g8_19 = $f3->mulInt64($g8_19);
-        $f3g9_38 = $f3_2->mulInt64($g9_19);
-        $f4g0    = $f4->mulInt64($g0);
-        $f4g1    = $f4->mulInt64($g1);
-        $f4g2    = $f4->mulInt64($g2);
-        $f4g3    = $f4->mulInt64($g3);
-        $f4g4    = $f4->mulInt64($g4);
-        $f4g5    = $f4->mulInt64($g5);
-        $f4g6_19 = $f4->mulInt64($g6_19);
-        $f4g7_19 = $f4->mulInt64($g7_19);
-        $f4g8_19 = $f4->mulInt64($g8_19);
-        $f4g9_19 = $f4->mulInt64($g9_19);
-        $f5g0    = $f5->mulInt64($g0);
-        $f5g1_2  = $f5_2->mulInt64($g1);
-        $f5g2    = $f5->mulInt64($g2);
-        $f5g3_2  = $f5_2->mulInt64($g3);
-        $f5g4    = $f5->mulInt64($g4);
-        $f5g5_38 = $f5_2->mulInt64($g5_19);
-        $f5g6_19 = $f5->mulInt64($g6_19);
-        $f5g7_38 = $f5_2->mulInt64($g7_19);
-        $f5g8_19 = $f5->mulInt64($g8_19);
-        $f5g9_38 = $f5_2->mulInt64($g9_19);
-        $f6g0    = $f6->mulInt64($g0);
-        $f6g1    = $f6->mulInt64($g1);
-        $f6g2    = $f6->mulInt64($g2);
-        $f6g3    = $f6->mulInt64($g3);
-        $f6g4_19 = $f6->mulInt64($g4_19);
-        $f6g5_19 = $f6->mulInt64($g5_19);
-        $f6g6_19 = $f6->mulInt64($g6_19);
-        $f6g7_19 = $f6->mulInt64($g7_19);
-        $f6g8_19 = $f6->mulInt64($g8_19);
-        $f6g9_19 = $f6->mulInt64($g9_19);
-        $f7g0    = $f7->mulInt64($g0);
-        $f7g1_2  = $f7_2->mulInt64($g1);
-        $f7g2    = $f7->mulInt64($g2);
-        $f7g3_38 = $f7_2->mulInt64($g3_19);
-        $f7g4_19 = $f7->mulInt64($g4_19);
-        $f7g5_38 = $f7_2->mulInt64($g5_19);
-        $f7g6_19 = $f7->mulInt64($g6_19);
-        $f7g7_38 = $f7_2->mulInt64($g7_19);
-        $f7g8_19 = $f7->mulInt64($g8_19);
-        $f7g9_38 = $f7_2->mulInt64($g9_19);
-        $f8g0    = $f8->mulInt64($g0);
-        $f8g1    = $f8->mulInt64($g1);
-        $f8g2_19 = $f8->mulInt64($g2_19);
-        $f8g3_19 = $f8->mulInt64($g3_19);
-        $f8g4_19 = $f8->mulInt64($g4_19);
-        $f8g5_19 = $f8->mulInt64($g5_19);
-        $f8g6_19 = $f8->mulInt64($g6_19);
-        $f8g7_19 = $f8->mulInt64($g7_19);
-        $f8g8_19 = $f8->mulInt64($g8_19);
-        $f8g9_19 = $f8->mulInt64($g9_19);
-        $f9g0    = $f9->mulInt64($g0);
-        $f9g1_38 = $f9_2->mulInt64($g1_19);
-        $f9g2_19 = $f9->mulInt64($g2_19);
-        $f9g3_38 = $f9_2->mulInt64($g3_19);
-        $f9g4_19 = $f9->mulInt64($g4_19);
-        $f9g5_38 = $f9_2->mulInt64($g5_19);
-        $f9g6_19 = $f9->mulInt64($g6_19);
-        $f9g7_38 = $f9_2->mulInt64($g7_19);
-        $f9g8_19 = $f9->mulInt64($g8_19);
-        $f9g9_38 = $f9_2->mulInt64($g9_19);
+        $f9_2 = $f9->shiftLeft( 1 );
+        $f0g0    = $f0->mulInt64( $g0 );
+        $f0g1    = $f0->mulInt64( $g1 );
+        $f0g2    = $f0->mulInt64( $g2 );
+        $f0g3    = $f0->mulInt64( $g3 );
+        $f0g4    = $f0->mulInt64( $g4 );
+        $f0g5    = $f0->mulInt64( $g5 );
+        $f0g6    = $f0->mulInt64( $g6 );
+        $f0g7    = $f0->mulInt64( $g7 );
+        $f0g8    = $f0->mulInt64( $g8 );
+        $f0g9    = $f0->mulInt64( $g9 );
+        $f1g0    = $f1->mulInt64( $g0 );
+        $f1g1_2  = $f1_2->mulInt64( $g1 );
+        $f1g2    = $f1->mulInt64( $g2 );
+        $f1g3_2  = $f1_2->mulInt64( $g3 );
+        $f1g4    = $f1->mulInt64( $g4 );
+        $f1g5_2  = $f1_2->mulInt64( $g5 );
+        $f1g6    = $f1->mulInt64( $g6 );
+        $f1g7_2  = $f1_2->mulInt64( $g7 );
+        $f1g8    = $f1->mulInt64( $g8 );
+        $f1g9_38 = $f1_2->mulInt64( $g9_19 );
+        $f2g0    = $f2->mulInt64( $g0 );
+        $f2g1    = $f2->mulInt64( $g1 );
+        $f2g2    = $f2->mulInt64( $g2 );
+        $f2g3    = $f2->mulInt64( $g3 );
+        $f2g4    = $f2->mulInt64( $g4 );
+        $f2g5    = $f2->mulInt64( $g5 );
+        $f2g6    = $f2->mulInt64( $g6 );
+        $f2g7    = $f2->mulInt64( $g7 );
+        $f2g8_19 = $f2->mulInt64( $g8_19 );
+        $f2g9_19 = $f2->mulInt64( $g9_19 );
+        $f3g0    = $f3->mulInt64( $g0 );
+        $f3g1_2  = $f3_2->mulInt64( $g1 );
+        $f3g2    = $f3->mulInt64( $g2 );
+        $f3g3_2  = $f3_2->mulInt64( $g3 );
+        $f3g4    = $f3->mulInt64( $g4 );
+        $f3g5_2  = $f3_2->mulInt64( $g5 );
+        $f3g6    = $f3->mulInt64( $g6 );
+        $f3g7_38 = $f3_2->mulInt64( $g7_19 );
+        $f3g8_19 = $f3->mulInt64( $g8_19 );
+        $f3g9_38 = $f3_2->mulInt64( $g9_19 );
+        $f4g0    = $f4->mulInt64( $g0 );
+        $f4g1    = $f4->mulInt64( $g1 );
+        $f4g2    = $f4->mulInt64( $g2 );
+        $f4g3    = $f4->mulInt64( $g3 );
+        $f4g4    = $f4->mulInt64( $g4 );
+        $f4g5    = $f4->mulInt64( $g5 );
+        $f4g6_19 = $f4->mulInt64( $g6_19 );
+        $f4g7_19 = $f4->mulInt64( $g7_19 );
+        $f4g8_19 = $f4->mulInt64( $g8_19 );
+        $f4g9_19 = $f4->mulInt64( $g9_19 );
+        $f5g0    = $f5->mulInt64( $g0 );
+        $f5g1_2  = $f5_2->mulInt64( $g1 );
+        $f5g2    = $f5->mulInt64( $g2 );
+        $f5g3_2  = $f5_2->mulInt64( $g3 );
+        $f5g4    = $f5->mulInt64( $g4 );
+        $f5g5_38 = $f5_2->mulInt64( $g5_19 );
+        $f5g6_19 = $f5->mulInt64( $g6_19 );
+        $f5g7_38 = $f5_2->mulInt64( $g7_19 );
+        $f5g8_19 = $f5->mulInt64( $g8_19 );
+        $f5g9_38 = $f5_2->mulInt64( $g9_19 );
+        $f6g0    = $f6->mulInt64( $g0 );
+        $f6g1    = $f6->mulInt64( $g1 );
+        $f6g2    = $f6->mulInt64( $g2 );
+        $f6g3    = $f6->mulInt64( $g3 );
+        $f6g4_19 = $f6->mulInt64( $g4_19 );
+        $f6g5_19 = $f6->mulInt64( $g5_19 );
+        $f6g6_19 = $f6->mulInt64( $g6_19 );
+        $f6g7_19 = $f6->mulInt64( $g7_19 );
+        $f6g8_19 = $f6->mulInt64( $g8_19 );
+        $f6g9_19 = $f6->mulInt64( $g9_19 );
+        $f7g0    = $f7->mulInt64( $g0 );
+        $f7g1_2  = $f7_2->mulInt64( $g1 );
+        $f7g2    = $f7->mulInt64( $g2 );
+        $f7g3_38 = $f7_2->mulInt64( $g3_19 );
+        $f7g4_19 = $f7->mulInt64( $g4_19 );
+        $f7g5_38 = $f7_2->mulInt64( $g5_19 );
+        $f7g6_19 = $f7->mulInt64( $g6_19 );
+        $f7g7_38 = $f7_2->mulInt64( $g7_19 );
+        $f7g8_19 = $f7->mulInt64( $g8_19 );
+        $f7g9_38 = $f7_2->mulInt64( $g9_19 );
+        $f8g0    = $f8->mulInt64( $g0 );
+        $f8g1    = $f8->mulInt64( $g1 );
+        $f8g2_19 = $f8->mulInt64( $g2_19 );
+        $f8g3_19 = $f8->mulInt64( $g3_19 );
+        $f8g4_19 = $f8->mulInt64( $g4_19 );
+        $f8g5_19 = $f8->mulInt64( $g5_19 );
+        $f8g6_19 = $f8->mulInt64( $g6_19 );
+        $f8g7_19 = $f8->mulInt64( $g7_19 );
+        $f8g8_19 = $f8->mulInt64( $g8_19 );
+        $f8g9_19 = $f8->mulInt64( $g9_19 );
+        $f9g0    = $f9->mulInt64( $g0 );
+        $f9g1_38 = $f9_2->mulInt64( $g1_19 );
+        $f9g2_19 = $f9->mulInt64( $g2_19 );
+        $f9g3_38 = $f9_2->mulInt64( $g3_19 );
+        $f9g4_19 = $f9->mulInt64( $g4_19 );
+        $f9g5_38 = $f9_2->mulInt64( $g5_19 );
+        $f9g6_19 = $f9->mulInt64( $g6_19 );
+        $f9g7_38 = $f9_2->mulInt64( $g7_19 );
+        $f9g8_19 = $f9->mulInt64( $g8_19 );
+        $f9g9_38 = $f9_2->mulInt64( $g9_19 );
 
         // $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
-        $h0 = $f0g0->addInt64($f1g9_38)->addInt64($f2g8_19)->addInt64($f3g7_38)
-            ->addInt64($f4g6_19)->addInt64($f5g5_38)->addInt64($f6g4_19)
-            ->addInt64($f7g3_38)->addInt64($f8g2_19)->addInt64($f9g1_38);
+        $h0 = $f0g0->addInt64( $f1g9_38 )->addInt64( $f2g8_19 )->addInt64( $f3g7_38 )
+            ->addInt64( $f4g6_19 )->addInt64( $f5g5_38 )->addInt64( $f6g4_19 )
+            ->addInt64( $f7g3_38 )->addInt64( $f8g2_19 )->addInt64( $f9g1_38 );
 
         // $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
-        $h1 = $f0g1->addInt64($f1g0)->addInt64($f2g9_19)->addInt64($f3g8_19)
-            ->addInt64($f4g7_19)->addInt64($f5g6_19)->addInt64($f6g5_19)
-            ->addInt64($f7g4_19)->addInt64($f8g3_19)->addInt64($f9g2_19);
+        $h1 = $f0g1->addInt64( $f1g0 )->addInt64( $f2g9_19 )->addInt64( $f3g8_19 )
+            ->addInt64( $f4g7_19 )->addInt64( $f5g6_19 )->addInt64( $f6g5_19 )
+            ->addInt64( $f7g4_19 )->addInt64( $f8g3_19 )->addInt64( $f9g2_19 );
 
         // $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
-        $h2 = $f0g2->addInt64($f1g1_2)->addInt64($f2g0)->addInt64($f3g9_38)
-            ->addInt64($f4g8_19)->addInt64($f5g7_38)->addInt64($f6g6_19)
-            ->addInt64($f7g5_38)->addInt64($f8g4_19)->addInt64($f9g3_38);
+        $h2 = $f0g2->addInt64( $f1g1_2 )->addInt64( $f2g0 )->addInt64( $f3g9_38 )
+            ->addInt64( $f4g8_19 )->addInt64( $f5g7_38 )->addInt64( $f6g6_19 )
+            ->addInt64( $f7g5_38 )->addInt64( $f8g4_19 )->addInt64( $f9g3_38 );
 
         // $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
-        $h3 = $f0g3->addInt64($f1g2)->addInt64($f2g1)->addInt64($f3g0)
-            ->addInt64($f4g9_19)->addInt64($f5g8_19)->addInt64($f6g7_19)
-            ->addInt64($f7g6_19)->addInt64($f8g5_19)->addInt64($f9g4_19);
+        $h3 = $f0g3->addInt64( $f1g2 )->addInt64( $f2g1 )->addInt64( $f3g0 )
+            ->addInt64( $f4g9_19 )->addInt64( $f5g8_19 )->addInt64( $f6g7_19 )
+            ->addInt64( $f7g6_19 )->addInt64( $f8g5_19 )->addInt64( $f9g4_19 );
 
         // $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
-        $h4 = $f0g4->addInt64($f1g3_2)->addInt64($f2g2)->addInt64($f3g1_2)
-            ->addInt64($f4g0)->addInt64($f5g9_38)->addInt64($f6g8_19)
-            ->addInt64($f7g7_38)->addInt64($f8g6_19)->addInt64($f9g5_38);
+        $h4 = $f0g4->addInt64( $f1g3_2 )->addInt64( $f2g2 )->addInt64( $f3g1_2 )
+            ->addInt64( $f4g0 )->addInt64( $f5g9_38 )->addInt64( $f6g8_19 )
+            ->addInt64( $f7g7_38 )->addInt64( $f8g6_19 )->addInt64( $f9g5_38 );
 
         // $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
-        $h5 = $f0g5->addInt64($f1g4)->addInt64($f2g3)->addInt64($f3g2)
-            ->addInt64($f4g1)->addInt64($f5g0)->addInt64($f6g9_19)
-            ->addInt64($f7g8_19)->addInt64($f8g7_19)->addInt64($f9g6_19);
+        $h5 = $f0g5->addInt64( $f1g4 )->addInt64( $f2g3 )->addInt64( $f3g2 )
+            ->addInt64( $f4g1 )->addInt64( $f5g0 )->addInt64( $f6g9_19 )
+            ->addInt64( $f7g8_19 )->addInt64( $f8g7_19 )->addInt64( $f9g6_19 );
 
         // $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
-        $h6 = $f0g6->addInt64($f1g5_2)->addInt64($f2g4)->addInt64($f3g3_2)
-            ->addInt64($f4g2)->addInt64($f5g1_2)->addInt64($f6g0)
-            ->addInt64($f7g9_38)->addInt64($f8g8_19)->addInt64($f9g7_38);
+        $h6 = $f0g6->addInt64( $f1g5_2 )->addInt64( $f2g4 )->addInt64( $f3g3_2 )
+            ->addInt64( $f4g2 )->addInt64( $f5g1_2 )->addInt64( $f6g0 )
+            ->addInt64( $f7g9_38 )->addInt64( $f8g8_19 )->addInt64( $f9g7_38 );
 
         // $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
-        $h7 = $f0g7->addInt64($f1g6)->addInt64($f2g5)->addInt64($f3g4)
-            ->addInt64($f4g3)->addInt64($f5g2)->addInt64($f6g1)
-            ->addInt64($f7g0)->addInt64($f8g9_19)->addInt64($f9g8_19);
+        $h7 = $f0g7->addInt64( $f1g6 )->addInt64( $f2g5 )->addInt64( $f3g4 )
+            ->addInt64( $f4g3 )->addInt64( $f5g2 )->addInt64( $f6g1 )
+            ->addInt64( $f7g0 )->addInt64( $f8g9_19 )->addInt64( $f9g8_19 );
 
         // $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
-        $h8 = $f0g8->addInt64($f1g7_2)->addInt64($f2g6)->addInt64($f3g5_2)
-            ->addInt64($f4g4)->addInt64($f5g3_2)->addInt64($f6g2)
-            ->addInt64($f7g1_2)->addInt64($f8g0)->addInt64($f9g9_38);
+        $h8 = $f0g8->addInt64( $f1g7_2 )->addInt64( $f2g6 )->addInt64( $f3g5_2 )
+            ->addInt64( $f4g4 )->addInt64( $f5g3_2 )->addInt64( $f6g2 )
+            ->addInt64( $f7g1_2 )->addInt64( $f8g0 )->addInt64( $f9g9_38 );
 
         // $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
-        $h9 = $f0g9->addInt64($f1g8)->addInt64($f2g7)->addInt64($f3g6)
-            ->addInt64($f4g5)->addInt64($f5g4)->addInt64($f6g3)
-            ->addInt64($f7g2)->addInt64($f8g1)->addInt64($f9g0);
+        $h9 = $f0g9->addInt64( $f1g8 )->addInt64( $f2g7 )->addInt64( $f3g6 )
+            ->addInt64( $f4g5 )->addInt64( $f5g4 )->addInt64( $f6g3 )
+            ->addInt64( $f7g2 )->addInt64( $f8g1 )->addInt64( $f9g0 );
 
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $h0
@@ -666,48 +666,48 @@ 
          * @var ParagonIE_Sodium_Core32_Int64 $carry8
          * @var ParagonIE_Sodium_Core32_Int64 $carry9
          */
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+        $carry0 = $h0->addInt( 1 << 25 )->shiftRight( 26 );
+        $h1 = $h1->addInt64( $carry0 );
+        $h0 = $h0->subInt64( $carry0->shiftLeft( 26 ) );
+        $carry4 = $h4->addInt( 1 << 25 )->shiftRight( 26 );
+        $h5 = $h5->addInt64( $carry4 );
+        $h4 = $h4->subInt64( $carry4->shiftLeft( 26 ) );
+
+        $carry1 = $h1->addInt( 1 << 24 )->shiftRight( 25 );
+        $h2 = $h2->addInt64( $carry1 );
+        $h1 = $h1->subInt64( $carry1->shiftLeft( 25 ) );
+        $carry5 = $h5->addInt( 1 << 24 )->shiftRight( 25 );
+        $h6 = $h6->addInt64( $carry5 );
+        $h5 = $h5->subInt64( $carry5->shiftLeft( 25 ) );
+
+        $carry2 = $h2->addInt( 1 << 25 )->shiftRight( 26 );
+        $h3 = $h3->addInt64( $carry2 );
+        $h2 = $h2->subInt64( $carry2->shiftLeft( 26 ) );
+        $carry6 = $h6->addInt( 1 << 25 )->shiftRight( 26 );
+        $h7 = $h7->addInt64( $carry6 );
+        $h6 = $h6->subInt64( $carry6->shiftLeft( 26 ) );
+
+        $carry3 = $h3->addInt( 1 << 24 )->shiftRight( 25 );
+        $h4 = $h4->addInt64( $carry3 );
+        $h3 = $h3->subInt64( $carry3->shiftLeft( 25 ) );
+        $carry7 = $h7->addInt( 1 << 24 )->shiftRight( 25 );
+        $h8 = $h8->addInt64( $carry7 );
+        $h7 = $h7->subInt64( $carry7->shiftLeft( 25 ) );
+
+        $carry4 = $h4->addInt( 1 << 25 )->shiftRight( 26 );
+        $h5 = $h5->addInt64( $carry4 );
+        $h4 = $h4->subInt64( $carry4->shiftLeft( 26 ) );
+        $carry8 = $h8->addInt( 1 << 25 )->shiftRight( 26 );
+        $h9 = $h9->addInt64( $carry8 );
+        $h8 = $h8->subInt64( $carry8->shiftLeft( 26 ) );
+
+        $carry9 = $h9->addInt( 1 << 24 )->shiftRight( 25 );
+        $h0 = $h0->addInt64( $carry9->mulInt( 19 ) );
+        $h9 = $h9->subInt64( $carry9->shiftLeft( 25 ) );
+
+        $carry0 = $h0->addInt( 1 << 25 )->shiftRight( 26 );
+        $h1 = $h1->addInt64( $carry0 );
+        $h0 = $h0->subInt64( $carry0->shiftLeft( 26 ) );
 
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
@@ -735,11 +735,11 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_neg(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    public static function fe_neg( ParagonIE_Sodium_Core32_Curve25519_Fe $f )
     {
         $h = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        for ($i = 0; $i < 10; ++$i) {
-            $h[$i] = $h[$i]->subInt32($f[$i]);
+        for ( $i = 0; $i < 10; ++$i ) {
+            $h[$i] = $h[$i]->subInt32( $f[$i] );
         }
         return $h;
     }
@@ -754,7 +754,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    public static function fe_sq( ParagonIE_Sodium_Core32_Curve25519_Fe $f )
     {
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $f0
@@ -780,86 +780,86 @@ 
         $f9 = $f[9]->toInt64();
 
         /** @var ParagonIE_Sodium_Core32_Int64 $f0_2 */
-        $f0_2 = $f0->shiftLeft(1);
-        $f1_2 = $f1->shiftLeft(1);
-        $f2_2 = $f2->shiftLeft(1);
-        $f3_2 = $f3->shiftLeft(1);
-        $f4_2 = $f4->shiftLeft(1);
-        $f5_2 = $f5->shiftLeft(1);
-        $f6_2 = $f6->shiftLeft(1);
-        $f7_2 = $f7->shiftLeft(1);
-        $f5_38 = $f5->mulInt(38, 6);
-        $f6_19 = $f6->mulInt(19, 5);
-        $f7_38 = $f7->mulInt(38, 6);
-        $f8_19 = $f8->mulInt(19, 5);
-        $f9_38 = $f9->mulInt(38, 6);
+        $f0_2 = $f0->shiftLeft( 1 );
+        $f1_2 = $f1->shiftLeft( 1 );
+        $f2_2 = $f2->shiftLeft( 1 );
+        $f3_2 = $f3->shiftLeft( 1 );
+        $f4_2 = $f4->shiftLeft( 1 );
+        $f5_2 = $f5->shiftLeft( 1 );
+        $f6_2 = $f6->shiftLeft( 1 );
+        $f7_2 = $f7->shiftLeft( 1 );
+        $f5_38 = $f5->mulInt( 38, 6 );
+        $f6_19 = $f6->mulInt( 19, 5 );
+        $f7_38 = $f7->mulInt( 38, 6 );
+        $f8_19 = $f8->mulInt( 19, 5 );
+        $f9_38 = $f9->mulInt( 38, 6 );
         /** @var ParagonIE_Sodium_Core32_Int64 $f0f0*/
-        $f0f0    = $f0->mulInt64($f0);
-        $f0f1_2  = $f0_2->mulInt64($f1);
-        $f0f2_2 =  $f0_2->mulInt64($f2);
-        $f0f3_2 =  $f0_2->mulInt64($f3);
-        $f0f4_2 =  $f0_2->mulInt64($f4);
-        $f0f5_2 =  $f0_2->mulInt64($f5);
-        $f0f6_2 =  $f0_2->mulInt64($f6);
-        $f0f7_2 =  $f0_2->mulInt64($f7);
-        $f0f8_2 =  $f0_2->mulInt64($f8);
-        $f0f9_2 =  $f0_2->mulInt64($f9);
-        $f1f1_2 = $f1_2->mulInt64($f1);
-        $f1f2_2 = $f1_2->mulInt64($f2);
-        $f1f3_4 = $f1_2->mulInt64($f3_2);
-        $f1f4_2 = $f1_2->mulInt64($f4);
-        $f1f5_4 = $f1_2->mulInt64($f5_2);
-        $f1f6_2 = $f1_2->mulInt64($f6);
-        $f1f7_4 = $f1_2->mulInt64($f7_2);
-        $f1f8_2 = $f1_2->mulInt64($f8);
-        $f1f9_76 = $f1_2->mulInt64($f9_38);
-        $f2f2 = $f2->mulInt64($f2);
-        $f2f3_2 = $f2_2->mulInt64($f3);
-        $f2f4_2 = $f2_2->mulInt64($f4);
-        $f2f5_2 = $f2_2->mulInt64($f5);
-        $f2f6_2 = $f2_2->mulInt64($f6);
-        $f2f7_2 = $f2_2->mulInt64($f7);
-        $f2f8_38 = $f2_2->mulInt64($f8_19);
-        $f2f9_38 = $f2->mulInt64($f9_38);
-        $f3f3_2 = $f3_2->mulInt64($f3);
-        $f3f4_2 = $f3_2->mulInt64($f4);
-        $f3f5_4 = $f3_2->mulInt64($f5_2);
-        $f3f6_2 = $f3_2->mulInt64($f6);
-        $f3f7_76 = $f3_2->mulInt64($f7_38);
-        $f3f8_38 = $f3_2->mulInt64($f8_19);
-        $f3f9_76 = $f3_2->mulInt64($f9_38);
-        $f4f4 = $f4->mulInt64($f4);
-        $f4f5_2 = $f4_2->mulInt64($f5);
-        $f4f6_38 = $f4_2->mulInt64($f6_19);
-        $f4f7_38 = $f4->mulInt64($f7_38);
-        $f4f8_38 = $f4_2->mulInt64($f8_19);
-        $f4f9_38 = $f4->mulInt64($f9_38);
-        $f5f5_38 = $f5->mulInt64($f5_38);
-        $f5f6_38 = $f5_2->mulInt64($f6_19);
-        $f5f7_76 = $f5_2->mulInt64($f7_38);
-        $f5f8_38 = $f5_2->mulInt64($f8_19);
-        $f5f9_76 = $f5_2->mulInt64($f9_38);
-        $f6f6_19 = $f6->mulInt64($f6_19);
-        $f6f7_38 = $f6->mulInt64($f7_38);
-        $f6f8_38 = $f6_2->mulInt64($f8_19);
-        $f6f9_38 = $f6->mulInt64($f9_38);
-        $f7f7_38 = $f7->mulInt64($f7_38);
-        $f7f8_38 = $f7_2->mulInt64($f8_19);
-        $f7f9_76 = $f7_2->mulInt64($f9_38);
-        $f8f8_19 = $f8->mulInt64($f8_19);
-        $f8f9_38 = $f8->mulInt64($f9_38);
-        $f9f9_38 = $f9->mulInt64($f9_38);
-
-        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
-        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
-        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
-        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
-        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
-        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
-        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
-        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
-        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
-        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
+        $f0f0    = $f0->mulInt64( $f0 );
+        $f0f1_2  = $f0_2->mulInt64( $f1 );
+        $f0f2_2 = $f0_2->mulInt64( $f2 );
+        $f0f3_2 = $f0_2->mulInt64( $f3 );
+        $f0f4_2 = $f0_2->mulInt64( $f4 );
+        $f0f5_2 = $f0_2->mulInt64( $f5 );
+        $f0f6_2 = $f0_2->mulInt64( $f6 );
+        $f0f7_2 = $f0_2->mulInt64( $f7 );
+        $f0f8_2 = $f0_2->mulInt64( $f8 );
+        $f0f9_2 = $f0_2->mulInt64( $f9 );
+        $f1f1_2 = $f1_2->mulInt64( $f1 );
+        $f1f2_2 = $f1_2->mulInt64( $f2 );
+        $f1f3_4 = $f1_2->mulInt64( $f3_2 );
+        $f1f4_2 = $f1_2->mulInt64( $f4 );
+        $f1f5_4 = $f1_2->mulInt64( $f5_2 );
+        $f1f6_2 = $f1_2->mulInt64( $f6 );
+        $f1f7_4 = $f1_2->mulInt64( $f7_2 );
+        $f1f8_2 = $f1_2->mulInt64( $f8 );
+        $f1f9_76 = $f1_2->mulInt64( $f9_38 );
+        $f2f2 = $f2->mulInt64( $f2 );
+        $f2f3_2 = $f2_2->mulInt64( $f3 );
+        $f2f4_2 = $f2_2->mulInt64( $f4 );
+        $f2f5_2 = $f2_2->mulInt64( $f5 );
+        $f2f6_2 = $f2_2->mulInt64( $f6 );
+        $f2f7_2 = $f2_2->mulInt64( $f7 );
+        $f2f8_38 = $f2_2->mulInt64( $f8_19 );
+        $f2f9_38 = $f2->mulInt64( $f9_38 );
+        $f3f3_2 = $f3_2->mulInt64( $f3 );
+        $f3f4_2 = $f3_2->mulInt64( $f4 );
+        $f3f5_4 = $f3_2->mulInt64( $f5_2 );
+        $f3f6_2 = $f3_2->mulInt64( $f6 );
+        $f3f7_76 = $f3_2->mulInt64( $f7_38 );
+        $f3f8_38 = $f3_2->mulInt64( $f8_19 );
+        $f3f9_76 = $f3_2->mulInt64( $f9_38 );
+        $f4f4 = $f4->mulInt64( $f4 );
+        $f4f5_2 = $f4_2->mulInt64( $f5 );
+        $f4f6_38 = $f4_2->mulInt64( $f6_19 );
+        $f4f7_38 = $f4->mulInt64( $f7_38 );
+        $f4f8_38 = $f4_2->mulInt64( $f8_19 );
+        $f4f9_38 = $f4->mulInt64( $f9_38 );
+        $f5f5_38 = $f5->mulInt64( $f5_38 );
+        $f5f6_38 = $f5_2->mulInt64( $f6_19 );
+        $f5f7_76 = $f5_2->mulInt64( $f7_38 );
+        $f5f8_38 = $f5_2->mulInt64( $f8_19 );
+        $f5f9_76 = $f5_2->mulInt64( $f9_38 );
+        $f6f6_19 = $f6->mulInt64( $f6_19 );
+        $f6f7_38 = $f6->mulInt64( $f7_38 );
+        $f6f8_38 = $f6_2->mulInt64( $f8_19 );
+        $f6f9_38 = $f6->mulInt64( $f9_38 );
+        $f7f7_38 = $f7->mulInt64( $f7_38 );
+        $f7f8_38 = $f7_2->mulInt64( $f8_19 );
+        $f7f9_76 = $f7_2->mulInt64( $f9_38 );
+        $f8f8_19 = $f8->mulInt64( $f8_19 );
+        $f8f9_38 = $f8->mulInt64( $f9_38 );
+        $f9f9_38 = $f9->mulInt64( $f9_38 );
+
+        $h0 = $f0f0->addInt64( $f1f9_76 )->addInt64( $f2f8_38 )->addInt64( $f3f7_76 )->addInt64( $f4f6_38 )->addInt64( $f5f5_38 );
+        $h1 = $f0f1_2->addInt64( $f2f9_38 )->addInt64( $f3f8_38 )->addInt64( $f4f7_38 )->addInt64( $f5f6_38 );
+        $h2 = $f0f2_2->addInt64( $f1f1_2 )->addInt64( $f3f9_76 )->addInt64( $f4f8_38 )->addInt64( $f5f7_76 )->addInt64( $f6f6_19 );
+        $h3 = $f0f3_2->addInt64( $f1f2_2 )->addInt64( $f4f9_38 )->addInt64( $f5f8_38 )->addInt64( $f6f7_38 );
+        $h4 = $f0f4_2->addInt64( $f1f3_4 )->addInt64( $f2f2 )->addInt64( $f5f9_76 )->addInt64( $f6f8_38 )->addInt64( $f7f7_38 );
+        $h5 = $f0f5_2->addInt64( $f1f4_2 )->addInt64( $f2f3_2 )->addInt64( $f6f9_38 )->addInt64( $f7f8_38 );
+        $h6 = $f0f6_2->addInt64( $f1f5_4 )->addInt64( $f2f4_2 )->addInt64( $f3f3_2 )->addInt64( $f7f9_76 )->addInt64( $f8f8_19 );
+        $h7 = $f0f7_2->addInt64( $f1f6_2 )->addInt64( $f2f5_2 )->addInt64( $f3f4_2 )->addInt64( $f8f9_38 );
+        $h8 = $f0f8_2->addInt64( $f1f7_4 )->addInt64( $f2f6_2 )->addInt64( $f3f5_4 )->addInt64( $f4f4 )->addInt64( $f9f9_38 );
+        $h9 = $f0f9_2->addInt64( $f1f8_2 )->addInt64( $f2f7_2 )->addInt64( $f3f6_2 )->addInt64( $f4f5_2 );
 
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $h0
@@ -874,53 +874,53 @@ 
          * @var ParagonIE_Sodium_Core32_Int64 $h9
          */
 
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+        $carry0 = $h0->addInt( 1 << 25 )->shiftRight( 26 );
+        $h1 = $h1->addInt64( $carry0 );
+        $h0 = $h0->subInt64( $carry0->shiftLeft( 26 ) );
 
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+        $carry4 = $h4->addInt( 1 << 25 )->shiftRight( 26 );
+        $h5 = $h5->addInt64( $carry4 );
+        $h4 = $h4->subInt64( $carry4->shiftLeft( 26 ) );
 
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
+        $carry1 = $h1->addInt( 1 << 24 )->shiftRight( 25 );
+        $h2 = $h2->addInt64( $carry1 );
+        $h1 = $h1->subInt64( $carry1->shiftLeft( 25 ) );
 
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
+        $carry5 = $h5->addInt( 1 << 24 )->shiftRight( 25 );
+        $h6 = $h6->addInt64( $carry5 );
+        $h5 = $h5->subInt64( $carry5->shiftLeft( 25 ) );
 
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
+        $carry2 = $h2->addInt( 1 << 25 )->shiftRight( 26 );
+        $h3 = $h3->addInt64( $carry2 );
+        $h2 = $h2->subInt64( $carry2->shiftLeft( 26 ) );
 
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
+        $carry6 = $h6->addInt( 1 << 25 )->shiftRight( 26 );
+        $h7 = $h7->addInt64( $carry6 );
+        $h6 = $h6->subInt64( $carry6->shiftLeft( 26 ) );
 
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
+        $carry3 = $h3->addInt( 1 << 24 )->shiftRight( 25 );
+        $h4 = $h4->addInt64( $carry3 );
+        $h3 = $h3->subInt64( $carry3->shiftLeft( 25 ) );
 
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
+        $carry7 = $h7->addInt( 1 << 24 )->shiftRight( 25 );
+        $h8 = $h8->addInt64( $carry7 );
+        $h7 = $h7->subInt64( $carry7->shiftLeft( 25 ) );
 
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+        $carry4 = $h4->addInt( 1 << 25 )->shiftRight( 26 );
+        $h5 = $h5->addInt64( $carry4 );
+        $h4 = $h4->subInt64( $carry4->shiftLeft( 26 ) );
 
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
+        $carry8 = $h8->addInt( 1 << 25 )->shiftRight( 26 );
+        $h9 = $h9->addInt64( $carry8 );
+        $h8 = $h8->subInt64( $carry8->shiftLeft( 26 ) );
 
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
+        $carry9 = $h9->addInt( 1 << 24 )->shiftRight( 25 );
+        $h0 = $h0->addInt64( $carry9->mulInt( 19 ) );
+        $h9 = $h9->subInt64( $carry9->shiftLeft( 25 ) );
 
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+        $carry0 = $h0->addInt( 1 << 25 )->shiftRight( 26 );
+        $h1 = $h1->addInt64( $carry0 );
+        $h0 = $h0->subInt64( $carry0->shiftLeft( 26 ) );
 
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
@@ -948,7 +948,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    public static function fe_sq2( ParagonIE_Sodium_Core32_Curve25519_Fe $f )
     {
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $f0
@@ -974,85 +974,85 @@ 
         $f8 = $f[8]->toInt64();
         $f9 = $f[9]->toInt64();
 
-        $f0_2 = $f0->shiftLeft(1);
-        $f1_2 = $f1->shiftLeft(1);
-        $f2_2 = $f2->shiftLeft(1);
-        $f3_2 = $f3->shiftLeft(1);
-        $f4_2 = $f4->shiftLeft(1);
-        $f5_2 = $f5->shiftLeft(1);
-        $f6_2 = $f6->shiftLeft(1);
-        $f7_2 = $f7->shiftLeft(1);
-        $f5_38 = $f5->mulInt(38, 6); /* 1.959375*2^30 */
-        $f6_19 = $f6->mulInt(19, 5); /* 1.959375*2^30 */
-        $f7_38 = $f7->mulInt(38, 6); /* 1.959375*2^30 */
-        $f8_19 = $f8->mulInt(19, 5); /* 1.959375*2^30 */
-        $f9_38 = $f9->mulInt(38, 6); /* 1.959375*2^30 */
-        $f0f0 = $f0->mulInt64($f0);
-        $f0f1_2 = $f0_2->mulInt64($f1);
-        $f0f2_2 = $f0_2->mulInt64($f2);
-        $f0f3_2 = $f0_2->mulInt64($f3);
-        $f0f4_2 = $f0_2->mulInt64($f4);
-        $f0f5_2 = $f0_2->mulInt64($f5);
-        $f0f6_2 = $f0_2->mulInt64($f6);
-        $f0f7_2 = $f0_2->mulInt64($f7);
-        $f0f8_2 = $f0_2->mulInt64($f8);
-        $f0f9_2 = $f0_2->mulInt64($f9);
-        $f1f1_2 = $f1_2->mulInt64($f1);
-        $f1f2_2 = $f1_2->mulInt64($f2);
-        $f1f3_4 = $f1_2->mulInt64($f3_2);
-        $f1f4_2 = $f1_2->mulInt64($f4);
-        $f1f5_4 = $f1_2->mulInt64($f5_2);
-        $f1f6_2 = $f1_2->mulInt64($f6);
-        $f1f7_4 = $f1_2->mulInt64($f7_2);
-        $f1f8_2 = $f1_2->mulInt64($f8);
-        $f1f9_76 = $f1_2->mulInt64($f9_38);
-        $f2f2 = $f2->mulInt64($f2);
-        $f2f3_2 = $f2_2->mulInt64($f3);
-        $f2f4_2 = $f2_2->mulInt64($f4);
-        $f2f5_2 = $f2_2->mulInt64($f5);
-        $f2f6_2 = $f2_2->mulInt64($f6);
-        $f2f7_2 = $f2_2->mulInt64($f7);
-        $f2f8_38 = $f2_2->mulInt64($f8_19);
-        $f2f9_38 = $f2->mulInt64($f9_38);
-        $f3f3_2 = $f3_2->mulInt64($f3);
-        $f3f4_2 = $f3_2->mulInt64($f4);
-        $f3f5_4 = $f3_2->mulInt64($f5_2);
-        $f3f6_2 = $f3_2->mulInt64($f6);
-        $f3f7_76 = $f3_2->mulInt64($f7_38);
-        $f3f8_38 = $f3_2->mulInt64($f8_19);
-        $f3f9_76 = $f3_2->mulInt64($f9_38);
-        $f4f4 = $f4->mulInt64($f4);
-        $f4f5_2 = $f4_2->mulInt64($f5);
-        $f4f6_38 = $f4_2->mulInt64($f6_19);
-        $f4f7_38 = $f4->mulInt64($f7_38);
-        $f4f8_38 = $f4_2->mulInt64($f8_19);
-        $f4f9_38 = $f4->mulInt64($f9_38);
-        $f5f5_38 = $f5->mulInt64($f5_38);
-        $f5f6_38 = $f5_2->mulInt64($f6_19);
-        $f5f7_76 = $f5_2->mulInt64($f7_38);
-        $f5f8_38 = $f5_2->mulInt64($f8_19);
-        $f5f9_76 = $f5_2->mulInt64($f9_38);
-        $f6f6_19 = $f6->mulInt64($f6_19);
-        $f6f7_38 = $f6->mulInt64($f7_38);
-        $f6f8_38 = $f6_2->mulInt64($f8_19);
-        $f6f9_38 = $f6->mulInt64($f9_38);
-        $f7f7_38 = $f7->mulInt64($f7_38);
-        $f7f8_38 = $f7_2->mulInt64($f8_19);
-        $f7f9_76 = $f7_2->mulInt64($f9_38);
-        $f8f8_19 = $f8->mulInt64($f8_19);
-        $f8f9_38 = $f8->mulInt64($f9_38);
-        $f9f9_38 = $f9->mulInt64($f9_38);
-
-        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
-        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
-        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
-        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
-        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
-        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
-        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
-        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
-        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
-        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
+        $f0_2 = $f0->shiftLeft( 1 );
+        $f1_2 = $f1->shiftLeft( 1 );
+        $f2_2 = $f2->shiftLeft( 1 );
+        $f3_2 = $f3->shiftLeft( 1 );
+        $f4_2 = $f4->shiftLeft( 1 );
+        $f5_2 = $f5->shiftLeft( 1 );
+        $f6_2 = $f6->shiftLeft( 1 );
+        $f7_2 = $f7->shiftLeft( 1 );
+        $f5_38 = $f5->mulInt( 38, 6 ); /* 1.959375*2^30 */
+        $f6_19 = $f6->mulInt( 19, 5 ); /* 1.959375*2^30 */
+        $f7_38 = $f7->mulInt( 38, 6 ); /* 1.959375*2^30 */
+        $f8_19 = $f8->mulInt( 19, 5 ); /* 1.959375*2^30 */
+        $f9_38 = $f9->mulInt( 38, 6 ); /* 1.959375*2^30 */
+        $f0f0 = $f0->mulInt64( $f0 );
+        $f0f1_2 = $f0_2->mulInt64( $f1 );
+        $f0f2_2 = $f0_2->mulInt64( $f2 );
+        $f0f3_2 = $f0_2->mulInt64( $f3 );
+        $f0f4_2 = $f0_2->mulInt64( $f4 );
+        $f0f5_2 = $f0_2->mulInt64( $f5 );
+        $f0f6_2 = $f0_2->mulInt64( $f6 );
+        $f0f7_2 = $f0_2->mulInt64( $f7 );
+        $f0f8_2 = $f0_2->mulInt64( $f8 );
+        $f0f9_2 = $f0_2->mulInt64( $f9 );
+        $f1f1_2 = $f1_2->mulInt64( $f1 );
+        $f1f2_2 = $f1_2->mulInt64( $f2 );
+        $f1f3_4 = $f1_2->mulInt64( $f3_2 );
+        $f1f4_2 = $f1_2->mulInt64( $f4 );
+        $f1f5_4 = $f1_2->mulInt64( $f5_2 );
+        $f1f6_2 = $f1_2->mulInt64( $f6 );
+        $f1f7_4 = $f1_2->mulInt64( $f7_2 );
+        $f1f8_2 = $f1_2->mulInt64( $f8 );
+        $f1f9_76 = $f1_2->mulInt64( $f9_38 );
+        $f2f2 = $f2->mulInt64( $f2 );
+        $f2f3_2 = $f2_2->mulInt64( $f3 );
+        $f2f4_2 = $f2_2->mulInt64( $f4 );
+        $f2f5_2 = $f2_2->mulInt64( $f5 );
+        $f2f6_2 = $f2_2->mulInt64( $f6 );
+        $f2f7_2 = $f2_2->mulInt64( $f7 );
+        $f2f8_38 = $f2_2->mulInt64( $f8_19 );
+        $f2f9_38 = $f2->mulInt64( $f9_38 );
+        $f3f3_2 = $f3_2->mulInt64( $f3 );
+        $f3f4_2 = $f3_2->mulInt64( $f4 );
+        $f3f5_4 = $f3_2->mulInt64( $f5_2 );
+        $f3f6_2 = $f3_2->mulInt64( $f6 );
+        $f3f7_76 = $f3_2->mulInt64( $f7_38 );
+        $f3f8_38 = $f3_2->mulInt64( $f8_19 );
+        $f3f9_76 = $f3_2->mulInt64( $f9_38 );
+        $f4f4 = $f4->mulInt64( $f4 );
+        $f4f5_2 = $f4_2->mulInt64( $f5 );
+        $f4f6_38 = $f4_2->mulInt64( $f6_19 );
+        $f4f7_38 = $f4->mulInt64( $f7_38 );
+        $f4f8_38 = $f4_2->mulInt64( $f8_19 );
+        $f4f9_38 = $f4->mulInt64( $f9_38 );
+        $f5f5_38 = $f5->mulInt64( $f5_38 );
+        $f5f6_38 = $f5_2->mulInt64( $f6_19 );
+        $f5f7_76 = $f5_2->mulInt64( $f7_38 );
+        $f5f8_38 = $f5_2->mulInt64( $f8_19 );
+        $f5f9_76 = $f5_2->mulInt64( $f9_38 );
+        $f6f6_19 = $f6->mulInt64( $f6_19 );
+        $f6f7_38 = $f6->mulInt64( $f7_38 );
+        $f6f8_38 = $f6_2->mulInt64( $f8_19 );
+        $f6f9_38 = $f6->mulInt64( $f9_38 );
+        $f7f7_38 = $f7->mulInt64( $f7_38 );
+        $f7f8_38 = $f7_2->mulInt64( $f8_19 );
+        $f7f9_76 = $f7_2->mulInt64( $f9_38 );
+        $f8f8_19 = $f8->mulInt64( $f8_19 );
+        $f8f9_38 = $f8->mulInt64( $f9_38 );
+        $f9f9_38 = $f9->mulInt64( $f9_38 );
+
+        $h0 = $f0f0->addInt64( $f1f9_76 )->addInt64( $f2f8_38 )->addInt64( $f3f7_76 )->addInt64( $f4f6_38 )->addInt64( $f5f5_38 );
+        $h1 = $f0f1_2->addInt64( $f2f9_38 )->addInt64( $f3f8_38 )->addInt64( $f4f7_38 )->addInt64( $f5f6_38 );
+        $h2 = $f0f2_2->addInt64( $f1f1_2 )->addInt64( $f3f9_76 )->addInt64( $f4f8_38 )->addInt64( $f5f7_76 )->addInt64( $f6f6_19 );
+        $h3 = $f0f3_2->addInt64( $f1f2_2 )->addInt64( $f4f9_38 )->addInt64( $f5f8_38 )->addInt64( $f6f7_38 );
+        $h4 = $f0f4_2->addInt64( $f1f3_4 )->addInt64( $f2f2 )->addInt64( $f5f9_76 )->addInt64( $f6f8_38 )->addInt64( $f7f7_38 );
+        $h5 = $f0f5_2->addInt64( $f1f4_2 )->addInt64( $f2f3_2 )->addInt64( $f6f9_38 )->addInt64( $f7f8_38 );
+        $h6 = $f0f6_2->addInt64( $f1f5_4 )->addInt64( $f2f4_2 )->addInt64( $f3f3_2 )->addInt64( $f7f9_76 )->addInt64( $f8f8_19 );
+        $h7 = $f0f7_2->addInt64( $f1f6_2 )->addInt64( $f2f5_2 )->addInt64( $f3f4_2 )->addInt64( $f8f9_38 );
+        $h8 = $f0f8_2->addInt64( $f1f7_4 )->addInt64( $f2f6_2 )->addInt64( $f3f5_4 )->addInt64( $f4f4 )->addInt64( $f9f9_38 );
+        $h9 = $f0f9_2->addInt64( $f1f8_2 )->addInt64( $f2f7_2 )->addInt64( $f3f6_2 )->addInt64( $f4f5_2 );
 
         /*
         $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19);
@@ -1072,59 +1072,59 @@ 
          * @var ParagonIE_Sodium_Core32_Int64 $h8
          * @var ParagonIE_Sodium_Core32_Int64 $h9
          */
-        $h0 = $h0->shiftLeft(1);
-        $h1 = $h1->shiftLeft(1);
-        $h2 = $h2->shiftLeft(1);
-        $h3 = $h3->shiftLeft(1);
-        $h4 = $h4->shiftLeft(1);
-        $h5 = $h5->shiftLeft(1);
-        $h6 = $h6->shiftLeft(1);
-        $h7 = $h7->shiftLeft(1);
-        $h8 = $h8->shiftLeft(1);
-        $h9 = $h9->shiftLeft(1);
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+        $h0 = $h0->shiftLeft( 1 );
+        $h1 = $h1->shiftLeft( 1 );
+        $h2 = $h2->shiftLeft( 1 );
+        $h3 = $h3->shiftLeft( 1 );
+        $h4 = $h4->shiftLeft( 1 );
+        $h5 = $h5->shiftLeft( 1 );
+        $h6 = $h6->shiftLeft( 1 );
+        $h7 = $h7->shiftLeft( 1 );
+        $h8 = $h8->shiftLeft( 1 );
+        $h9 = $h9->shiftLeft( 1 );
+
+        $carry0 = $h0->addInt( 1 << 25 )->shiftRight( 26 );
+        $h1 = $h1->addInt64( $carry0 );
+        $h0 = $h0->subInt64( $carry0->shiftLeft( 26 ) );
+        $carry4 = $h4->addInt( 1 << 25 )->shiftRight( 26 );
+        $h5 = $h5->addInt64( $carry4 );
+        $h4 = $h4->subInt64( $carry4->shiftLeft( 26 ) );
+
+        $carry1 = $h1->addInt( 1 << 24 )->shiftRight( 25 );
+        $h2 = $h2->addInt64( $carry1 );
+        $h1 = $h1->subInt64( $carry1->shiftLeft( 25 ) );
+        $carry5 = $h5->addInt( 1 << 24 )->shiftRight( 25 );
+        $h6 = $h6->addInt64( $carry5 );
+        $h5 = $h5->subInt64( $carry5->shiftLeft( 25 ) );
+
+        $carry2 = $h2->addInt( 1 << 25 )->shiftRight( 26 );
+        $h3 = $h3->addInt64( $carry2 );
+        $h2 = $h2->subInt64( $carry2->shiftLeft( 26 ) );
+        $carry6 = $h6->addInt( 1 << 25 )->shiftRight( 26 );
+        $h7 = $h7->addInt64( $carry6 );
+        $h6 = $h6->subInt64( $carry6->shiftLeft( 26 ) );
+
+        $carry3 = $h3->addInt( 1 << 24 )->shiftRight( 25 );
+        $h4 = $h4->addInt64( $carry3 );
+        $h3 = $h3->subInt64( $carry3->shiftLeft( 25 ) );
+        $carry7 = $h7->addInt( 1 << 24 )->shiftRight( 25 );
+        $h8 = $h8->addInt64( $carry7 );
+        $h7 = $h7->subInt64( $carry7->shiftLeft( 25 ) );
+
+        $carry4 = $h4->addInt( 1 << 25 )->shiftRight( 26 );
+        $h5 = $h5->addInt64( $carry4 );
+        $h4 = $h4->subInt64( $carry4->shiftLeft( 26 ) );
+        $carry8 = $h8->addInt( 1 << 25 )->shiftRight( 26 );
+        $h9 = $h9->addInt64( $carry8 );
+        $h8 = $h8->subInt64( $carry8->shiftLeft( 26 ) );
+
+        $carry9 = $h9->addInt( 1 << 24 )->shiftRight( 25 );
+        $h0 = $h0->addInt64( $carry9->mulInt( 19 ) );
+        $h9 = $h9->subInt64( $carry9->shiftLeft( 25 ) );
+
+        $carry0 = $h0->addInt( 1 << 25 )->shiftRight( 26 );
+        $h1 = $h1->addInt64( $carry0 );
+        $h0 = $h0->subInt64( $carry0->shiftLeft( 26 ) );
 
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
@@ -1153,56 +1153,56 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $Z
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_invert(ParagonIE_Sodium_Core32_Curve25519_Fe $Z)
+    public static function fe_invert( ParagonIE_Sodium_Core32_Curve25519_Fe $Z )
     {
         $z = clone $Z;
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t2 = self::fe_sq($t0);
-        $t1 = self::fe_mul($t1, $t2);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t0 = self::fe_sq( $z );
+        $t1 = self::fe_sq( $t0 );
+        $t1 = self::fe_sq( $t1 );
+        $t1 = self::fe_mul( $z, $t1 );
+        $t0 = self::fe_mul( $t0, $t1 );
+        $t2 = self::fe_sq( $t0 );
+        $t1 = self::fe_mul( $t1, $t2 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 20; ++$i) {
-            $t3 = self::fe_sq($t3);
+        $t2 = self::fe_mul( $t2, $t1 );
+        $t3 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 20; ++$i ) {
+            $t3 = self::fe_sq( $t3 );
         }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t2 = self::fe_mul( $t3, $t2 );
+        $t2 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 100; ++$i) {
-            $t3 = self::fe_sq($t3);
+        $t2 = self::fe_mul( $t2, $t1 );
+        $t3 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 100; ++$i ) {
+            $t3 = self::fe_sq( $t3 );
         }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t2 = self::fe_mul( $t3, $t2 );
+        $t2 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
-        return self::fe_mul($t1, $t0);
+        return self::fe_mul( $t1, $t0 );
     }
 
     /**
@@ -1213,7 +1213,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $z
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_pow22523(ParagonIE_Sodium_Core32_Curve25519_Fe $z)
+    public static function fe_pow22523( ParagonIE_Sodium_Core32_Curve25519_Fe $z )
     {
         # fe_sq(t0, z);
         # fe_sq(t1, t0);
@@ -1223,102 +1223,102 @@ 
         # fe_sq(t0, t0);
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_sq( $z );
+        $t1 = self::fe_sq( $t0 );
+        $t1 = self::fe_sq( $t1 );
+        $t1 = self::fe_mul( $z, $t1 );
+        $t0 = self::fe_mul( $t0, $t1 );
+        $t0 = self::fe_sq( $t0 );
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 5; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 10; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t1, t1, t0);
         # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t1, $t0 );
+        $t2 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 20; ++i) {
         #     fe_sq(t2, t2);
         # }
-        for ($i = 1; $i < 20; ++$i) {
-            $t2 = self::fe_sq($t2);
+        for ( $i = 1; $i < 20; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
 
         # fe_mul(t1, t2, t1);
         # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 10; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 50; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t1, t1, t0);
         # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t1, $t0 );
+        $t2 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 100; ++i) {
         #     fe_sq(t2, t2);
         # }
-        for ($i = 1; $i < 100; ++$i) {
-            $t2 = self::fe_sq($t2);
+        for ( $i = 1; $i < 100; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
 
         # fe_mul(t1, t2, t1);
         # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 50; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t0, t0);
         # fe_sq(t0, t0);
         # fe_mul(out, t0, z);
-        $t0 = self::fe_mul($t1, $t0);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_sq($t0);
-        return self::fe_mul($t0, $z);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t0 = self::fe_sq( $t0 );
+        $t0 = self::fe_sq( $t0 );
+        return self::fe_mul( $t0, $z );
     }
 
     /**
@@ -1339,20 +1339,20 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_sub(ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g)
+    public static function fe_sub( ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g )
     {
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
-                $f[0]->subInt32($g[0]),
-                $f[1]->subInt32($g[1]),
-                $f[2]->subInt32($g[2]),
-                $f[3]->subInt32($g[3]),
-                $f[4]->subInt32($g[4]),
-                $f[5]->subInt32($g[5]),
-                $f[6]->subInt32($g[6]),
-                $f[7]->subInt32($g[7]),
-                $f[8]->subInt32($g[8]),
-                $f[9]->subInt32($g[9])
+                $f[0]->subInt32( $g[0] ),
+                $f[1]->subInt32( $g[1] ),
+                $f[2]->subInt32( $g[2] ),
+                $f[3]->subInt32( $g[3] ),
+                $f[4]->subInt32( $g[4] ),
+                $f[5]->subInt32( $g[5] ),
+                $f[6]->subInt32( $g[6] ),
+                $f[7]->subInt32( $g[7] ),
+                $f[8]->subInt32( $g[8] ),
+                $f[9]->subInt32( $g[9] )
             )
         );
     }
@@ -1373,17 +1373,17 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
     ) {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YplusX);
-        $r->Y = self::fe_mul($r->Y, $q->YminusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0   = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->YplusX );
+        $r->Y = self::fe_mul( $r->Y, $q->YminusX );
+        $r->T = self::fe_mul( $q->T2d, $p->T );
+        $r->X = self::fe_mul( $p->Z, $q->Z );
+        $t0   = self::fe_add( $r->X, $r->X );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_add( $t0, $r->T );
+        $r->T = self::fe_sub( $t0, $r->T );
         return $r;
     }
 
@@ -1394,33 +1394,33 @@ 
      * @param string $a
      * @return array<int, mixed>
      */
-    public static function slide($a)
+    public static function slide( $a )
     {
-        if (self::strlen($a) < 256) {
-            if (self::strlen($a) < 16) {
-                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+        if ( self::strlen( $a ) < 256 ) {
+            if ( self::strlen( $a ) < 16 ) {
+                $a = str_pad( $a, 256, '0', STR_PAD_RIGHT );
             }
         }
         $r = array();
-        for ($i = 0; $i < 256; ++$i) {
+        for ( $i = 0; $i < 256; ++$i ) {
             $r[$i] = 1 & (
-                self::chrToInt($a[$i >> 3])
+                self::chrToInt( $a[$i >> 3] )
                     >>
-                ($i & 7)
+                ( $i & 7 )
             );
         }
 
-        for ($i = 0;$i < 256;++$i) {
-            if ($r[$i]) {
-                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
-                    if ($r[$i + $b]) {
-                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
+        for ( $i = 0; $i < 256; ++$i ) {
+            if ( $r[$i] ) {
+                for ( $b = 1; $b <= 6 && $i + $b < 256; ++$b ) {
+                    if ( $r[$i + $b] ) {
+                        if ( $r[$i] + ( $r[$i + $b] << $b ) <= 15 ) {
                             $r[$i] += $r[$i + $b] << $b;
                             $r[$i + $b] = 0;
-                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
+                        } elseif ( $r[$i] - ( $r[$i + $b] << $b ) >= -15 ) {
                             $r[$i] -= $r[$i + $b] << $b;
-                            for ($k = $i + $b; $k < 256; ++$k) {
-                                if (!$r[$k]) {
+                            for ( $k = $i + $b; $k < 256; ++$k ) {
+                                if ( ! $r[$k] ) {
                                     $r[$k] = 1;
                                     break;
                                 }
@@ -1442,22 +1442,22 @@ 
      * @param string $s
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
      */
-    public static function ge_frombytes_negate_vartime($s)
+    public static function ge_frombytes_negate_vartime( $s )
     {
         static $d = null;
-        if (!$d) {
+        if ( ! $d ) {
             $d = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                 array(
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[0]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[1]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[2]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[3]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[4]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[5]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[6]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[7]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[8]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[9])
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[0] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[1] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[2] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[3] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[4] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[5] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[6] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[7] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[8] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d[9] )
                 )
             );
         }
@@ -1466,7 +1466,7 @@ 
         # fe_1(h->Z);
         $h = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
             self::fe_0(),
-            self::fe_frombytes($s),
+            self::fe_frombytes( $s ),
             self::fe_1()
         );
 
@@ -1474,35 +1474,35 @@ 
         # fe_mul(v,u,d);
         # fe_sub(u,u,h->Z);       /* u = y^2-1 */
         # fe_add(v,v,h->Z);       /* v = dy^2+1 */
-        $u = self::fe_sq($h->Y);
-        $v = self::fe_mul($u, $d);
-        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
-        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+        $u = self::fe_sq( $h->Y );
+        $v = self::fe_mul( $u, $d );
+        $u = self::fe_sub( $u, $h->Z ); /* u =  y^2 - 1 */
+        $v = self::fe_add( $v, $h->Z ); /* v = dy^2 + 1 */
 
         # fe_sq(v3,v);
         # fe_mul(v3,v3,v);        /* v3 = v^3 */
         # fe_sq(h->X,v3);
         # fe_mul(h->X,h->X,v);
         # fe_mul(h->X,h->X,u);    /* x = uv^7 */
-        $v3 = self::fe_sq($v);
-        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
-        $h->X = self::fe_sq($v3);
-        $h->X = self::fe_mul($h->X, $v);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+        $v3 = self::fe_sq( $v );
+        $v3 = self::fe_mul( $v3, $v ); /* v3 = v^3 */
+        $h->X = self::fe_sq( $v3 );
+        $h->X = self::fe_mul( $h->X, $v );
+        $h->X = self::fe_mul( $h->X, $u ); /* x = uv^7 */
 
         # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
         # fe_mul(h->X,h->X,v3);
         # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
-        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
-        $h->X = self::fe_mul($h->X, $v3);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+        $h->X = self::fe_pow22523( $h->X ); /* x = (uv^7)^((q-5)/8) */
+        $h->X = self::fe_mul( $h->X, $v3 );
+        $h->X = self::fe_mul( $h->X, $u ); /* x = uv^3(uv^7)^((q-5)/8) */
 
         # fe_sq(vxx,h->X);
         # fe_mul(vxx,vxx,v);
         # fe_sub(check,vxx,u);    /* vx^2-u */
-        $vxx = self::fe_sq($h->X);
-        $vxx = self::fe_mul($vxx, $v);
-        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
+        $vxx = self::fe_sq( $h->X );
+        $vxx = self::fe_mul( $vxx, $v );
+        $check = self::fe_sub( $vxx, $u ); /* vx^2 - u */
 
         # if (fe_isnonzero(check)) {
         #     fe_add(check,vxx,u);  /* vx^2+u */
@@ -1511,27 +1511,27 @@ 
         #     }
         #     fe_mul(h->X,h->X,sqrtm1);
         # }
-        if (self::fe_isnonzero($check)) {
-            $check = self::fe_add($vxx, $u); /* vx^2 + u */
-            if (self::fe_isnonzero($check)) {
-                throw new RangeException('Internal check failed.');
+        if ( self::fe_isnonzero( $check ) ) {
+            $check = self::fe_add( $vxx, $u ); /* vx^2 + u */
+            if ( self::fe_isnonzero( $check ) ) {
+                throw new RangeException( 'Internal check failed.' );
             }
             $h->X = self::fe_mul(
                 $h->X,
-                ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(self::$sqrtm1)
+                ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray( self::$sqrtm1 )
             );
         }
 
         # if (fe_isnegative(h->X) == (s[31] >> 7)) {
         #     fe_neg(h->X,h->X);
         # }
-        $i = self::chrToInt($s[31]);
-        if (self::fe_isnegative($h->X) === ($i >> 7)) {
-            $h->X = self::fe_neg($h->X);
+        $i = self::chrToInt( $s[31] );
+        if ( self::fe_isnegative( $h->X ) === ( $i >> 7 ) ) {
+            $h->X = self::fe_neg( $h->X );
         }
 
         # fe_mul(h->T,h->X,h->Y);
-        $h->T = self::fe_mul($h->X, $h->Y);
+        $h->T = self::fe_mul( $h->X, $h->Y );
         return $h;
     }
 
@@ -1549,16 +1549,16 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
     ) {
         $r = clone $R;
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yplusx);
-        $r->Y = self::fe_mul($r->Y, $q->yminusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->yplusx );
+        $r->Y = self::fe_mul( $r->Y, $q->yminusx );
+        $r->T = self::fe_mul( $q->xy2d, $p->T );
+        $t0 = self::fe_add( clone $p->Z, clone $p->Z );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_add( $t0, $r->T );
+        $r->T = self::fe_sub( $t0, $r->T );
 
         return $r;
     }
@@ -1578,16 +1578,16 @@ 
     ) {
         $r = clone $R;
 
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yminusx);
-        $r->Y = self::fe_mul($r->Y, $q->yplusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add($p->Z, $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->yminusx );
+        $r->Y = self::fe_mul( $r->Y, $q->yplusx );
+        $r->T = self::fe_mul( $q->xy2d, $p->T );
+        $t0 = self::fe_add( $p->Z, $p->Z );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_sub( $t0, $r->T );
+        $r->T = self::fe_add( $t0, $r->T );
 
         return $r;
     }
@@ -1598,12 +1598,12 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
      */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
+    public static function ge_p1p1_to_p2( ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p )
     {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P2();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
+        $r->X = self::fe_mul( $p->X, $p->T );
+        $r->Y = self::fe_mul( $p->Y, $p->Z );
+        $r->Z = self::fe_mul( $p->Z, $p->T );
         return $r;
     }
 
@@ -1613,13 +1613,13 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
      */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
+    public static function ge_p1p1_to_p3( ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p )
     {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        $r->T = self::fe_mul($p->X, $p->Y);
+        $r->X = self::fe_mul( $p->X, $p->T );
+        $r->Y = self::fe_mul( $p->Y, $p->Z );
+        $r->Z = self::fe_mul( $p->Z, $p->T );
+        $r->T = self::fe_mul( $p->X, $p->Y );
         return $r;
     }
 
@@ -1643,19 +1643,19 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
      */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p)
+    public static function ge_p2_dbl( ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p )
     {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
 
-        $r->X = self::fe_sq($p->X);
-        $r->Z = self::fe_sq($p->Y);
-        $r->T = self::fe_sq2($p->Z);
-        $r->Y = self::fe_add($p->X, $p->Y);
-        $t0   = self::fe_sq($r->Y);
-        $r->Y = self::fe_add($r->Z, $r->X);
-        $r->Z = self::fe_sub($r->Z, $r->X);
-        $r->X = self::fe_sub($t0, $r->Y);
-        $r->T = self::fe_sub($r->T, $r->Z);
+        $r->X = self::fe_sq( $p->X );
+        $r->Z = self::fe_sq( $p->Y );
+        $r->T = self::fe_sq2( $p->Z );
+        $r->Y = self::fe_add( $p->X, $p->Y );
+        $t0   = self::fe_sq( $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->X );
+        $r->Z = self::fe_sub( $r->Z, $r->X );
+        $r->X = self::fe_sub( $t0, $r->Y );
+        $r->T = self::fe_sub( $r->T, $r->Z );
 
         return $r;
     }
@@ -1681,30 +1681,30 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
      */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+    public static function ge_p3_to_cached( ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p )
     {
         static $d2 = null;
-        if ($d2 === null) {
+        if ( $d2 === null ) {
             $d2 = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                 array(
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[0]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[1]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[2]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[3]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[4]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[5]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[6]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[7]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[8]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[9])
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[0] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[1] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[2] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[3] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[4] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[5] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[6] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[7] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[8] ),
+                    ParagonIE_Sodium_Core32_Int32::fromInt( self::$d2[9] )
                 )
             );
         }
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached();
-        $r->YplusX = self::fe_add($p->Y, $p->X);
-        $r->YminusX = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_copy($p->Z);
-        $r->T2d = self::fe_mul($p->T, $d2);
+        $r->YplusX = self::fe_add( $p->Y, $p->X );
+        $r->YminusX = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_copy( $p->Z );
+        $r->T2d = self::fe_mul( $p->T, $d2 );
         return $r;
     }
 
@@ -1714,7 +1714,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
      */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+    public static function ge_p3_to_p2( ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p )
     {
         return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
             $p->X,
@@ -1729,14 +1729,14 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h
      * @return string
      */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h)
+    public static function ge_p3_tobytes( ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h )
     {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
+        $recip = self::fe_invert( $h->Z );
+        $x = self::fe_mul( $h->X, $recip );
+        $y = self::fe_mul( $h->Y, $recip );
+        $s = self::fe_tobytes( $y );
         $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+            self::chrToInt( $s[31] ) ^ ( self::fe_isnegative( $x ) << 7 )
         );
         return $s;
     }
@@ -1747,10 +1747,10 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
      */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+    public static function ge_p3_dbl( ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p )
     {
-        $q = self::ge_p3_to_p2($p);
-        return self::ge_p2_dbl($q);
+        $q = self::ge_p3_to_p2( $p );
+        return self::ge_p2_dbl( $q );
     }
 
     /**
@@ -1772,9 +1772,9 @@ 
      * @param int $c
      * @return int
      */
-    public static function equal($b, $c)
+    public static function equal( $b, $c )
     {
-        return (($b ^ $c) - 1 & 0xffffffff) >> 31;
+        return ( ( $b ^ $c ) - 1 & 0xffffffff ) >> 31;
     }
 
     /**
@@ -1783,13 +1783,13 @@ 
      * @param int $char
      * @return int (1 = yes, 0 = no)
      */
-    public static function negative($char)
+    public static function negative( $char )
     {
-        if (is_int($char)) {
+        if ( is_int( $char ) ) {
             return $char < 0 ? 1 : 0;
         }
-        $x = self::chrToInt(self::substr($char, 0, 1));
-        if (PHP_INT_SIZE === 8) {
+        $x = self::chrToInt( self::substr( $char, 0, 1 ) );
+        if ( PHP_INT_SIZE === 8 ) {
             return $x >> 63;
         }
         return $x >> 31;
@@ -1810,13 +1810,13 @@ 
         ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u,
         $b
     ) {
-        if (!is_int($b)) {
-            throw new InvalidArgumentException('Expected an integer.');
+        if ( ! is_int( $b ) ) {
+            throw new InvalidArgumentException( 'Expected an integer.' );
         }
         return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_cmov($t->yplusx, $u->yplusx, $b),
-            self::fe_cmov($t->yminusx, $u->yminusx, $b),
-            self::fe_cmov($t->xy2d, $u->xy2d, $b)
+            self::fe_cmov( $t->yplusx, $u->yplusx, $b ),
+            self::fe_cmov( $t->yminusx, $u->yminusx, $b ),
+            self::fe_cmov( $t->xy2d, $u->xy2d, $b )
         );
     }
 
@@ -1827,84 +1827,84 @@ 
      * @param int $b
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
      */
-    public static function ge_select($pos = 0, $b = 0)
+    public static function ge_select( $pos = 0, $b = 0 )
     {
         static $base = null;
-        if ($base === null) {
+        if ( $base === null ) {
             $base = array();
-            foreach (self::$base as $i => $bas) {
-                for ($j = 0; $j < 8; ++$j) {
+            foreach ( self::$base as $i => $bas ) {
+                for ( $j = 0; $j < 8; ++$j ) {
                     $base[$i][$j] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
                         ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                             array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][9])
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][0] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][1] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][2] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][3] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][4] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][5] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][6] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][7] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][8] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][0][9] )
                             )
                         ),
                         ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                             array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][9])
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][0] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][1] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][2] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][3] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][4] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][5] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][6] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][7] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][8] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][1][9] )
                             )
                         ),
                         ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                             array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][9])
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][0] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][1] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][2] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][3] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][4] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][5] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][6] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][7] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][8] ),
+                                ParagonIE_Sodium_Core32_Int32::fromInt( $bas[$j][2][9] )
                             )
                         )
                     );
                 }
             }
         }
-        if (!is_int($pos)) {
-            throw new InvalidArgumentException('Position must be an integer');
+        if ( ! is_int( $pos ) ) {
+            throw new InvalidArgumentException( 'Position must be an integer' );
         }
-        if ($pos < 0 || $pos > 31) {
-            throw new RangeException('Position is out of range [0, 31]');
+        if ( $pos < 0 || $pos > 31 ) {
+            throw new RangeException( 'Position is out of range [0, 31]' );
         }
 
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
+        $bnegative = self::negative( $b );
+        $babs = $b - ( ( (-$bnegative) & $b ) << 1 );
 
         $t = self::ge_precomp_0();
-        for ($i = 0; $i < 8; ++$i) {
+        for ( $i = 0; $i < 8; ++$i ) {
             $t = self::cmov(
                 $t,
                 $base[$pos][$i],
-                self::equal($babs, $i + 1)
+                self::equal( $babs, $i + 1 )
             );
         }
         $minusT = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_copy($t->yminusx),
-            self::fe_copy($t->yplusx),
-            self::fe_neg($t->xy2d)
+            self::fe_copy( $t->yminusx ),
+            self::fe_copy( $t->yplusx ),
+            self::fe_neg( $t->xy2d )
         );
-        return self::cmov($t, $minusT, -$bnegative);
+        return self::cmov( $t, $minusT, -$bnegative );
     }
 
     /**
@@ -1924,17 +1924,17 @@ 
     ) {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
 
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YminusX);
-        $r->Y = self::fe_mul($r->Y, $q->YplusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0 = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->YminusX );
+        $r->Y = self::fe_mul( $r->Y, $q->YplusX );
+        $r->T = self::fe_mul( $q->T2d, $p->T );
+        $r->X = self::fe_mul( $p->Z, $q->Z );
+        $t0 = self::fe_add( $r->X, $r->X );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_sub( $t0, $r->T );
+        $r->T = self::fe_add( $t0, $r->T );
 
         return $r;
     }
@@ -1945,14 +1945,14 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h
      * @return string
      */
-    public static function ge_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h)
+    public static function ge_tobytes( ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h )
     {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
+        $recip = self::fe_invert( $h->Z );
+        $x = self::fe_mul( $h->X, $recip );
+        $y = self::fe_mul( $h->Y, $recip );
+        $s = self::fe_tobytes( $y );
         $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+            self::chrToInt( $s[31] ) ^ ( self::fe_isnegative( $x ) << 7 )
         );
         return $s;
     }
@@ -1979,56 +1979,56 @@ 
          * @var ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp[]
          */
         static $Bi = array();
-        if (!$Bi) {
-            for ($i = 0; $i < 8; ++$i) {
+        if ( ! $Bi ) {
+            for ( $i = 0; $i < 8; ++$i ) {
 
                 $Bi[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
                     ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                         array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][9])
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][0] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][1] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][2] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][3] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][4] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][5] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][6] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][7] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][8] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][0][9] )
                         )
                     ),
                     ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                         array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][9])
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][0] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][1] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][2] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][3] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][4] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][5] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][6] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][7] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][8] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][1][9] )
                         )
                     ),
                     ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                         array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][9])
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][0] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][1] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][2] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][3] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][4] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][5] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][6] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][7] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][8] ),
+                            ParagonIE_Sodium_Core32_Int32::fromInt( self::$base2[$i][2][9] )
                         )
                     )
                 );
             }
         }
-        for ($i = 0; $i < 8; ++$i) {
+        for ( $i = 0; $i < 8; ++$i ) {
             $Ai[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached(
                 self::fe_0(),
                 self::fe_0(),
@@ -2039,14 +2039,14 @@ 
 
         # slide(aslide,a);
         # slide(bslide,b);
-        $aslide = self::slide($a);
-        $bslide = self::slide($b);
+        $aslide = self::slide( $a );
+        $bslide = self::slide( $b );
 
         # ge_p3_to_cached(&Ai[0],A);
         # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
-        $Ai[0] = self::ge_p3_to_cached($A);
-        $t = self::ge_p3_dbl($A);
-        $A2 = self::ge_p1p1_to_p3($t);
+        $Ai[0] = self::ge_p3_to_cached( $A );
+        $t = self::ge_p3_dbl( $A );
+        $A2 = self::ge_p1p1_to_p3( $t );
 
         # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
         # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
@@ -2055,10 +2055,10 @@ 
         # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
         # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
         # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
-        for ($i = 0; $i < 7; ++$i) {
-            $t = self::ge_add($A2, $Ai[$i]);
-            $u = self::ge_p1p1_to_p3($t);
-            $Ai[$i + 1] = self::ge_p3_to_cached($u);
+        for ( $i = 0; $i < 7; ++$i ) {
+            $t = self::ge_add( $A2, $Ai[$i] );
+            $u = self::ge_p1p1_to_p3( $t );
+            $Ai[$i + 1] = self::ge_p3_to_cached( $u );
         }
 
         # ge_p2_0(r);
@@ -2068,31 +2068,31 @@ 
         #     if (aslide[i] || bslide[i]) break;
         # }
         $i = 255;
-        for (; $i >= 0; --$i) {
-            if ($aslide[$i] || $bslide[$i]) {
+        for ( ; $i >= 0; --$i ) {
+            if ( $aslide[$i] || $bslide[$i] ) {
                 break;
             }
         }
 
         # for (;i >= 0;--i) {
-        for (; $i >= 0; --$i) {
+        for ( ; $i >= 0; --$i ) {
             # ge_p2_dbl(&t,r);
-            $t = self::ge_p2_dbl($r);
+            $t = self::ge_p2_dbl( $r );
 
             # if (aslide[i] > 0) {
-            if ($aslide[$i] > 0) {
+            if ( $aslide[$i] > 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_add(&t,&u,&Ai[aslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_add(
                     $u,
-                    $Ai[(int) floor($aslide[$i] / 2)]
+                    $Ai[(int) floor( $aslide[$i] / 2 )]
                 );
                 # } else if (aslide[i] < 0) {
-            } elseif ($aslide[$i] < 0) {
+            } elseif ( $aslide[$i] < 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_sub(
                     $u,
                     $Ai[(int) floor(-$aslide[$i] / 2)]
@@ -2100,20 +2100,20 @@ 
             }
 
             # if (bslide[i] > 0) {
-            if ($bslide[$i] > 0) {
+            if ( $bslide[$i] > 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_madd(&t,&u,&Bi[bslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_madd(
                     $t,
                     $u,
-                    $Bi[(int) floor($bslide[$i] / 2)]
+                    $Bi[(int) floor( $bslide[$i] / 2 )]
                 );
                 # } else if (bslide[i] < 0) {
-            } elseif ($bslide[$i] < 0) {
+            } elseif ( $bslide[$i] < 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_msub(
                     $t,
                     $u,
@@ -2121,7 +2121,7 @@ 
                 );
             }
             # ge_p1p1_to_p2(r,&t);
-            $r = self::ge_p1p1_to_p2($t);
+            $r = self::ge_p1p1_to_p2( $t );
         }
         return $r;
     }
@@ -2132,18 +2132,18 @@ 
      * @param string $a
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
      */
-    public static function ge_scalarmult_base($a)
+    public static function ge_scalarmult_base( $a )
     {
         $e = array();
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
 
-        for ($i = 0; $i < 32; ++$i) {
-            $e[$i << 1] = self::chrToInt($a[$i]) & 15;
-            $e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
+        for ( $i = 0; $i < 32; ++$i ) {
+            $e[$i << 1] = self::chrToInt( $a[$i] ) & 15;
+            $e[( $i << 1 ) + 1] = ( self::chrToInt( $a[$i] ) >> 4 ) & 15;
         }
 
         $carry = 0;
-        for ($i = 0; $i < 63; ++$i) {
+        for ( $i = 0; $i < 63; ++$i ) {
             $e[$i] += $carry;
             $carry = $e[$i] + 8;
             $carry >>= 4;
@@ -2153,27 +2153,27 @@ 
 
         $h = self::ge_p3_0();
 
-        for ($i = 1; $i < 64; $i += 2) {
-            $t = self::ge_select((int) floor($i / 2), $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
+        for ( $i = 1; $i < 64; $i += 2 ) {
+            $t = self::ge_select( (int) floor( $i / 2 ), $e[$i] );
+            $r = self::ge_madd( $r, $h, $t );
+            $h = self::ge_p1p1_to_p3( $r );
         }
 
-        $r = self::ge_p3_dbl($h);
+        $r = self::ge_p3_dbl( $h );
 
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
 
-        $h = self::ge_p1p1_to_p3($r);
+        $h = self::ge_p1p1_to_p3( $r );
 
-        for ($i = 0; $i < 64; $i += 2) {
-            $t = self::ge_select($i >> 1, $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
+        for ( $i = 0; $i < 64; $i += 2 ) {
+            $t = self::ge_select( $i >> 1, $e[$i] );
+            $r = self::ge_madd( $r, $h, $t );
+            $h = self::ge_p1p1_to_p3( $r );
         }
         return $h;
     }
@@ -2189,44 +2189,44 @@ 
      * @param string $c
      * @return string
      */
-    public static function sc_muladd($a, $b, $c)
+    public static function sc_muladd( $a, $b, $c )
     {
-        $a0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 0, 3)))->toInt64();
-        $a1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5))->toInt64();
-        $a2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2))->toInt64();
-        $a3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7))->toInt64();
-        $a4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4))->toInt64();
-        $a5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1))->toInt64();
-        $a6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6))->toInt64();
-        $a7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3))->toInt64();
-        $a8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 21, 3)))->toInt64();
-        $a9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5))->toInt64();
-        $a10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2))->toInt64();
-        $a11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($a, 28, 4)) >> 7))->toInt64();
-        $b0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 0, 3)))->toInt64();
-        $b1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5))->toInt64();
-        $b2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2))->toInt64();
-        $b3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7))->toInt64();
-        $b4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4))->toInt64();
-        $b5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1))->toInt64();
-        $b6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6))->toInt64();
-        $b7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3))->toInt64();
-        $b8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 21, 3)))->toInt64();
-        $b9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5))->toInt64();
-        $b10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2))->toInt64();
-        $b11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($b, 28, 4)) >> 7))->toInt64();
-        $c0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 0, 3)))->toInt64();
-        $c1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5))->toInt64();
-        $c2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2))->toInt64();
-        $c3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7))->toInt64();
-        $c4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4))->toInt64();
-        $c5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1))->toInt64();
-        $c6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6))->toInt64();
-        $c7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3))->toInt64();
-        $c8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 21, 3)))->toInt64();
-        $c9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5))->toInt64();
-        $c10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2))->toInt64();
-        $c11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($c, 28, 4)) >> 7))->toInt64();
+        $a0 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $a, 0, 3 ) ) )->toInt64();
+        $a1 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $a, 2, 4 ) ) >> 5 ) )->toInt64();
+        $a2 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $a, 5, 3 ) ) >> 2 ) )->toInt64();
+        $a3 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $a, 7, 4 ) ) >> 7 ) )->toInt64();
+        $a4 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $a, 10, 4 ) ) >> 4 ) )->toInt64();
+        $a5 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $a, 13, 3 ) ) >> 1 ) )->toInt64();
+        $a6 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $a, 15, 4 ) ) >> 6 ) )->toInt64();
+        $a7 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $a, 18, 3 ) ) >> 3 ) )->toInt64();
+        $a8 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $a, 21, 3 ) ) )->toInt64();
+        $a9 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $a, 23, 4 ) ) >> 5 ) )->toInt64();
+        $a10 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $a, 26, 3 ) ) >> 2 ) )->toInt64();
+        $a11 = ParagonIE_Sodium_Core32_Int32::fromInt( 0x1fffffff & ( self::load_4( self::substr( $a, 28, 4 ) ) >> 7 ) )->toInt64();
+        $b0 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $b, 0, 3 ) ) )->toInt64();
+        $b1 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $b, 2, 4 ) ) >> 5 ) )->toInt64();
+        $b2 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $b, 5, 3 ) ) >> 2 ) )->toInt64();
+        $b3 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $b, 7, 4 ) ) >> 7 ) )->toInt64();
+        $b4 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $b, 10, 4 ) ) >> 4 ) )->toInt64();
+        $b5 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $b, 13, 3 ) ) >> 1 ) )->toInt64();
+        $b6 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $b, 15, 4 ) ) >> 6 ) )->toInt64();
+        $b7 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $b, 18, 3 ) ) >> 3 ) )->toInt64();
+        $b8 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $b, 21, 3 ) ) )->toInt64();
+        $b9 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $b, 23, 4 ) ) >> 5 ) )->toInt64();
+        $b10 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $b, 26, 3 ) ) >> 2 ) )->toInt64();
+        $b11 = ParagonIE_Sodium_Core32_Int32::fromInt( 0x1fffffff & ( self::load_4( self::substr( $b, 28, 4 ) ) >> 7 ) )->toInt64();
+        $c0 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $c, 0, 3 ) ) )->toInt64();
+        $c1 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $c, 2, 4 ) ) >> 5 ) )->toInt64();
+        $c2 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $c, 5, 3 ) ) >> 2 ) )->toInt64();
+        $c3 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $c, 7, 4 ) ) >> 7 ) )->toInt64();
+        $c4 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $c, 10, 4 ) ) >> 4 ) )->toInt64();
+        $c5 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $c, 13, 3 ) ) >> 1 ) )->toInt64();
+        $c6 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $c, 15, 4 ) ) >> 6 ) )->toInt64();
+        $c7 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $c, 18, 3 ) ) >> 3 ) )->toInt64();
+        $c8 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $c, 21, 3 ) ) )->toInt64();
+        $c9 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $c, 23, 4 ) ) >> 5 ) )->toInt64();
+        $c10 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $c, 26, 3 ) ) >> 2 ) )->toInt64();
+        $c11 = ParagonIE_Sodium_Core32_Int32::fromInt( 0x1fffffff & ( self::load_4( self::substr( $c, 28, 4 ) ) >> 7 ) )->toInt64();
 
         /* Can't really avoid the pyramid here: */
         /**
@@ -2256,367 +2256,367 @@ 
          * @var ParagonIE_Sodium_Core32_Int64 $s23
          */
 
-        $s0 = $c0->addInt64($a0->mulInt64($b0));
-        $s1 = $c1->addInt64($a0->mulInt64($b1))->addInt64($a1->mulInt64($b0));
-        $s2 = $c2->addInt64($a0->mulInt64($b2))->addInt64($a1->mulInt64($b1))->addInt64($a2->mulInt64($b0));
-        $s3 = $c3->addInt64($a0->mulInt64($b3))->addInt64($a1->mulInt64($b2))->addInt64($a2->mulInt64($b1))->addInt64($a3->mulInt64($b0));
-        $s4 = $c4->addInt64($a0->mulInt64($b4))->addInt64($a1->mulInt64($b3))->addInt64($a2->mulInt64($b2))->addInt64($a3->mulInt64($b1))->addInt64($a4->mulInt64($b0));
-        $s5 = $c5->addInt64($a0->mulInt64($b5))->addInt64($a1->mulInt64($b4))->addInt64($a2->mulInt64($b3))->addInt64($a3->mulInt64($b2))->addInt64($a4->mulInt64($b1))->addInt64($a5->mulInt64($b0));
-        $s6 = $c6->addInt64($a0->mulInt64($b6))->addInt64($a1->mulInt64($b5))->addInt64($a2->mulInt64($b4))->addInt64($a3->mulInt64($b3))->addInt64($a4->mulInt64($b2))->addInt64($a5->mulInt64($b1))
-                 ->addInt64($a6->mulInt64($b0));
-        $s7 = $c7->addInt64($a0->mulInt64($b7))->addInt64($a1->mulInt64($b6))->addInt64($a2->mulInt64($b5))->addInt64($a3->mulInt64($b4))->addInt64($a4->mulInt64($b3))->addInt64($a5->mulInt64($b2))
-                 ->addInt64($a6->mulInt64($b1))->addInt64($a7->mulInt64($b0));
-        $s8 = $c8->addInt64($a0->mulInt64($b8))->addInt64($a1->mulInt64($b7))->addInt64($a2->mulInt64($b6))->addInt64($a3->mulInt64($b5))->addInt64($a4->mulInt64($b4))->addInt64($a5->mulInt64($b3))
-                 ->addInt64($a6->mulInt64($b2))->addInt64($a7->mulInt64($b1))->addInt64($a8->mulInt64($b0));
-        $s9 = $c9->addInt64($a0->mulInt64($b9))->addInt64($a1->mulInt64($b8))->addInt64($a2->mulInt64($b7))->addInt64($a3->mulInt64($b6))->addInt64($a4->mulInt64($b5))->addInt64($a5->mulInt64($b4))
-                 ->addInt64($a6->mulInt64($b3))->addInt64($a7->mulInt64($b2))->addInt64($a8->mulInt64($b1))->addInt64($a9->mulInt64($b0));
-        $s10 = $c10->addInt64($a0->mulInt64($b10))->addInt64($a1->mulInt64($b9))->addInt64($a2->mulInt64($b8))->addInt64($a3->mulInt64($b7))->addInt64($a4->mulInt64($b6))->addInt64($a5->mulInt64($b5))
-                   ->addInt64($a6->mulInt64($b4))->addInt64($a7->mulInt64($b3))->addInt64($a8->mulInt64($b2))->addInt64($a9->mulInt64($b1))->addInt64($a10->mulInt64($b0));
-        $s11 = $c11->addInt64($a0->mulInt64($b11))->addInt64($a1->mulInt64($b10))->addInt64($a2->mulInt64($b9))->addInt64($a3->mulInt64($b8))->addInt64($a4->mulInt64($b7))->addInt64($a5->mulInt64($b6))
-                   ->addInt64($a6->mulInt64($b5))->addInt64($a7->mulInt64($b4))->addInt64($a8->mulInt64($b3))->addInt64($a9->mulInt64($b2))->addInt64($a10->mulInt64($b1))->addInt64($a11->mulInt64($b0));
-        $s12 = $a1->mulInt64($b11)->addInt64($a2->mulInt64($b10))->addInt64($a3->mulInt64($b9))->addInt64($a4->mulInt64($b8))->addInt64($a5->mulInt64($b7))->addInt64($a6->mulInt64($b6))
-                  ->addInt64($a7->mulInt64($b5))->addInt64($a8->mulInt64($b4))->addInt64($a9->mulInt64($b3))->addInt64($a10->mulInt64($b2))->addInt64($a11->mulInt64($b1));
-        $s13 = $a2->mulInt64($b11)->addInt64($a3->mulInt64($b10))->addInt64($a4->mulInt64($b9))->addInt64($a5->mulInt64($b8))->addInt64($a6->mulInt64($b7))->addInt64($a7->mulInt64($b6))
-                  ->addInt64($a8->mulInt64($b5))->addInt64($a9->mulInt64($b4))->addInt64($a10->mulInt64($b3))->addInt64($a11->mulInt64($b2));
-        $s14 = $a3->mulInt64($b11)->addInt64($a4->mulInt64($b10))->addInt64($a5->mulInt64($b9))->addInt64($a6->mulInt64($b8))->addInt64($a7->mulInt64($b7))->addInt64($a8->mulInt64($b6))
-                  ->addInt64($a9->mulInt64($b5))->addInt64($a10->mulInt64($b4))->addInt64($a11->mulInt64($b3));
-        $s15 = $a4->mulInt64($b11)->addInt64($a5->mulInt64($b10))->addInt64($a6->mulInt64($b9))->addInt64($a7->mulInt64($b8))->addInt64($a8->mulInt64($b7))->addInt64($a9->mulInt64($b6))
-                  ->addInt64($a10->mulInt64($b5))->addInt64($a11->mulInt64($b4));
-        $s16 = $a5->mulInt64($b11)->addInt64($a6->mulInt64($b10))->addInt64($a7->mulInt64($b9))->addInt64($a8->mulInt64($b8))->addInt64($a9->mulInt64($b7))->addInt64($a10->mulInt64($b6))
-                   ->addInt64($a11->mulInt64($b5));
-        $s17 = $a6->mulInt64($b11)->addInt64($a7->mulInt64($b10))->addInt64($a8->mulInt64($b9))->addInt64($a9->mulInt64($b8))->addInt64($a10->mulInt64($b7))->addInt64($a11->mulInt64($b6));
-        $s18 = $a7->mulInt64($b11)->addInt64($a8->mulInt64($b10))->addInt64($a9->mulInt64($b9))->addInt64($a10->mulInt64($b8))->addInt64($a11->mulInt64($b7));
-        $s19 = $a8->mulInt64($b11)->addInt64($a9->mulInt64($b10))->addInt64($a10->mulInt64($b9))->addInt64($a11->mulInt64($b8));
-        $s20 = $a9->mulInt64($b11)->addInt64($a10->mulInt64($b10))->addInt64($a11->mulInt64($b9));
-        $s21 = $a10->mulInt64($b11)->addInt64($a11->mulInt64($b10));
-        $s22 = $a11->mulInt64($b11);
+        $s0 = $c0->addInt64( $a0->mulInt64( $b0 ) );
+        $s1 = $c1->addInt64( $a0->mulInt64( $b1 ) )->addInt64( $a1->mulInt64( $b0 ) );
+        $s2 = $c2->addInt64( $a0->mulInt64( $b2 ) )->addInt64( $a1->mulInt64( $b1 ) )->addInt64( $a2->mulInt64( $b0 ) );
+        $s3 = $c3->addInt64( $a0->mulInt64( $b3 ) )->addInt64( $a1->mulInt64( $b2 ) )->addInt64( $a2->mulInt64( $b1 ) )->addInt64( $a3->mulInt64( $b0 ) );
+        $s4 = $c4->addInt64( $a0->mulInt64( $b4 ) )->addInt64( $a1->mulInt64( $b3 ) )->addInt64( $a2->mulInt64( $b2 ) )->addInt64( $a3->mulInt64( $b1 ) )->addInt64( $a4->mulInt64( $b0 ) );
+        $s5 = $c5->addInt64( $a0->mulInt64( $b5 ) )->addInt64( $a1->mulInt64( $b4 ) )->addInt64( $a2->mulInt64( $b3 ) )->addInt64( $a3->mulInt64( $b2 ) )->addInt64( $a4->mulInt64( $b1 ) )->addInt64( $a5->mulInt64( $b0 ) );
+        $s6 = $c6->addInt64( $a0->mulInt64( $b6 ) )->addInt64( $a1->mulInt64( $b5 ) )->addInt64( $a2->mulInt64( $b4 ) )->addInt64( $a3->mulInt64( $b3 ) )->addInt64( $a4->mulInt64( $b2 ) )->addInt64( $a5->mulInt64( $b1 ) )
+                 ->addInt64( $a6->mulInt64( $b0 ) );
+        $s7 = $c7->addInt64( $a0->mulInt64( $b7 ) )->addInt64( $a1->mulInt64( $b6 ) )->addInt64( $a2->mulInt64( $b5 ) )->addInt64( $a3->mulInt64( $b4 ) )->addInt64( $a4->mulInt64( $b3 ) )->addInt64( $a5->mulInt64( $b2 ) )
+                 ->addInt64( $a6->mulInt64( $b1 ) )->addInt64( $a7->mulInt64( $b0 ) );
+        $s8 = $c8->addInt64( $a0->mulInt64( $b8 ) )->addInt64( $a1->mulInt64( $b7 ) )->addInt64( $a2->mulInt64( $b6 ) )->addInt64( $a3->mulInt64( $b5 ) )->addInt64( $a4->mulInt64( $b4 ) )->addInt64( $a5->mulInt64( $b3 ) )
+                 ->addInt64( $a6->mulInt64( $b2 ) )->addInt64( $a7->mulInt64( $b1 ) )->addInt64( $a8->mulInt64( $b0 ) );
+        $s9 = $c9->addInt64( $a0->mulInt64( $b9 ) )->addInt64( $a1->mulInt64( $b8 ) )->addInt64( $a2->mulInt64( $b7 ) )->addInt64( $a3->mulInt64( $b6 ) )->addInt64( $a4->mulInt64( $b5 ) )->addInt64( $a5->mulInt64( $b4 ) )
+                 ->addInt64( $a6->mulInt64( $b3 ) )->addInt64( $a7->mulInt64( $b2 ) )->addInt64( $a8->mulInt64( $b1 ) )->addInt64( $a9->mulInt64( $b0 ) );
+        $s10 = $c10->addInt64( $a0->mulInt64( $b10 ) )->addInt64( $a1->mulInt64( $b9 ) )->addInt64( $a2->mulInt64( $b8 ) )->addInt64( $a3->mulInt64( $b7 ) )->addInt64( $a4->mulInt64( $b6 ) )->addInt64( $a5->mulInt64( $b5 ) )
+                   ->addInt64( $a6->mulInt64( $b4 ) )->addInt64( $a7->mulInt64( $b3 ) )->addInt64( $a8->mulInt64( $b2 ) )->addInt64( $a9->mulInt64( $b1 ) )->addInt64( $a10->mulInt64( $b0 ) );
+        $s11 = $c11->addInt64( $a0->mulInt64( $b11 ) )->addInt64( $a1->mulInt64( $b10 ) )->addInt64( $a2->mulInt64( $b9 ) )->addInt64( $a3->mulInt64( $b8 ) )->addInt64( $a4->mulInt64( $b7 ) )->addInt64( $a5->mulInt64( $b6 ) )
+                   ->addInt64( $a6->mulInt64( $b5 ) )->addInt64( $a7->mulInt64( $b4 ) )->addInt64( $a8->mulInt64( $b3 ) )->addInt64( $a9->mulInt64( $b2 ) )->addInt64( $a10->mulInt64( $b1 ) )->addInt64( $a11->mulInt64( $b0 ) );
+        $s12 = $a1->mulInt64( $b11 )->addInt64( $a2->mulInt64( $b10 ) )->addInt64( $a3->mulInt64( $b9 ) )->addInt64( $a4->mulInt64( $b8 ) )->addInt64( $a5->mulInt64( $b7 ) )->addInt64( $a6->mulInt64( $b6 ) )
+                  ->addInt64( $a7->mulInt64( $b5 ) )->addInt64( $a8->mulInt64( $b4 ) )->addInt64( $a9->mulInt64( $b3 ) )->addInt64( $a10->mulInt64( $b2 ) )->addInt64( $a11->mulInt64( $b1 ) );
+        $s13 = $a2->mulInt64( $b11 )->addInt64( $a3->mulInt64( $b10 ) )->addInt64( $a4->mulInt64( $b9 ) )->addInt64( $a5->mulInt64( $b8 ) )->addInt64( $a6->mulInt64( $b7 ) )->addInt64( $a7->mulInt64( $b6 ) )
+                  ->addInt64( $a8->mulInt64( $b5 ) )->addInt64( $a9->mulInt64( $b4 ) )->addInt64( $a10->mulInt64( $b3 ) )->addInt64( $a11->mulInt64( $b2 ) );
+        $s14 = $a3->mulInt64( $b11 )->addInt64( $a4->mulInt64( $b10 ) )->addInt64( $a5->mulInt64( $b9 ) )->addInt64( $a6->mulInt64( $b8 ) )->addInt64( $a7->mulInt64( $b7 ) )->addInt64( $a8->mulInt64( $b6 ) )
+                  ->addInt64( $a9->mulInt64( $b5 ) )->addInt64( $a10->mulInt64( $b4 ) )->addInt64( $a11->mulInt64( $b3 ) );
+        $s15 = $a4->mulInt64( $b11 )->addInt64( $a5->mulInt64( $b10 ) )->addInt64( $a6->mulInt64( $b9 ) )->addInt64( $a7->mulInt64( $b8 ) )->addInt64( $a8->mulInt64( $b7 ) )->addInt64( $a9->mulInt64( $b6 ) )
+                  ->addInt64( $a10->mulInt64( $b5 ) )->addInt64( $a11->mulInt64( $b4 ) );
+        $s16 = $a5->mulInt64( $b11 )->addInt64( $a6->mulInt64( $b10 ) )->addInt64( $a7->mulInt64( $b9 ) )->addInt64( $a8->mulInt64( $b8 ) )->addInt64( $a9->mulInt64( $b7 ) )->addInt64( $a10->mulInt64( $b6 ) )
+                   ->addInt64( $a11->mulInt64( $b5 ) );
+        $s17 = $a6->mulInt64( $b11 )->addInt64( $a7->mulInt64( $b10 ) )->addInt64( $a8->mulInt64( $b9 ) )->addInt64( $a9->mulInt64( $b8 ) )->addInt64( $a10->mulInt64( $b7 ) )->addInt64( $a11->mulInt64( $b6 ) );
+        $s18 = $a7->mulInt64( $b11 )->addInt64( $a8->mulInt64( $b10 ) )->addInt64( $a9->mulInt64( $b9 ) )->addInt64( $a10->mulInt64( $b8 ) )->addInt64( $a11->mulInt64( $b7 ) );
+        $s19 = $a8->mulInt64( $b11 )->addInt64( $a9->mulInt64( $b10 ) )->addInt64( $a10->mulInt64( $b9 ) )->addInt64( $a11->mulInt64( $b8 ) );
+        $s20 = $a9->mulInt64( $b11 )->addInt64( $a10->mulInt64( $b10 ) )->addInt64( $a11->mulInt64( $b9 ) );
+        $s21 = $a10->mulInt64( $b11 )->addInt64( $a11->mulInt64( $b10 ) );
+        $s22 = $a11->mulInt64( $b11 );
         $s23 = new ParagonIE_Sodium_Core32_Int64();
 
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-        $carry18 = $s18->addInt(1 << 20)->shiftRight(21);
-        $s19 = $s19->addInt64($carry18);
-        $s18 = $s18->subInt64($carry18->shiftLeft(21));
-        $carry20 = $s20->addInt(1 << 20)->shiftRight(21);
-        $s21 = $s21->addInt64($carry20);
-        $s20 = $s20->subInt64($carry20->shiftLeft(21));
-        $carry22 = $s22->addInt(1 << 20)->shiftRight(21);
-        $s23 = $s23->addInt64($carry22);
-        $s22 = $s22->subInt64($carry22->shiftLeft(21));
-
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-        $carry17 = $s17->addInt(1 << 20)->shiftRight(21);
-        $s18 = $s18->addInt64($carry17);
-        $s17 = $s17->subInt64($carry17->shiftLeft(21));
-        $carry19 = $s19->addInt(1 << 20)->shiftRight(21);
-        $s20 = $s20->addInt64($carry19);
-        $s19 = $s19->subInt64($carry19->shiftLeft(21));
-        $carry21 = $s21->addInt(1 << 20)->shiftRight(21);
-        $s22 = $s22->addInt64($carry21);
-        $s21 = $s21->subInt64($carry21->shiftLeft(21));
-
-        $s11 = $s11->addInt64($s23->mulInt(666643));
-        $s12 = $s12->addInt64($s23->mulInt(470296));
-        $s13 = $s13->addInt64($s23->mulInt(654183));
-        $s14 = $s14->subInt64($s23->mulInt(997805));
-        $s15 = $s15->addInt64($s23->mulInt(136657));
-        $s16 = $s16->subInt64($s23->mulInt(683901));
-
-        $s10 = $s10->addInt64($s22->mulInt(666643));
-        $s11 = $s11->addInt64($s22->mulInt(470296));
-        $s12 = $s12->addInt64($s22->mulInt(654183));
-        $s13 = $s13->subInt64($s22->mulInt(997805));
-        $s14 = $s14->addInt64($s22->mulInt(136657));
-        $s15 = $s15->subInt64($s22->mulInt(683901));
-
-        $s9  =  $s9->addInt64($s21->mulInt(666643));
-        $s10 = $s10->addInt64($s21->mulInt(470296));
-        $s11 = $s11->addInt64($s21->mulInt(654183));
-        $s12 = $s12->subInt64($s21->mulInt(997805));
-        $s13 = $s13->addInt64($s21->mulInt(136657));
-        $s14 = $s14->subInt64($s21->mulInt(683901));
-
-        $s8  =  $s8->addInt64($s20->mulInt(666643));
-        $s9  =  $s9->addInt64($s20->mulInt(470296));
-        $s10 = $s10->addInt64($s20->mulInt(654183));
-        $s11 = $s11->subInt64($s20->mulInt(997805));
-        $s12 = $s12->addInt64($s20->mulInt(136657));
-        $s13 = $s13->subInt64($s20->mulInt(683901));
-
-        $s7  =  $s7->addInt64($s19->mulInt(666643));
-        $s8  =  $s8->addInt64($s19->mulInt(470296));
-        $s9  =  $s9->addInt64($s19->mulInt(654183));
-        $s10 = $s10->subInt64($s19->mulInt(997805));
-        $s11 = $s11->addInt64($s19->mulInt(136657));
-        $s12 = $s12->subInt64($s19->mulInt(683901));
-
-        $s6  =  $s6->addInt64($s18->mulInt(666643));
-        $s7  =  $s7->addInt64($s18->mulInt(470296));
-        $s8  =  $s8->addInt64($s18->mulInt(654183));
-        $s9  =  $s9->subInt64($s18->mulInt(997805));
-        $s10 = $s10->addInt64($s18->mulInt(136657));
-        $s11 = $s11->subInt64($s18->mulInt(683901));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt64($s17->mulInt(666643));
-        $s6  =  $s6->addInt64($s17->mulInt(470296));
-        $s7  =  $s7->addInt64($s17->mulInt(654183));
-        $s8  =  $s8->subInt64($s17->mulInt(997805));
-        $s9  =  $s9->addInt64($s17->mulInt(136657));
-        $s10 = $s10->subInt64($s17->mulInt(683901));
-
-        $s4  =  $s4->addInt64($s16->mulInt(666643));
-        $s5  =  $s5->addInt64($s16->mulInt(470296));
-        $s6  =  $s6->addInt64($s16->mulInt(654183));
-        $s7  =  $s7->subInt64($s16->mulInt(997805));
-        $s8  =  $s8->addInt64($s16->mulInt(136657));
-        $s9  =  $s9->subInt64($s16->mulInt(683901));
-
-        $s3  =  $s3->addInt64($s15->mulInt(666643));
-        $s4  =  $s4->addInt64($s15->mulInt(470296));
-        $s5  =  $s5->addInt64($s15->mulInt(654183));
-        $s6  =  $s6->subInt64($s15->mulInt(997805));
-        $s7  =  $s7->addInt64($s15->mulInt(136657));
-        $s8  =  $s8->subInt64($s15->mulInt(683901));
-
-        $s2  =  $s2->addInt64($s14->mulInt(666643));
-        $s3  =  $s3->addInt64($s14->mulInt(470296));
-        $s4  =  $s4->addInt64($s14->mulInt(654183));
-        $s5  =  $s5->subInt64($s14->mulInt(997805));
-        $s6  =  $s6->addInt64($s14->mulInt(136657));
-        $s7  =  $s7->subInt64($s14->mulInt(683901));
-
-        $s1  =  $s1->addInt64($s13->mulInt(666643));
-        $s2  =  $s2->addInt64($s13->mulInt(470296));
-        $s3  =  $s3->addInt64($s13->mulInt(654183));
-        $s4  =  $s4->subInt64($s13->mulInt(997805));
-        $s5  =  $s5->addInt64($s13->mulInt(136657));
-        $s6  =  $s6->subInt64($s13->mulInt(683901));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
+        $carry0 = $s0->addInt( 1 << 20 )->shiftRight( 21 );
+        $s1 = $s1->addInt64( $carry0 );
+        $s0 = $s0->subInt64( $carry0->shiftLeft( 21 ) );
+        $carry2 = $s2->addInt( 1 << 20 )->shiftRight( 21 );
+        $s3 = $s3->addInt64( $carry2 );
+        $s2 = $s2->subInt64( $carry2->shiftLeft( 21 ) );
+        $carry4 = $s4->addInt( 1 << 20 )->shiftRight( 21 );
+        $s5 = $s5->addInt64( $carry4 );
+        $s4 = $s4->subInt64( $carry4->shiftLeft( 21 ) );
+        $carry6 = $s6->addInt( 1 << 20 )->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry8 = $s8->addInt( 1 << 20 )->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry10 = $s10->addInt( 1 << 20 )->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+        $carry12 = $s12->addInt( 1 << 20 )->shiftRight( 21 );
+        $s13 = $s13->addInt64( $carry12 );
+        $s12 = $s12->subInt64( $carry12->shiftLeft( 21 ) );
+        $carry14 = $s14->addInt( 1 << 20 )->shiftRight( 21 );
+        $s15 = $s15->addInt64( $carry14 );
+        $s14 = $s14->subInt64( $carry14->shiftLeft( 21 ) );
+        $carry16 = $s16->addInt( 1 << 20 )->shiftRight( 21 );
+        $s17 = $s17->addInt64( $carry16 );
+        $s16 = $s16->subInt64( $carry16->shiftLeft( 21 ) );
+        $carry18 = $s18->addInt( 1 << 20 )->shiftRight( 21 );
+        $s19 = $s19->addInt64( $carry18 );
+        $s18 = $s18->subInt64( $carry18->shiftLeft( 21 ) );
+        $carry20 = $s20->addInt( 1 << 20 )->shiftRight( 21 );
+        $s21 = $s21->addInt64( $carry20 );
+        $s20 = $s20->subInt64( $carry20->shiftLeft( 21 ) );
+        $carry22 = $s22->addInt( 1 << 20 )->shiftRight( 21 );
+        $s23 = $s23->addInt64( $carry22 );
+        $s22 = $s22->subInt64( $carry22->shiftLeft( 21 ) );
+
+        $carry1 = $s1->addInt( 1 << 20 )->shiftRight( 21 );
+        $s2 = $s2->addInt64( $carry1 );
+        $s1 = $s1->subInt64( $carry1->shiftLeft( 21 ) );
+        $carry3 = $s3->addInt( 1 << 20 )->shiftRight( 21 );
+        $s4 = $s4->addInt64( $carry3 );
+        $s3 = $s3->subInt64( $carry3->shiftLeft( 21 ) );
+        $carry5 = $s5->addInt( 1 << 20 )->shiftRight( 21 );
+        $s6 = $s6->addInt64( $carry5 );
+        $s5 = $s5->subInt64( $carry5->shiftLeft( 21 ) );
+        $carry7 = $s7->addInt( 1 << 20 )->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry9 = $s9->addInt( 1 << 20 )->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry11 = $s11->addInt( 1 << 20 )->shiftRight( 21 );
+        $s12 = $s12->addInt64( $carry11 );
+        $s11 = $s11->subInt64( $carry11->shiftLeft( 21 ) );
+        $carry13 = $s13->addInt( 1 << 20 )->shiftRight( 21 );
+        $s14 = $s14->addInt64( $carry13 );
+        $s13 = $s13->subInt64( $carry13->shiftLeft( 21 ) );
+        $carry15 = $s15->addInt( 1 << 20 )->shiftRight( 21 );
+        $s16 = $s16->addInt64( $carry15 );
+        $s15 = $s15->subInt64( $carry15->shiftLeft( 21 ) );
+        $carry17 = $s17->addInt( 1 << 20 )->shiftRight( 21 );
+        $s18 = $s18->addInt64( $carry17 );
+        $s17 = $s17->subInt64( $carry17->shiftLeft( 21 ) );
+        $carry19 = $s19->addInt( 1 << 20 )->shiftRight( 21 );
+        $s20 = $s20->addInt64( $carry19 );
+        $s19 = $s19->subInt64( $carry19->shiftLeft( 21 ) );
+        $carry21 = $s21->addInt( 1 << 20 )->shiftRight( 21 );
+        $s22 = $s22->addInt64( $carry21 );
+        $s21 = $s21->subInt64( $carry21->shiftLeft( 21 ) );
+
+        $s11 = $s11->addInt64( $s23->mulInt( 666643 ) );
+        $s12 = $s12->addInt64( $s23->mulInt( 470296 ) );
+        $s13 = $s13->addInt64( $s23->mulInt( 654183 ) );
+        $s14 = $s14->subInt64( $s23->mulInt( 997805 ) );
+        $s15 = $s15->addInt64( $s23->mulInt( 136657 ) );
+        $s16 = $s16->subInt64( $s23->mulInt( 683901 ) );
+
+        $s10 = $s10->addInt64( $s22->mulInt( 666643 ) );
+        $s11 = $s11->addInt64( $s22->mulInt( 470296 ) );
+        $s12 = $s12->addInt64( $s22->mulInt( 654183 ) );
+        $s13 = $s13->subInt64( $s22->mulInt( 997805 ) );
+        $s14 = $s14->addInt64( $s22->mulInt( 136657 ) );
+        $s15 = $s15->subInt64( $s22->mulInt( 683901 ) );
+
+        $s9  = $s9->addInt64( $s21->mulInt( 666643 ) );
+        $s10 = $s10->addInt64( $s21->mulInt( 470296 ) );
+        $s11 = $s11->addInt64( $s21->mulInt( 654183 ) );
+        $s12 = $s12->subInt64( $s21->mulInt( 997805 ) );
+        $s13 = $s13->addInt64( $s21->mulInt( 136657 ) );
+        $s14 = $s14->subInt64( $s21->mulInt( 683901 ) );
+
+        $s8  = $s8->addInt64( $s20->mulInt( 666643 ) );
+        $s9  = $s9->addInt64( $s20->mulInt( 470296 ) );
+        $s10 = $s10->addInt64( $s20->mulInt( 654183 ) );
+        $s11 = $s11->subInt64( $s20->mulInt( 997805 ) );
+        $s12 = $s12->addInt64( $s20->mulInt( 136657 ) );
+        $s13 = $s13->subInt64( $s20->mulInt( 683901 ) );
+
+        $s7  = $s7->addInt64( $s19->mulInt( 666643 ) );
+        $s8  = $s8->addInt64( $s19->mulInt( 470296 ) );
+        $s9  = $s9->addInt64( $s19->mulInt( 654183 ) );
+        $s10 = $s10->subInt64( $s19->mulInt( 997805 ) );
+        $s11 = $s11->addInt64( $s19->mulInt( 136657 ) );
+        $s12 = $s12->subInt64( $s19->mulInt( 683901 ) );
+
+        $s6  = $s6->addInt64( $s18->mulInt( 666643 ) );
+        $s7  = $s7->addInt64( $s18->mulInt( 470296 ) );
+        $s8  = $s8->addInt64( $s18->mulInt( 654183 ) );
+        $s9  = $s9->subInt64( $s18->mulInt( 997805 ) );
+        $s10 = $s10->addInt64( $s18->mulInt( 136657 ) );
+        $s11 = $s11->subInt64( $s18->mulInt( 683901 ) );
+
+        $carry6 = $s6->addInt( 1 << 20 )->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry8 = $s8->addInt( 1 << 20 )->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry10 = $s10->addInt( 1 << 20 )->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+        $carry12 = $s12->addInt( 1 << 20 )->shiftRight( 21 );
+        $s13 = $s13->addInt64( $carry12 );
+        $s12 = $s12->subInt64( $carry12->shiftLeft( 21 ) );
+        $carry14 = $s14->addInt( 1 << 20 )->shiftRight( 21 );
+        $s15 = $s15->addInt64( $carry14 );
+        $s14 = $s14->subInt64( $carry14->shiftLeft( 21 ) );
+        $carry16 = $s16->addInt( 1 << 20 )->shiftRight( 21 );
+        $s17 = $s17->addInt64( $carry16 );
+        $s16 = $s16->subInt64( $carry16->shiftLeft( 21 ) );
+
+        $carry7 = $s7->addInt( 1 << 20 )->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry9 = $s9->addInt( 1 << 20 )->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry11 = $s11->addInt( 1 << 20 )->shiftRight( 21 );
+        $s12 = $s12->addInt64( $carry11 );
+        $s11 = $s11->subInt64( $carry11->shiftLeft( 21 ) );
+        $carry13 = $s13->addInt( 1 << 20 )->shiftRight( 21 );
+        $s14 = $s14->addInt64( $carry13 );
+        $s13 = $s13->subInt64( $carry13->shiftLeft( 21 ) );
+        $carry15 = $s15->addInt( 1 << 20 )->shiftRight( 21 );
+        $s16 = $s16->addInt64( $carry15 );
+        $s15 = $s15->subInt64( $carry15->shiftLeft( 21 ) );
+
+        $s5  = $s5->addInt64( $s17->mulInt( 666643 ) );
+        $s6  = $s6->addInt64( $s17->mulInt( 470296 ) );
+        $s7  = $s7->addInt64( $s17->mulInt( 654183 ) );
+        $s8  = $s8->subInt64( $s17->mulInt( 997805 ) );
+        $s9  = $s9->addInt64( $s17->mulInt( 136657 ) );
+        $s10 = $s10->subInt64( $s17->mulInt( 683901 ) );
+
+        $s4  = $s4->addInt64( $s16->mulInt( 666643 ) );
+        $s5  = $s5->addInt64( $s16->mulInt( 470296 ) );
+        $s6  = $s6->addInt64( $s16->mulInt( 654183 ) );
+        $s7  = $s7->subInt64( $s16->mulInt( 997805 ) );
+        $s8  = $s8->addInt64( $s16->mulInt( 136657 ) );
+        $s9  = $s9->subInt64( $s16->mulInt( 683901 ) );
+
+        $s3  = $s3->addInt64( $s15->mulInt( 666643 ) );
+        $s4  = $s4->addInt64( $s15->mulInt( 470296 ) );
+        $s5  = $s5->addInt64( $s15->mulInt( 654183 ) );
+        $s6  = $s6->subInt64( $s15->mulInt( 997805 ) );
+        $s7  = $s7->addInt64( $s15->mulInt( 136657 ) );
+        $s8  = $s8->subInt64( $s15->mulInt( 683901 ) );
+
+        $s2  = $s2->addInt64( $s14->mulInt( 666643 ) );
+        $s3  = $s3->addInt64( $s14->mulInt( 470296 ) );
+        $s4  = $s4->addInt64( $s14->mulInt( 654183 ) );
+        $s5  = $s5->subInt64( $s14->mulInt( 997805 ) );
+        $s6  = $s6->addInt64( $s14->mulInt( 136657 ) );
+        $s7  = $s7->subInt64( $s14->mulInt( 683901 ) );
+
+        $s1  = $s1->addInt64( $s13->mulInt( 666643 ) );
+        $s2  = $s2->addInt64( $s13->mulInt( 470296 ) );
+        $s3  = $s3->addInt64( $s13->mulInt( 654183 ) );
+        $s4  = $s4->subInt64( $s13->mulInt( 997805 ) );
+        $s5  = $s5->addInt64( $s13->mulInt( 136657 ) );
+        $s6  = $s6->subInt64( $s13->mulInt( 683901 ) );
+
+        $s0  = $s0->addInt64( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt64( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt64( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt64( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt64( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt64( $s12->mulInt( 683901 ) );
         $s12 = new ParagonIE_Sodium_Core32_Int64();
 
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
+        $carry0 = $s0->addInt( 1 << 20 )->shiftRight( 21 );
+        $s1 = $s1->addInt64( $carry0 );
+        $s0 = $s0->subInt64( $carry0->shiftLeft( 21 ) );
+        $carry2 = $s2->addInt( 1 << 20 )->shiftRight( 21 );
+        $s3 = $s3->addInt64( $carry2 );
+        $s2 = $s2->subInt64( $carry2->shiftLeft( 21 ) );
+        $carry4 = $s4->addInt( 1 << 20 )->shiftRight( 21 );
+        $s5 = $s5->addInt64( $carry4 );
+        $s4 = $s4->subInt64( $carry4->shiftLeft( 21 ) );
+        $carry6 = $s6->addInt( 1 << 20 )->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry8 = $s8->addInt( 1 << 20 )->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry10 = $s10->addInt( 1 << 20 )->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+
+        $carry1 = $s1->addInt( 1 << 20 )->shiftRight( 21 );
+        $s2 = $s2->addInt64( $carry1 );
+        $s1 = $s1->subInt64( $carry1->shiftLeft( 21 ) );
+        $carry3 = $s3->addInt( 1 << 20 )->shiftRight( 21 );
+        $s4 = $s4->addInt64( $carry3 );
+        $s3 = $s3->subInt64( $carry3->shiftLeft( 21 ) );
+        $carry5 = $s5->addInt( 1 << 20 )->shiftRight( 21 );
+        $s6 = $s6->addInt64( $carry5 );
+        $s5 = $s5->subInt64( $carry5->shiftLeft( 21 ) );
+        $carry7 = $s7->addInt( 1 << 20 )->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry9 = $s9->addInt( 1 << 20 )->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry11 = $s11->addInt( 1 << 20 )->shiftRight( 21 );
+        $s12 = $s12->addInt64( $carry11 );
+        $s11 = $s11->subInt64( $carry11->shiftLeft( 21 ) );
+
+        $s0  = $s0->addInt64( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt64( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt64( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt64( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt64( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt64( $s12->mulInt( 683901 ) );
         $s12 = new ParagonIE_Sodium_Core32_Int64();
 
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s10->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $S0  =  $s0->toInt32()->toInt();
-        $S1  =  $s1->toInt32()->toInt();
-        $S2  =  $s2->toInt32()->toInt();
-        $S3  =  $s3->toInt32()->toInt();
-        $S4  =  $s4->toInt32()->toInt();
-        $S5  =  $s5->toInt32()->toInt();
-        $S6  =  $s6->toInt32()->toInt();
-        $S7  =  $s7->toInt32()->toInt();
-        $S8  =  $s8->toInt32()->toInt();
-        $S9  =  $s9->toInt32()->toInt();
+        $carry0 = $s0->shiftRight( 21 );
+        $s1 = $s1->addInt64( $carry0 );
+        $s0 = $s0->subInt64( $carry0->shiftLeft( 21 ) );
+        $carry1 = $s1->shiftRight( 21 );
+        $s2 = $s2->addInt64( $carry1 );
+        $s1 = $s1->subInt64( $carry1->shiftLeft( 21 ) );
+        $carry2 = $s2->shiftRight( 21 );
+        $s3 = $s3->addInt64( $carry2 );
+        $s2 = $s2->subInt64( $carry2->shiftLeft( 21 ) );
+        $carry3 = $s3->shiftRight( 21 );
+        $s4 = $s4->addInt64( $carry3 );
+        $s3 = $s3->subInt64( $carry3->shiftLeft( 21 ) );
+        $carry4 = $s4->shiftRight( 21 );
+        $s5 = $s5->addInt64( $carry4 );
+        $s4 = $s4->subInt64( $carry4->shiftLeft( 21 ) );
+        $carry5 = $s5->shiftRight( 21 );
+        $s6 = $s6->addInt64( $carry5 );
+        $s5 = $s5->subInt64( $carry5->shiftLeft( 21 ) );
+        $carry6 = $s6->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry7 = $s7->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry8 = $s8->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry9 = $s9->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry10 = $s10->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+        $carry11 = $s11->shiftRight( 21 );
+        $s12 = $s12->addInt64( $carry11 );
+        $s11 = $s11->subInt64( $carry11->shiftLeft( 21 ) );
+
+        $s0  = $s0->addInt64( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt64( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt64( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt64( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt64( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt64( $s12->mulInt( 683901 ) );
+
+        $carry0 = $s0->shiftRight( 21 );
+        $s1 = $s1->addInt64( $carry0 );
+        $s0 = $s0->subInt64( $carry0->shiftLeft( 21 ) );
+        $carry1 = $s1->shiftRight( 21 );
+        $s2 = $s2->addInt64( $carry1 );
+        $s1 = $s1->subInt64( $carry1->shiftLeft( 21 ) );
+        $carry2 = $s2->shiftRight( 21 );
+        $s3 = $s3->addInt64( $carry2 );
+        $s2 = $s2->subInt64( $carry2->shiftLeft( 21 ) );
+        $carry3 = $s3->shiftRight( 21 );
+        $s4 = $s4->addInt64( $carry3 );
+        $s3 = $s3->subInt64( $carry3->shiftLeft( 21 ) );
+        $carry4 = $s4->shiftRight( 21 );
+        $s5 = $s5->addInt64( $carry4 );
+        $s4 = $s4->subInt64( $carry4->shiftLeft( 21 ) );
+        $carry5 = $s5->shiftRight( 21 );
+        $s6 = $s6->addInt64( $carry5 );
+        $s5 = $s5->subInt64( $carry5->shiftLeft( 21 ) );
+        $carry6 = $s6->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry7 = $s7->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry8 = $s10->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry9 = $s9->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry10 = $s10->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+
+        $S0  = $s0->toInt32()->toInt();
+        $S1  = $s1->toInt32()->toInt();
+        $S2  = $s2->toInt32()->toInt();
+        $S3  = $s3->toInt32()->toInt();
+        $S4  = $s4->toInt32()->toInt();
+        $S5  = $s5->toInt32()->toInt();
+        $S6  = $s6->toInt32()->toInt();
+        $S7  = $s7->toInt32()->toInt();
+        $S8  = $s8->toInt32()->toInt();
+        $S9  = $s9->toInt32()->toInt();
         $S10 = $s10->toInt32()->toInt();
         $S11 = $s11->toInt32()->toInt();
         
@@ -2624,40 +2624,40 @@ 
          * @var array<int, int>
          */
         $arr = array(
-            (int) (0xff & ($S0 >> 0)),
-            (int) (0xff & ($S0 >> 8)),
-            (int) (0xff & (($S0 >> 16) | self::mul($S1, 1 << 5))),
-            (int) (0xff & ($S1 >> 3)),
-            (int) (0xff & ($S1 >> 11)),
-            (int) (0xff & (($S1 >> 19) | self::mul($S2, 1 << 2))),
-            (int) (0xff & ($S2 >> 6)),
-            (int) (0xff & (($S2 >> 14) | self::mul($S3, 1 << 7))),
-            (int) (0xff & ($S3 >> 1)),
-            (int) (0xff & ($S3 >> 9)),
-            (int) (0xff & (($S3 >> 17) | self::mul($S4, 1 << 4))),
-            (int) (0xff & ($S4 >> 4)),
-            (int) (0xff & ($S4 >> 12)),
-            (int) (0xff & (($S4 >> 20) | self::mul($S5, 1 << 1))),
-            (int) (0xff & ($S5 >> 7)),
-            (int) (0xff & (($S5 >> 15) | self::mul($S6, 1 << 6))),
-            (int) (0xff & ($S6 >> 2)),
-            (int) (0xff & ($S6 >> 10)),
-            (int) (0xff & (($S6 >> 18) | self::mul($S7, 1 << 3))),
-            (int) (0xff & ($S7 >> 5)),
-            (int) (0xff & ($S7 >> 13)),
-            (int) (0xff & ($S8 >> 0)),
-            (int) (0xff & ($S8 >> 8)),
-            (int) (0xff & (($S8 >> 16) | self::mul($S9, 1 << 5))),
-            (int) (0xff & ($S9 >> 3)),
-            (int) (0xff & ($S9 >> 11)),
-            (int) (0xff & (($S9 >> 19) | self::mul($S10, 1 << 2))),
-            (int) (0xff & ($S10 >> 6)),
-            (int) (0xff & (($S10 >> 14) | self::mul($S11, 1 << 7))),
-            (int) (0xff & ($S11 >> 1)),
-            (int) (0xff & ($S11 >> 9)),
-            (int) (0xff & ($S11 >> 17))
+            (int) ( 0xff & ( $S0 >> 0 ) ),
+            (int) ( 0xff & ( $S0 >> 8 ) ),
+            (int) ( 0xff & ( ( $S0 >> 16 ) | self::mul( $S1, 1 << 5 ) ) ),
+            (int) ( 0xff & ( $S1 >> 3 ) ),
+            (int) ( 0xff & ( $S1 >> 11 ) ),
+            (int) ( 0xff & ( ( $S1 >> 19 ) | self::mul( $S2, 1 << 2 ) ) ),
+            (int) ( 0xff & ( $S2 >> 6 ) ),
+            (int) ( 0xff & ( ( $S2 >> 14 ) | self::mul( $S3, 1 << 7 ) ) ),
+            (int) ( 0xff & ( $S3 >> 1 ) ),
+            (int) ( 0xff & ( $S3 >> 9 ) ),
+            (int) ( 0xff & ( ( $S3 >> 17 ) | self::mul( $S4, 1 << 4 ) ) ),
+            (int) ( 0xff & ( $S4 >> 4 ) ),
+            (int) ( 0xff & ( $S4 >> 12 ) ),
+            (int) ( 0xff & ( ( $S4 >> 20 ) | self::mul( $S5, 1 << 1 ) ) ),
+            (int) ( 0xff & ( $S5 >> 7 ) ),
+            (int) ( 0xff & ( ( $S5 >> 15 ) | self::mul( $S6, 1 << 6 ) ) ),
+            (int) ( 0xff & ( $S6 >> 2 ) ),
+            (int) ( 0xff & ( $S6 >> 10 ) ),
+            (int) ( 0xff & ( ( $S6 >> 18 ) | self::mul( $S7, 1 << 3 ) ) ),
+            (int) ( 0xff & ( $S7 >> 5 ) ),
+            (int) ( 0xff & ( $S7 >> 13 ) ),
+            (int) ( 0xff & ( $S8 >> 0 ) ),
+            (int) ( 0xff & ( $S8 >> 8 ) ),
+            (int) ( 0xff & ( ( $S8 >> 16 ) | self::mul( $S9, 1 << 5 ) ) ),
+            (int) ( 0xff & ( $S9 >> 3 ) ),
+            (int) ( 0xff & ( $S9 >> 11 ) ),
+            (int) ( 0xff & ( ( $S9 >> 19 ) | self::mul( $S10, 1 << 2 ) ) ),
+            (int) ( 0xff & ( $S10 >> 6 ) ),
+            (int) ( 0xff & ( ( $S10 >> 14 ) | self::mul( $S11, 1 << 7 ) ) ),
+            (int) ( 0xff & ( $S11 >> 1 ) ),
+            (int) ( 0xff & ( $S11 >> 9 ) ),
+            (int) ( 0xff & ( $S11 >> 17 ) )
         );
-        return self::intArrayToString($arr);
+        return self::intArrayToString( $arr );
     }
 
     /**
@@ -2666,7 +2666,7 @@ 
      * @param string $s
      * @return string
      */
-    public static function sc_reduce($s)
+    public static function sc_reduce( $s )
     {
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $s0
@@ -2694,273 +2694,273 @@ 
          * @var ParagonIE_Sodium_Core32_Int64 $s22
          * @var ParagonIE_Sodium_Core32_Int64 $s23
          */
-        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)))->toInt64();
-        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5))->toInt64();
-        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2))->toInt64();
-        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7))->toInt64();
-        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4))->toInt64();
-        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1))->toInt64();
-        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6))->toInt64();
-        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3))->toInt64();
-        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)))->toInt64();
-        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5))->toInt64();
-        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2))->toInt64();
-        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7))->toInt64();
-        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4))->toInt64();
-        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1))->toInt64();
-        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6))->toInt64();
-        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3))->toInt64();
-        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)))->toInt64();
-        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5))->toInt64();
-        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2))->toInt64();
-        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7))->toInt64();
-        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4))->toInt64();
-        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1))->toInt64();
-        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6))->toInt64();
-        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($s, 60, 4)) >> 3))->toInt64();
-
-        $s11 = $s11->addInt64($s23->mulInt(666643));
-        $s12 = $s12->addInt64($s23->mulInt(470296));
-        $s13 = $s13->addInt64($s23->mulInt(654183));
-        $s14 = $s14->subInt64($s23->mulInt(997805));
-        $s15 = $s15->addInt64($s23->mulInt(136657));
-        $s16 = $s16->subInt64($s23->mulInt(683901));
-
-        $s10 = $s10->addInt64($s22->mulInt(666643));
-        $s11 = $s11->addInt64($s22->mulInt(470296));
-        $s12 = $s12->addInt64($s22->mulInt(654183));
-        $s13 = $s13->subInt64($s22->mulInt(997805));
-        $s14 = $s14->addInt64($s22->mulInt(136657));
-        $s15 = $s15->subInt64($s22->mulInt(683901));
-
-        $s9  =  $s9->addInt64($s21->mulInt(666643));
-        $s10 = $s10->addInt64($s21->mulInt(470296));
-        $s11 = $s11->addInt64($s21->mulInt(654183));
-        $s12 = $s12->subInt64($s21->mulInt(997805));
-        $s13 = $s13->addInt64($s21->mulInt(136657));
-        $s14 = $s14->subInt64($s21->mulInt(683901));
-
-        $s8  =  $s8->addInt64($s20->mulInt(666643));
-        $s9  =  $s9->addInt64($s20->mulInt(470296));
-        $s10 = $s10->addInt64($s20->mulInt(654183));
-        $s11 = $s11->subInt64($s20->mulInt(997805));
-        $s12 = $s12->addInt64($s20->mulInt(136657));
-        $s13 = $s13->subInt64($s20->mulInt(683901));
-
-        $s7  =  $s7->addInt64($s19->mulInt(666643));
-        $s8  =  $s8->addInt64($s19->mulInt(470296));
-        $s9  =  $s9->addInt64($s19->mulInt(654183));
-        $s10 = $s10->subInt64($s19->mulInt(997805));
-        $s11 = $s11->addInt64($s19->mulInt(136657));
-        $s12 = $s12->subInt64($s19->mulInt(683901));
-
-        $s6  =  $s6->addInt64($s18->mulInt(666643));
-        $s7  =  $s7->addInt64($s18->mulInt(470296));
-        $s8  =  $s8->addInt64($s18->mulInt(654183));
-        $s9  =  $s9->subInt64($s18->mulInt(997805));
-        $s10 = $s10->addInt64($s18->mulInt(136657));
-        $s11 = $s11->subInt64($s18->mulInt(683901));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt64($s17->mulInt(666643));
-        $s6  =  $s6->addInt64($s17->mulInt(470296));
-        $s7  =  $s7->addInt64($s17->mulInt(654183));
-        $s8  =  $s8->subInt64($s17->mulInt(997805));
-        $s9  =  $s9->addInt64($s17->mulInt(136657));
-        $s10 = $s10->subInt64($s17->mulInt(683901));
-
-        $s4  =  $s4->addInt64($s16->mulInt(666643));
-        $s5  =  $s5->addInt64($s16->mulInt(470296));
-        $s6  =  $s6->addInt64($s16->mulInt(654183));
-        $s7  =  $s7->subInt64($s16->mulInt(997805));
-        $s8  =  $s8->addInt64($s16->mulInt(136657));
-        $s9  =  $s9->subInt64($s16->mulInt(683901));
-
-        $s3  =  $s3->addInt64($s15->mulInt(666643));
-        $s4  =  $s4->addInt64($s15->mulInt(470296));
-        $s5  =  $s5->addInt64($s15->mulInt(654183));
-        $s6  =  $s6->subInt64($s15->mulInt(997805));
-        $s7  =  $s7->addInt64($s15->mulInt(136657));
-        $s8  =  $s8->subInt64($s15->mulInt(683901));
-
-        $s2  =  $s2->addInt64($s14->mulInt(666643));
-        $s3  =  $s3->addInt64($s14->mulInt(470296));
-        $s4  =  $s4->addInt64($s14->mulInt(654183));
-        $s5  =  $s5->subInt64($s14->mulInt(997805));
-        $s6  =  $s6->addInt64($s14->mulInt(136657));
-        $s7  =  $s7->subInt64($s14->mulInt(683901));
-
-        $s1  =  $s1->addInt64($s13->mulInt(666643));
-        $s2  =  $s2->addInt64($s13->mulInt(470296));
-        $s3  =  $s3->addInt64($s13->mulInt(654183));
-        $s4  =  $s4->subInt64($s13->mulInt(997805));
-        $s5  =  $s5->addInt64($s13->mulInt(136657));
-        $s6  =  $s6->subInt64($s13->mulInt(683901));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
+        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $s, 0, 3 ) ) )->toInt64();
+        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 2, 4 ) ) >> 5 ) )->toInt64();
+        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 5, 3 ) ) >> 2 ) )->toInt64();
+        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 7, 4 ) ) >> 7 ) )->toInt64();
+        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 10, 4 ) ) >> 4 ) )->toInt64();
+        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 13, 3 ) ) >> 1 ) )->toInt64();
+        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 15, 4 ) ) >> 6 ) )->toInt64();
+        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 18, 4 ) ) >> 3 ) )->toInt64();
+        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $s, 21, 3 ) ) )->toInt64();
+        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 23, 4 ) ) >> 5 ) )->toInt64();
+        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 26, 3 ) ) >> 2 ) )->toInt64();
+        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 28, 4 ) ) >> 7 ) )->toInt64();
+        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 31, 4 ) ) >> 4 ) )->toInt64();
+        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 34, 3 ) ) >> 1 ) )->toInt64();
+        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 36, 4 ) ) >> 6 ) )->toInt64();
+        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 39, 4 ) ) >> 3 ) )->toInt64();
+        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $s, 42, 3 ) ) )->toInt64();
+        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 44, 4 ) ) >> 5 ) )->toInt64();
+        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 47, 3 ) ) >> 2 ) )->toInt64();
+        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 49, 4 ) ) >> 7 ) )->toInt64();
+        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 52, 4 ) ) >> 4 ) )->toInt64();
+        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 55, 3 ) ) >> 1 ) )->toInt64();
+        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 57, 4 ) ) >> 6 ) )->toInt64();
+        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt( 0x1fffffff & ( self::load_4( self::substr( $s, 60, 4 ) ) >> 3 ) )->toInt64();
+
+        $s11 = $s11->addInt64( $s23->mulInt( 666643 ) );
+        $s12 = $s12->addInt64( $s23->mulInt( 470296 ) );
+        $s13 = $s13->addInt64( $s23->mulInt( 654183 ) );
+        $s14 = $s14->subInt64( $s23->mulInt( 997805 ) );
+        $s15 = $s15->addInt64( $s23->mulInt( 136657 ) );
+        $s16 = $s16->subInt64( $s23->mulInt( 683901 ) );
+
+        $s10 = $s10->addInt64( $s22->mulInt( 666643 ) );
+        $s11 = $s11->addInt64( $s22->mulInt( 470296 ) );
+        $s12 = $s12->addInt64( $s22->mulInt( 654183 ) );
+        $s13 = $s13->subInt64( $s22->mulInt( 997805 ) );
+        $s14 = $s14->addInt64( $s22->mulInt( 136657 ) );
+        $s15 = $s15->subInt64( $s22->mulInt( 683901 ) );
+
+        $s9  = $s9->addInt64( $s21->mulInt( 666643 ) );
+        $s10 = $s10->addInt64( $s21->mulInt( 470296 ) );
+        $s11 = $s11->addInt64( $s21->mulInt( 654183 ) );
+        $s12 = $s12->subInt64( $s21->mulInt( 997805 ) );
+        $s13 = $s13->addInt64( $s21->mulInt( 136657 ) );
+        $s14 = $s14->subInt64( $s21->mulInt( 683901 ) );
+
+        $s8  = $s8->addInt64( $s20->mulInt( 666643 ) );
+        $s9  = $s9->addInt64( $s20->mulInt( 470296 ) );
+        $s10 = $s10->addInt64( $s20->mulInt( 654183 ) );
+        $s11 = $s11->subInt64( $s20->mulInt( 997805 ) );
+        $s12 = $s12->addInt64( $s20->mulInt( 136657 ) );
+        $s13 = $s13->subInt64( $s20->mulInt( 683901 ) );
+
+        $s7  = $s7->addInt64( $s19->mulInt( 666643 ) );
+        $s8  = $s8->addInt64( $s19->mulInt( 470296 ) );
+        $s9  = $s9->addInt64( $s19->mulInt( 654183 ) );
+        $s10 = $s10->subInt64( $s19->mulInt( 997805 ) );
+        $s11 = $s11->addInt64( $s19->mulInt( 136657 ) );
+        $s12 = $s12->subInt64( $s19->mulInt( 683901 ) );
+
+        $s6  = $s6->addInt64( $s18->mulInt( 666643 ) );
+        $s7  = $s7->addInt64( $s18->mulInt( 470296 ) );
+        $s8  = $s8->addInt64( $s18->mulInt( 654183 ) );
+        $s9  = $s9->subInt64( $s18->mulInt( 997805 ) );
+        $s10 = $s10->addInt64( $s18->mulInt( 136657 ) );
+        $s11 = $s11->subInt64( $s18->mulInt( 683901 ) );
+
+        $carry6 = $s6->addInt( 1 << 20 )->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry8 = $s8->addInt( 1 << 20 )->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry10 = $s10->addInt( 1 << 20 )->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+        $carry12 = $s12->addInt( 1 << 20 )->shiftRight( 21 );
+        $s13 = $s13->addInt64( $carry12 );
+        $s12 = $s12->subInt64( $carry12->shiftLeft( 21 ) );
+        $carry14 = $s14->addInt( 1 << 20 )->shiftRight( 21 );
+        $s15 = $s15->addInt64( $carry14 );
+        $s14 = $s14->subInt64( $carry14->shiftLeft( 21 ) );
+        $carry16 = $s16->addInt( 1 << 20 )->shiftRight( 21 );
+        $s17 = $s17->addInt64( $carry16 );
+        $s16 = $s16->subInt64( $carry16->shiftLeft( 21 ) );
+
+        $carry7 = $s7->addInt( 1 << 20 )->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry9 = $s9->addInt( 1 << 20 )->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry11 = $s11->addInt( 1 << 20 )->shiftRight( 21 );
+        $s12 = $s12->addInt64( $carry11 );
+        $s11 = $s11->subInt64( $carry11->shiftLeft( 21 ) );
+        $carry13 = $s13->addInt( 1 << 20 )->shiftRight( 21 );
+        $s14 = $s14->addInt64( $carry13 );
+        $s13 = $s13->subInt64( $carry13->shiftLeft( 21 ) );
+        $carry15 = $s15->addInt( 1 << 20 )->shiftRight( 21 );
+        $s16 = $s16->addInt64( $carry15 );
+        $s15 = $s15->subInt64( $carry15->shiftLeft( 21 ) );
+
+        $s5  = $s5->addInt64( $s17->mulInt( 666643 ) );
+        $s6  = $s6->addInt64( $s17->mulInt( 470296 ) );
+        $s7  = $s7->addInt64( $s17->mulInt( 654183 ) );
+        $s8  = $s8->subInt64( $s17->mulInt( 997805 ) );
+        $s9  = $s9->addInt64( $s17->mulInt( 136657 ) );
+        $s10 = $s10->subInt64( $s17->mulInt( 683901 ) );
+
+        $s4  = $s4->addInt64( $s16->mulInt( 666643 ) );
+        $s5  = $s5->addInt64( $s16->mulInt( 470296 ) );
+        $s6  = $s6->addInt64( $s16->mulInt( 654183 ) );
+        $s7  = $s7->subInt64( $s16->mulInt( 997805 ) );
+        $s8  = $s8->addInt64( $s16->mulInt( 136657 ) );
+        $s9  = $s9->subInt64( $s16->mulInt( 683901 ) );
+
+        $s3  = $s3->addInt64( $s15->mulInt( 666643 ) );
+        $s4  = $s4->addInt64( $s15->mulInt( 470296 ) );
+        $s5  = $s5->addInt64( $s15->mulInt( 654183 ) );
+        $s6  = $s6->subInt64( $s15->mulInt( 997805 ) );
+        $s7  = $s7->addInt64( $s15->mulInt( 136657 ) );
+        $s8  = $s8->subInt64( $s15->mulInt( 683901 ) );
+
+        $s2  = $s2->addInt64( $s14->mulInt( 666643 ) );
+        $s3  = $s3->addInt64( $s14->mulInt( 470296 ) );
+        $s4  = $s4->addInt64( $s14->mulInt( 654183 ) );
+        $s5  = $s5->subInt64( $s14->mulInt( 997805 ) );
+        $s6  = $s6->addInt64( $s14->mulInt( 136657 ) );
+        $s7  = $s7->subInt64( $s14->mulInt( 683901 ) );
+
+        $s1  = $s1->addInt64( $s13->mulInt( 666643 ) );
+        $s2  = $s2->addInt64( $s13->mulInt( 470296 ) );
+        $s3  = $s3->addInt64( $s13->mulInt( 654183 ) );
+        $s4  = $s4->subInt64( $s13->mulInt( 997805 ) );
+        $s5  = $s5->addInt64( $s13->mulInt( 136657 ) );
+        $s6  = $s6->subInt64( $s13->mulInt( 683901 ) );
+
+        $s0  = $s0->addInt64( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt64( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt64( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt64( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt64( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt64( $s12->mulInt( 683901 ) );
         $s12 = new ParagonIE_Sodium_Core32_Int64();
 
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
+        $carry0 = $s0->addInt( 1 << 20 )->shiftRight( 21 );
+        $s1 = $s1->addInt64( $carry0 );
+        $s0 = $s0->subInt64( $carry0->shiftLeft( 21 ) );
+        $carry2 = $s2->addInt( 1 << 20 )->shiftRight( 21 );
+        $s3 = $s3->addInt64( $carry2 );
+        $s2 = $s2->subInt64( $carry2->shiftLeft( 21 ) );
+        $carry4 = $s4->addInt( 1 << 20 )->shiftRight( 21 );
+        $s5 = $s5->addInt64( $carry4 );
+        $s4 = $s4->subInt64( $carry4->shiftLeft( 21 ) );
+        $carry6 = $s6->addInt( 1 << 20 )->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry8 = $s8->addInt( 1 << 20 )->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry10 = $s10->addInt( 1 << 20 )->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+        $carry1 = $s1->addInt( 1 << 20 )->shiftRight( 21 );
+        $s2 = $s2->addInt64( $carry1 );
+        $s1 = $s1->subInt64( $carry1->shiftLeft( 21 ) );
+        $carry3 = $s3->addInt( 1 << 20 )->shiftRight( 21 );
+        $s4 = $s4->addInt64( $carry3 );
+        $s3 = $s3->subInt64( $carry3->shiftLeft( 21 ) );
+        $carry5 = $s5->addInt( 1 << 20 )->shiftRight( 21 );
+        $s6 = $s6->addInt64( $carry5 );
+        $s5 = $s5->subInt64( $carry5->shiftLeft( 21 ) );
+        $carry7 = $s7->addInt( 1 << 20 )->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry9 = $s9->addInt( 1 << 20 )->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry11 = $s11->addInt( 1 << 20 )->shiftRight( 21 );
+        $s12 = $s12->addInt64( $carry11 );
+        $s11 = $s11->subInt64( $carry11->shiftLeft( 21 ) );
+
+        $s0  = $s0->addInt64( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt64( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt64( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt64( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt64( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt64( $s12->mulInt( 683901 ) );
         $s12 = new ParagonIE_Sodium_Core32_Int64();
 
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643));
-        $s1  =  $s1->addInt64($s12->mulInt(470296));
-        $s2  =  $s2->addInt64($s12->mulInt(654183));
-        $s3  =  $s3->subInt64($s12->mulInt(997805));
-        $s4  =  $s4->addInt64($s12->mulInt(136657));
-        $s5  =  $s5->subInt64($s12->mulInt(683901));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+        $carry0 = $s0->shiftRight( 21 );
+        $s1 = $s1->addInt64( $carry0 );
+        $s0 = $s0->subInt64( $carry0->shiftLeft( 21 ) );
+        $carry1 = $s1->shiftRight( 21 );
+        $s2 = $s2->addInt64( $carry1 );
+        $s1 = $s1->subInt64( $carry1->shiftLeft( 21 ) );
+        $carry2 = $s2->shiftRight( 21 );
+        $s3 = $s3->addInt64( $carry2 );
+        $s2 = $s2->subInt64( $carry2->shiftLeft( 21 ) );
+        $carry3 = $s3->shiftRight( 21 );
+        $s4 = $s4->addInt64( $carry3 );
+        $s3 = $s3->subInt64( $carry3->shiftLeft( 21 ) );
+        $carry4 = $s4->shiftRight( 21 );
+        $s5 = $s5->addInt64( $carry4 );
+        $s4 = $s4->subInt64( $carry4->shiftLeft( 21 ) );
+        $carry5 = $s5->shiftRight( 21 );
+        $s6 = $s6->addInt64( $carry5 );
+        $s5 = $s5->subInt64( $carry5->shiftLeft( 21 ) );
+        $carry6 = $s6->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry7 = $s7->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry8 = $s8->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry9 = $s9->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry10 = $s10->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
+        $carry11 = $s11->shiftRight( 21 );
+        $s12 = $s12->addInt64( $carry11 );
+        $s11 = $s11->subInt64( $carry11->shiftLeft( 21 ) );
+
+        $s0  = $s0->addInt64( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt64( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt64( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt64( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt64( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt64( $s12->mulInt( 683901 ) );
+
+        $carry0 = $s0->shiftRight( 21 );
+        $s1 = $s1->addInt64( $carry0 );
+        $s0 = $s0->subInt64( $carry0->shiftLeft( 21 ) );
+        $carry1 = $s1->shiftRight( 21 );
+        $s2 = $s2->addInt64( $carry1 );
+        $s1 = $s1->subInt64( $carry1->shiftLeft( 21 ) );
+        $carry2 = $s2->shiftRight( 21 );
+        $s3 = $s3->addInt64( $carry2 );
+        $s2 = $s2->subInt64( $carry2->shiftLeft( 21 ) );
+        $carry3 = $s3->shiftRight( 21 );
+        $s4 = $s4->addInt64( $carry3 );
+        $s3 = $s3->subInt64( $carry3->shiftLeft( 21 ) );
+        $carry4 = $s4->shiftRight( 21 );
+        $s5 = $s5->addInt64( $carry4 );
+        $s4 = $s4->subInt64( $carry4->shiftLeft( 21 ) );
+        $carry5 = $s5->shiftRight( 21 );
+        $s6 = $s6->addInt64( $carry5 );
+        $s5 = $s5->subInt64( $carry5->shiftLeft( 21 ) );
+        $carry6 = $s6->shiftRight( 21 );
+        $s7 = $s7->addInt64( $carry6 );
+        $s6 = $s6->subInt64( $carry6->shiftLeft( 21 ) );
+        $carry7 = $s7->shiftRight( 21 );
+        $s8 = $s8->addInt64( $carry7 );
+        $s7 = $s7->subInt64( $carry7->shiftLeft( 21 ) );
+        $carry8 = $s8->shiftRight( 21 );
+        $s9 = $s9->addInt64( $carry8 );
+        $s8 = $s8->subInt64( $carry8->shiftLeft( 21 ) );
+        $carry9 = $s9->shiftRight( 21 );
+        $s10 = $s10->addInt64( $carry9 );
+        $s9 = $s9->subInt64( $carry9->shiftLeft( 21 ) );
+        $carry10 = $s10->shiftRight( 21 );
+        $s11 = $s11->addInt64( $carry10 );
+        $s10 = $s10->subInt64( $carry10->shiftLeft( 21 ) );
 
         $S0 = $s0->toInt32()->toInt();
         $S1 = $s1->toInt32()->toInt();
@@ -2979,40 +2979,40 @@ 
          * @var array<int, int>
          */
         $arr = array(
-            (int) ($S0 >> 0),
-            (int) ($S0 >> 8),
-            (int) (($S0 >> 16) | self::mul($S1, 1 << 5)),
-            (int) ($S1 >> 3),
-            (int) ($S1 >> 11),
-            (int) (($S1 >> 19) | self::mul($S2, 1 << 2)),
-            (int) ($S2 >> 6),
-            (int) (($S2 >> 14) | self::mul($S3, 1 << 7)),
-            (int) ($S3 >> 1),
-            (int) ($S3 >> 9),
-            (int) (($S3 >> 17) | self::mul($S4, 1 << 4)),
-            (int) ($S4 >> 4),
-            (int) ($S4 >> 12),
-            (int) (($S4 >> 20) | self::mul($S5, 1 << 1)),
-            (int) ($S5 >> 7),
-            (int) (($S5 >> 15) | self::mul($S6, 1 << 6)),
-            (int) ($S6 >> 2),
-            (int) ($S6 >> 10),
-            (int) (($S6 >> 18) | self::mul($S7, 1 << 3)),
-            (int) ($S7 >> 5),
-            (int) ($S7 >> 13),
-            (int) ($S8 >> 0),
-            (int) ($S8 >> 8),
-            (int) (($S8 >> 16) | self::mul($S9, 1 << 5)),
-            (int) ($S9 >> 3),
-            (int) ($S9 >> 11),
-            (int) (($S9 >> 19) | self::mul($S10, 1 << 2)),
-            (int) ($S10 >> 6),
-            (int) (($S10 >> 14) | self::mul($S11, 1 << 7)),
-            (int) ($S11 >> 1),
-            (int) ($S11 >> 9),
+            (int) ( $S0 >> 0 ),
+            (int) ( $S0 >> 8 ),
+            (int) ( ( $S0 >> 16 ) | self::mul( $S1, 1 << 5 ) ),
+            (int) ( $S1 >> 3 ),
+            (int) ( $S1 >> 11 ),
+            (int) ( ( $S1 >> 19 ) | self::mul( $S2, 1 << 2 ) ),
+            (int) ( $S2 >> 6 ),
+            (int) ( ( $S2 >> 14 ) | self::mul( $S3, 1 << 7 ) ),
+            (int) ( $S3 >> 1 ),
+            (int) ( $S3 >> 9 ),
+            (int) ( ( $S3 >> 17 ) | self::mul( $S4, 1 << 4 ) ),
+            (int) ( $S4 >> 4 ),
+            (int) ( $S4 >> 12 ),
+            (int) ( ( $S4 >> 20 ) | self::mul( $S5, 1 << 1 ) ),
+            (int) ( $S5 >> 7 ),
+            (int) ( ( $S5 >> 15 ) | self::mul( $S6, 1 << 6 ) ),
+            (int) ( $S6 >> 2 ),
+            (int) ( $S6 >> 10 ),
+            (int) ( ( $S6 >> 18 ) | self::mul( $S7, 1 << 3 ) ),
+            (int) ( $S7 >> 5 ),
+            (int) ( $S7 >> 13 ),
+            (int) ( $S8 >> 0 ),
+            (int) ( $S8 >> 8 ),
+            (int) ( ( $S8 >> 16 ) | self::mul( $S9, 1 << 5 ) ),
+            (int) ( $S9 >> 3 ),
+            (int) ( $S9 >> 11 ),
+            (int) ( ( $S9 >> 19 ) | self::mul( $S10, 1 << 2 ) ),
+            (int) ( $S10 >> 6 ),
+            (int) ( ( $S10 >> 14 ) | self::mul( $S11, 1 << 7 ) ),
+            (int) ( $S11 >> 1 ),
+            (int) ( $S11 >> 9 ),
             (int) $S11 >> 17
         );
-        return self::intArrayToString($arr);
+        return self::intArrayToString( $arr );
     }
 
     /**
@@ -3021,7 +3021,7 @@ 
      * @param string $s
      * @return string
      */
-    public static function sc_reduce_old($s)
+    public static function sc_reduce_old( $s )
     {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $s0
@@ -3049,282 +3049,282 @@ 
          * @var ParagonIE_Sodium_Core32_Int32 $s22
          * @var ParagonIE_Sodium_Core32_Int32 $s23
          */
-        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)));
-        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5));
-        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2));
-        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7));
-        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4));
-        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1));
-        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6));
-        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3));
-        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)));
-        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5));
-        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2));
-        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7));
-        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4));
-        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1));
-        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6));
-        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3));
-        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)));
-        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5));
-        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2));
-        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7));
-        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4));
-        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1));
-        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6));
-        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt(self::load_4(self::substr($s, 60, 4)) >> 3);
-
-        $s11 = $s11->addInt32($s23->mulInt(666643));
-        $s12 = $s12->addInt32($s23->mulInt(470296));
-        $s13 = $s13->addInt32($s23->mulInt(654183));
-        $s14 = $s14->subInt32($s23->mulInt(997805));
-        $s15 = $s15->addInt32($s23->mulInt(136657));
-        $s16 = $s16->subInt32($s23->mulInt(683901));
-
-        $s10 = $s10->addInt32($s22->mulInt(666643));
-        $s11 = $s11->addInt32($s22->mulInt(470296));
-        $s12 = $s12->addInt32($s22->mulInt(654183));
-        $s13 = $s13->subInt32($s22->mulInt(997805));
-        $s14 = $s14->addInt32($s22->mulInt(136657));
-        $s15 = $s15->subInt32($s22->mulInt(683901));
-
-        $s9  =  $s9->addInt32($s21->mulInt(666643));
-        $s10 = $s10->addInt32($s21->mulInt(470296));
-        $s11 = $s11->addInt32($s21->mulInt(654183));
-        $s12 = $s12->subInt32($s21->mulInt(997805));
-        $s13 = $s13->addInt32($s21->mulInt(136657));
-        $s14 = $s14->subInt32($s21->mulInt(683901));
-
-        $s8  =  $s8->addInt32($s20->mulInt(666643));
-        $s9  =  $s9->addInt32($s20->mulInt(470296));
-        $s10 = $s10->addInt32($s20->mulInt(654183));
-        $s11 = $s11->subInt32($s20->mulInt(997805));
-        $s12 = $s12->addInt32($s20->mulInt(136657));
-        $s13 = $s13->subInt32($s20->mulInt(683901));
-
-        $s7  =  $s7->addInt32($s19->mulInt(666643));
-        $s8  =  $s8->addInt32($s19->mulInt(470296));
-        $s9  =  $s9->addInt32($s19->mulInt(654183));
-        $s10 = $s10->subInt32($s19->mulInt(997805));
-        $s11 = $s11->addInt32($s19->mulInt(136657));
-        $s12 = $s12->subInt32($s19->mulInt(683901));
-
-        $s6  =  $s6->addInt32($s18->mulInt(666643));
-        $s7  =  $s7->addInt32($s18->mulInt(470296));
-        $s8  =  $s8->addInt32($s18->mulInt(654183));
-        $s9  =  $s9->subInt32($s18->mulInt(997805));
-        $s10 = $s10->addInt32($s18->mulInt(136657));
-        $s11 = $s11->subInt32($s18->mulInt(683901));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
-
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt32($carry12);
-        $s12 = $s12->subInt32($carry12->shiftLeft(21));
-
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt32($carry14);
-        $s14 = $s14->subInt32($carry14->shiftLeft(21));
-
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt32($carry16);
-        $s16 = $s16->subInt32($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt32($carry11);
-        $s11 = $s11->subInt32($carry11->shiftLeft(21));
-
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt32($carry13);
-        $s13 = $s13->subInt32($carry13->shiftLeft(21));
-
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt32($carry15);
-        $s15 = $s15->subInt32($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt32($s17->mulInt(666643));
-        $s6  =  $s6->addInt32($s17->mulInt(470296));
-        $s7  =  $s7->addInt32($s17->mulInt(654183));
-        $s8  =  $s8->subInt32($s17->mulInt(997805));
-        $s9  =  $s9->addInt32($s17->mulInt(136657));
-        $s10 = $s10->subInt32($s17->mulInt(683901));
-
-        $s4  =  $s4->addInt32($s16->mulInt(666643));
-        $s5  =  $s5->addInt32($s16->mulInt(470296));
-        $s6  =  $s6->addInt32($s16->mulInt(654183));
-        $s7  =  $s7->subInt32($s16->mulInt(997805));
-        $s8  =  $s8->addInt32($s16->mulInt(136657));
-        $s9  =  $s9->subInt32($s16->mulInt(683901));
-
-        $s3  =  $s3->addInt32($s15->mulInt(666643));
-        $s4  =  $s4->addInt32($s15->mulInt(470296));
-        $s5  =  $s5->addInt32($s15->mulInt(654183));
-        $s6  =  $s6->subInt32($s15->mulInt(997805));
-        $s7  =  $s7->addInt32($s15->mulInt(136657));
-        $s8  =  $s8->subInt32($s15->mulInt(683901));
-
-        $s2  =  $s2->addInt32($s14->mulInt(666643));
-        $s3  =  $s3->addInt32($s14->mulInt(470296));
-        $s4  =  $s4->addInt32($s14->mulInt(654183));
-        $s5  =  $s5->subInt32($s14->mulInt(997805));
-        $s6  =  $s6->addInt32($s14->mulInt(136657));
-        $s7  =  $s7->subInt32($s14->mulInt(683901));
-
-        $s1  =  $s1->addInt32($s13->mulInt(666643));
-        $s2  =  $s2->addInt32($s13->mulInt(470296));
-        $s3  =  $s3->addInt32($s13->mulInt(654183));
-        $s4  =  $s4->subInt32($s13->mulInt(997805));
-        $s5  =  $s5->addInt32($s13->mulInt(136657));
-        $s6  =  $s6->subInt32($s13->mulInt(683901));
-
-        $s0  =  $s0->addInt32($s12->mulInt(666643));
-        $s1  =  $s1->addInt32($s12->mulInt(470296));
-        $s2  =  $s2->addInt32($s12->mulInt(654183));
-        $s3  =  $s3->subInt32($s12->mulInt(997805));
-        $s4  =  $s4->addInt32($s12->mulInt(136657));
-        $s5  =  $s5->subInt32($s12->mulInt(683901));
+        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $s, 0, 3 ) ) );
+        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 2, 4 ) ) >> 5 ) );
+        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 5, 3 ) ) >> 2 ) );
+        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 7, 4 ) ) >> 7 ) );
+        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 10, 4 ) ) >> 4 ) );
+        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 13, 3 ) ) >> 1 ) );
+        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 15, 4 ) ) >> 6 ) );
+        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 18, 4 ) ) >> 3 ) );
+        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $s, 21, 3 ) ) );
+        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 23, 4 ) ) >> 5 ) );
+        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 26, 3 ) ) >> 2 ) );
+        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 28, 4 ) ) >> 7 ) );
+        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 31, 4 ) ) >> 4 ) );
+        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 34, 3 ) ) >> 1 ) );
+        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 36, 4 ) ) >> 6 ) );
+        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 39, 4 ) ) >> 3 ) );
+        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & self::load_3( self::substr( $s, 42, 3 ) ) );
+        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 44, 4 ) ) >> 5 ) );
+        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 47, 3 ) ) >> 2 ) );
+        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 49, 4 ) ) >> 7 ) );
+        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 52, 4 ) ) >> 4 ) );
+        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_3( self::substr( $s, 55, 3 ) ) >> 1 ) );
+        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt( 2097151 & ( self::load_4( self::substr( $s, 57, 4 ) ) >> 6 ) );
+        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt( self::load_4( self::substr( $s, 60, 4 ) ) >> 3 );
+
+        $s11 = $s11->addInt32( $s23->mulInt( 666643 ) );
+        $s12 = $s12->addInt32( $s23->mulInt( 470296 ) );
+        $s13 = $s13->addInt32( $s23->mulInt( 654183 ) );
+        $s14 = $s14->subInt32( $s23->mulInt( 997805 ) );
+        $s15 = $s15->addInt32( $s23->mulInt( 136657 ) );
+        $s16 = $s16->subInt32( $s23->mulInt( 683901 ) );
+
+        $s10 = $s10->addInt32( $s22->mulInt( 666643 ) );
+        $s11 = $s11->addInt32( $s22->mulInt( 470296 ) );
+        $s12 = $s12->addInt32( $s22->mulInt( 654183 ) );
+        $s13 = $s13->subInt32( $s22->mulInt( 997805 ) );
+        $s14 = $s14->addInt32( $s22->mulInt( 136657 ) );
+        $s15 = $s15->subInt32( $s22->mulInt( 683901 ) );
+
+        $s9  = $s9->addInt32( $s21->mulInt( 666643 ) );
+        $s10 = $s10->addInt32( $s21->mulInt( 470296 ) );
+        $s11 = $s11->addInt32( $s21->mulInt( 654183 ) );
+        $s12 = $s12->subInt32( $s21->mulInt( 997805 ) );
+        $s13 = $s13->addInt32( $s21->mulInt( 136657 ) );
+        $s14 = $s14->subInt32( $s21->mulInt( 683901 ) );
+
+        $s8  = $s8->addInt32( $s20->mulInt( 666643 ) );
+        $s9  = $s9->addInt32( $s20->mulInt( 470296 ) );
+        $s10 = $s10->addInt32( $s20->mulInt( 654183 ) );
+        $s11 = $s11->subInt32( $s20->mulInt( 997805 ) );
+        $s12 = $s12->addInt32( $s20->mulInt( 136657 ) );
+        $s13 = $s13->subInt32( $s20->mulInt( 683901 ) );
+
+        $s7  = $s7->addInt32( $s19->mulInt( 666643 ) );
+        $s8  = $s8->addInt32( $s19->mulInt( 470296 ) );
+        $s9  = $s9->addInt32( $s19->mulInt( 654183 ) );
+        $s10 = $s10->subInt32( $s19->mulInt( 997805 ) );
+        $s11 = $s11->addInt32( $s19->mulInt( 136657 ) );
+        $s12 = $s12->subInt32( $s19->mulInt( 683901 ) );
+
+        $s6  = $s6->addInt32( $s18->mulInt( 666643 ) );
+        $s7  = $s7->addInt32( $s18->mulInt( 470296 ) );
+        $s8  = $s8->addInt32( $s18->mulInt( 654183 ) );
+        $s9  = $s9->subInt32( $s18->mulInt( 997805 ) );
+        $s10 = $s10->addInt32( $s18->mulInt( 136657 ) );
+        $s11 = $s11->subInt32( $s18->mulInt( 683901 ) );
+
+        $carry6 = $s6->addInt( 1 << 20 )->shiftRight( 21 );
+        $s7 = $s7->addInt32( $carry6 );
+        $s6 = $s6->subInt32( $carry6->shiftLeft( 21 ) );
+
+        $carry8 = $s8->addInt( 1 << 20 )->shiftRight( 21 );
+        $s9 = $s9->addInt32( $carry8 );
+        $s8 = $s8->subInt32( $carry8->shiftLeft( 21 ) );
+
+        $carry10 = $s10->addInt( 1 << 20 )->shiftRight( 21 );
+        $s11 = $s11->addInt32( $carry10 );
+        $s10 = $s10->subInt32( $carry10->shiftLeft( 21 ) );
+
+        $carry12 = $s12->addInt( 1 << 20 )->shiftRight( 21 );
+        $s13 = $s13->addInt32( $carry12 );
+        $s12 = $s12->subInt32( $carry12->shiftLeft( 21 ) );
+
+        $carry14 = $s14->addInt( 1 << 20 )->shiftRight( 21 );
+        $s15 = $s15->addInt32( $carry14 );
+        $s14 = $s14->subInt32( $carry14->shiftLeft( 21 ) );
+
+        $carry16 = $s16->addInt( 1 << 20 )->shiftRight( 21 );
+        $s17 = $s17->addInt32( $carry16 );
+        $s16 = $s16->subInt32( $carry16->shiftLeft( 21 ) );
+
+        $carry7 = $s7->addInt( 1 << 20 )->shiftRight( 21 );
+        $s8 = $s8->addInt32( $carry7 );
+        $s7 = $s7->subInt32( $carry7->shiftLeft( 21 ) );
+
+        $carry9 = $s9->addInt( 1 << 20 )->shiftRight( 21 );
+        $s10 = $s10->addInt32( $carry9 );
+        $s9 = $s9->subInt32( $carry9->shiftLeft( 21 ) );
+
+        $carry11 = $s11->addInt( 1 << 20 )->shiftRight( 21 );
+        $s12 = $s12->addInt32( $carry11 );
+        $s11 = $s11->subInt32( $carry11->shiftLeft( 21 ) );
+
+        $carry13 = $s13->addInt( 1 << 20 )->shiftRight( 21 );
+        $s14 = $s14->addInt32( $carry13 );
+        $s13 = $s13->subInt32( $carry13->shiftLeft( 21 ) );
+
+        $carry15 = $s15->addInt( 1 << 20 )->shiftRight( 21 );
+        $s16 = $s16->addInt32( $carry15 );
+        $s15 = $s15->subInt32( $carry15->shiftLeft( 21 ) );
+
+        $s5  = $s5->addInt32( $s17->mulInt( 666643 ) );
+        $s6  = $s6->addInt32( $s17->mulInt( 470296 ) );
+        $s7  = $s7->addInt32( $s17->mulInt( 654183 ) );
+        $s8  = $s8->subInt32( $s17->mulInt( 997805 ) );
+        $s9  = $s9->addInt32( $s17->mulInt( 136657 ) );
+        $s10 = $s10->subInt32( $s17->mulInt( 683901 ) );
+
+        $s4  = $s4->addInt32( $s16->mulInt( 666643 ) );
+        $s5  = $s5->addInt32( $s16->mulInt( 470296 ) );
+        $s6  = $s6->addInt32( $s16->mulInt( 654183 ) );
+        $s7  = $s7->subInt32( $s16->mulInt( 997805 ) );
+        $s8  = $s8->addInt32( $s16->mulInt( 136657 ) );
+        $s9  = $s9->subInt32( $s16->mulInt( 683901 ) );
+
+        $s3  = $s3->addInt32( $s15->mulInt( 666643 ) );
+        $s4  = $s4->addInt32( $s15->mulInt( 470296 ) );
+        $s5  = $s5->addInt32( $s15->mulInt( 654183 ) );
+        $s6  = $s6->subInt32( $s15->mulInt( 997805 ) );
+        $s7  = $s7->addInt32( $s15->mulInt( 136657 ) );
+        $s8  = $s8->subInt32( $s15->mulInt( 683901 ) );
+
+        $s2  = $s2->addInt32( $s14->mulInt( 666643 ) );
+        $s3  = $s3->addInt32( $s14->mulInt( 470296 ) );
+        $s4  = $s4->addInt32( $s14->mulInt( 654183 ) );
+        $s5  = $s5->subInt32( $s14->mulInt( 997805 ) );
+        $s6  = $s6->addInt32( $s14->mulInt( 136657 ) );
+        $s7  = $s7->subInt32( $s14->mulInt( 683901 ) );
+
+        $s1  = $s1->addInt32( $s13->mulInt( 666643 ) );
+        $s2  = $s2->addInt32( $s13->mulInt( 470296 ) );
+        $s3  = $s3->addInt32( $s13->mulInt( 654183 ) );
+        $s4  = $s4->subInt32( $s13->mulInt( 997805 ) );
+        $s5  = $s5->addInt32( $s13->mulInt( 136657 ) );
+        $s6  = $s6->subInt32( $s13->mulInt( 683901 ) );
+
+        $s0  = $s0->addInt32( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt32( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt32( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt32( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt32( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt32( $s12->mulInt( 683901 ) );
         $s12 = new ParagonIE_Sodium_Core32_Int32();
 
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt32($carry0);
-        $s0 = $s0->subInt32($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt32($carry2);
-        $s2 = $s2->subInt32($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt32($carry4);
-        $s4 = $s4->subInt32($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt32($carry1);
-        $s1 = $s1->subInt32($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt32($carry3);
-        $s3 = $s3->subInt32($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt32($carry5);
-        $s5 = $s5->subInt32($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt32($carry11);
-        $s11 = $s11->subInt32($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt32($s12->mulInt(666643));
-        $s1  =  $s1->addInt32($s12->mulInt(470296));
-        $s2  =  $s2->addInt32($s12->mulInt(654183));
-        $s3  =  $s3->subInt32($s12->mulInt(997805));
-        $s4  =  $s4->addInt32($s12->mulInt(136657));
-        $s5  =  $s5->subInt32($s12->mulInt(683901));
+        $carry0 = $s0->addInt( 1 << 20 )->shiftRight( 21 );
+        $s1 = $s1->addInt32( $carry0 );
+        $s0 = $s0->subInt32( $carry0->shiftLeft( 21 ) );
+        $carry2 = $s2->addInt( 1 << 20 )->shiftRight( 21 );
+        $s3 = $s3->addInt32( $carry2 );
+        $s2 = $s2->subInt32( $carry2->shiftLeft( 21 ) );
+        $carry4 = $s4->addInt( 1 << 20 )->shiftRight( 21 );
+        $s5 = $s5->addInt32( $carry4 );
+        $s4 = $s4->subInt32( $carry4->shiftLeft( 21 ) );
+        $carry6 = $s6->addInt( 1 << 20 )->shiftRight( 21 );
+        $s7 = $s7->addInt32( $carry6 );
+        $s6 = $s6->subInt32( $carry6->shiftLeft( 21 ) );
+        $carry8 = $s8->addInt( 1 << 20 )->shiftRight( 21 );
+        $s9 = $s9->addInt32( $carry8 );
+        $s8 = $s8->subInt32( $carry8->shiftLeft( 21 ) );
+        $carry10 = $s10->addInt( 1 << 20 )->shiftRight( 21 );
+        $s11 = $s11->addInt32( $carry10 );
+        $s10 = $s10->subInt32( $carry10->shiftLeft( 21 ) );
+        $carry1 = $s1->addInt( 1 << 20 )->shiftRight( 21 );
+        $s2 = $s2->addInt32( $carry1 );
+        $s1 = $s1->subInt32( $carry1->shiftLeft( 21 ) );
+        $carry3 = $s3->addInt( 1 << 20 )->shiftRight( 21 );
+        $s4 = $s4->addInt32( $carry3 );
+        $s3 = $s3->subInt32( $carry3->shiftLeft( 21 ) );
+        $carry5 = $s5->addInt( 1 << 20 )->shiftRight( 21 );
+        $s6 = $s6->addInt32( $carry5 );
+        $s5 = $s5->subInt32( $carry5->shiftLeft( 21 ) );
+        $carry7 = $s7->addInt( 1 << 20 )->shiftRight( 21 );
+        $s8 = $s8->addInt32( $carry7 );
+        $s7 = $s7->subInt32( $carry7->shiftLeft( 21 ) );
+        $carry9 = $s9->addInt( 1 << 20 )->shiftRight( 21 );
+        $s10 = $s10->addInt32( $carry9 );
+        $s9 = $s9->subInt32( $carry9->shiftLeft( 21 ) );
+        $carry11 = $s11->addInt( 1 << 20 )->shiftRight( 21 );
+        $s12 = $s12->addInt32( $carry11 );
+        $s11 = $s11->subInt32( $carry11->shiftLeft( 21 ) );
+
+        $s0  = $s0->addInt32( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt32( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt32( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt32( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt32( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt32( $s12->mulInt( 683901 ) );
         $s12 = new ParagonIE_Sodium_Core32_Int32();
 
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt32($carry0);
-        $s0 = $s0->subInt32($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt32($carry1);
-        $s1 = $s1->subInt32($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt32($carry2);
-        $s2 = $s2->subInt32($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt32($carry3);
-        $s3 = $s3->subInt32($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt32($carry4);
-        $s4 = $s4->subInt32($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt32($carry5);
-        $s5 = $s5->subInt32($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt32($carry11);
-        $s11 = $s11->subInt32($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt32($s12->mulInt(666643));
-        $s1  =  $s1->addInt32($s12->mulInt(470296));
-        $s2  =  $s2->addInt32($s12->mulInt(654183));
-        $s3  =  $s3->subInt32($s12->mulInt(997805));
-        $s4  =  $s4->addInt32($s12->mulInt(136657));
-        $s5  =  $s5->subInt32($s12->mulInt(683901));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt32($carry0);
-        $s0 = $s0->subInt32($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt32($carry1);
-        $s1 = $s1->subInt32($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt32($carry2);
-        $s2 = $s2->subInt32($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt32($carry3);
-        $s3 = $s3->subInt32($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt32($carry4);
-        $s4 = $s4->subInt32($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt32($carry5);
-        $s5 = $s5->subInt32($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt32($carry6);
-        $s6 = $s6->subInt32($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt32($carry7);
-        $s7 = $s7->subInt32($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt32($carry8);
-        $s8 = $s8->subInt32($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt32($carry9);
-        $s9 = $s9->subInt32($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt32($carry10);
-        $s10 = $s10->subInt32($carry10->shiftLeft(21));
+        $carry0 = $s0->shiftRight( 21 );
+        $s1 = $s1->addInt32( $carry0 );
+        $s0 = $s0->subInt32( $carry0->shiftLeft( 21 ) );
+        $carry1 = $s1->shiftRight( 21 );
+        $s2 = $s2->addInt32( $carry1 );
+        $s1 = $s1->subInt32( $carry1->shiftLeft( 21 ) );
+        $carry2 = $s2->shiftRight( 21 );
+        $s3 = $s3->addInt32( $carry2 );
+        $s2 = $s2->subInt32( $carry2->shiftLeft( 21 ) );
+        $carry3 = $s3->shiftRight( 21 );
+        $s4 = $s4->addInt32( $carry3 );
+        $s3 = $s3->subInt32( $carry3->shiftLeft( 21 ) );
+        $carry4 = $s4->shiftRight( 21 );
+        $s5 = $s5->addInt32( $carry4 );
+        $s4 = $s4->subInt32( $carry4->shiftLeft( 21 ) );
+        $carry5 = $s5->shiftRight( 21 );
+        $s6 = $s6->addInt32( $carry5 );
+        $s5 = $s5->subInt32( $carry5->shiftLeft( 21 ) );
+        $carry6 = $s6->shiftRight( 21 );
+        $s7 = $s7->addInt32( $carry6 );
+        $s6 = $s6->subInt32( $carry6->shiftLeft( 21 ) );
+        $carry7 = $s7->shiftRight( 21 );
+        $s8 = $s8->addInt32( $carry7 );
+        $s7 = $s7->subInt32( $carry7->shiftLeft( 21 ) );
+        $carry8 = $s8->shiftRight( 21 );
+        $s9 = $s9->addInt32( $carry8 );
+        $s8 = $s8->subInt32( $carry8->shiftLeft( 21 ) );
+        $carry9 = $s9->shiftRight( 21 );
+        $s10 = $s10->addInt32( $carry9 );
+        $s9 = $s9->subInt32( $carry9->shiftLeft( 21 ) );
+        $carry10 = $s10->shiftRight( 21 );
+        $s11 = $s11->addInt32( $carry10 );
+        $s10 = $s10->subInt32( $carry10->shiftLeft( 21 ) );
+        $carry11 = $s11->shiftRight( 21 );
+        $s12 = $s12->addInt32( $carry11 );
+        $s11 = $s11->subInt32( $carry11->shiftLeft( 21 ) );
+
+        $s0  = $s0->addInt32( $s12->mulInt( 666643 ) );
+        $s1  = $s1->addInt32( $s12->mulInt( 470296 ) );
+        $s2  = $s2->addInt32( $s12->mulInt( 654183 ) );
+        $s3  = $s3->subInt32( $s12->mulInt( 997805 ) );
+        $s4  = $s4->addInt32( $s12->mulInt( 136657 ) );
+        $s5  = $s5->subInt32( $s12->mulInt( 683901 ) );
+
+        $carry0 = $s0->shiftRight( 21 );
+        $s1 = $s1->addInt32( $carry0 );
+        $s0 = $s0->subInt32( $carry0->shiftLeft( 21 ) );
+        $carry1 = $s1->shiftRight( 21 );
+        $s2 = $s2->addInt32( $carry1 );
+        $s1 = $s1->subInt32( $carry1->shiftLeft( 21 ) );
+        $carry2 = $s2->shiftRight( 21 );
+        $s3 = $s3->addInt32( $carry2 );
+        $s2 = $s2->subInt32( $carry2->shiftLeft( 21 ) );
+        $carry3 = $s3->shiftRight( 21 );
+        $s4 = $s4->addInt32( $carry3 );
+        $s3 = $s3->subInt32( $carry3->shiftLeft( 21 ) );
+        $carry4 = $s4->shiftRight( 21 );
+        $s5 = $s5->addInt32( $carry4 );
+        $s4 = $s4->subInt32( $carry4->shiftLeft( 21 ) );
+        $carry5 = $s5->shiftRight( 21 );
+        $s6 = $s6->addInt32( $carry5 );
+        $s5 = $s5->subInt32( $carry5->shiftLeft( 21 ) );
+        $carry6 = $s6->shiftRight( 21 );
+        $s7 = $s7->addInt32( $carry6 );
+        $s6 = $s6->subInt32( $carry6->shiftLeft( 21 ) );
+        $carry7 = $s7->shiftRight( 21 );
+        $s8 = $s8->addInt32( $carry7 );
+        $s7 = $s7->subInt32( $carry7->shiftLeft( 21 ) );
+        $carry8 = $s8->shiftRight( 21 );
+        $s9 = $s9->addInt32( $carry8 );
+        $s8 = $s8->subInt32( $carry8->shiftLeft( 21 ) );
+        $carry9 = $s9->shiftRight( 21 );
+        $s10 = $s10->addInt32( $carry9 );
+        $s9 = $s9->subInt32( $carry9->shiftLeft( 21 ) );
+        $carry10 = $s10->shiftRight( 21 );
+        $s11 = $s11->addInt32( $carry10 );
+        $s10 = $s10->subInt32( $carry10->shiftLeft( 21 ) );
 
         $S0 = $s0->toInt();
         $S1 = $s1->toInt();
@@ -3343,39 +3343,39 @@ 
          * @var array<int, int>
          */
         $arr = array(
-            (int) ($S0 >> 0),
-            (int) ($S0 >> 8),
-            (int) (($S0 >> 16) | self::mul($S1, 1 << 5)),
-            (int) ($S1 >> 3),
-            (int) ($S1 >> 11),
-            (int) (($S1 >> 19) | self::mul($S2, 1 << 2)),
-            (int) ($S2 >> 6),
-            (int) (($S2 >> 14) | self::mul($S3, 1 << 7)),
-            (int) ($S3 >> 1),
-            (int) ($S3 >> 9),
-            (int) (($S3 >> 17) | self::mul($S4, 1 << 4)),
-            (int) ($S4 >> 4),
-            (int) ($S4 >> 12),
-            (int) (($S4 >> 20) | self::mul($S5, 1 << 1)),
-            (int) ($S5 >> 7),
-            (int) (($S5 >> 15) | self::mul($S6, 1 << 6)),
-            (int) ($S6 >> 2),
-            (int) ($S6 >> 10),
-            (int) (($S6 >> 18) | self::mul($S7, 1 << 3)),
-            (int) ($S7 >> 5),
-            (int) ($S7 >> 13),
-            (int) ($S8 >> 0),
-            (int) ($S8 >> 8),
-            (int) (($S8 >> 16) | self::mul($S9, 1 << 5)),
-            (int) ($S9 >> 3),
-            (int) ($S9 >> 11),
-            (int) (($S9 >> 19) | self::mul($S10, 1 << 2)),
-            (int) ($S10 >> 6),
-            (int) (($S10 >> 14) | self::mul($S11, 1 << 7)),
-            (int) ($S11 >> 1),
-            (int) ($S11 >> 9),
+            (int) ( $S0 >> 0 ),
+            (int) ( $S0 >> 8 ),
+            (int) ( ( $S0 >> 16 ) | self::mul( $S1, 1 << 5 ) ),
+            (int) ( $S1 >> 3 ),
+            (int) ( $S1 >> 11 ),
+            (int) ( ( $S1 >> 19 ) | self::mul( $S2, 1 << 2 ) ),
+            (int) ( $S2 >> 6 ),
+            (int) ( ( $S2 >> 14 ) | self::mul( $S3, 1 << 7 ) ),
+            (int) ( $S3 >> 1 ),
+            (int) ( $S3 >> 9 ),
+            (int) ( ( $S3 >> 17 ) | self::mul( $S4, 1 << 4 ) ),
+            (int) ( $S4 >> 4 ),
+            (int) ( $S4 >> 12 ),
+            (int) ( ( $S4 >> 20 ) | self::mul( $S5, 1 << 1 ) ),
+            (int) ( $S5 >> 7 ),
+            (int) ( ( $S5 >> 15 ) | self::mul( $S6, 1 << 6 ) ),
+            (int) ( $S6 >> 2 ),
+            (int) ( $S6 >> 10 ),
+            (int) ( ( $S6 >> 18 ) | self::mul( $S7, 1 << 3 ) ),
+            (int) ( $S7 >> 5 ),
+            (int) ( $S7 >> 13 ),
+            (int) ( $S8 >> 0 ),
+            (int) ( $S8 >> 8 ),
+            (int) ( ( $S8 >> 16 ) | self::mul( $S9, 1 << 5 ) ),
+            (int) ( $S9 >> 3 ),
+            (int) ( $S9 >> 11 ),
+            (int) ( ( $S9 >> 19 ) | self::mul( $S10, 1 << 2 ) ),
+            (int) ( $S10 >> 6 ),
+            (int) ( ( $S10 >> 14 ) | self::mul( $S11, 1 << 7 ) ),
+            (int) ( $S11 >> 1 ),
+            (int) ( $S11 >> 9 ),
             (int) $S11 >> 17
         );
-        return self::intArrayToString($arr);
+        return self::intArrayToString( $arr );
     }
 }

Braces +34 added lines, -68 removed lines

@@ -13,8 +13,7 @@ 
  *
  * @ref https://github.com/jedisct1/libsodium/blob/master/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
  */
-abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core32_Curve25519_H
-{
+abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core32_Curve25519_H {
     /**
      * Get a field element of size 10 with a value of 0
      *
@@ -22,8 +21,7 @@ 
      *
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_0()
-    {
+    public static function fe_0() {
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
                 new ParagonIE_Sodium_Core32_Int32(),
@@ -47,8 +45,7 @@ 
      *
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_1()
-    {
+    public static function fe_1() {
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
                 ParagonIE_Sodium_Core32_Int32::fromInt(1),
@@ -121,8 +118,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_copy(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_copy(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         $h = clone $f;
         return $h;
     }
@@ -137,8 +133,7 @@ 
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      * @throws RangeException
      */
-    public static function fe_frombytes($s)
-    {
+    public static function fe_frombytes($s) {
         if (self::strlen($s) !== 32) {
             throw new RangeException('Expected a 32-byte string.');
         }
@@ -236,8 +231,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $h
      * @return string
      */
-    public static function fe_tobytes(ParagonIE_Sodium_Core32_Curve25519_Fe $h)
-    {
+    public static function fe_tobytes(ParagonIE_Sodium_Core32_Curve25519_Fe $h) {
         /**
          * @var ParagonIE_Sodium_Core32_Int64[] $f
          * @var ParagonIE_Sodium_Core32_Int64 $q
@@ -388,8 +382,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return int
      */
-    public static function fe_isnegative(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_isnegative(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         $str = self::fe_tobytes($f);
         return self::chrToInt($str[0]) & 1;
     }
@@ -402,8 +395,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return bool
      */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_isnonzero(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         static $zero;
         if ($zero === null) {
             $zero = str_repeat("\x00", 32);
@@ -735,8 +727,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_neg(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_neg(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         $h = new ParagonIE_Sodium_Core32_Curve25519_Fe();
         for ($i = 0; $i < 10; ++$i) {
             $h[$i] = $h[$i]->subInt32($f[$i]);
@@ -754,8 +745,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $f0
          * @var ParagonIE_Sodium_Core32_Int64 $f1
@@ -948,8 +938,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
+    public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f) {
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $f0
          * @var ParagonIE_Sodium_Core32_Int64 $f1
@@ -1153,8 +1142,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $Z
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_invert(ParagonIE_Sodium_Core32_Curve25519_Fe $Z)
-    {
+    public static function fe_invert(ParagonIE_Sodium_Core32_Curve25519_Fe $Z) {
         $z = clone $Z;
         $t0 = self::fe_sq($z);
         $t1 = self::fe_sq($t0);
@@ -1213,8 +1201,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $z
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_pow22523(ParagonIE_Sodium_Core32_Curve25519_Fe $z)
-    {
+    public static function fe_pow22523(ParagonIE_Sodium_Core32_Curve25519_Fe $z) {
         # fe_sq(t0, z);
         # fe_sq(t1, t0);
         # fe_sq(t1, t1);
@@ -1339,8 +1326,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
      * @return ParagonIE_Sodium_Core32_Curve25519_Fe
      */
-    public static function fe_sub(ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g)
-    {
+    public static function fe_sub(ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g) {
         return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
             array(
                 $f[0]->subInt32($g[0]),
@@ -1394,8 +1380,7 @@ 
      * @param string $a
      * @return array<int, mixed>
      */
-    public static function slide($a)
-    {
+    public static function slide($a) {
         if (self::strlen($a) < 256) {
             if (self::strlen($a) < 16) {
                 $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
@@ -1442,8 +1427,7 @@ 
      * @param string $s
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
      */
-    public static function ge_frombytes_negate_vartime($s)
-    {
+    public static function ge_frombytes_negate_vartime($s) {
         static $d = null;
         if (!$d) {
             $d = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
@@ -1598,8 +1582,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
      */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
-    {
+    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p) {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P2();
         $r->X = self::fe_mul($p->X, $p->T);
         $r->Y = self::fe_mul($p->Y, $p->Z);
@@ -1613,8 +1596,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
      */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
-    {
+    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p) {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3();
         $r->X = self::fe_mul($p->X, $p->T);
         $r->Y = self::fe_mul($p->Y, $p->Z);
@@ -1628,8 +1610,7 @@ 
      *
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
      */
-    public static function ge_p2_0()
-    {
+    public static function ge_p2_0() {
         return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
             self::fe_0(),
             self::fe_1(),
@@ -1643,8 +1624,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
      */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p)
-    {
+    public static function ge_p2_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p) {
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
 
         $r->X = self::fe_sq($p->X);
@@ -1665,8 +1645,7 @@ 
      *
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
      */
-    public static function ge_p3_0()
-    {
+    public static function ge_p3_0() {
         return new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
             self::fe_0(),
             self::fe_1(),
@@ -1681,8 +1660,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
      */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_to_cached(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p) {
         static $d2 = null;
         if ($d2 === null) {
             $d2 = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
@@ -1714,8 +1692,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
      */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p) {
         return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
             $p->X,
             $p->Y,
@@ -1729,8 +1706,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h
      * @return string
      */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h)
-    {
+    public static function ge_p3_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h) {
         $recip = self::fe_invert($h->Z);
         $x = self::fe_mul($h->X, $recip);
         $y = self::fe_mul($h->Y, $recip);
@@ -1747,8 +1723,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
      */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p) {
         $q = self::ge_p3_to_p2($p);
         return self::ge_p2_dbl($q);
     }
@@ -1756,8 +1731,7 @@ 
     /**
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
      */
-    public static function ge_precomp_0()
-    {
+    public static function ge_precomp_0() {
         return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
             self::fe_1(),
             self::fe_1(),
@@ -1772,8 +1746,7 @@ 
      * @param int $c
      * @return int
      */
-    public static function equal($b, $c)
-    {
+    public static function equal($b, $c) {
         return (($b ^ $c) - 1 & 0xffffffff) >> 31;
     }
 
@@ -1783,8 +1756,7 @@ 
      * @param int $char
      * @return int (1 = yes, 0 = no)
      */
-    public static function negative($char)
-    {
+    public static function negative($char) {
         if (is_int($char)) {
             return $char < 0 ? 1 : 0;
         }
@@ -1827,8 +1799,7 @@ 
      * @param int $b
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
      */
-    public static function ge_select($pos = 0, $b = 0)
-    {
+    public static function ge_select($pos = 0, $b = 0) {
         static $base = null;
         if ($base === null) {
             $base = array();
@@ -1945,8 +1916,7 @@ 
      * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h
      * @return string
      */
-    public static function ge_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h)
-    {
+    public static function ge_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h) {
         $recip = self::fe_invert($h->Z);
         $x = self::fe_mul($h->X, $recip);
         $y = self::fe_mul($h->Y, $recip);
@@ -2132,8 +2102,7 @@ 
      * @param string $a
      * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
      */
-    public static function ge_scalarmult_base($a)
-    {
+    public static function ge_scalarmult_base($a) {
         $e = array();
         $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
 
@@ -2189,8 +2158,7 @@ 
      * @param string $c
      * @return string
      */
-    public static function sc_muladd($a, $b, $c)
-    {
+    public static function sc_muladd($a, $b, $c) {
         $a0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 0, 3)))->toInt64();
         $a1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5))->toInt64();
         $a2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2))->toInt64();
@@ -2666,8 +2634,7 @@ 
      * @param string $s
      * @return string
      */
-    public static function sc_reduce($s)
-    {
+    public static function sc_reduce($s) {
         /**
          * @var ParagonIE_Sodium_Core32_Int64 $s0
          * @var ParagonIE_Sodium_Core32_Int64 $s1
@@ -3021,8 +2988,7 @@ 
      * @param string $s
      * @return string
      */
-    public static function sc_reduce_old($s)
-    {
+    public static function sc_reduce_old($s) {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $s0
          * @var ParagonIE_Sodium_Core32_Int32 $s1