WordPoints / wordpoints

src/library/sodium_compat/src/Crypto32.php

Indentation +1158 added lines, -1158 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Crypto32', false)) {
-    return;
+	return;
 }
 
 /**
@@ -14,1161 +14,1161 @@ 
  */
 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 Error
-     */
-    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 (Error $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 Error('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
-     */
-    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 (Error $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 Error
-     */
-    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 (Error $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 Error('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
-     */
-    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 (Error $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 Error
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    public static function box($plaintext, $nonce, $keypair)
-    {
-        $c = self::secretbox(
-            $plaintext,
-            $nonce,
-            self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
-            )
-        );
-        return $c;
-    }
-
-    /**
-     * 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
-     */
-    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 (Error $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
-     */
-    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 (Error $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
-     */
-    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
-     */
-    public static function box_keypair()
-    {
-        $sKey = random_bytes(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
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    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 $nonce
-     * @param string $keypair
-     * @return string
-     */
-    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
-     */
-    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 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
-     */
-    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);
-    }
-
-    /**
-     * 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
-     */
-    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
-     */
-    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 Error
-     */
-    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 Error
-     */
-    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 Error
-     */
-    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 Error('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
-     */
-    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 (Error $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 Error
-     */
-    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 (Error $ex) {
-                $subkey = null;
-            }
-            throw new Error('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,
-                $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
-     */
-    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 (Error $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 Error
-     */
-    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 (Error $ex) {
-                $subkey = null;
-            }
-            throw new Error('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),
-                $subkey,
-                ParagonIE_Sodium_Core32_Util::store64_le(1)
-            );
-        }
-        return $m;
-    }
-
-    /**
-     * Detached Ed25519 signature.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    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 Error
+	 */
+	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 (Error $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 Error('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
+	 */
+	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 (Error $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 Error
+	 */
+	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 (Error $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 Error('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
+	 */
+	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 (Error $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 Error
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	public static function box($plaintext, $nonce, $keypair)
+	{
+		$c = self::secretbox(
+			$plaintext,
+			$nonce,
+			self::box_beforenm(
+				self::box_secretkey($keypair),
+				self::box_publickey($keypair)
+			)
+		);
+		return $c;
+	}
+
+	/**
+	 * 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
+	 */
+	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 (Error $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
+	 */
+	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 (Error $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
+	 */
+	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
+	 */
+	public static function box_keypair()
+	{
+		$sKey = random_bytes(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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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 $nonce
+	 * @param string $keypair
+	 * @return string
+	 */
+	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
+	 */
+	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 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
+	 */
+	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);
+	}
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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 Error
+	 */
+	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 Error
+	 */
+	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 Error
+	 */
+	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 Error('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
+	 */
+	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 (Error $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 Error
+	 */
+	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 (Error $ex) {
+				$subkey = null;
+			}
+			throw new Error('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,
+				$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
+	 */
+	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 (Error $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 Error
+	 */
+	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 (Error $ex) {
+				$subkey = null;
+			}
+			throw new Error('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),
+				$subkey,
+				ParagonIE_Sodium_Core32_Util::store64_le(1)
+			);
+		}
+		return $m;
+	}
+
+	/**
+	 * Detached Ed25519 signature.
+	 *
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	public static function sign_verify_detached($signature, $message, $pk)
+	{
+		return ParagonIE_Sodium_Core32_Ed25519::verify_detached($signature, $message, $pk);
+	}
 }

src/library/sodium_compat/src/File.php

Indentation +1061 added lines, -1061 removed lines

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

src/library/sodium_compat/src/Core32/Util.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core32_Util', false)) {
-    return;
+	return;
 }
 
 /**

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

Indentation +46 added lines, -46 removed lines

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

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

Indentation +580 added lines, -580 removed lines

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

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

Indentation +407 added lines, -407 removed lines

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

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

Indentation +418 added lines, -418 removed lines

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

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

Indentation +50 added lines, -50 removed lines

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

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

Indentation +50 added lines, -50 removed lines

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