gravityview / GravityView

vendor/paragonie/sodium_compat/src/Crypto32.php

Indentation +1638 added lines, -1638 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Crypto32', false)) {
-    return;
+	return;
 }
 
 /**
@@ -14,1641 +14,1641 @@ 
  */
 abstract class ParagonIE_Sodium_Crypto32
 {
-    const aead_chacha20poly1305_KEYBYTES = 32;
-    const aead_chacha20poly1305_NSECBYTES = 0;
-    const aead_chacha20poly1305_NPUBBYTES = 8;
-    const aead_chacha20poly1305_ABYTES = 16;
-
-    const aead_chacha20poly1305_IETF_KEYBYTES = 32;
-    const aead_chacha20poly1305_IETF_NSECBYTES = 0;
-    const aead_chacha20poly1305_IETF_NPUBBYTES = 12;
-    const aead_chacha20poly1305_IETF_ABYTES = 16;
-
-    const aead_xchacha20poly1305_IETF_KEYBYTES = 32;
-    const aead_xchacha20poly1305_IETF_NSECBYTES = 0;
-    const aead_xchacha20poly1305_IETF_NPUBBYTES = 24;
-    const aead_xchacha20poly1305_IETF_ABYTES = 16;
-
-    const box_curve25519xsalsa20poly1305_SEEDBYTES = 32;
-    const box_curve25519xsalsa20poly1305_PUBLICKEYBYTES = 32;
-    const box_curve25519xsalsa20poly1305_SECRETKEYBYTES = 32;
-    const box_curve25519xsalsa20poly1305_BEFORENMBYTES = 32;
-    const box_curve25519xsalsa20poly1305_NONCEBYTES = 24;
-    const box_curve25519xsalsa20poly1305_MACBYTES = 16;
-    const box_curve25519xsalsa20poly1305_BOXZEROBYTES = 16;
-    const box_curve25519xsalsa20poly1305_ZEROBYTES = 32;
-
-    const onetimeauth_poly1305_BYTES = 16;
-    const onetimeauth_poly1305_KEYBYTES = 32;
-
-    const secretbox_xsalsa20poly1305_KEYBYTES = 32;
-    const secretbox_xsalsa20poly1305_NONCEBYTES = 24;
-    const secretbox_xsalsa20poly1305_MACBYTES = 16;
-    const secretbox_xsalsa20poly1305_BOXZEROBYTES = 16;
-    const secretbox_xsalsa20poly1305_ZEROBYTES = 32;
-
-    const secretbox_xchacha20poly1305_KEYBYTES = 32;
-    const secretbox_xchacha20poly1305_NONCEBYTES = 24;
-    const secretbox_xchacha20poly1305_MACBYTES = 16;
-    const secretbox_xchacha20poly1305_BOXZEROBYTES = 16;
-    const secretbox_xchacha20poly1305_ZEROBYTES = 32;
-
-    const stream_salsa20_KEYBYTES = 32;
-
-    /**
-     * AEAD Decryption with ChaCha20-Poly1305
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int  $clen - Length of ciphertext */
-        $clen = $len - self::aead_chacha20poly1305_ABYTES;
-
-        /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var string $mac - Message authentication code */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $message,
-            $clen,
-            self::aead_chacha20poly1305_ABYTES
-        );
-
-        /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 0, $clen);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
-            32,
-            $nonce,
-            $key
-        );
-
-        /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
-        $computed_mac = $state->finish();
-
-        /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
-            throw new SodiumException('Invalid MAC');
-        }
-
-        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
-        return ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-            $ciphertext,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-    }
-
-    /**
-     * AEAD Encryption with ChaCha20-Poly1305
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
-            32,
-            $nonce,
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-
-        /** @var string $ciphertext - Raw encrypted data */
-        $ciphertext = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-            $message,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
-        return $ciphertext . $state->finish();
-    }
-
-    /**
-     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_ietf_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int  $clen - Length of ciphertext */
-        $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
-            32,
-            $nonce,
-            $key
-        );
-
-        /** @var string $mac - Message authentication code */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $message,
-            $len - self::aead_chacha20poly1305_IETF_ABYTES,
-            self::aead_chacha20poly1305_IETF_ABYTES
-        );
-
-        /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr(
-            $message,
-            0,
-            $len - self::aead_chacha20poly1305_IETF_ABYTES
-        );
-
-        /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
-        $computed_mac = $state->finish();
-
-        /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
-            throw new SodiumException('Invalid MAC');
-        }
-
-        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
-        return ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $ciphertext,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-    }
-
-    /**
-     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_ietf_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
-            32,
-            $nonce,
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-
-        /** @var string $ciphertext - Raw encrypted data */
-        $ciphertext = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $message,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
-        return $ciphertext . $state->finish();
-    }
-
-    /**
-     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_xchacha20poly1305_ietf_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
-    }
-
-    /**
-     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_xchacha20poly1305_ietf_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
-    }
-
-    /**
-     * HMAC-SHA-512-256 (a.k.a. the leftmost 256 bits of HMAC-SHA-512)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $key
-     * @return string
-     * @throws TypeError
-     */
-    public static function auth($message, $key)
-    {
-        return ParagonIE_Sodium_Core32_Util::substr(
-            hash_hmac('sha512', $message, $key, true),
-            0,
-            32
-        );
-    }
-
-    /**
-     * HMAC-SHA-512-256 validation. Constant-time via hash_equals().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $mac
-     * @param string $message
-     * @param string $key
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function auth_verify($mac, $message, $key)
-    {
-        return ParagonIE_Sodium_Core32_Util::hashEquals(
-            $mac,
-            self::auth($message, $key)
-        );
-    }
-
-    /**
-     * X25519 key exchange followed by XSalsa20Poly1305 symmetric encryption
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $plaintext
-     * @param string $nonce
-     * @param string $keypair
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box($plaintext, $nonce, $keypair)
-    {
-        return self::secretbox(
-            $plaintext,
-            $nonce,
-            self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
-            )
-        );
-    }
-
-    /**
-     * X25519-XSalsa20-Poly1305 with one ephemeral X25519 keypair.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $publicKey
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_seal($message, $publicKey)
-    {
-        /** @var string $ephemeralKeypair */
-        $ephemeralKeypair = self::box_keypair();
-
-        /** @var string $ephemeralSK */
-        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
-
-        /** @var string $ephemeralPK */
-        $ephemeralPK = self::box_publickey($ephemeralKeypair);
-
-        /** @var string $nonce */
-        $nonce = self::generichash(
-            $ephemeralPK . $publicKey,
-            '',
-            24
-        );
-
-        /** @var string $keypair - The combined keypair used in crypto_box() */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
-
-        /** @var string $ciphertext Ciphertext + MAC from crypto_box */
-        $ciphertext = self::box($message, $nonce, $keypair);
-        try {
-            ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
-            ParagonIE_Sodium_Compat::memzero($ephemeralSK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
-            $ephemeralKeypair = null;
-            $ephemeralSK = null;
-            $nonce = null;
-        }
-        return $ephemeralPK . $ciphertext;
-    }
-
-    /**
-     * Opens a message encrypted via box_seal().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $keypair
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_seal_open($message, $keypair)
-    {
-        /** @var string $ephemeralPK */
-        $ephemeralPK = ParagonIE_Sodium_Core32_Util::substr($message, 0, 32);
-
-        /** @var string $ciphertext (ciphertext + MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 32);
-
-        /** @var string $secretKey */
-        $secretKey = self::box_secretkey($keypair);
-
-        /** @var string $publicKey */
-        $publicKey = self::box_publickey($keypair);
-
-        /** @var string $nonce */
-        $nonce = self::generichash(
-            $ephemeralPK . $publicKey,
-            '',
-            24
-        );
-
-        /** @var string $keypair */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
-
-        /** @var string $m */
-        $m = self::box_open($ciphertext, $nonce, $keypair);
-        try {
-            ParagonIE_Sodium_Compat::memzero($secretKey);
-            ParagonIE_Sodium_Compat::memzero($ephemeralPK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
-            $secretKey = null;
-            $ephemeralPK = null;
-            $nonce = null;
-        }
-        return $m;
-    }
-
-    /**
-     * Used by crypto_box() to get the crypto_secretbox() key.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sk
-     * @param string $pk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_beforenm($sk, $pk)
-    {
-        return ParagonIE_Sodium_Core32_HSalsa20::hsalsa20(
-            str_repeat("\x00", 16),
-            self::scalarmult($sk, $pk)
-        );
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @return string
-     * @throws Exception
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_keypair()
-    {
-        $sKey = random_bytes(32);
-        $pKey = self::scalarmult_base($sKey);
-        return $sKey . $pKey;
-    }
-
-    /**
-     * @param string $seed
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_seed_keypair($seed)
-    {
-        $sKey = ParagonIE_Sodium_Core32_Util::substr(
-            hash('sha512', $seed, true),
-            0,
-            32
-        );
-        $pKey = self::scalarmult_base($sKey);
-        return $sKey . $pKey;
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sKey
-     * @param string $pKey
-     * @return string
-     * @throws TypeError
-     */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
-    {
-        return ParagonIE_Sodium_Core32_Util::substr($sKey, 0, 32) .
-            ParagonIE_Sodium_Core32_Util::substr($pKey, 0, 32);
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $keypair
-     * @return string
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function box_secretkey($keypair)
-    {
-        if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== 64) {
-            throw new RangeException(
-                'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
-            );
-        }
-        return ParagonIE_Sodium_Core32_Util::substr($keypair, 0, 32);
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $keypair
-     * @return string
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function box_publickey($keypair)
-    {
-        if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new RangeException(
-                'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
-            );
-        }
-        return ParagonIE_Sodium_Core32_Util::substr($keypair, 32, 32);
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sKey
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_publickey_from_secretkey($sKey)
-    {
-        if (ParagonIE_Sodium_Core32_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new RangeException(
-                'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.'
-            );
-        }
-        return self::scalarmult_base($sKey);
-    }
-
-    /**
-     * Decrypt a message encrypted with box().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ciphertext
-     * @param string $nonce
-     * @param string $keypair
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_open($ciphertext, $nonce, $keypair)
-    {
-        return self::secretbox_open(
-            $ciphertext,
-            $nonce,
-            self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
-            )
-        );
-    }
-
-    /**
-     * Calculate a BLAKE2b hash.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string|null $key
-     * @param int $outlen
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash($message, $key = '', $outlen = 32)
-    {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            /** @var SplFixedArray $k */
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-
-        /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outlen);
-        ParagonIE_Sodium_Core32_BLAKE2b::update($ctx, $in, $in->count());
-
-        /** @var SplFixedArray $out */
-        $out = new SplFixedArray($outlen);
-        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($ctx, $out);
-
-        /** @var array<int, int> */
-        $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
-    }
-
-    /**
-     * Finalize a BLAKE2b hashing context, returning the hash.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ctx
-     * @param int $outlen
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_final($ctx, $outlen = 32)
-    {
-        if (!is_string($ctx)) {
-            throw new TypeError('Context must be a string');
-        }
-        $out = new SplFixedArray($outlen);
-
-        /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $out */
-        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($context, $out);
-
-        /** @var array<int, int> */
-        $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
-    }
-
-    /**
-     * Initialize a hashing context for BLAKE2b.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $key
-     * @param int $outputLength
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_init($key = '', $outputLength = 32)
-    {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength);
-
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
-    }
-
-    /**
-     * Initialize a hashing context for BLAKE2b.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $key
-     * @param int $outputLength
-     * @param string $salt
-     * @param string $personal
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_init_salt_personal(
-        $key = '',
-        $outputLength = 32,
-        $salt = '',
-        $personal = ''
-    ) {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-        if (!empty($salt)) {
-            $s = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($salt);
-        } else {
-            $s = null;
-        }
-        if (!empty($salt)) {
-            $p = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($personal);
-        } else {
-            $p = null;
-        }
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength, $s, $p);
-
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
-    }
-
-    /**
-     * Update a hashing context for BLAKE2b with $message
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ctx
-     * @param string $message
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_update($ctx, $message)
-    {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
-
-        ParagonIE_Sodium_Core32_BLAKE2b::update($context, $in, $in->count());
-
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($context);
-    }
-
-    /**
-     * Libsodium's crypto_kx().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $my_sk
-     * @param string $their_pk
-     * @param string $client_pk
-     * @param string $server_pk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
-    {
-        return self::generichash(
-            self::scalarmult($my_sk, $their_pk) .
-            $client_pk .
-            $server_pk
-        );
-    }
-
-    /**
-     * ECDH over Curve25519
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sKey
-     * @param string $pKey
-     * @return string
-     *
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function scalarmult($sKey, $pKey)
-    {
-        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
-        self::scalarmult_throw_if_zero($q);
-        return $q;
-    }
-
-    /**
-     * ECDH over Curve25519, using the basepoint.
-     * Used to get a secret key from a public key.
-     *
-     * @param string $secret
-     * @return string
-     *
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function scalarmult_base($secret)
-    {
-        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
-        self::scalarmult_throw_if_zero($q);
-        return $q;
-    }
-
-    /**
-     * This throws an Error if a zero public key was passed to the function.
-     *
-     * @param string $q
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function scalarmult_throw_if_zero($q)
-    {
-        $d = 0;
-        for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
-            $d |= ParagonIE_Sodium_Core32_Util::chrToInt($q[$i]);
-        }
-
-        /* branch-free variant of === 0 */
-        if (-(1 & (($d - 1) >> 8))) {
-            throw new SodiumException('Zero public key is not allowed');
-        }
-    }
-
-    /**
-     * XSalsa20-Poly1305 authenticated symmetric-key encryption.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $plaintext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox($plaintext, $nonce, $key)
-    {
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
-            $block0,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $block0,
-            self::secretbox_xsalsa20poly1305_ZEROBYTES
-        );
-        if ($mlen > $mlen0) {
-            $c .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $plaintext,
-                    self::secretbox_xsalsa20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-                1,
-                $subkey
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_Util::substr(
-                $block0,
-                0,
-                self::onetimeauth_poly1305_KEYBYTES
-            )
-        );
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-            $subkey = null;
-        }
-
-        $state->update($c);
-
-        /** @var string $c - MAC || ciphertext */
-        $c = $state->finish() . $c;
-        unset($state);
-
-        return $c;
-    }
-
-    /**
-     * Decrypt a ciphertext generated via secretbox().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ciphertext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox_open($ciphertext, $nonce, $key)
-    {
-        /** @var string $mac */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            0,
-            self::secretbox_xsalsa20poly1305_MACBYTES
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            self::secretbox_xsalsa20poly1305_MACBYTES
-        );
-
-        /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
-            64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-        $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
-            $mac,
-            $c,
-            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
-        );
-        if (!$verified) {
-            try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
-                $subkey = null;
-            }
-            throw new SodiumException('Invalid MAC');
-        }
-
-        /** @var string $m - Decrypted message */
-        $m = ParagonIE_Sodium_Core32_Util::xorStrings(
-            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
-        );
-        if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            // We had more than 1 block, so let's continue to decrypt the rest.
-            $m .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $c,
-                    self::secretbox_xsalsa20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-                1,
-                (string) $subkey
-            );
-        }
-        return $m;
-    }
-
-    /**
-     * XChaCha20-Poly1305 authenticated symmetric-key encryption.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $plaintext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-            $block0,
-            $nonceLast,
-            $subkey
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $block0,
-            self::secretbox_xchacha20poly1305_ZEROBYTES
-        );
-        if ($mlen > $mlen0) {
-            $c .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $plaintext,
-                    self::secretbox_xchacha20poly1305_ZEROBYTES
-                ),
-                $nonceLast,
-                $subkey,
-                ParagonIE_Sodium_Core32_Util::store64_le(1)
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_Util::substr(
-                $block0,
-                0,
-                self::onetimeauth_poly1305_KEYBYTES
-            )
-        );
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-            $subkey = null;
-        }
-
-        $state->update($c);
-
-        /** @var string $c - MAC || ciphertext */
-        $c = $state->finish() . $c;
-        unset($state);
-
-        return $c;
-    }
-
-    /**
-     * Decrypt a ciphertext generated via secretbox_xchacha20poly1305().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ciphertext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
-        /** @var string $mac */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            0,
-            self::secretbox_xchacha20poly1305_MACBYTES
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            self::secretbox_xchacha20poly1305_MACBYTES
-        );
-
-        /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hchacha20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
-            64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-        $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
-            $mac,
-            $c,
-            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
-        );
-
-        if (!$verified) {
-            try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
-                $subkey = null;
-            }
-            throw new SodiumException('Invalid MAC');
-        }
-
-        /** @var string $m - Decrypted message */
-        $m = ParagonIE_Sodium_Core32_Util::xorStrings(
-            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
-        );
-
-        if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
-            // We had more than 1 block, so let's continue to decrypt the rest.
-            $m .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $c,
-                    self::secretbox_xchacha20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-                (string) $subkey,
-                ParagonIE_Sodium_Core32_Util::store64_le(1)
-            );
-        }
-        return $m;
-    }
-
-    /**
-     * @param string $key
-     * @return array<int, string> Returns a state and a header.
-     * @throws Exception
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_init_push($key)
-    {
-        # randombytes_buf(out, crypto_secretstream_xchacha20poly1305_HEADERBYTES);
-        $out = random_bytes(24);
-
-        # crypto_core_hchacha20(state->k, out, k, NULL);
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20($out, $key);
-        $state = new ParagonIE_Sodium_Core32_SecretStream_State(
-            $subkey,
-            ParagonIE_Sodium_Core32_Util::substr($out, 16, 8) . str_repeat("\0", 4)
-        );
-
-        # _crypto_secretstream_xchacha20poly1305_counter_reset(state);
-        $state->counterReset();
-
-        # memcpy(STATE_INONCE(state), out + crypto_core_hchacha20_INPUTBYTES,
-        #        crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        # memset(state->_pad, 0, sizeof state->_pad);
-        return array(
-            $state->toString(),
-            $out
-        );
-    }
-
-    /**
-     * @param string $key
-     * @param string $header
-     * @return string Returns a state.
-     * @throws Exception
-     */
-    public static function secretstream_xchacha20poly1305_init_pull($key, $header)
-    {
-        # crypto_core_hchacha20(state->k, in, k, NULL);
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($header, 0, 16),
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core32_SecretStream_State(
-            $subkey,
-            ParagonIE_Sodium_Core32_Util::substr($header, 16)
-        );
-        $state->counterReset();
-        # memcpy(STATE_INONCE(state), in + crypto_core_hchacha20_INPUTBYTES,
-        #     crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        # memset(state->_pad, 0, sizeof state->_pad);
-        # return 0;
-        return $state->toString();
-    }
-
-    /**
-     * @param string $state
-     * @param string $msg
-     * @param string $aad
-     * @param int $tag
-     * @return string
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
-    {
-        $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
-        # crypto_onetimeauth_poly1305_state poly1305_state;
-        # unsigned char                     block[64U];
-        # unsigned char                     slen[8U];
-        # unsigned char                    *c;
-        # unsigned char                    *mac;
-
-        $msglen = ParagonIE_Sodium_Core32_Util::strlen($msg);
-        $aadlen = ParagonIE_Sodium_Core32_Util::strlen($aad);
-
-        if ((($msglen + 63) >> 6) > 0xfffffffe) {
-            throw new SodiumException(
-                'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
-            );
-        }
-
-        # if (outlen_p != NULL) {
-        #     *outlen_p = 0U;
-        # }
-        # if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
-        #     sodium_misuse();
-        # }
-
-        # crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
-        # crypto_onetimeauth_poly1305_init(&poly1305_state, block);
-        # sodium_memzero(block, sizeof block);
-        $auth = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
-        );
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-        $auth->update($aad);
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
-        #     (0x10 - adlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
-
-        # memset(block, 0, sizeof block);
-        # block[0] = tag;
-        # crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
-        #                                    state->nonce, 1U, state->k);
-        $block = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            ParagonIE_Sodium_Core32_Util::intToChr($tag) . str_repeat("\0", 63),
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-        $auth->update($block);
-
-        # out[0] = block[0];
-        $out = $block[0];
-        # c = out + (sizeof tag);
-        # crypto_stream_chacha20_ietf_xor_ic(c, m, mlen, state->nonce, 2U, state->k);
-        $cipher = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $msg,
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(2)
-        );
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-        $auth->update($cipher);
-
-        $out .= $cipher;
-        unset($cipher);
-
-        # crypto_onetimeauth_poly1305_update
-        # (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
-
-        # STORE64_LE(slen, (uint64_t) adlen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le($aadlen);
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $auth->update($slen);
-
-        # STORE64_LE(slen, (sizeof block) + mlen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le(64 + $msglen);
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $auth->update($slen);
-
-        # mac = c + mlen;
-        # crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
-        $mac = $auth->finish();
-        $out .= $mac;
-
-        # sodium_memzero(&poly1305_state, sizeof poly1305_state);
-        unset($auth);
-
-
-        # XOR_BUF(STATE_INONCE(state), mac,
-        #     crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        $st->xorNonce($mac);
-
-        # sodium_increment(STATE_COUNTER(state),
-        #     crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
-        $st->incrementCounter();
-        // Overwrite by reference:
-        $state = $st->toString();
-
-        /** @var bool $rekey */
-        $rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
-        # if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
-        #     sodium_is_zero(STATE_COUNTER(state),
-        #         crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
-        #     crypto_secretstream_xchacha20poly1305_rekey(state);
-        # }
-        if ($rekey || $st->needsRekey()) {
-            // DO REKEY
-            self::secretstream_xchacha20poly1305_rekey($state);
-        }
-        # if (outlen_p != NULL) {
-        #     *outlen_p = crypto_secretstream_xchacha20poly1305_ABYTES + mlen;
-        # }
-        return $out;
-    }
-
-    /**
-     * @param string $state
-     * @param string $cipher
-     * @param string $aad
-     * @return bool|array{0: string, 1: int}
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '')
-    {
-        $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
-
-        $cipherlen = ParagonIE_Sodium_Core32_Util::strlen($cipher);
-        #     mlen = inlen - crypto_secretstream_xchacha20poly1305_ABYTES;
-        $msglen = $cipherlen - ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES;
-        $aadlen = ParagonIE_Sodium_Core32_Util::strlen($aad);
-
-        #     if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
-        #         sodium_misuse();
-        #     }
-        if ((($msglen + 63) >> 6) > 0xfffffffe) {
-            throw new SodiumException(
-                'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
-            );
-        }
-
-        #     crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
-        #     crypto_onetimeauth_poly1305_init(&poly1305_state, block);
-        #     sodium_memzero(block, sizeof block);
-        $auth = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
-        );
-
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-        $auth->update($aad);
-
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
-        #         (0x10 - adlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
-
-
-        #     memset(block, 0, sizeof block);
-        #     block[0] = in[0];
-        #     crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
-        #                                        state->nonce, 1U, state->k);
-        $block = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $cipher[0] . str_repeat("\0", 63),
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-        #     tag = block[0];
-        #     block[0] = in[0];
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-        $tag = ParagonIE_Sodium_Core32_Util::chrToInt($block[0]);
-        $block[0] = $cipher[0];
-        $auth->update($block);
-
-
-        #     c = in + (sizeof tag);
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-        $auth->update(ParagonIE_Sodium_Core32_Util::substr($cipher, 1, $msglen));
-
-        #     crypto_onetimeauth_poly1305_update
-        #     (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
-
-        #     STORE64_LE(slen, (uint64_t) adlen);
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le($aadlen);
-        $auth->update($slen);
-
-        #     STORE64_LE(slen, (sizeof block) + mlen);
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le(64 + $msglen);
-        $auth->update($slen);
-
-        #     crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
-        #     sodium_memzero(&poly1305_state, sizeof poly1305_state);
-        $mac = $auth->finish();
-
-        #     stored_mac = c + mlen;
-        #     if (sodium_memcmp(mac, stored_mac, sizeof mac) != 0) {
-        #     sodium_memzero(mac, sizeof mac);
-        #         return -1;
-        #     }
-
-        $stored = ParagonIE_Sodium_Core32_Util::substr($cipher, $msglen + 1, 16);
-        if (!ParagonIE_Sodium_Core32_Util::hashEquals($mac, $stored)) {
-            return false;
-        }
-
-        #     crypto_stream_chacha20_ietf_xor_ic(m, c, mlen, state->nonce, 2U, state->k);
-        $out = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            ParagonIE_Sodium_Core32_Util::substr($cipher, 1, $msglen),
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(2)
-        );
-
-        #     XOR_BUF(STATE_INONCE(state), mac,
-        #         crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        $st->xorNonce($mac);
-
-        #     sodium_increment(STATE_COUNTER(state),
-        #         crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
-        $st->incrementCounter();
-
-        #     if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
-        #         sodium_is_zero(STATE_COUNTER(state),
-        #             crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
-        #         crypto_secretstream_xchacha20poly1305_rekey(state);
-        #     }
-
-        // Overwrite by reference:
-        $state = $st->toString();
-
-        /** @var bool $rekey */
-        $rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
-        if ($rekey || $st->needsRekey()) {
-            // DO REKEY
-            self::secretstream_xchacha20poly1305_rekey($state);
-        }
-        return array($out, $tag);
-    }
-
-    /**
-     * @param string $state
-     * @return void
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_rekey(&$state)
-    {
-        $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
-        # unsigned char new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES +
-        # crypto_secretstream_xchacha20poly1305_INONCEBYTES];
-        # size_t        i;
-        # for (i = 0U; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
-        #     new_key_and_inonce[i] = state->k[i];
-        # }
-        $new_key_and_inonce = $st->getKey();
-
-        # for (i = 0U; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
-        #     new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i] =
-        #         STATE_INONCE(state)[i];
-        # }
-        $new_key_and_inonce .= ParagonIE_Sodium_Core32_Util::substR($st->getNonce(), 0, 8);
-
-        # crypto_stream_chacha20_ietf_xor(new_key_and_inonce, new_key_and_inonce,
-        #                                 sizeof new_key_and_inonce,
-        #                                 state->nonce, state->k);
-
-        $st->rekey(ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $new_key_and_inonce,
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(0)
-        ));
-
-        # for (i = 0U; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
-        #     state->k[i] = new_key_and_inonce[i];
-        # }
-        # for (i = 0U; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
-        #     STATE_INONCE(state)[i] =
-        #          new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i];
-        # }
-        # _crypto_secretstream_xchacha20poly1305_counter_reset(state);
-        $st->counterReset();
-
-        $state = $st->toString();
-    }
-
-    /**
-     * Detached Ed25519 signature.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign_detached($message, $sk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::sign_detached($message, $sk);
-    }
-
-    /**
-     * Attached Ed25519 signature. (Returns a signed message.)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign($message, $sk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::sign($message, $sk);
-    }
-
-    /**
-     * Opens a signed message. If valid, returns the message.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $signedMessage
-     * @param string $pk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign_open($signedMessage, $pk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::sign_open($signedMessage, $pk);
-    }
-
-    /**
-     * Verify a detached signature of a given message and public key.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $signature
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign_verify_detached($signature, $message, $pk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::verify_detached($signature, $message, $pk);
-    }
+	const aead_chacha20poly1305_KEYBYTES = 32;
+	const aead_chacha20poly1305_NSECBYTES = 0;
+	const aead_chacha20poly1305_NPUBBYTES = 8;
+	const aead_chacha20poly1305_ABYTES = 16;
+
+	const aead_chacha20poly1305_IETF_KEYBYTES = 32;
+	const aead_chacha20poly1305_IETF_NSECBYTES = 0;
+	const aead_chacha20poly1305_IETF_NPUBBYTES = 12;
+	const aead_chacha20poly1305_IETF_ABYTES = 16;
+
+	const aead_xchacha20poly1305_IETF_KEYBYTES = 32;
+	const aead_xchacha20poly1305_IETF_NSECBYTES = 0;
+	const aead_xchacha20poly1305_IETF_NPUBBYTES = 24;
+	const aead_xchacha20poly1305_IETF_ABYTES = 16;
+
+	const box_curve25519xsalsa20poly1305_SEEDBYTES = 32;
+	const box_curve25519xsalsa20poly1305_PUBLICKEYBYTES = 32;
+	const box_curve25519xsalsa20poly1305_SECRETKEYBYTES = 32;
+	const box_curve25519xsalsa20poly1305_BEFORENMBYTES = 32;
+	const box_curve25519xsalsa20poly1305_NONCEBYTES = 24;
+	const box_curve25519xsalsa20poly1305_MACBYTES = 16;
+	const box_curve25519xsalsa20poly1305_BOXZEROBYTES = 16;
+	const box_curve25519xsalsa20poly1305_ZEROBYTES = 32;
+
+	const onetimeauth_poly1305_BYTES = 16;
+	const onetimeauth_poly1305_KEYBYTES = 32;
+
+	const secretbox_xsalsa20poly1305_KEYBYTES = 32;
+	const secretbox_xsalsa20poly1305_NONCEBYTES = 24;
+	const secretbox_xsalsa20poly1305_MACBYTES = 16;
+	const secretbox_xsalsa20poly1305_BOXZEROBYTES = 16;
+	const secretbox_xsalsa20poly1305_ZEROBYTES = 32;
+
+	const secretbox_xchacha20poly1305_KEYBYTES = 32;
+	const secretbox_xchacha20poly1305_NONCEBYTES = 24;
+	const secretbox_xchacha20poly1305_MACBYTES = 16;
+	const secretbox_xchacha20poly1305_BOXZEROBYTES = 16;
+	const secretbox_xchacha20poly1305_ZEROBYTES = 32;
+
+	const stream_salsa20_KEYBYTES = 32;
+
+	/**
+	 * AEAD Decryption with ChaCha20-Poly1305
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $ad
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function aead_chacha20poly1305_decrypt(
+		$message = '',
+		$ad = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/** @var int $len - Length of message (ciphertext + MAC) */
+		$len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+		/** @var int  $clen - Length of ciphertext */
+		$clen = $len - self::aead_chacha20poly1305_ABYTES;
+
+		/** @var int $adlen - Length of associated data */
+		$adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+		/** @var string $mac - Message authentication code */
+		$mac = ParagonIE_Sodium_Core32_Util::substr(
+			$message,
+			$clen,
+			self::aead_chacha20poly1305_ABYTES
+		);
+
+		/** @var string $ciphertext - The encrypted message (sans MAC) */
+		$ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 0, $clen);
+
+		/** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+		$block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
+			32,
+			$nonce,
+			$key
+		);
+
+		/* Recalculate the Poly1305 authentication tag (MAC): */
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+		} catch (SodiumException $ex) {
+			$block0 = null;
+		}
+		$state->update($ad);
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+		$state->update($ciphertext);
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
+		$computed_mac = $state->finish();
+
+		/* Compare the given MAC with the recalculated MAC: */
+		if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
+			throw new SodiumException('Invalid MAC');
+		}
+
+		// Here, we know that the MAC is valid, so we decrypt and return the plaintext
+		return ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+			$ciphertext,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core32_Util::store64_le(1)
+		);
+	}
+
+	/**
+	 * AEAD Encryption with ChaCha20-Poly1305
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $ad
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function aead_chacha20poly1305_encrypt(
+		$message = '',
+		$ad = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/** @var int $len - Length of the plaintext message */
+		$len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+		/** @var int $adlen - Length of the associated data */
+		$adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+		/** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+		$block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
+			32,
+			$nonce,
+			$key
+		);
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+		} catch (SodiumException $ex) {
+			$block0 = null;
+		}
+
+		/** @var string $ciphertext - Raw encrypted data */
+		$ciphertext = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+			$message,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core32_Util::store64_le(1)
+		);
+
+		$state->update($ad);
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+		$state->update($ciphertext);
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
+		return $ciphertext . $state->finish();
+	}
+
+	/**
+	 * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $ad
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function aead_chacha20poly1305_ietf_decrypt(
+		$message = '',
+		$ad = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/** @var int $adlen - Length of associated data */
+		$adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+		/** @var int $len - Length of message (ciphertext + MAC) */
+		$len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+		/** @var int  $clen - Length of ciphertext */
+		$clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
+
+		/** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+		$block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
+			32,
+			$nonce,
+			$key
+		);
+
+		/** @var string $mac - Message authentication code */
+		$mac = ParagonIE_Sodium_Core32_Util::substr(
+			$message,
+			$len - self::aead_chacha20poly1305_IETF_ABYTES,
+			self::aead_chacha20poly1305_IETF_ABYTES
+		);
+
+		/** @var string $ciphertext - The encrypted message (sans MAC) */
+		$ciphertext = ParagonIE_Sodium_Core32_Util::substr(
+			$message,
+			0,
+			$len - self::aead_chacha20poly1305_IETF_ABYTES
+		);
+
+		/* Recalculate the Poly1305 authentication tag (MAC): */
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+		} catch (SodiumException $ex) {
+			$block0 = null;
+		}
+		$state->update($ad);
+		$state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+		$state->update($ciphertext);
+		$state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
+		$computed_mac = $state->finish();
+
+		/* Compare the given MAC with the recalculated MAC: */
+		if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
+			throw new SodiumException('Invalid MAC');
+		}
+
+		// Here, we know that the MAC is valid, so we decrypt and return the plaintext
+		return ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+			$ciphertext,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core32_Util::store64_le(1)
+		);
+	}
+
+	/**
+	 * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $ad
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function aead_chacha20poly1305_ietf_encrypt(
+		$message = '',
+		$ad = '',
+		$nonce = '',
+		$key = ''
+	) {
+		/** @var int $len - Length of the plaintext message */
+		$len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+		/** @var int $adlen - Length of the associated data */
+		$adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+		/** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+		$block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
+			32,
+			$nonce,
+			$key
+		);
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+		} catch (SodiumException $ex) {
+			$block0 = null;
+		}
+
+		/** @var string $ciphertext - Raw encrypted data */
+		$ciphertext = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+			$message,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core32_Util::store64_le(1)
+		);
+
+		$state->update($ad);
+		$state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+		$state->update($ciphertext);
+		$state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+		$state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
+		return $ciphertext . $state->finish();
+	}
+
+	/**
+	 * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $ad
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function aead_xchacha20poly1305_ietf_decrypt(
+		$message = '',
+		$ad = '',
+		$nonce = '',
+		$key = ''
+	) {
+		$subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+			$key
+		);
+		$nonceLast = "\x00\x00\x00\x00" .
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+		return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
+	}
+
+	/**
+	 * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $ad
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function aead_xchacha20poly1305_ietf_encrypt(
+		$message = '',
+		$ad = '',
+		$nonce = '',
+		$key = ''
+	) {
+		$subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+			$key
+		);
+		$nonceLast = "\x00\x00\x00\x00" .
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+		return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
+	}
+
+	/**
+	 * HMAC-SHA-512-256 (a.k.a. the leftmost 256 bits of HMAC-SHA-512)
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function auth($message, $key)
+	{
+		return ParagonIE_Sodium_Core32_Util::substr(
+			hash_hmac('sha512', $message, $key, true),
+			0,
+			32
+		);
+	}
+
+	/**
+	 * HMAC-SHA-512-256 validation. Constant-time via hash_equals().
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $mac
+	 * @param string $message
+	 * @param string $key
+	 * @return bool
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function auth_verify($mac, $message, $key)
+	{
+		return ParagonIE_Sodium_Core32_Util::hashEquals(
+			$mac,
+			self::auth($message, $key)
+		);
+	}
+
+	/**
+	 * X25519 key exchange followed by XSalsa20Poly1305 symmetric encryption
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $plaintext
+	 * @param string $nonce
+	 * @param string $keypair
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box($plaintext, $nonce, $keypair)
+	{
+		return self::secretbox(
+			$plaintext,
+			$nonce,
+			self::box_beforenm(
+				self::box_secretkey($keypair),
+				self::box_publickey($keypair)
+			)
+		);
+	}
+
+	/**
+	 * X25519-XSalsa20-Poly1305 with one ephemeral X25519 keypair.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $publicKey
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box_seal($message, $publicKey)
+	{
+		/** @var string $ephemeralKeypair */
+		$ephemeralKeypair = self::box_keypair();
+
+		/** @var string $ephemeralSK */
+		$ephemeralSK = self::box_secretkey($ephemeralKeypair);
+
+		/** @var string $ephemeralPK */
+		$ephemeralPK = self::box_publickey($ephemeralKeypair);
+
+		/** @var string $nonce */
+		$nonce = self::generichash(
+			$ephemeralPK . $publicKey,
+			'',
+			24
+		);
+
+		/** @var string $keypair - The combined keypair used in crypto_box() */
+		$keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
+
+		/** @var string $ciphertext Ciphertext + MAC from crypto_box */
+		$ciphertext = self::box($message, $nonce, $keypair);
+		try {
+			ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
+			ParagonIE_Sodium_Compat::memzero($ephemeralSK);
+			ParagonIE_Sodium_Compat::memzero($nonce);
+		} catch (SodiumException $ex) {
+			$ephemeralKeypair = null;
+			$ephemeralSK = null;
+			$nonce = null;
+		}
+		return $ephemeralPK . $ciphertext;
+	}
+
+	/**
+	 * Opens a message encrypted via box_seal().
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $keypair
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box_seal_open($message, $keypair)
+	{
+		/** @var string $ephemeralPK */
+		$ephemeralPK = ParagonIE_Sodium_Core32_Util::substr($message, 0, 32);
+
+		/** @var string $ciphertext (ciphertext + MAC) */
+		$ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 32);
+
+		/** @var string $secretKey */
+		$secretKey = self::box_secretkey($keypair);
+
+		/** @var string $publicKey */
+		$publicKey = self::box_publickey($keypair);
+
+		/** @var string $nonce */
+		$nonce = self::generichash(
+			$ephemeralPK . $publicKey,
+			'',
+			24
+		);
+
+		/** @var string $keypair */
+		$keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
+
+		/** @var string $m */
+		$m = self::box_open($ciphertext, $nonce, $keypair);
+		try {
+			ParagonIE_Sodium_Compat::memzero($secretKey);
+			ParagonIE_Sodium_Compat::memzero($ephemeralPK);
+			ParagonIE_Sodium_Compat::memzero($nonce);
+		} catch (SodiumException $ex) {
+			$secretKey = null;
+			$ephemeralPK = null;
+			$nonce = null;
+		}
+		return $m;
+	}
+
+	/**
+	 * Used by crypto_box() to get the crypto_secretbox() key.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $sk
+	 * @param string $pk
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box_beforenm($sk, $pk)
+	{
+		return ParagonIE_Sodium_Core32_HSalsa20::hsalsa20(
+			str_repeat("\x00", 16),
+			self::scalarmult($sk, $pk)
+		);
+	}
+
+	/**
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @return string
+	 * @throws Exception
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box_keypair()
+	{
+		$sKey = random_bytes(32);
+		$pKey = self::scalarmult_base($sKey);
+		return $sKey . $pKey;
+	}
+
+	/**
+	 * @param string $seed
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box_seed_keypair($seed)
+	{
+		$sKey = ParagonIE_Sodium_Core32_Util::substr(
+			hash('sha512', $seed, true),
+			0,
+			32
+		);
+		$pKey = self::scalarmult_base($sKey);
+		return $sKey . $pKey;
+	}
+
+	/**
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $sKey
+	 * @param string $pKey
+	 * @return string
+	 * @throws TypeError
+	 */
+	public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
+	{
+		return ParagonIE_Sodium_Core32_Util::substr($sKey, 0, 32) .
+			ParagonIE_Sodium_Core32_Util::substr($pKey, 0, 32);
+	}
+
+	/**
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $keypair
+	 * @return string
+	 * @throws RangeException
+	 * @throws TypeError
+	 */
+	public static function box_secretkey($keypair)
+	{
+		if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== 64) {
+			throw new RangeException(
+				'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
+			);
+		}
+		return ParagonIE_Sodium_Core32_Util::substr($keypair, 0, 32);
+	}
+
+	/**
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $keypair
+	 * @return string
+	 * @throws RangeException
+	 * @throws TypeError
+	 */
+	public static function box_publickey($keypair)
+	{
+		if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+			throw new RangeException(
+				'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
+			);
+		}
+		return ParagonIE_Sodium_Core32_Util::substr($keypair, 32, 32);
+	}
+
+	/**
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $sKey
+	 * @return string
+	 * @throws RangeException
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box_publickey_from_secretkey($sKey)
+	{
+		if (ParagonIE_Sodium_Core32_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
+			throw new RangeException(
+				'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.'
+			);
+		}
+		return self::scalarmult_base($sKey);
+	}
+
+	/**
+	 * Decrypt a message encrypted with box().
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $ciphertext
+	 * @param string $nonce
+	 * @param string $keypair
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function box_open($ciphertext, $nonce, $keypair)
+	{
+		return self::secretbox_open(
+			$ciphertext,
+			$nonce,
+			self::box_beforenm(
+				self::box_secretkey($keypair),
+				self::box_publickey($keypair)
+			)
+		);
+	}
+
+	/**
+	 * Calculate a BLAKE2b hash.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string|null $key
+	 * @param int $outlen
+	 * @return string
+	 * @throws RangeException
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function generichash($message, $key = '', $outlen = 32)
+	{
+		// This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
+		ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
+
+		$k = null;
+		if (!empty($key)) {
+			/** @var SplFixedArray $k */
+			$k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
+			if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
+				throw new RangeException('Invalid key size');
+			}
+		}
+
+		/** @var SplFixedArray $in */
+		$in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
+
+		/** @var SplFixedArray $ctx */
+		$ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outlen);
+		ParagonIE_Sodium_Core32_BLAKE2b::update($ctx, $in, $in->count());
+
+		/** @var SplFixedArray $out */
+		$out = new SplFixedArray($outlen);
+		$out = ParagonIE_Sodium_Core32_BLAKE2b::finish($ctx, $out);
+
+		/** @var array<int, int> */
+		$outArray = $out->toArray();
+		return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
+	}
+
+	/**
+	 * Finalize a BLAKE2b hashing context, returning the hash.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $ctx
+	 * @param int $outlen
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function generichash_final($ctx, $outlen = 32)
+	{
+		if (!is_string($ctx)) {
+			throw new TypeError('Context must be a string');
+		}
+		$out = new SplFixedArray($outlen);
+
+		/** @var SplFixedArray $context */
+		$context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
+
+		/** @var SplFixedArray $out */
+		$out = ParagonIE_Sodium_Core32_BLAKE2b::finish($context, $out);
+
+		/** @var array<int, int> */
+		$outArray = $out->toArray();
+		return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
+	}
+
+	/**
+	 * Initialize a hashing context for BLAKE2b.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $key
+	 * @param int $outputLength
+	 * @return string
+	 * @throws RangeException
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function generichash_init($key = '', $outputLength = 32)
+	{
+		// This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
+		ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
+
+		$k = null;
+		if (!empty($key)) {
+			$k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
+			if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
+				throw new RangeException('Invalid key size');
+			}
+		}
+
+		/** @var SplFixedArray $ctx */
+		$ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength);
+
+		return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
+	}
+
+	/**
+	 * Initialize a hashing context for BLAKE2b.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $key
+	 * @param int $outputLength
+	 * @param string $salt
+	 * @param string $personal
+	 * @return string
+	 * @throws RangeException
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function generichash_init_salt_personal(
+		$key = '',
+		$outputLength = 32,
+		$salt = '',
+		$personal = ''
+	) {
+		// This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
+		ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
+
+		$k = null;
+		if (!empty($key)) {
+			$k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
+			if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
+				throw new RangeException('Invalid key size');
+			}
+		}
+		if (!empty($salt)) {
+			$s = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($salt);
+		} else {
+			$s = null;
+		}
+		if (!empty($salt)) {
+			$p = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($personal);
+		} else {
+			$p = null;
+		}
+
+		/** @var SplFixedArray $ctx */
+		$ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength, $s, $p);
+
+		return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
+	}
+
+	/**
+	 * Update a hashing context for BLAKE2b with $message
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $ctx
+	 * @param string $message
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function generichash_update($ctx, $message)
+	{
+		// This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
+		ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
+
+		/** @var SplFixedArray $context */
+		$context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
+
+		/** @var SplFixedArray $in */
+		$in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
+
+		ParagonIE_Sodium_Core32_BLAKE2b::update($context, $in, $in->count());
+
+		return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($context);
+	}
+
+	/**
+	 * Libsodium's crypto_kx().
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $my_sk
+	 * @param string $their_pk
+	 * @param string $client_pk
+	 * @param string $server_pk
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
+	{
+		return self::generichash(
+			self::scalarmult($my_sk, $their_pk) .
+			$client_pk .
+			$server_pk
+		);
+	}
+
+	/**
+	 * ECDH over Curve25519
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $sKey
+	 * @param string $pKey
+	 * @return string
+	 *
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function scalarmult($sKey, $pKey)
+	{
+		$q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
+		self::scalarmult_throw_if_zero($q);
+		return $q;
+	}
+
+	/**
+	 * ECDH over Curve25519, using the basepoint.
+	 * Used to get a secret key from a public key.
+	 *
+	 * @param string $secret
+	 * @return string
+	 *
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function scalarmult_base($secret)
+	{
+		$q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
+		self::scalarmult_throw_if_zero($q);
+		return $q;
+	}
+
+	/**
+	 * This throws an Error if a zero public key was passed to the function.
+	 *
+	 * @param string $q
+	 * @return void
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	protected static function scalarmult_throw_if_zero($q)
+	{
+		$d = 0;
+		for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
+			$d |= ParagonIE_Sodium_Core32_Util::chrToInt($q[$i]);
+		}
+
+		/* branch-free variant of === 0 */
+		if (-(1 & (($d - 1) >> 8))) {
+			throw new SodiumException('Zero public key is not allowed');
+		}
+	}
+
+	/**
+	 * XSalsa20-Poly1305 authenticated symmetric-key encryption.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $plaintext
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function secretbox($plaintext, $nonce, $key)
+	{
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+
+		/** @var string $block0 */
+		$block0 = str_repeat("\x00", 32);
+
+		/** @var int $mlen - Length of the plaintext message */
+		$mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
+		$mlen0 = $mlen;
+		if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+			$mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
+		}
+		$block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
+			$block0,
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+			$subkey
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core32_Util::substr(
+			$block0,
+			self::secretbox_xsalsa20poly1305_ZEROBYTES
+		);
+		if ($mlen > $mlen0) {
+			$c .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
+				ParagonIE_Sodium_Core32_Util::substr(
+					$plaintext,
+					self::secretbox_xsalsa20poly1305_ZEROBYTES
+				),
+				ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+				1,
+				$subkey
+			);
+		}
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State(
+			ParagonIE_Sodium_Core32_Util::substr(
+				$block0,
+				0,
+				self::onetimeauth_poly1305_KEYBYTES
+			)
+		);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+			ParagonIE_Sodium_Compat::memzero($subkey);
+		} catch (SodiumException $ex) {
+			$block0 = null;
+			$subkey = null;
+		}
+
+		$state->update($c);
+
+		/** @var string $c - MAC || ciphertext */
+		$c = $state->finish() . $c;
+		unset($state);
+
+		return $c;
+	}
+
+	/**
+	 * Decrypt a ciphertext generated via secretbox().
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $ciphertext
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function secretbox_open($ciphertext, $nonce, $key)
+	{
+		/** @var string $mac */
+		$mac = ParagonIE_Sodium_Core32_Util::substr(
+			$ciphertext,
+			0,
+			self::secretbox_xsalsa20poly1305_MACBYTES
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core32_Util::substr(
+			$ciphertext,
+			self::secretbox_xsalsa20poly1305_MACBYTES
+		);
+
+		/** @var int $clen */
+		$clen = ParagonIE_Sodium_Core32_Util::strlen($c);
+
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
+			64,
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+			$subkey
+		);
+		$verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
+			$mac,
+			$c,
+			ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
+		);
+		if (!$verified) {
+			try {
+				ParagonIE_Sodium_Compat::memzero($subkey);
+			} catch (SodiumException $ex) {
+				$subkey = null;
+			}
+			throw new SodiumException('Invalid MAC');
+		}
+
+		/** @var string $m - Decrypted message */
+		$m = ParagonIE_Sodium_Core32_Util::xorStrings(
+			ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
+			ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
+		);
+		if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+			// We had more than 1 block, so let's continue to decrypt the rest.
+			$m .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
+				ParagonIE_Sodium_Core32_Util::substr(
+					$c,
+					self::secretbox_xsalsa20poly1305_ZEROBYTES
+				),
+				ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+				1,
+				(string) $subkey
+			);
+		}
+		return $m;
+	}
+
+	/**
+	 * XChaCha20-Poly1305 authenticated symmetric-key encryption.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $plaintext
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+	{
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+			$key
+		);
+		$nonceLast = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+		/** @var string $block0 */
+		$block0 = str_repeat("\x00", 32);
+
+		/** @var int $mlen - Length of the plaintext message */
+		$mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
+		$mlen0 = $mlen;
+		if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+			$mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
+		}
+		$block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+			$block0,
+			$nonceLast,
+			$subkey
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core32_Util::substr(
+			$block0,
+			self::secretbox_xchacha20poly1305_ZEROBYTES
+		);
+		if ($mlen > $mlen0) {
+			$c .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+				ParagonIE_Sodium_Core32_Util::substr(
+					$plaintext,
+					self::secretbox_xchacha20poly1305_ZEROBYTES
+				),
+				$nonceLast,
+				$subkey,
+				ParagonIE_Sodium_Core32_Util::store64_le(1)
+			);
+		}
+		$state = new ParagonIE_Sodium_Core32_Poly1305_State(
+			ParagonIE_Sodium_Core32_Util::substr(
+				$block0,
+				0,
+				self::onetimeauth_poly1305_KEYBYTES
+			)
+		);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+			ParagonIE_Sodium_Compat::memzero($subkey);
+		} catch (SodiumException $ex) {
+			$block0 = null;
+			$subkey = null;
+		}
+
+		$state->update($c);
+
+		/** @var string $c - MAC || ciphertext */
+		$c = $state->finish() . $c;
+		unset($state);
+
+		return $c;
+	}
+
+	/**
+	 * Decrypt a ciphertext generated via secretbox_xchacha20poly1305().
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $ciphertext
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+	{
+		/** @var string $mac */
+		$mac = ParagonIE_Sodium_Core32_Util::substr(
+			$ciphertext,
+			0,
+			self::secretbox_xchacha20poly1305_MACBYTES
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core32_Util::substr(
+			$ciphertext,
+			self::secretbox_xchacha20poly1305_MACBYTES
+		);
+
+		/** @var int $clen */
+		$clen = ParagonIE_Sodium_Core32_Util::strlen($c);
+
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core32_HChaCha20::hchacha20($nonce, $key);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
+			64,
+			ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+			$subkey
+		);
+		$verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
+			$mac,
+			$c,
+			ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
+		);
+
+		if (!$verified) {
+			try {
+				ParagonIE_Sodium_Compat::memzero($subkey);
+			} catch (SodiumException $ex) {
+				$subkey = null;
+			}
+			throw new SodiumException('Invalid MAC');
+		}
+
+		/** @var string $m - Decrypted message */
+		$m = ParagonIE_Sodium_Core32_Util::xorStrings(
+			ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
+			ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
+		);
+
+		if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
+			// We had more than 1 block, so let's continue to decrypt the rest.
+			$m .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+				ParagonIE_Sodium_Core32_Util::substr(
+					$c,
+					self::secretbox_xchacha20poly1305_ZEROBYTES
+				),
+				ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+				(string) $subkey,
+				ParagonIE_Sodium_Core32_Util::store64_le(1)
+			);
+		}
+		return $m;
+	}
+
+	/**
+	 * @param string $key
+	 * @return array<int, string> Returns a state and a header.
+	 * @throws Exception
+	 * @throws SodiumException
+	 */
+	public static function secretstream_xchacha20poly1305_init_push($key)
+	{
+		# randombytes_buf(out, crypto_secretstream_xchacha20poly1305_HEADERBYTES);
+		$out = random_bytes(24);
+
+		# crypto_core_hchacha20(state->k, out, k, NULL);
+		$subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20($out, $key);
+		$state = new ParagonIE_Sodium_Core32_SecretStream_State(
+			$subkey,
+			ParagonIE_Sodium_Core32_Util::substr($out, 16, 8) . str_repeat("\0", 4)
+		);
+
+		# _crypto_secretstream_xchacha20poly1305_counter_reset(state);
+		$state->counterReset();
+
+		# memcpy(STATE_INONCE(state), out + crypto_core_hchacha20_INPUTBYTES,
+		#        crypto_secretstream_xchacha20poly1305_INONCEBYTES);
+		# memset(state->_pad, 0, sizeof state->_pad);
+		return array(
+			$state->toString(),
+			$out
+		);
+	}
+
+	/**
+	 * @param string $key
+	 * @param string $header
+	 * @return string Returns a state.
+	 * @throws Exception
+	 */
+	public static function secretstream_xchacha20poly1305_init_pull($key, $header)
+	{
+		# crypto_core_hchacha20(state->k, in, k, NULL);
+		$subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
+			ParagonIE_Sodium_Core32_Util::substr($header, 0, 16),
+			$key
+		);
+		$state = new ParagonIE_Sodium_Core32_SecretStream_State(
+			$subkey,
+			ParagonIE_Sodium_Core32_Util::substr($header, 16)
+		);
+		$state->counterReset();
+		# memcpy(STATE_INONCE(state), in + crypto_core_hchacha20_INPUTBYTES,
+		#     crypto_secretstream_xchacha20poly1305_INONCEBYTES);
+		# memset(state->_pad, 0, sizeof state->_pad);
+		# return 0;
+		return $state->toString();
+	}
+
+	/**
+	 * @param string $state
+	 * @param string $msg
+	 * @param string $aad
+	 * @param int $tag
+	 * @return string
+	 * @throws SodiumException
+	 */
+	public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
+	{
+		$st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
+		# crypto_onetimeauth_poly1305_state poly1305_state;
+		# unsigned char                     block[64U];
+		# unsigned char                     slen[8U];
+		# unsigned char                    *c;
+		# unsigned char                    *mac;
+
+		$msglen = ParagonIE_Sodium_Core32_Util::strlen($msg);
+		$aadlen = ParagonIE_Sodium_Core32_Util::strlen($aad);
+
+		if ((($msglen + 63) >> 6) > 0xfffffffe) {
+			throw new SodiumException(
+				'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
+			);
+		}
+
+		# if (outlen_p != NULL) {
+		#     *outlen_p = 0U;
+		# }
+		# if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
+		#     sodium_misuse();
+		# }
+
+		# crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
+		# crypto_onetimeauth_poly1305_init(&poly1305_state, block);
+		# sodium_memzero(block, sizeof block);
+		$auth = new ParagonIE_Sodium_Core32_Poly1305_State(
+			ParagonIE_Sodium_Core32_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
+		);
+
+		# crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
+		$auth->update($aad);
+
+		# crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
+		#     (0x10 - adlen) & 0xf);
+		$auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
+
+		# memset(block, 0, sizeof block);
+		# block[0] = tag;
+		# crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
+		#                                    state->nonce, 1U, state->k);
+		$block = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+			ParagonIE_Sodium_Core32_Util::intToChr($tag) . str_repeat("\0", 63),
+			$st->getCombinedNonce(),
+			$st->getKey(),
+			ParagonIE_Sodium_Core32_Util::store64_le(1)
+		);
+
+		# crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
+		$auth->update($block);
+
+		# out[0] = block[0];
+		$out = $block[0];
+		# c = out + (sizeof tag);
+		# crypto_stream_chacha20_ietf_xor_ic(c, m, mlen, state->nonce, 2U, state->k);
+		$cipher = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+			$msg,
+			$st->getCombinedNonce(),
+			$st->getKey(),
+			ParagonIE_Sodium_Core32_Util::store64_le(2)
+		);
+
+		# crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
+		$auth->update($cipher);
+
+		$out .= $cipher;
+		unset($cipher);
+
+		# crypto_onetimeauth_poly1305_update
+		# (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
+		$auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
+
+		# STORE64_LE(slen, (uint64_t) adlen);
+		$slen = ParagonIE_Sodium_Core32_Util::store64_le($aadlen);
+
+		# crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
+		$auth->update($slen);
+
+		# STORE64_LE(slen, (sizeof block) + mlen);
+		$slen = ParagonIE_Sodium_Core32_Util::store64_le(64 + $msglen);
+
+		# crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
+		$auth->update($slen);
+
+		# mac = c + mlen;
+		# crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
+		$mac = $auth->finish();
+		$out .= $mac;
+
+		# sodium_memzero(&poly1305_state, sizeof poly1305_state);
+		unset($auth);
+
+
+		# XOR_BUF(STATE_INONCE(state), mac,
+		#     crypto_secretstream_xchacha20poly1305_INONCEBYTES);
+		$st->xorNonce($mac);
+
+		# sodium_increment(STATE_COUNTER(state),
+		#     crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
+		$st->incrementCounter();
+		// Overwrite by reference:
+		$state = $st->toString();
+
+		/** @var bool $rekey */
+		$rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
+		# if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
+		#     sodium_is_zero(STATE_COUNTER(state),
+		#         crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
+		#     crypto_secretstream_xchacha20poly1305_rekey(state);
+		# }
+		if ($rekey || $st->needsRekey()) {
+			// DO REKEY
+			self::secretstream_xchacha20poly1305_rekey($state);
+		}
+		# if (outlen_p != NULL) {
+		#     *outlen_p = crypto_secretstream_xchacha20poly1305_ABYTES + mlen;
+		# }
+		return $out;
+	}
+
+	/**
+	 * @param string $state
+	 * @param string $cipher
+	 * @param string $aad
+	 * @return bool|array{0: string, 1: int}
+	 * @throws SodiumException
+	 */
+	public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '')
+	{
+		$st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
+
+		$cipherlen = ParagonIE_Sodium_Core32_Util::strlen($cipher);
+		#     mlen = inlen - crypto_secretstream_xchacha20poly1305_ABYTES;
+		$msglen = $cipherlen - ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES;
+		$aadlen = ParagonIE_Sodium_Core32_Util::strlen($aad);
+
+		#     if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
+		#         sodium_misuse();
+		#     }
+		if ((($msglen + 63) >> 6) > 0xfffffffe) {
+			throw new SodiumException(
+				'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
+			);
+		}
+
+		#     crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
+		#     crypto_onetimeauth_poly1305_init(&poly1305_state, block);
+		#     sodium_memzero(block, sizeof block);
+		$auth = new ParagonIE_Sodium_Core32_Poly1305_State(
+			ParagonIE_Sodium_Core32_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
+		);
+
+		#     crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
+		$auth->update($aad);
+
+		#     crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
+		#         (0x10 - adlen) & 0xf);
+		$auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
+
+
+		#     memset(block, 0, sizeof block);
+		#     block[0] = in[0];
+		#     crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
+		#                                        state->nonce, 1U, state->k);
+		$block = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+			$cipher[0] . str_repeat("\0", 63),
+			$st->getCombinedNonce(),
+			$st->getKey(),
+			ParagonIE_Sodium_Core32_Util::store64_le(1)
+		);
+		#     tag = block[0];
+		#     block[0] = in[0];
+		#     crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
+		$tag = ParagonIE_Sodium_Core32_Util::chrToInt($block[0]);
+		$block[0] = $cipher[0];
+		$auth->update($block);
+
+
+		#     c = in + (sizeof tag);
+		#     crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
+		$auth->update(ParagonIE_Sodium_Core32_Util::substr($cipher, 1, $msglen));
+
+		#     crypto_onetimeauth_poly1305_update
+		#     (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
+		$auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
+
+		#     STORE64_LE(slen, (uint64_t) adlen);
+		#     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
+		$slen = ParagonIE_Sodium_Core32_Util::store64_le($aadlen);
+		$auth->update($slen);
+
+		#     STORE64_LE(slen, (sizeof block) + mlen);
+		#     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
+		$slen = ParagonIE_Sodium_Core32_Util::store64_le(64 + $msglen);
+		$auth->update($slen);
+
+		#     crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
+		#     sodium_memzero(&poly1305_state, sizeof poly1305_state);
+		$mac = $auth->finish();
+
+		#     stored_mac = c + mlen;
+		#     if (sodium_memcmp(mac, stored_mac, sizeof mac) != 0) {
+		#     sodium_memzero(mac, sizeof mac);
+		#         return -1;
+		#     }
+
+		$stored = ParagonIE_Sodium_Core32_Util::substr($cipher, $msglen + 1, 16);
+		if (!ParagonIE_Sodium_Core32_Util::hashEquals($mac, $stored)) {
+			return false;
+		}
+
+		#     crypto_stream_chacha20_ietf_xor_ic(m, c, mlen, state->nonce, 2U, state->k);
+		$out = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+			ParagonIE_Sodium_Core32_Util::substr($cipher, 1, $msglen),
+			$st->getCombinedNonce(),
+			$st->getKey(),
+			ParagonIE_Sodium_Core32_Util::store64_le(2)
+		);
+
+		#     XOR_BUF(STATE_INONCE(state), mac,
+		#         crypto_secretstream_xchacha20poly1305_INONCEBYTES);
+		$st->xorNonce($mac);
+
+		#     sodium_increment(STATE_COUNTER(state),
+		#         crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
+		$st->incrementCounter();
+
+		#     if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
+		#         sodium_is_zero(STATE_COUNTER(state),
+		#             crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
+		#         crypto_secretstream_xchacha20poly1305_rekey(state);
+		#     }
+
+		// Overwrite by reference:
+		$state = $st->toString();
+
+		/** @var bool $rekey */
+		$rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
+		if ($rekey || $st->needsRekey()) {
+			// DO REKEY
+			self::secretstream_xchacha20poly1305_rekey($state);
+		}
+		return array($out, $tag);
+	}
+
+	/**
+	 * @param string $state
+	 * @return void
+	 * @throws SodiumException
+	 */
+	public static function secretstream_xchacha20poly1305_rekey(&$state)
+	{
+		$st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
+		# unsigned char new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES +
+		# crypto_secretstream_xchacha20poly1305_INONCEBYTES];
+		# size_t        i;
+		# for (i = 0U; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
+		#     new_key_and_inonce[i] = state->k[i];
+		# }
+		$new_key_and_inonce = $st->getKey();
+
+		# for (i = 0U; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
+		#     new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i] =
+		#         STATE_INONCE(state)[i];
+		# }
+		$new_key_and_inonce .= ParagonIE_Sodium_Core32_Util::substR($st->getNonce(), 0, 8);
+
+		# crypto_stream_chacha20_ietf_xor(new_key_and_inonce, new_key_and_inonce,
+		#                                 sizeof new_key_and_inonce,
+		#                                 state->nonce, state->k);
+
+		$st->rekey(ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+			$new_key_and_inonce,
+			$st->getCombinedNonce(),
+			$st->getKey(),
+			ParagonIE_Sodium_Core32_Util::store64_le(0)
+		));
+
+		# for (i = 0U; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
+		#     state->k[i] = new_key_and_inonce[i];
+		# }
+		# for (i = 0U; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
+		#     STATE_INONCE(state)[i] =
+		#          new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i];
+		# }
+		# _crypto_secretstream_xchacha20poly1305_counter_reset(state);
+		$st->counterReset();
+
+		$state = $st->toString();
+	}
+
+	/**
+	 * Detached Ed25519 signature.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function sign_detached($message, $sk)
+	{
+		return ParagonIE_Sodium_Core32_Ed25519::sign_detached($message, $sk);
+	}
+
+	/**
+	 * Attached Ed25519 signature. (Returns a signed message.)
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function sign($message, $sk)
+	{
+		return ParagonIE_Sodium_Core32_Ed25519::sign($message, $sk);
+	}
+
+	/**
+	 * Opens a signed message. If valid, returns the message.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $signedMessage
+	 * @param string $pk
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function sign_open($signedMessage, $pk)
+	{
+		return ParagonIE_Sodium_Core32_Ed25519::sign_open($signedMessage, $pk);
+	}
+
+	/**
+	 * Verify a detached signature of a given message and public key.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $signature
+	 * @param string $message
+	 * @param string $pk
+	 * @return bool
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function sign_verify_detached($signature, $message, $pk)
+	{
+		return ParagonIE_Sodium_Core32_Ed25519::verify_detached($signature, $message, $pk);
+	}
 }

vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php

Indentation +773 added lines, -773 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
-    return;
+	return;
 }
 
 /**
@@ -11,780 +11,780 @@ 
  */
 abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
 {
-    /**
-     * @var SplFixedArray
-     */
-    protected static $iv;
-
-    /**
-     * @var array<int, array<int, 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
-     * @psalm-suppress MixedAssignment
-     */
-    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
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
-     */
-    protected static function add64($x, $y)
-    {
-        $l = ($x[1] + $y[1]) & 0xffffffff;
-        return self::new64(
-            (int) ($x[0] + $y[0] + (
-                ($l < $x[1]) ? 1 : 0
-            )),
-            (int) $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 SodiumException
-     * @throws TypeError
-     */
-    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
-    {
-        if (!is_numeric($x[0])) {
-            throw new SodiumException('x[0] is not an integer');
-        }
-        if (!is_numeric($x[1])) {
-            throw new SodiumException('x[1] is not an integer');
-        }
-        if (!is_numeric($y[0])) {
-            throw new SodiumException('y[0] is not an integer');
-        }
-        if (!is_numeric($y[1])) {
-            throw new SodiumException('y[1] is not an integer');
-        }
-        return self::new64(
-            (int) (($x[0] ^ $y[0]) & 0xffffffff),
-            (int) (($x[1] ^ $y[1]) & 0xffffffff)
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param int $c
-     * @return SplFixedArray
-     * @psalm-suppress MixedAssignment
-     */
-    public static function rotr64($x, $c)
-    {
-        if ($c >= 64) {
-            $c %= 64;
-        }
-        if ($c >= 32) {
-            /** @var int $tmp */
-            $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) {
-            /** @var int $h0 */
-            $h0 = ((int) ($x[0]) << $c) | (
-                (
-                    (int) ($x[1]) & ((1 << $c) - 1)
-                        <<
-                    (32 - $c)
-                ) >> (32 - $c)
-            );
-            /** @var int $l0 */
-            $l0 = (int) ($x[1]) << $c;
-        } else {
-            /** @var int $h0 */
-            $h0 = (int) ($x[1]) << ($c - 32);
-        }
-
-        $h1 = 0;
-        $c1 = 64 - $c;
-
-        if ($c1 < 32) {
-            /** @var int $h1 */
-            $h1 = (int) ($x[0]) >> $c1;
-            /** @var int $l1 */
-            $l1 = ((int) ($x[1]) >> $c1) | ((int) ($x[0]) & ((1 << $c1) - 1)) << (32 - $c1);
-        } else {
-            /** @var int $l1 */
-            $l1 = (int) ($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
-     * @psalm-suppress MixedOperand
-     */
-    protected static function flatten64($x)
-    {
-        return (int) ($x[0] * 4294967296 + $x[1]);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param int $i
-     * @return SplFixedArray
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayOffset
-     */
-    protected static function load64(SplFixedArray $x, $i)
-    {
-        /** @var int $l */
-        $l = (int) ($x[$i])
-             | ((int) ($x[$i+1]) << 8)
-             | ((int) ($x[$i+2]) << 16)
-             | ((int) ($x[$i+3]) << 24);
-        /** @var int $h */
-        $h = (int) ($x[$i+4])
-             | ((int) ($x[$i+5]) << 8)
-             | ((int) ($x[$i+6]) << 16)
-             | ((int) ($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
-     * @psalm-suppress MixedAssignment
-     */
-    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 array<int, array<int, 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
+	 * @psalm-suppress MixedAssignment
+	 */
+	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
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedOperand
+	 */
+	protected static function add64($x, $y)
+	{
+		$l = ($x[1] + $y[1]) & 0xffffffff;
+		return self::new64(
+			(int) ($x[0] + $y[0] + (
+				($l < $x[1]) ? 1 : 0
+			)),
+			(int) $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 SodiumException
+	 * @throws TypeError
+	 */
+	protected static function xor64(SplFixedArray $x, SplFixedArray $y)
+	{
+		if (!is_numeric($x[0])) {
+			throw new SodiumException('x[0] is not an integer');
+		}
+		if (!is_numeric($x[1])) {
+			throw new SodiumException('x[1] is not an integer');
+		}
+		if (!is_numeric($y[0])) {
+			throw new SodiumException('y[0] is not an integer');
+		}
+		if (!is_numeric($y[1])) {
+			throw new SodiumException('y[1] is not an integer');
+		}
+		return self::new64(
+			(int) (($x[0] ^ $y[0]) & 0xffffffff),
+			(int) (($x[1] ^ $y[1]) & 0xffffffff)
+		);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param int $c
+	 * @return SplFixedArray
+	 * @psalm-suppress MixedAssignment
+	 */
+	public static function rotr64($x, $c)
+	{
+		if ($c >= 64) {
+			$c %= 64;
+		}
+		if ($c >= 32) {
+			/** @var int $tmp */
+			$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) {
+			/** @var int $h0 */
+			$h0 = ((int) ($x[0]) << $c) | (
+				(
+					(int) ($x[1]) & ((1 << $c) - 1)
+						<<
+					(32 - $c)
+				) >> (32 - $c)
+			);
+			/** @var int $l0 */
+			$l0 = (int) ($x[1]) << $c;
+		} else {
+			/** @var int $h0 */
+			$h0 = (int) ($x[1]) << ($c - 32);
+		}
+
+		$h1 = 0;
+		$c1 = 64 - $c;
+
+		if ($c1 < 32) {
+			/** @var int $h1 */
+			$h1 = (int) ($x[0]) >> $c1;
+			/** @var int $l1 */
+			$l1 = ((int) ($x[1]) >> $c1) | ((int) ($x[0]) & ((1 << $c1) - 1)) << (32 - $c1);
+		} else {
+			/** @var int $l1 */
+			$l1 = (int) ($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
+	 * @psalm-suppress MixedOperand
+	 */
+	protected static function flatten64($x)
+	{
+		return (int) ($x[0] * 4294967296 + $x[1]);
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $x
+	 * @param int $i
+	 * @return SplFixedArray
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedArrayOffset
+	 */
+	protected static function load64(SplFixedArray $x, $i)
+	{
+		/** @var int $l */
+		$l = (int) ($x[$i])
+			 | ((int) ($x[$i+1]) << 8)
+			 | ((int) ($x[$i+2]) << 16)
+			 | ((int) ($x[$i+3]) << 24);
+		/** @var int $h */
+		$h = (int) ($x[$i+4])
+			 | ((int) ($x[$i+5]) << 8)
+			 | ((int) ($x[$i+6]) << 16)
+			 | ((int) ($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
+	 * @psalm-suppress MixedAssignment
+	 */
+	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]
             */
-            /** @var int $uIdx */
-            $uIdx = ((7 - $j) & 4) >> 2;
-            $x[$i]   = ((int) ($u[$uIdx]) & 0xff);
-            if (++$i > $maxLength) {
-                return;
-            }
-            /** @psalm-suppress MixedOperand */
-            $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
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     */
-    protected static function context()
-    {
-        $ctx    = new SplFixedArray(6);
-        $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
-        $ctx[5] = 0;                      // last_node (uint8_t)
-
-        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
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     */
-    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
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayOffset
-     */
-    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 SodiumException
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     */
-    public static function increment_counter($ctx, $inc)
-    {
-        if ($inc < 0) {
-            throw new SodiumException('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
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedOperand
-     */
-    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 SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedOperand
-     */
-    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 SodiumException('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
-     * @param SplFixedArray|null $salt
-     * @param SplFixedArray|null $personal
-     * @return SplFixedArray
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     */
-    public static function init(
-        $key = null,
-        $outlen = 64,
-        $salt = null,
-        $personal = null
-    ) {
-        self::pseudoConstructor();
-        $klen = 0;
-
-        if ($key !== null) {
-            if (count($key) > 64) {
-                throw new SodiumException('Invalid key size');
-            }
-            $klen = count($key);
-        }
-
-        if ($outlen > 64) {
-            throw new SodiumException('Invalid output size');
-        }
-
-        $ctx = self::context();
-
-        $p = new SplFixedArray(64);
-        // Zero our param buffer...
-        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
-
-        if ($salt instanceof SplFixedArray) {
-            // salt: [32] through [47]
-            for ($i = 0; $i < 16; ++$i) {
-                $p[32 + $i] = (int) $salt[$i];
-            }
-        }
-        if ($personal instanceof SplFixedArray) {
-            // personal: [48] through [63]
-            for ($i = 0; $i < 16; ++$i) {
-                $p[48 + $i] = (int) $personal[$i];
-            }
-        }
-
-        $ctx[0][0] = self::xor64(
-            $ctx[0][0],
-            self::load64($p, 0)
-        );
-        if ($salt instanceof SplFixedArray || $personal instanceof SplFixedArray) {
-            // We need to do what blake2b_init_param() does:
-            for ($i = 1; $i < 8; ++$i) {
-                $ctx[0][$i] = self::xor64(
-                    $ctx[0][$i],
-                    self::load64($p, $i << 3)
-                );
-            }
-        }
-
-        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);
-            $ctx[4] = 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
-     * @psalm-suppress MixedArgumentTypeCoercion
-     */
-    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
-     * @throws TypeError
-     */
-    public static function SplFixedArrayToString(SplFixedArray $a)
-    {
-        /**
-         * @var array<int, int|string> $arr
-         */
-        $arr = $a->toArray();
-        $c = $a->count();
-        array_unshift($arr, str_repeat('C', $c));
-        return (string) (call_user_func_array('pack', $arr));
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @return string
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function contextToString(SplFixedArray $ctx)
-    {
-        $str = '';
-        /** @var array<int, array<int, int>> $ctxA */
-        $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]);
-
-        /** @var int $ctx4 */
-        $ctx4 = (int) $ctx[4];
-
-        # size_t buflen;
-        $str .= implode('', array(
-            self::intToChr($ctx4 & 0xff),
-            self::intToChr(($ctx4 >> 8) & 0xff),
-            self::intToChr(($ctx4 >> 16) & 0xff),
-            self::intToChr(($ctx4 >> 24) & 0xff),
-            self::intToChr(($ctx4 >> 32) & 0xff),
-            self::intToChr(($ctx4 >> 40) & 0xff),
-            self::intToChr(($ctx4 >> 48) & 0xff),
-            self::intToChr(($ctx4 >> 56) & 0xff)
-        ));
-        # uint8_t last_node;
-        return $str . self::intToChr($ctx[5]) . str_repeat("\x00", 23);
-    }
-
-    /**
-     * 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
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAssignment
-     */
-    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;
-    }
+			/** @var int $uIdx */
+			$uIdx = ((7 - $j) & 4) >> 2;
+			$x[$i]   = ((int) ($u[$uIdx]) & 0xff);
+			if (++$i > $maxLength) {
+				return;
+			}
+			/** @psalm-suppress MixedOperand */
+			$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
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedArrayAccess
+	 * @psalm-suppress MixedArrayAssignment
+	 */
+	protected static function context()
+	{
+		$ctx    = new SplFixedArray(6);
+		$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
+		$ctx[5] = 0;                      // last_node (uint8_t)
+
+		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
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedArrayAccess
+	 * @psalm-suppress MixedArrayAssignment
+	 * @psalm-suppress MixedArrayOffset
+	 */
+	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
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedArrayOffset
+	 */
+	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 SodiumException
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedArrayAccess
+	 * @psalm-suppress MixedArrayAssignment
+	 */
+	public static function increment_counter($ctx, $inc)
+	{
+		if ($inc < 0) {
+			throw new SodiumException('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
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedArrayAccess
+	 * @psalm-suppress MixedArrayAssignment
+	 * @psalm-suppress MixedArrayOffset
+	 * @psalm-suppress MixedOperand
+	 */
+	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 SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedArrayAccess
+	 * @psalm-suppress MixedArrayAssignment
+	 * @psalm-suppress MixedArrayOffset
+	 * @psalm-suppress MixedOperand
+	 */
+	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 SodiumException('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
+	 * @param SplFixedArray|null $salt
+	 * @param SplFixedArray|null $personal
+	 * @return SplFixedArray
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedArrayAccess
+	 * @psalm-suppress MixedArrayAssignment
+	 * @psalm-suppress MixedArrayOffset
+	 */
+	public static function init(
+		$key = null,
+		$outlen = 64,
+		$salt = null,
+		$personal = null
+	) {
+		self::pseudoConstructor();
+		$klen = 0;
+
+		if ($key !== null) {
+			if (count($key) > 64) {
+				throw new SodiumException('Invalid key size');
+			}
+			$klen = count($key);
+		}
+
+		if ($outlen > 64) {
+			throw new SodiumException('Invalid output size');
+		}
+
+		$ctx = self::context();
+
+		$p = new SplFixedArray(64);
+		// Zero our param buffer...
+		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
+
+		if ($salt instanceof SplFixedArray) {
+			// salt: [32] through [47]
+			for ($i = 0; $i < 16; ++$i) {
+				$p[32 + $i] = (int) $salt[$i];
+			}
+		}
+		if ($personal instanceof SplFixedArray) {
+			// personal: [48] through [63]
+			for ($i = 0; $i < 16; ++$i) {
+				$p[48 + $i] = (int) $personal[$i];
+			}
+		}
+
+		$ctx[0][0] = self::xor64(
+			$ctx[0][0],
+			self::load64($p, 0)
+		);
+		if ($salt instanceof SplFixedArray || $personal instanceof SplFixedArray) {
+			// We need to do what blake2b_init_param() does:
+			for ($i = 1; $i < 8; ++$i) {
+				$ctx[0][$i] = self::xor64(
+					$ctx[0][$i],
+					self::load64($p, $i << 3)
+				);
+			}
+		}
+
+		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);
+			$ctx[4] = 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
+	 * @psalm-suppress MixedArgumentTypeCoercion
+	 */
+	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
+	 * @throws TypeError
+	 */
+	public static function SplFixedArrayToString(SplFixedArray $a)
+	{
+		/**
+		 * @var array<int, int|string> $arr
+		 */
+		$arr = $a->toArray();
+		$c = $a->count();
+		array_unshift($arr, str_repeat('C', $c));
+		return (string) (call_user_func_array('pack', $arr));
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param SplFixedArray $ctx
+	 * @return string
+	 * @throws TypeError
+	 * @psalm-suppress MixedArgument
+	 * @psalm-suppress MixedAssignment
+	 * @psalm-suppress MixedArrayAccess
+	 * @psalm-suppress MixedArrayAssignment
+	 * @psalm-suppress MixedArrayOffset
+	 * @psalm-suppress MixedMethodCall
+	 */
+	public static function contextToString(SplFixedArray $ctx)
+	{
+		$str = '';
+		/** @var array<int, array<int, int>> $ctxA */
+		$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]);
+
+		/** @var int $ctx4 */
+		$ctx4 = (int) $ctx[4];
+
+		# size_t buflen;
+		$str .= implode('', array(
+			self::intToChr($ctx4 & 0xff),
+			self::intToChr(($ctx4 >> 8) & 0xff),
+			self::intToChr(($ctx4 >> 16) & 0xff),
+			self::intToChr(($ctx4 >> 24) & 0xff),
+			self::intToChr(($ctx4 >> 32) & 0xff),
+			self::intToChr(($ctx4 >> 40) & 0xff),
+			self::intToChr(($ctx4 >> 48) & 0xff),
+			self::intToChr(($ctx4 >> 56) & 0xff)
+		));
+		# uint8_t last_node;
+		return $str . self::intToChr($ctx[5]) . str_repeat("\x00", 23);
+	}
+
+	/**
+	 * 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
+	 * @throws SodiumException
+	 * @throws TypeError
+	 * @psalm-suppress MixedArrayAssignment
+	 */
+	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;
+	}
 }

vendor/paragonie/sodium_compat/src/Core/Ed25519.php

Indentation +540 added lines, -540 removed lines

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

vendor/paragonie/sodium_compat/src/Core/Util.php

Indentation +936 added lines, -936 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_Util', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,939 +9,939 @@ 
  */
 abstract class ParagonIE_Sodium_Core_Util
 {
-    /**
-     * @param int $integer
-     * @param int $size (16, 32, 64)
-     * @return int
-     */
-    public static function abs($integer, $size = 0)
-    {
-        /** @var int $realSize */
-        $realSize = (PHP_INT_SIZE << 3) - 1;
-        if ($size) {
-            --$size;
-        } else {
-            /** @var int $size */
-            $size = $realSize;
-        }
-
-        $negative = -(($integer >> $size) & 1);
-        return (int) (
-            ($integer ^ $negative)
-                +
-            (($negative >> $realSize) & 1)
-        );
-    }
-
-    /**
-     * 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) {
-            /** @var array<int, int> $chunk */
-            $chunk = unpack('C', $binaryString[$i]);
-            /** @var int $c */
-            $c = $chunk[1] & 0xf;
-            /** @var int $b */
-            $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
-     * @throws TypeError
-     */
-    public static function bin2hexUpper($bin_string)
-    {
-        $hex = '';
-        $len = self::strlen($bin_string);
-        for ($i = 0; $i < $len; ++$i) {
-            /** @var array<int, int> $chunk */
-            $chunk = unpack('C', $bin_string[$i]);
-            /**
-             * Lower 16 bits
-             *
-             * @var int $c
-             */
-            $c = $chunk[1] & 0xf;
-
-            /**
-             * Upper 16 bits
-             * @var int $b
-             */
-            $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 SodiumException
-     * @throws TypeError
-     */
-    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 SodiumException('chrToInt() expects a string that is exactly 1 character long');
-        }
-        /** @var array<int, int> $chunk */
-        $chunk = unpack('C', $chr);
-        return (int) ($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
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    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 SodiumException
-     * @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 SodiumException('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 SodiumException
-     * @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;
-        /** @var int $len */
-        $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;
-    }
-
-    /**
-     * Catch hash_update() failures and throw instead of silently proceeding
-     *
-     * @param HashContext|resource &$hs
-     * @param string $data
-     * @return void
-     * @throws SodiumException
-     * @psalm-suppress PossiblyInvalidArgument
-     */
-    protected static function hash_update(&$hs, $data)
-    {
-        if (!hash_update($hs, $data)) {
-            throw new SodiumException('hash_update() failed');
-        }
-    }
-
-    /**
-     * 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.');
-        }
-
-        /** @var int $hex_pos */
-        $hex_pos = 0;
-        /** @var string $bin */
-        $bin = '';
-        /** @var int $c_acc */
-        $c_acc = 0;
-        /** @var int $hex_len */
-        $hex_len = self::strlen($hexString);
-        /** @var int $state */
-        $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;
-            /** @var int $c */
-            $c = $chunk[$hex_pos];
-            /** @var int $c_num */
-            $c_num = $c ^ 48;
-            /** @var int $c_num0 */
-            $c_num0 = ($c_num - 10) >> 8;
-            /** @var int $c_alpha */
-            $c_alpha = ($c & ~32) - 55;
-            /** @var int $c_alpha0 */
-            $c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
-            if (($c_num0 | $c_alpha0) === 0) {
-                throw new RangeException(
-                    'hex2bin() only expects hexadecimal characters'
-                );
-            }
-            /** @var int $c_val */
-            $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)
-    {
-        /** @var array<int, int> $args */
-        $args = $ints;
-        foreach ($args as $i => $v) {
-            $args[$i] = (int) ($v & 0xff);
-        }
-        array_unshift($args, str_repeat('C', count($ints)));
-        return (string) (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.'
-            );
-        }
-        /** @var array<int, int> $unpacked */
-        $unpacked = unpack('V', $string . "\0");
-        return (int) ($unpacked[1] & 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.'
-            );
-        }
-        /** @var array<int, int> $unpacked */
-        $unpacked = unpack('V', $string);
-        return (int) ($unpacked[1] & 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 SodiumException
-     * @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.'
-            );
-        }
-        if (PHP_VERSION_ID >= 50603 && PHP_INT_SIZE === 8) {
-            /** @var array<int, int> $unpacked */
-            $unpacked = unpack('P', $string);
-            return (int) $unpacked[1];
-        }
-
-        /** @var int $result */
-        $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
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    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;
-        /** @var int $defaultSize */
-        if (!$defaultSize) {
-            /** @var int $defaultSize */
-            $defaultSize = (PHP_INT_SIZE << 3) - 1;
-        }
-        if ($size < 1) {
-            /** @var int $size */
-            $size = $defaultSize;
-        }
-        /** @var int $size */
-
-        $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 >> ((int) $defaultSize)) & 1);
-
-        /**
-         * Ensure $b is a positive integer, without creating
-         * a branching side-channel
-         *
-         * @var int $b
-         */
-        $b = ($b & ~$mask) | ($mask & -$b);
-
-        /**
-         * Unless $size is provided:
-         *
-         * 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;
-        }
-        $c = (int) @($c & -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;
-        /** @var int $low */
-        $low = $num & 0xffffffff;
-
-        if ((+(abs($num))) >= 1) {
-            if ($num > 0) {
-                /** @var int $high */
-                $high = min((+(floor($num/4294967296))), 4294967295);
-            } else {
-                /** @var int $high */
-                $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.');
-            }
-        }
-        /** @var string $packed */
-        $packed = pack('N', $int);
-        return self::substr($packed, 1, 3);
-    }
-
-    /**
-     * 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.');
-            }
-        }
-
-        /** @var string $packed */
-        $packed = pack('V', $int);
-        return $packed;
-    }
-
-    /**
-     * 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.');
-            }
-        }
-
-        /** @var string $packed */
-        $packed = pack('N', $int);
-        return $packed;
-    }
-
-    /**
-     * 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) {
-            if (PHP_VERSION_ID >= 50603) {
-                /** @var string $packed */
-                $packed = pack('P', $int);
-                return $packed;
-            }
-            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 ($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 SodiumException
-     * @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 SodiumException
-     * @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 (string) ($a ^ $b);
-    }
-
-    /**
-     * Returns whether or not mbstring.func_overload is in effect.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * Note: MB_OVERLOAD_STRING === 2, but we don't reference the constant
-     * (for nuisance-free PHP 8 support)
-     *
-     * @return bool
-     */
-    protected static function isMbStringOverride()
-    {
-        static $mbstring = null;
-
-        if ($mbstring === null) {
-            if (!defined('MB_OVERLOAD_STRING')) {
-                $mbstring = false;
-                return $mbstring;
-            }
-            $mbstring = extension_loaded('mbstring')
-                && defined('MB_OVERLOAD_STRING')
-                &&
-            ((int) (ini_get('mbstring.func_overload')) & 2);
-            // MB_OVERLOAD_STRING === 2
-        }
-        /** @var bool $mbstring */
-
-        return $mbstring;
-    }
+	/**
+	 * @param int $integer
+	 * @param int $size (16, 32, 64)
+	 * @return int
+	 */
+	public static function abs($integer, $size = 0)
+	{
+		/** @var int $realSize */
+		$realSize = (PHP_INT_SIZE << 3) - 1;
+		if ($size) {
+			--$size;
+		} else {
+			/** @var int $size */
+			$size = $realSize;
+		}
+
+		$negative = -(($integer >> $size) & 1);
+		return (int) (
+			($integer ^ $negative)
+				+
+			(($negative >> $realSize) & 1)
+		);
+	}
+
+	/**
+	 * 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) {
+			/** @var array<int, int> $chunk */
+			$chunk = unpack('C', $binaryString[$i]);
+			/** @var int $c */
+			$c = $chunk[1] & 0xf;
+			/** @var int $b */
+			$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
+	 * @throws TypeError
+	 */
+	public static function bin2hexUpper($bin_string)
+	{
+		$hex = '';
+		$len = self::strlen($bin_string);
+		for ($i = 0; $i < $len; ++$i) {
+			/** @var array<int, int> $chunk */
+			$chunk = unpack('C', $bin_string[$i]);
+			/**
+			 * Lower 16 bits
+			 *
+			 * @var int $c
+			 */
+			$c = $chunk[1] & 0xf;
+
+			/**
+			 * Upper 16 bits
+			 * @var int $b
+			 */
+			$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 SodiumException
+	 * @throws TypeError
+	 */
+	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 SodiumException('chrToInt() expects a string that is exactly 1 character long');
+		}
+		/** @var array<int, int> $chunk */
+		$chunk = unpack('C', $chr);
+		return (int) ($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
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	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 SodiumException
+	 * @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 SodiumException('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 SodiumException
+	 * @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;
+		/** @var int $len */
+		$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;
+	}
+
+	/**
+	 * Catch hash_update() failures and throw instead of silently proceeding
+	 *
+	 * @param HashContext|resource &$hs
+	 * @param string $data
+	 * @return void
+	 * @throws SodiumException
+	 * @psalm-suppress PossiblyInvalidArgument
+	 */
+	protected static function hash_update(&$hs, $data)
+	{
+		if (!hash_update($hs, $data)) {
+			throw new SodiumException('hash_update() failed');
+		}
+	}
+
+	/**
+	 * 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.');
+		}
+
+		/** @var int $hex_pos */
+		$hex_pos = 0;
+		/** @var string $bin */
+		$bin = '';
+		/** @var int $c_acc */
+		$c_acc = 0;
+		/** @var int $hex_len */
+		$hex_len = self::strlen($hexString);
+		/** @var int $state */
+		$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;
+			/** @var int $c */
+			$c = $chunk[$hex_pos];
+			/** @var int $c_num */
+			$c_num = $c ^ 48;
+			/** @var int $c_num0 */
+			$c_num0 = ($c_num - 10) >> 8;
+			/** @var int $c_alpha */
+			$c_alpha = ($c & ~32) - 55;
+			/** @var int $c_alpha0 */
+			$c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
+			if (($c_num0 | $c_alpha0) === 0) {
+				throw new RangeException(
+					'hex2bin() only expects hexadecimal characters'
+				);
+			}
+			/** @var int $c_val */
+			$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)
+	{
+		/** @var array<int, int> $args */
+		$args = $ints;
+		foreach ($args as $i => $v) {
+			$args[$i] = (int) ($v & 0xff);
+		}
+		array_unshift($args, str_repeat('C', count($ints)));
+		return (string) (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.'
+			);
+		}
+		/** @var array<int, int> $unpacked */
+		$unpacked = unpack('V', $string . "\0");
+		return (int) ($unpacked[1] & 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.'
+			);
+		}
+		/** @var array<int, int> $unpacked */
+		$unpacked = unpack('V', $string);
+		return (int) ($unpacked[1] & 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 SodiumException
+	 * @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.'
+			);
+		}
+		if (PHP_VERSION_ID >= 50603 && PHP_INT_SIZE === 8) {
+			/** @var array<int, int> $unpacked */
+			$unpacked = unpack('P', $string);
+			return (int) $unpacked[1];
+		}
+
+		/** @var int $result */
+		$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
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	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;
+		/** @var int $defaultSize */
+		if (!$defaultSize) {
+			/** @var int $defaultSize */
+			$defaultSize = (PHP_INT_SIZE << 3) - 1;
+		}
+		if ($size < 1) {
+			/** @var int $size */
+			$size = $defaultSize;
+		}
+		/** @var int $size */
+
+		$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 >> ((int) $defaultSize)) & 1);
+
+		/**
+		 * Ensure $b is a positive integer, without creating
+		 * a branching side-channel
+		 *
+		 * @var int $b
+		 */
+		$b = ($b & ~$mask) | ($mask & -$b);
+
+		/**
+		 * Unless $size is provided:
+		 *
+		 * 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;
+		}
+		$c = (int) @($c & -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;
+		/** @var int $low */
+		$low = $num & 0xffffffff;
+
+		if ((+(abs($num))) >= 1) {
+			if ($num > 0) {
+				/** @var int $high */
+				$high = min((+(floor($num/4294967296))), 4294967295);
+			} else {
+				/** @var int $high */
+				$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.');
+			}
+		}
+		/** @var string $packed */
+		$packed = pack('N', $int);
+		return self::substr($packed, 1, 3);
+	}
+
+	/**
+	 * 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.');
+			}
+		}
+
+		/** @var string $packed */
+		$packed = pack('V', $int);
+		return $packed;
+	}
+
+	/**
+	 * 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.');
+			}
+		}
+
+		/** @var string $packed */
+		$packed = pack('N', $int);
+		return $packed;
+	}
+
+	/**
+	 * 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) {
+			if (PHP_VERSION_ID >= 50603) {
+				/** @var string $packed */
+				$packed = pack('P', $int);
+				return $packed;
+			}
+			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 ($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 SodiumException
+	 * @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 SodiumException
+	 * @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 (string) ($a ^ $b);
+	}
+
+	/**
+	 * Returns whether or not mbstring.func_overload is in effect.
+	 *
+	 * @internal You should not use this directly from another application
+	 *
+	 * Note: MB_OVERLOAD_STRING === 2, but we don't reference the constant
+	 * (for nuisance-free PHP 8 support)
+	 *
+	 * @return bool
+	 */
+	protected static function isMbStringOverride()
+	{
+		static $mbstring = null;
+
+		if ($mbstring === null) {
+			if (!defined('MB_OVERLOAD_STRING')) {
+				$mbstring = false;
+				return $mbstring;
+			}
+			$mbstring = extension_loaded('mbstring')
+				&& defined('MB_OVERLOAD_STRING')
+				&&
+			((int) (ini_get('mbstring.func_overload')) & 2);
+			// MB_OVERLOAD_STRING === 2
+		}
+		/** @var bool $mbstring */
+
+		return $mbstring;
+	}
 }

vendor/paragonie/sodium_compat/src/Core/SipHash.php

Indentation +293 added lines, -293 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_SipHash', false)) {
-    return;
+	return;
 }
 
 /**
@@ -11,296 +11,296 @@ 
  */
 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((int) $v[2], (int) $v[3], 13);
-
-        #  v1 ^= v0;
-        $v[2] = (int) $v[2] ^ (int) $v[0];
-        $v[3] = (int) $v[3] ^ (int) $v[1];
-
-        #  v0=ROTL(v0,32);
-        list($v[0], $v[1]) = self::rotl_64((int) $v[0], (int) $v[1], 32);
-
-        # v2 += v3;
-        list($v[4], $v[5]) = self::add(
-            array((int) $v[4], (int) $v[5]),
-            array((int) $v[6], (int) $v[7])
-        );
-
-        # v3=ROTL(v3,16);
-        list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 16);
-
-        #  v3 ^= v2;
-        $v[6] = (int) $v[6] ^ (int) $v[4];
-        $v[7] = (int) $v[7] ^ (int) $v[5];
-
-        # v0 += v3;
-        list($v[0], $v[1]) = self::add(
-            array((int) $v[0], (int) $v[1]),
-            array((int) $v[6], (int) $v[7])
-        );
-
-        # v3=ROTL(v3,21);
-        list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 21);
-
-        # v3 ^= v0;
-        $v[6] = (int) $v[6] ^ (int) $v[0];
-        $v[7] = (int) $v[7] ^ (int) $v[1];
-
-        # v2 += v1;
-        list($v[4], $v[5]) = self::add(
-            array((int) $v[4], (int) $v[5]),
-            array((int) $v[2], (int) $v[3])
-        );
-
-        # v1=ROTL(v1,17);
-        list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 17);
-
-        #  v1 ^= v2;;
-        $v[2] = (int) $v[2] ^ (int) $v[4];
-        $v[3] = (int) $v[3] ^ (int) $v[5];
-
-        # v2=ROTL(v2,32)
-        list($v[4], $v[5]) = self::rotl_64((int) $v[4], (int) $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)
-    {
-        /** @var int $x1 */
-        $x1 = $a[1] + $b[1];
-        /** @var int $c */
-        $c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
-        /** @var int $x0 */
-        $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
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    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((int) $v[2], (int) $v[3], 13);
+
+		#  v1 ^= v0;
+		$v[2] = (int) $v[2] ^ (int) $v[0];
+		$v[3] = (int) $v[3] ^ (int) $v[1];
+
+		#  v0=ROTL(v0,32);
+		list($v[0], $v[1]) = self::rotl_64((int) $v[0], (int) $v[1], 32);
+
+		# v2 += v3;
+		list($v[4], $v[5]) = self::add(
+			array((int) $v[4], (int) $v[5]),
+			array((int) $v[6], (int) $v[7])
+		);
+
+		# v3=ROTL(v3,16);
+		list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 16);
+
+		#  v3 ^= v2;
+		$v[6] = (int) $v[6] ^ (int) $v[4];
+		$v[7] = (int) $v[7] ^ (int) $v[5];
+
+		# v0 += v3;
+		list($v[0], $v[1]) = self::add(
+			array((int) $v[0], (int) $v[1]),
+			array((int) $v[6], (int) $v[7])
+		);
+
+		# v3=ROTL(v3,21);
+		list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 21);
+
+		# v3 ^= v0;
+		$v[6] = (int) $v[6] ^ (int) $v[0];
+		$v[7] = (int) $v[7] ^ (int) $v[1];
+
+		# v2 += v1;
+		list($v[4], $v[5]) = self::add(
+			array((int) $v[4], (int) $v[5]),
+			array((int) $v[2], (int) $v[3])
+		);
+
+		# v1=ROTL(v1,17);
+		list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 17);
+
+		#  v1 ^= v2;;
+		$v[2] = (int) $v[2] ^ (int) $v[4];
+		$v[3] = (int) $v[3] ^ (int) $v[5];
+
+		# v2=ROTL(v2,32)
+		list($v[4], $v[5]) = self::rotl_64((int) $v[4], (int) $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)
+	{
+		/** @var int $x1 */
+		$x1 = $a[1] + $b[1];
+		/** @var int $c */
+		$c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
+		/** @var int $x0 */
+		$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
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	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]);
+	}
 }

vendor/paragonie/sodium_compat/src/Core/XChaCha20.php

Indentation +103 added lines, -103 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_XChaCha20', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,109 +9,109 @@ 
  */
 class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
 {
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new SodiumException('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx(
-                self::hChaCha20(
-                    self::substr($nonce, 0, 16),
-                    $key
-                ),
-                self::substr($nonce, 16, 8)
-            ),
-            str_repeat("\x00", $len)
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function stream($len = 64, $nonce = '', $key = '')
+	{
+		if (self::strlen($nonce) !== 24) {
+			throw new SodiumException('Nonce must be 24 bytes long');
+		}
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core_ChaCha20_Ctx(
+				self::hChaCha20(
+					self::substr($nonce, 0, 16),
+					$key
+				),
+				self::substr($nonce, 16, 8)
+			),
+			str_repeat("\x00", $len)
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ietfStream($len = 64, $nonce = '', $key = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new SodiumException('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx(
-                self::hChaCha20(
-                    self::substr($nonce, 0, 16),
-                    $key
-                ),
-                "\x00\x00\x00\x00" . self::substr($nonce, 16, 8)
-            ),
-            str_repeat("\x00", $len)
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function ietfStream($len = 64, $nonce = '', $key = '')
+	{
+		if (self::strlen($nonce) !== 24) {
+			throw new SodiumException('Nonce must be 24 bytes long');
+		}
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core_ChaCha20_IetfCtx(
+				self::hChaCha20(
+					self::substr($nonce, 0, 16),
+					$key
+				),
+				"\x00\x00\x00\x00" . self::substr($nonce, 16, 8)
+			),
+			str_repeat("\x00", $len)
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new SodiumException('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx(
-                self::hChaCha20(self::substr($nonce, 0, 16), $key),
-                self::substr($nonce, 16, 8),
-                $ic
-            ),
-            $message
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @param string $ic
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+	{
+		if (self::strlen($nonce) !== 24) {
+			throw new SodiumException('Nonce must be 24 bytes long');
+		}
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core_ChaCha20_Ctx(
+				self::hChaCha20(self::substr($nonce, 0, 16), $key),
+				self::substr($nonce, 16, 8),
+				$ic
+			),
+			$message
+		);
+	}
 
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new SodiumException('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx(
-                self::hChaCha20(self::substr($nonce, 0, 16), $key),
-                "\x00\x00\x00\x00" . self::substr($nonce, 16, 8),
-                $ic
-            ),
-            $message
-        );
-    }
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @param string $ic
+	 * @return string
+	 * @throws SodiumException
+	 * @throws TypeError
+	 */
+	public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+	{
+		if (self::strlen($nonce) !== 24) {
+			throw new SodiumException('Nonce must be 24 bytes long');
+		}
+		return self::encryptBytes(
+			new ParagonIE_Sodium_Core_ChaCha20_IetfCtx(
+				self::hChaCha20(self::substr($nonce, 0, 16), $key),
+				"\x00\x00\x00\x00" . self::substr($nonce, 16, 8),
+				$ic
+			),
+			$message
+		);
+	}
 }

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

Indentation +316 added lines, -316 removed lines

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

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

Indentation +50 added lines, -50 removed lines

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

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

Indentation +45 added lines, -45 removed lines

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