WordPoints / wordpoints

src/library/sodium_compat/src/Core32/HChaCha20.php

Indentation +94 added lines, -94 removed lines

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

Spacing +34 added lines, -34 removed lines

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

Braces +3 added lines, -6 removed lines

@@ -7,16 +7,14 @@ 
 /**
  * Class ParagonIE_Sodium_Core_HChaCha20
  */
-class ParagonIE_Sodium_Core32_HChaCha20 extends ParagonIE_Sodium_Core32_ChaCha20
-{
+class ParagonIE_Sodium_Core32_HChaCha20 extends ParagonIE_Sodium_Core32_ChaCha20 {
     /**
      * @param string $in
      * @param string $key
      * @param string|null $c
      * @return string
      */
-    public static function hChaCha20($in = '', $key = '', $c = null)
-    {
+    public static function hChaCha20($in = '', $key = '', $c = null) {
         $ctx = array();
 
         if ($c === null) {
@@ -50,8 +48,7 @@ 
      * @param array $ctx
      * @return string
      */
-    protected static function hChaCha20Bytes(array $ctx)
-    {
+    protected static function hChaCha20Bytes(array $ctx) {
         /**
          * @var ParagonIE_Sodium_Core32_Int32 $x0
          * @var ParagonIE_Sodium_Core32_Int32 $x1

src/library/sodium_compat/src/Crypto.php

Indentation +1173 added lines, -1173 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Crypto', false)) {
-    return;
+	return;
 }
 
 /**
@@ -14,1176 +14,1176 @@ 
  */
 abstract class ParagonIE_Sodium_Crypto
 {
-    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_Core_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_Core_Util::strlen($ad);
-
-        /** @var string $mac - Message authentication code */
-        $mac = ParagonIE_Sodium_Core_Util::substr(
-            $message,
-            $clen,
-            self::aead_chacha20poly1305_ABYTES
-        );
-
-        /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 0, $clen);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
-            32,
-            $nonce,
-            $key
-        );
-
-        /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
-            $block0 = null;
-        }
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
-        $computed_mac = $state->finish();
-
-        /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core_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_Core_ChaCha20::streamXorIc(
-            $ciphertext,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core_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_Core_Util::strlen($message);
-
-        /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
-            32,
-            $nonce,
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
-            $block0 = null;
-        }
-
-        /** @var string $ciphertext - Raw encrypted data */
-        $ciphertext = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
-            $message,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
-        );
-
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core_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_Core_Util::strlen($ad);
-
-        /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core_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_Core_ChaCha20::ietfStream(
-            32,
-            $nonce,
-            $key
-        );
-
-        /** @var string $mac - Message authentication code */
-        $mac = ParagonIE_Sodium_Core_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_Core_Util::substr(
-            $message,
-            0,
-            $len - self::aead_chacha20poly1305_IETF_ABYTES
-        );
-
-        /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core_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_Core_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
-        $computed_mac = $state->finish();
-
-        /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core_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_Core_ChaCha20::ietfStreamXorIc(
-            $ciphertext,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core_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_Core_Util::strlen($message);
-
-        /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
-            32,
-            $nonce,
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
-            $block0 = null;
-        }
-
-        /** @var string $ciphertext - Raw encrypted data */
-        $ciphertext = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
-            $message,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core_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_Core_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core_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_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core_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_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_Util::substr($message, 0, 32);
-
-        /** @var string $ciphertext (ciphertext + MAC) */
-        $ciphertext = ParagonIE_Sodium_Core_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_Core_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;
-    }
-
-    /**
-     * @param string $seed
-     * @return string
-     */
-    public static function box_seed_keypair($seed)
-    {
-        $sKey = ParagonIE_Sodium_Core_Util::substr(
-            hash('sha512', $seed, true),
-            0,
-            32
-        );
-        $pKey = self::scalarmult_base($sKey);
-        return $sKey . $pKey;
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sKey
-     * @param string $pKey
-     * @return string
-     */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
-    {
-        return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
-            ParagonIE_Sodium_Core_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_Core_Util::strlen($keypair) !== 64) {
-            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
-        }
-        return ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_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_Core_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            /** @var SplFixedArray $k */
-            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-
-        /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outlen);
-        ParagonIE_Sodium_Core_BLAKE2b::update($ctx, $in, $in->count());
-
-        /** @var SplFixedArray $out */
-        $out = new SplFixedArray($outlen);
-        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($ctx, $out);
-
-        /** @var array<int, int> */
-        $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core_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_Core_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $out */
-        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($context, $out);
-
-        /** @var array<int, int> */
-        $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core_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_Core_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength);
-
-        return ParagonIE_Sodium_Core_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_Core_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
-
-        /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
-
-        ParagonIE_Sodium_Core_BLAKE2b::update($context, $in, $in->count());
-
-        return ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_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_Core_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
-            $block0,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core_Util::substr(
-            $block0,
-            self::secretbox_xsalsa20poly1305_ZEROBYTES
-        );
-        if ($mlen > $mlen0) {
-            $c .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
-                ParagonIE_Sodium_Core_Util::substr(
-                    $plaintext,
-                    self::secretbox_xsalsa20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-                1,
-                $subkey
-            );
-        }
-        $state = new ParagonIE_Sodium_Core_Poly1305_State(
-            ParagonIE_Sodium_Core_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_Core_Util::substr(
-            $ciphertext,
-            0,
-            self::secretbox_xsalsa20poly1305_MACBYTES
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core_Util::substr(
-            $ciphertext,
-            self::secretbox_xsalsa20poly1305_MACBYTES
-        );
-
-        /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
-            64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-        $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
-            $mac,
-            $c,
-            ParagonIE_Sodium_Core_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_Core_Util::xorStrings(
-            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core_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_Core_Salsa20::salsa20_xor_ic(
-                ParagonIE_Sodium_Core_Util::substr(
-                    $c,
-                    self::secretbox_xsalsa20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core_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_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
-            $block0,
-            $nonceLast,
-            $subkey
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core_Util::substr(
-            $block0,
-            self::secretbox_xchacha20poly1305_ZEROBYTES
-        );
-        if ($mlen > $mlen0) {
-            $c .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
-                ParagonIE_Sodium_Core_Util::substr(
-                    $plaintext,
-                    self::secretbox_xchacha20poly1305_ZEROBYTES
-                ),
-                $nonceLast,
-                $subkey,
-                ParagonIE_Sodium_Core_Util::store64_le(1)
-            );
-        }
-        $state = new ParagonIE_Sodium_Core_Poly1305_State(
-            ParagonIE_Sodium_Core_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_Core_Util::substr(
-            $ciphertext,
-            0,
-            self::secretbox_xchacha20poly1305_MACBYTES
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core_Util::substr(
-            $ciphertext,
-            self::secretbox_xchacha20poly1305_MACBYTES
-        );
-
-        /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
-            64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-        $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
-            $mac,
-            $c,
-            ParagonIE_Sodium_Core_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_Core_Util::xorStrings(
-            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core_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_Core_ChaCha20::streamXorIc(
-                ParagonIE_Sodium_Core_Util::substr(
-                    $c,
-                    self::secretbox_xchacha20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-                $subkey,
-                ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_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_Core_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_Core_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_Core_Util::strlen($ad);
+
+		/** @var string $mac - Message authentication code */
+		$mac = ParagonIE_Sodium_Core_Util::substr(
+			$message,
+			$clen,
+			self::aead_chacha20poly1305_ABYTES
+		);
+
+		/** @var string $ciphertext - The encrypted message (sans MAC) */
+		$ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 0, $clen);
+
+		/** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+		$block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+			32,
+			$nonce,
+			$key
+		);
+
+		/* Recalculate the Poly1305 authentication tag (MAC): */
+		$state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+		} catch (Error $ex) {
+			$block0 = null;
+		}
+		$state->update($ad);
+		$state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+		$state->update($ciphertext);
+		$state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+		$computed_mac = $state->finish();
+
+		/* Compare the given MAC with the recalculated MAC: */
+		if (!ParagonIE_Sodium_Core_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_Core_ChaCha20::streamXorIc(
+			$ciphertext,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core_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_Core_Util::strlen($message);
+
+		/** @var int $adlen - Length of the associated data */
+		$adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+		/** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+		$block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+			32,
+			$nonce,
+			$key
+		);
+		$state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+		} catch (Error $ex) {
+			$block0 = null;
+		}
+
+		/** @var string $ciphertext - Raw encrypted data */
+		$ciphertext = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+			$message,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core_Util::store64_le(1)
+		);
+
+		$state->update($ad);
+		$state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+		$state->update($ciphertext);
+		$state->update(ParagonIE_Sodium_Core_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_Core_Util::strlen($ad);
+
+		/** @var int $len - Length of message (ciphertext + MAC) */
+		$len = ParagonIE_Sodium_Core_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_Core_ChaCha20::ietfStream(
+			32,
+			$nonce,
+			$key
+		);
+
+		/** @var string $mac - Message authentication code */
+		$mac = ParagonIE_Sodium_Core_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_Core_Util::substr(
+			$message,
+			0,
+			$len - self::aead_chacha20poly1305_IETF_ABYTES
+		);
+
+		/* Recalculate the Poly1305 authentication tag (MAC): */
+		$state = new ParagonIE_Sodium_Core_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_Core_Util::store64_le($adlen));
+		$state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+		$computed_mac = $state->finish();
+
+		/* Compare the given MAC with the recalculated MAC: */
+		if (!ParagonIE_Sodium_Core_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_Core_ChaCha20::ietfStreamXorIc(
+			$ciphertext,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core_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_Core_Util::strlen($message);
+
+		/** @var int $adlen - Length of the associated data */
+		$adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+		/** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+		$block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
+			32,
+			$nonce,
+			$key
+		);
+		$state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+		try {
+			ParagonIE_Sodium_Compat::memzero($block0);
+		} catch (Error $ex) {
+			$block0 = null;
+		}
+
+		/** @var string $ciphertext - Raw encrypted data */
+		$ciphertext = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
+			$message,
+			$nonce,
+			$key,
+			ParagonIE_Sodium_Core_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_Core_Util::store64_le($adlen));
+		$state->update(ParagonIE_Sodium_Core_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_Core_HChaCha20::hChaCha20(
+			ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+			$key
+		);
+		$nonceLast = "\x00\x00\x00\x00" .
+			ParagonIE_Sodium_Core_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_Core_HChaCha20::hChaCha20(
+			ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+			$key
+		);
+		$nonceLast = "\x00\x00\x00\x00" .
+			ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_Util::substr($message, 0, 32);
+
+		/** @var string $ciphertext (ciphertext + MAC) */
+		$ciphertext = ParagonIE_Sodium_Core_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_Core_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;
+	}
+
+	/**
+	 * @param string $seed
+	 * @return string
+	 */
+	public static function box_seed_keypair($seed)
+	{
+		$sKey = ParagonIE_Sodium_Core_Util::substr(
+			hash('sha512', $seed, true),
+			0,
+			32
+		);
+		$pKey = self::scalarmult_base($sKey);
+		return $sKey . $pKey;
+	}
+
+	/**
+	 * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+	 *
+	 * @param string $sKey
+	 * @param string $pKey
+	 * @return string
+	 */
+	public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
+	{
+		return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
+			ParagonIE_Sodium_Core_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_Core_Util::strlen($keypair) !== 64) {
+			throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+		}
+		return ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_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_Core_BLAKE2b::$iv is initialized
+		ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+		$k = null;
+		if (!empty($key)) {
+			/** @var SplFixedArray $k */
+			$k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
+			if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
+				throw new RangeException('Invalid key size');
+			}
+		}
+
+		/** @var SplFixedArray $in */
+		$in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+
+		/** @var SplFixedArray $ctx */
+		$ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outlen);
+		ParagonIE_Sodium_Core_BLAKE2b::update($ctx, $in, $in->count());
+
+		/** @var SplFixedArray $out */
+		$out = new SplFixedArray($outlen);
+		$out = ParagonIE_Sodium_Core_BLAKE2b::finish($ctx, $out);
+
+		/** @var array<int, int> */
+		$outArray = $out->toArray();
+		return ParagonIE_Sodium_Core_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_Core_BLAKE2b::stringToContext($ctx);
+
+		/** @var SplFixedArray $out */
+		$out = ParagonIE_Sodium_Core_BLAKE2b::finish($context, $out);
+
+		/** @var array<int, int> */
+		$outArray = $out->toArray();
+		return ParagonIE_Sodium_Core_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_Core_BLAKE2b::$iv is initialized
+		ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+		$k = null;
+		if (!empty($key)) {
+			$k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
+			if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
+				throw new RangeException('Invalid key size');
+			}
+		}
+
+		/** @var SplFixedArray $ctx */
+		$ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength);
+
+		return ParagonIE_Sodium_Core_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_Core_BLAKE2b::$iv is initialized
+		ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+		/** @var SplFixedArray $context */
+		$context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+
+		/** @var SplFixedArray $in */
+		$in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+
+		ParagonIE_Sodium_Core_BLAKE2b::update($context, $in, $in->count());
+
+		return ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_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_Core_HSalsa20::hsalsa20($nonce, $key);
+
+		/** @var string $block0 */
+		$block0 = str_repeat("\x00", 32);
+
+		/** @var int $mlen - Length of the plaintext message */
+		$mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+		$mlen0 = $mlen;
+		if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+			$mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
+		}
+		$block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
+			$block0,
+			ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+			$subkey
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core_Util::substr(
+			$block0,
+			self::secretbox_xsalsa20poly1305_ZEROBYTES
+		);
+		if ($mlen > $mlen0) {
+			$c .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+				ParagonIE_Sodium_Core_Util::substr(
+					$plaintext,
+					self::secretbox_xsalsa20poly1305_ZEROBYTES
+				),
+				ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+				1,
+				$subkey
+			);
+		}
+		$state = new ParagonIE_Sodium_Core_Poly1305_State(
+			ParagonIE_Sodium_Core_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_Core_Util::substr(
+			$ciphertext,
+			0,
+			self::secretbox_xsalsa20poly1305_MACBYTES
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core_Util::substr(
+			$ciphertext,
+			self::secretbox_xsalsa20poly1305_MACBYTES
+		);
+
+		/** @var int $clen */
+		$clen = ParagonIE_Sodium_Core_Util::strlen($c);
+
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
+			64,
+			ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+			$subkey
+		);
+		$verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
+			$mac,
+			$c,
+			ParagonIE_Sodium_Core_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_Core_Util::xorStrings(
+			ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
+			ParagonIE_Sodium_Core_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_Core_Salsa20::salsa20_xor_ic(
+				ParagonIE_Sodium_Core_Util::substr(
+					$c,
+					self::secretbox_xsalsa20poly1305_ZEROBYTES
+				),
+				ParagonIE_Sodium_Core_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_Core_HChaCha20::hChaCha20(
+			ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+			$key
+		);
+		$nonceLast = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+		/** @var string $block0 */
+		$block0 = str_repeat("\x00", 32);
+
+		/** @var int $mlen - Length of the plaintext message */
+		$mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+		$mlen0 = $mlen;
+		if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+			$mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
+		}
+		$block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+			$block0,
+			$nonceLast,
+			$subkey
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core_Util::substr(
+			$block0,
+			self::secretbox_xchacha20poly1305_ZEROBYTES
+		);
+		if ($mlen > $mlen0) {
+			$c .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+				ParagonIE_Sodium_Core_Util::substr(
+					$plaintext,
+					self::secretbox_xchacha20poly1305_ZEROBYTES
+				),
+				$nonceLast,
+				$subkey,
+				ParagonIE_Sodium_Core_Util::store64_le(1)
+			);
+		}
+		$state = new ParagonIE_Sodium_Core_Poly1305_State(
+			ParagonIE_Sodium_Core_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_Core_Util::substr(
+			$ciphertext,
+			0,
+			self::secretbox_xchacha20poly1305_MACBYTES
+		);
+
+		/** @var string $c */
+		$c = ParagonIE_Sodium_Core_Util::substr(
+			$ciphertext,
+			self::secretbox_xchacha20poly1305_MACBYTES
+		);
+
+		/** @var int $clen */
+		$clen = ParagonIE_Sodium_Core_Util::strlen($c);
+
+		/** @var string $subkey */
+		$subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20($nonce, $key);
+
+		/** @var string $block0 */
+		$block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+			64,
+			ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+			$subkey
+		);
+		$verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
+			$mac,
+			$c,
+			ParagonIE_Sodium_Core_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_Core_Util::xorStrings(
+			ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
+			ParagonIE_Sodium_Core_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_Core_ChaCha20::streamXorIc(
+				ParagonIE_Sodium_Core_Util::substr(
+					$c,
+					self::secretbox_xchacha20poly1305_ZEROBYTES
+				),
+				ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+				$subkey,
+				ParagonIE_Sodium_Core_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_Core_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_Core_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_Core_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_Core_Ed25519::verify_detached($signature, $message, $pk);
+	}
 }

Spacing +215 added lines, -215 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Crypto', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Crypto', false ) ) {
     return;
 }
 
@@ -74,13 +74,13 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_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_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var string $mac - Message authentication code */
         $mac = ParagonIE_Sodium_Core_Util::substr(
@@ -90,7 +90,7 @@ 
         );
 
         /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 0, $clen);
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr( $message, 0, $clen );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
@@ -100,21 +100,21 @@ 
         );
 
         /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( Error $ex ) {
             $block0 = null;
         }
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $state->update( $ad );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $adlen ) );
+        $state->update( $ciphertext );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $clen ) );
         $computed_mac = $state->finish();
 
         /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
-            throw new Error('Invalid MAC');
+        if ( ! ParagonIE_Sodium_Core_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
@@ -122,7 +122,7 @@ 
             $ciphertext,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
     }
 
@@ -144,10 +144,10 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $message );
 
         /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
@@ -155,10 +155,10 @@ 
             $nonce,
             $key
         );
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( Error $ex ) {
             $block0 = null;
         }
 
@@ -167,13 +167,13 @@ 
             $message,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
 
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        $state->update( $ad );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $adlen ) );
+        $state->update( $ciphertext );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $len ) );
         return $ciphertext . $state->finish();
     }
 
@@ -196,10 +196,10 @@ 
         $key = ''
     ) {
         /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $message );
 
         /** @var int  $clen - Length of ciphertext */
         $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
@@ -226,23 +226,23 @@ 
         );
 
         /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            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_Core_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $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_Core_Util::store64_le( $adlen ) );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $clen ) );
         $computed_mac = $state->finish();
 
         /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
-            throw new Error('Invalid MAC');
+        if ( ! ParagonIE_Sodium_Core_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
@@ -250,7 +250,7 @@ 
             $ciphertext,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
     }
 
@@ -272,10 +272,10 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $message );
 
         /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
@@ -283,10 +283,10 @@ 
             $nonce,
             $key
         );
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( Error $ex ) {
             $block0 = null;
         }
 
@@ -295,15 +295,15 @@ 
             $message,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_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_Core_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        $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_Core_Util::store64_le( $adlen ) );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $len ) );
         return $ciphertext . $state->finish();
     }
 
@@ -326,13 +326,13 @@ 
         $key = ''
     ) {
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 0, 16 ),
             $key
         );
         $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
-        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
+        return self::aead_chacha20poly1305_ietf_decrypt( $message, $ad, $nonceLast, $subkey );
     }
 
     /**
@@ -353,13 +353,13 @@ 
         $key = ''
     ) {
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 0, 16 ),
             $key
         );
         $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
-        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
+        return self::aead_chacha20poly1305_ietf_encrypt( $message, $ad, $nonceLast, $subkey );
     }
 
     /**
@@ -371,10 +371,10 @@ 
      * @param string $key
      * @return string
      */
-    public static function auth($message, $key)
+    public static function auth( $message, $key )
     {
         return ParagonIE_Sodium_Core_Util::substr(
-            hash_hmac('sha512', $message, $key, true),
+            hash_hmac( 'sha512', $message, $key, true ),
             0,
             32
         );
@@ -390,11 +390,11 @@ 
      * @param string $key
      * @return bool
      */
-    public static function auth_verify($mac, $message, $key)
+    public static function auth_verify( $mac, $message, $key )
     {
         return ParagonIE_Sodium_Core_Util::hashEquals(
             $mac,
-            self::auth($message, $key)
+            self::auth( $message, $key )
         );
     }
 
@@ -408,14 +408,14 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box($plaintext, $nonce, $keypair)
+    public static function box( $plaintext, $nonce, $keypair )
     {
         $c = self::secretbox(
             $plaintext,
             $nonce,
             self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
+                self::box_secretkey( $keypair ),
+                self::box_publickey( $keypair )
             )
         );
         return $c;
@@ -430,16 +430,16 @@ 
      * @param string $publicKey
      * @return string
      */
-    public static function box_seal($message, $publicKey)
+    public static function box_seal( $message, $publicKey )
     {
         /** @var string $ephemeralKeypair */
         $ephemeralKeypair = self::box_keypair();
 
         /** @var string $ephemeralSK */
-        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
+        $ephemeralSK = self::box_secretkey( $ephemeralKeypair );
 
         /** @var string $ephemeralPK */
-        $ephemeralPK = self::box_publickey($ephemeralKeypair);
+        $ephemeralPK = self::box_publickey( $ephemeralKeypair );
 
         /** @var string $nonce */
         $nonce = self::generichash(
@@ -449,15 +449,15 @@ 
         );
 
         /** @var string $keypair - The combined keypair used in crypto_box() */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
+        $keypair = self::box_keypair_from_secretkey_and_publickey( $ephemeralSK, $publicKey );
 
         /** @var string $ciphertext Ciphertext + MAC from crypto_box */
-        $ciphertext = self::box($message, $nonce, $keypair);
+        $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) {
+            ParagonIE_Sodium_Compat::memzero( $ephemeralKeypair );
+            ParagonIE_Sodium_Compat::memzero( $ephemeralSK );
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+        } catch ( Error $ex ) {
             $ephemeralKeypair = null;
             $ephemeralSK = null;
             $nonce = null;
@@ -474,19 +474,19 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box_seal_open($message, $keypair)
+    public static function box_seal_open( $message, $keypair )
     {
         /** @var string $ephemeralPK */
-        $ephemeralPK = ParagonIE_Sodium_Core_Util::substr($message, 0, 32);
+        $ephemeralPK = ParagonIE_Sodium_Core_Util::substr( $message, 0, 32 );
 
         /** @var string $ciphertext (ciphertext + MAC) */
-        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 32);
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr( $message, 32 );
 
         /** @var string $secretKey */
-        $secretKey = self::box_secretkey($keypair);
+        $secretKey = self::box_secretkey( $keypair );
 
         /** @var string $publicKey */
-        $publicKey = self::box_publickey($keypair);
+        $publicKey = self::box_publickey( $keypair );
 
         /** @var string $nonce */
         $nonce = self::generichash(
@@ -496,15 +496,15 @@ 
         );
 
         /** @var string $keypair */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
+        $keypair = self::box_keypair_from_secretkey_and_publickey( $secretKey, $ephemeralPK );
 
         /** @var string $m */
-        $m = self::box_open($ciphertext, $nonce, $keypair);
+        $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) {
+            ParagonIE_Sodium_Compat::memzero( $secretKey );
+            ParagonIE_Sodium_Compat::memzero( $ephemeralPK );
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+        } catch ( Error $ex ) {
             $secretKey = null;
             $ephemeralPK = null;
             $nonce = null;
@@ -521,11 +521,11 @@ 
      * @param string $pk
      * @return string
      */
-    public static function box_beforenm($sk, $pk)
+    public static function box_beforenm( $sk, $pk )
     {
         return ParagonIE_Sodium_Core_HSalsa20::hsalsa20(
-            str_repeat("\x00", 16),
-            self::scalarmult($sk, $pk)
+            str_repeat( "\x00", 16 ),
+            self::scalarmult( $sk, $pk )
         );
     }
 
@@ -536,8 +536,8 @@ 
      */
     public static function box_keypair()
     {
-        $sKey = random_bytes(32);
-        $pKey = self::scalarmult_base($sKey);
+        $sKey = random_bytes( 32 );
+        $pKey = self::scalarmult_base( $sKey );
         return $sKey . $pKey;
     }
 
@@ -545,14 +545,14 @@ 
      * @param string $seed
      * @return string
      */
-    public static function box_seed_keypair($seed)
+    public static function box_seed_keypair( $seed )
     {
         $sKey = ParagonIE_Sodium_Core_Util::substr(
-            hash('sha512', $seed, true),
+            hash( 'sha512', $seed, true ),
             0,
             32
         );
-        $pKey = self::scalarmult_base($sKey);
+        $pKey = self::scalarmult_base( $sKey );
         return $sKey . $pKey;
     }
 
@@ -563,10 +563,10 @@ 
      * @param string $pKey
      * @return string
      */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
+    public static function box_keypair_from_secretkey_and_publickey( $sKey, $pKey )
     {
-        return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
-            ParagonIE_Sodium_Core_Util::substr($pKey, 0, 32);
+        return ParagonIE_Sodium_Core_Util::substr( $sKey, 0, 32 ) .
+            ParagonIE_Sodium_Core_Util::substr( $pKey, 0, 32 );
     }
 
     /**
@@ -576,12 +576,12 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function box_secretkey($keypair)
+    public static function box_secretkey( $keypair )
     {
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== 64) {
-            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== 64 ) {
+            throw new RangeException( 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.' );
         }
-        return ParagonIE_Sodium_Core_Util::substr($keypair, 0, 32);
+        return ParagonIE_Sodium_Core_Util::substr( $keypair, 0, 32 );
     }
 
     /**
@@ -591,12 +591,12 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function box_publickey($keypair)
+    public static function box_publickey( $keypair )
     {
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        if ( ParagonIE_Sodium_Core_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_Core_Util::substr($keypair, 32, 32);
+        return ParagonIE_Sodium_Core_Util::substr( $keypair, 32, 32 );
     }
 
     /**
@@ -606,12 +606,12 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function box_publickey_from_secretkey($sKey)
+    public static function box_publickey_from_secretkey( $sKey )
     {
-        if (ParagonIE_Sodium_Core_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.');
+        if ( ParagonIE_Sodium_Core_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);
+        return self::scalarmult_base( $sKey );
     }
 
     /**
@@ -625,14 +625,14 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box_open($ciphertext, $nonce, $keypair)
+    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)
+                self::box_secretkey( $keypair ),
+                self::box_publickey( $keypair )
             )
         );
     }
@@ -648,34 +648,34 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function generichash($message, $key = '', $outlen = 32)
+    public static function generichash( $message, $key = '', $outlen = 32 )
     {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         $k = null;
-        if (!empty($key)) {
+        if ( ! empty( $key ) ) {
             /** @var SplFixedArray $k */
-            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $key );
+            if ( $k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES ) {
+                throw new RangeException( 'Invalid key size' );
             }
         }
 
         /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $message );
 
         /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outlen);
-        ParagonIE_Sodium_Core_BLAKE2b::update($ctx, $in, $in->count());
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init( $k, $outlen );
+        ParagonIE_Sodium_Core_BLAKE2b::update( $ctx, $in, $in->count() );
 
         /** @var SplFixedArray $out */
-        $out = new SplFixedArray($outlen);
-        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($ctx, $out);
+        $out = new SplFixedArray( $outlen );
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish( $ctx, $out );
 
         /** @var array<int, int> */
         $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+        return ParagonIE_Sodium_Core_Util::intArrayToString( $outArray );
     }
 
     /**
@@ -688,22 +688,22 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function generichash_final($ctx, $outlen = 32)
+    public static function generichash_final( $ctx, $outlen = 32 )
     {
-        if (!is_string($ctx)) {
-            throw new TypeError('Context must be a string');
+        if ( ! is_string( $ctx ) ) {
+            throw new TypeError( 'Context must be a string' );
         }
-        $out = new SplFixedArray($outlen);
+        $out = new SplFixedArray( $outlen );
 
         /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext( $ctx );
 
         /** @var SplFixedArray $out */
-        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($context, $out);
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish( $context, $out );
 
         /** @var array<int, int> */
         $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+        return ParagonIE_Sodium_Core_Util::intArrayToString( $outArray );
     }
 
     /**
@@ -716,23 +716,23 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function generichash_init($key = '', $outputLength = 32)
+    public static function generichash_init( $key = '', $outputLength = 32 )
     {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
+        if ( ! empty( $key ) ) {
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $key );
+            if ( $k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES ) {
+                throw new RangeException( 'Invalid key size' );
             }
         }
 
         /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength);
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init( $k, $outputLength );
 
-        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($ctx);
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString( $ctx );
     }
 
     /**
@@ -744,20 +744,20 @@ 
      * @param string $message
      * @return string
      */
-    public static function generichash_update($ctx, $message)
+    public static function generichash_update( $ctx, $message )
     {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext( $ctx );
 
         /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $message );
 
-        ParagonIE_Sodium_Core_BLAKE2b::update($context, $in, $in->count());
+        ParagonIE_Sodium_Core_BLAKE2b::update( $context, $in, $in->count() );
 
-        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($context);
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString( $context );
     }
 
     /**
@@ -771,10 +771,10 @@ 
      * @param string $server_pk
      * @return string
      */
-    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
+    public static function keyExchange( $my_sk, $their_pk, $client_pk, $server_pk )
     {
         return self::generichash(
-            self::scalarmult($my_sk, $their_pk) .
+            self::scalarmult( $my_sk, $their_pk ) .
             $client_pk .
             $server_pk
         );
@@ -791,10 +791,10 @@ 
      *
      * @throws Error
      */
-    public static function scalarmult($sKey, $pKey)
+    public static function scalarmult( $sKey, $pKey )
     {
-        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
-        self::scalarmult_throw_if_zero($q);
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10( $sKey, $pKey );
+        self::scalarmult_throw_if_zero( $q );
         return $q;
     }
 
@@ -807,10 +807,10 @@ 
      *
      * @throws Error
      */
-    public static function scalarmult_base($secret)
+    public static function scalarmult_base( $secret )
     {
-        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
-        self::scalarmult_throw_if_zero($q);
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base( $secret );
+        self::scalarmult_throw_if_zero( $q );
         return $q;
     }
 
@@ -821,16 +821,16 @@ 
      * @return void
      * @throws Error
      */
-    protected static function scalarmult_throw_if_zero($q)
+    protected static function scalarmult_throw_if_zero( $q )
     {
         $d = 0;
-        for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
-            $d |= ParagonIE_Sodium_Core_Util::chrToInt($q[$i]);
+        for ( $i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i ) {
+            $d |= ParagonIE_Sodium_Core_Util::chrToInt( $q[$i] );
         }
 
         /* branch-free variant of === 0 */
-        if (-(1 & (($d - 1) >> 8))) {
-            throw new Error('Zero public key is not allowed');
+        if (-( 1 & ( ( $d - 1 ) >> 8 ) )) {
+            throw new Error( 'Zero public key is not allowed' );
         }
     }
 
@@ -844,26 +844,26 @@ 
      * @param string $key
      * @return string
      */
-    public static function secretbox($plaintext, $nonce, $key)
+    public static function secretbox( $plaintext, $nonce, $key )
     {
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen = ParagonIE_Sodium_Core_Util::strlen( $plaintext );
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
             $block0,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
 
@@ -872,13 +872,13 @@ 
             $block0,
             self::secretbox_xsalsa20poly1305_ZEROBYTES
         );
-        if ($mlen > $mlen0) {
+        if ( $mlen > $mlen0 ) {
             $c .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
                 ParagonIE_Sodium_Core_Util::substr(
                     $plaintext,
                     self::secretbox_xsalsa20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
                 1,
                 $subkey
             );
@@ -891,18 +891,18 @@ 
             )
         );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( Error $ex ) {
             $block0 = null;
             $subkey = null;
         }
 
-        $state->update($c);
+        $state->update( $c );
 
         /** @var string $c - MAC || ciphertext */
         $c = $state->finish() . $c;
-        unset($state);
+        unset( $state );
 
         return $c;
     }
@@ -918,7 +918,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function secretbox_open($ciphertext, $nonce, $key)
+    public static function secretbox_open( $ciphertext, $nonce, $key )
     {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core_Util::substr(
@@ -934,44 +934,44 @@ 
         );
 
         /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+        $clen = ParagonIE_Sodium_Core_Util::strlen( $c );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
             64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
         $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
             $mac,
             $c,
-            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+            ParagonIE_Sodium_Core_Util::substr( $block0, 0, 32 )
         );
-        if (!$verified) {
+        if ( ! $verified ) {
             try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (Error $ex) {
+                ParagonIE_Sodium_Compat::memzero( $subkey );
+            } catch ( Error $ex ) {
                 $subkey = null;
             }
-            throw new Error('Invalid MAC');
+            throw new Error( 'Invalid MAC' );
         }
 
         /** @var string $m - Decrypted message */
         $m = ParagonIE_Sodium_Core_Util::xorStrings(
-            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
+            ParagonIE_Sodium_Core_Util::substr( $block0, self::secretbox_xsalsa20poly1305_ZEROBYTES ),
+            ParagonIE_Sodium_Core_Util::substr( $c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES )
         );
-        if ($clen > 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_Core_Salsa20::salsa20_xor_ic(
                 ParagonIE_Sodium_Core_Util::substr(
                     $c,
                     self::secretbox_xsalsa20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
                 1,
                 $subkey
             );
@@ -989,25 +989,25 @@ 
      * @param string $key
      * @return string
      */
-    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    public static function secretbox_xchacha20poly1305( $plaintext, $nonce, $key )
     {
         /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 0, 16 ),
             $key
         );
-        $nonceLast = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+        $nonceLast = ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen = ParagonIE_Sodium_Core_Util::strlen( $plaintext );
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
@@ -1021,7 +1021,7 @@ 
             $block0,
             self::secretbox_xchacha20poly1305_ZEROBYTES
         );
-        if ($mlen > $mlen0) {
+        if ( $mlen > $mlen0 ) {
             $c .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
                 ParagonIE_Sodium_Core_Util::substr(
                     $plaintext,
@@ -1029,7 +1029,7 @@ 
                 ),
                 $nonceLast,
                 $subkey,
-                ParagonIE_Sodium_Core_Util::store64_le(1)
+                ParagonIE_Sodium_Core_Util::store64_le( 1 )
             );
         }
         $state = new ParagonIE_Sodium_Core_Poly1305_State(
@@ -1040,18 +1040,18 @@ 
             )
         );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (Error $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( Error $ex ) {
             $block0 = null;
             $subkey = null;
         }
 
-        $state->update($c);
+        $state->update( $c );
 
         /** @var string $c - MAC || ciphertext */
         $c = $state->finish() . $c;
-        unset($state);
+        unset( $state );
 
         return $c;
     }
@@ -1067,7 +1067,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    public static function secretbox_xchacha20poly1305_open( $ciphertext, $nonce, $key )
     {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core_Util::substr(
@@ -1083,48 +1083,48 @@ 
         );
 
         /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+        $clen = ParagonIE_Sodium_Core_Util::strlen( $c );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20( $nonce, $key );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
             64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
         $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
             $mac,
             $c,
-            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+            ParagonIE_Sodium_Core_Util::substr( $block0, 0, 32 )
         );
 
-        if (!$verified) {
+        if ( ! $verified ) {
             try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (Error $ex) {
+                ParagonIE_Sodium_Compat::memzero( $subkey );
+            } catch ( Error $ex ) {
                 $subkey = null;
             }
-            throw new Error('Invalid MAC');
+            throw new Error( 'Invalid MAC' );
         }
 
         /** @var string $m - Decrypted message */
         $m = ParagonIE_Sodium_Core_Util::xorStrings(
-            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
+            ParagonIE_Sodium_Core_Util::substr( $block0, self::secretbox_xchacha20poly1305_ZEROBYTES ),
+            ParagonIE_Sodium_Core_Util::substr( $c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES )
         );
 
-        if ($clen > 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_Core_ChaCha20::streamXorIc(
                 ParagonIE_Sodium_Core_Util::substr(
                     $c,
                     self::secretbox_xchacha20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
                 $subkey,
-                ParagonIE_Sodium_Core_Util::store64_le(1)
+                ParagonIE_Sodium_Core_Util::store64_le( 1 )
             );
         }
         return $m;
@@ -1139,9 +1139,9 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign_detached($message, $sk)
+    public static function sign_detached( $message, $sk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::sign_detached($message, $sk);
+        return ParagonIE_Sodium_Core_Ed25519::sign_detached( $message, $sk );
     }
 
     /**
@@ -1153,9 +1153,9 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign($message, $sk)
+    public static function sign( $message, $sk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::sign($message, $sk);
+        return ParagonIE_Sodium_Core_Ed25519::sign( $message, $sk );
     }
 
     /**
@@ -1167,9 +1167,9 @@ 
      * @param string $pk
      * @return string
      */
-    public static function sign_open($signedMessage, $pk)
+    public static function sign_open( $signedMessage, $pk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::sign_open($signedMessage, $pk);
+        return ParagonIE_Sodium_Core_Ed25519::sign_open( $signedMessage, $pk );
     }
 
     /**
@@ -1182,8 +1182,8 @@ 
      * @param string $pk
      * @return bool
      */
-    public static function sign_verify_detached($signature, $message, $pk)
+    public static function sign_verify_detached( $signature, $message, $pk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::verify_detached($signature, $message, $pk);
+        return ParagonIE_Sodium_Core_Ed25519::verify_detached( $signature, $message, $pk );
     }
 }

Braces +30 added lines, -60 removed lines

@@ -12,8 +12,7 @@ 
  * If you are using this library, you should be using
  * ParagonIE_Sodium_Compat in your code, not this class.
  */
-abstract class ParagonIE_Sodium_Crypto
-{
+abstract class ParagonIE_Sodium_Crypto {
     const aead_chacha20poly1305_KEYBYTES = 32;
     const aead_chacha20poly1305_NSECBYTES = 0;
     const aead_chacha20poly1305_NPUBBYTES = 8;
@@ -371,8 +370,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function auth($message, $key)
-    {
+    public static function auth($message, $key) {
         return ParagonIE_Sodium_Core_Util::substr(
             hash_hmac('sha512', $message, $key, true),
             0,
@@ -390,8 +388,7 @@ 
      * @param string $key
      * @return bool
      */
-    public static function auth_verify($mac, $message, $key)
-    {
+    public static function auth_verify($mac, $message, $key) {
         return ParagonIE_Sodium_Core_Util::hashEquals(
             $mac,
             self::auth($message, $key)
@@ -408,8 +405,7 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box($plaintext, $nonce, $keypair)
-    {
+    public static function box($plaintext, $nonce, $keypair) {
         $c = self::secretbox(
             $plaintext,
             $nonce,
@@ -430,8 +426,7 @@ 
      * @param string $publicKey
      * @return string
      */
-    public static function box_seal($message, $publicKey)
-    {
+    public static function box_seal($message, $publicKey) {
         /** @var string $ephemeralKeypair */
         $ephemeralKeypair = self::box_keypair();
 
@@ -474,8 +469,7 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box_seal_open($message, $keypair)
-    {
+    public static function box_seal_open($message, $keypair) {
         /** @var string $ephemeralPK */
         $ephemeralPK = ParagonIE_Sodium_Core_Util::substr($message, 0, 32);
 
@@ -521,8 +515,7 @@ 
      * @param string $pk
      * @return string
      */
-    public static function box_beforenm($sk, $pk)
-    {
+    public static function box_beforenm($sk, $pk) {
         return ParagonIE_Sodium_Core_HSalsa20::hsalsa20(
             str_repeat("\x00", 16),
             self::scalarmult($sk, $pk)
@@ -534,8 +527,7 @@ 
      *
      * @return string
      */
-    public static function box_keypair()
-    {
+    public static function box_keypair() {
         $sKey = random_bytes(32);
         $pKey = self::scalarmult_base($sKey);
         return $sKey . $pKey;
@@ -545,8 +537,7 @@ 
      * @param string $seed
      * @return string
      */
-    public static function box_seed_keypair($seed)
-    {
+    public static function box_seed_keypair($seed) {
         $sKey = ParagonIE_Sodium_Core_Util::substr(
             hash('sha512', $seed, true),
             0,
@@ -563,8 +554,7 @@ 
      * @param string $pKey
      * @return string
      */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
-    {
+    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey) {
         return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
             ParagonIE_Sodium_Core_Util::substr($pKey, 0, 32);
     }
@@ -576,8 +566,7 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function box_secretkey($keypair)
-    {
+    public static function box_secretkey($keypair) {
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== 64) {
             throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
         }
@@ -591,8 +580,7 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function box_publickey($keypair)
-    {
+    public static function box_publickey($keypair) {
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
             throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
         }
@@ -606,8 +594,7 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function box_publickey_from_secretkey($sKey)
-    {
+    public static function box_publickey_from_secretkey($sKey) {
         if (ParagonIE_Sodium_Core_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.');
         }
@@ -625,8 +612,7 @@ 
      * @param string $keypair
      * @return string
      */
-    public static function box_open($ciphertext, $nonce, $keypair)
-    {
+    public static function box_open($ciphertext, $nonce, $keypair) {
         return self::secretbox_open(
             $ciphertext,
             $nonce,
@@ -648,8 +634,7 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function generichash($message, $key = '', $outlen = 32)
-    {
+    public static function generichash($message, $key = '', $outlen = 32) {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
@@ -688,8 +673,7 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function generichash_final($ctx, $outlen = 32)
-    {
+    public static function generichash_final($ctx, $outlen = 32) {
         if (!is_string($ctx)) {
             throw new TypeError('Context must be a string');
         }
@@ -716,8 +700,7 @@ 
      * @return string
      * @throws RangeException
      */
-    public static function generichash_init($key = '', $outputLength = 32)
-    {
+    public static function generichash_init($key = '', $outputLength = 32) {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
@@ -744,8 +727,7 @@ 
      * @param string $message
      * @return string
      */
-    public static function generichash_update($ctx, $message)
-    {
+    public static function generichash_update($ctx, $message) {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
@@ -771,8 +753,7 @@ 
      * @param string $server_pk
      * @return string
      */
-    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
-    {
+    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk) {
         return self::generichash(
             self::scalarmult($my_sk, $their_pk) .
             $client_pk .
@@ -791,8 +772,7 @@ 
      *
      * @throws Error
      */
-    public static function scalarmult($sKey, $pKey)
-    {
+    public static function scalarmult($sKey, $pKey) {
         $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
         self::scalarmult_throw_if_zero($q);
         return $q;
@@ -807,8 +787,7 @@ 
      *
      * @throws Error
      */
-    public static function scalarmult_base($secret)
-    {
+    public static function scalarmult_base($secret) {
         $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
         self::scalarmult_throw_if_zero($q);
         return $q;
@@ -821,8 +800,7 @@ 
      * @return void
      * @throws Error
      */
-    protected static function scalarmult_throw_if_zero($q)
-    {
+    protected static function scalarmult_throw_if_zero($q) {
         $d = 0;
         for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
             $d |= ParagonIE_Sodium_Core_Util::chrToInt($q[$i]);
@@ -844,8 +822,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function secretbox($plaintext, $nonce, $key)
-    {
+    public static function secretbox($plaintext, $nonce, $key) {
         /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
 
@@ -918,8 +895,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function secretbox_open($ciphertext, $nonce, $key)
-    {
+    public static function secretbox_open($ciphertext, $nonce, $key) {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core_Util::substr(
             $ciphertext,
@@ -989,8 +965,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
+    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key) {
         /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
             ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
@@ -1067,8 +1042,7 @@ 
      * @return string
      * @throws Error
      */
-    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
+    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key) {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core_Util::substr(
             $ciphertext,
@@ -1139,8 +1113,7 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign_detached($message, $sk)
-    {
+    public static function sign_detached($message, $sk) {
         return ParagonIE_Sodium_Core_Ed25519::sign_detached($message, $sk);
     }
 
@@ -1153,8 +1126,7 @@ 
      * @param string $sk
      * @return string
      */
-    public static function sign($message, $sk)
-    {
+    public static function sign($message, $sk) {
         return ParagonIE_Sodium_Core_Ed25519::sign($message, $sk);
     }
 
@@ -1167,8 +1139,7 @@ 
      * @param string $pk
      * @return string
      */
-    public static function sign_open($signedMessage, $pk)
-    {
+    public static function sign_open($signedMessage, $pk) {
         return ParagonIE_Sodium_Core_Ed25519::sign_open($signedMessage, $pk);
     }
 
@@ -1182,8 +1153,7 @@ 
      * @param string $pk
      * @return bool
      */
-    public static function sign_verify_detached($signature, $message, $pk)
-    {
+    public static function sign_verify_detached($signature, $message, $pk) {
         return ParagonIE_Sodium_Core_Ed25519::verify_detached($signature, $message, $pk);
     }
 }

src/library/sodium_compat/src/Core/Poly1305.php

Indentation +46 added lines, -46 removed lines

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

Spacing +10 added lines, -10 removed lines

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

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_Poly1305
  */
-abstract class ParagonIE_Sodium_Core_Poly1305 extends ParagonIE_Sodium_Core_Util
-{
+abstract class ParagonIE_Sodium_Core_Poly1305 extends ParagonIE_Sodium_Core_Util {
     const BLOCK_SIZE = 16;
 
     /**
@@ -18,8 +17,7 @@ 
      * @param string $key
      * @return string
      */
-    public static function onetimeauth($m, $key)
-    {
+    public static function onetimeauth($m, $key) {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'
@@ -41,8 +39,7 @@ 
      * @param string $key
      * @return bool
      */
-    public static function onetimeauth_verify($mac, $m, $key)
-    {
+    public static function onetimeauth_verify($mac, $m, $key) {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'

src/library/sodium_compat/src/Core/Ed25519.php

Indentation +407 added lines, -407 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_Ed25519', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,410 +9,410 @@ 
  */
 abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_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_Core_Curve25519_Ge_P3 $A */
-        $A = self::ge_frombytes_negate_vartime($pk);
-
-        /** @var string $hDigest */
-        $hDigest = hash(
-            'sha512',
-            self::substr($sig, 0, 32) .
-                self::substr($pk, 0, 32) .
-                $message,
-            true
-        );
-
-        /** @var string $h */
-        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
-
-        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
-        $R = self::ge_double_scalarmult_vartime(
-            $h,
-            $A,
-            self::substr($sig, 32)
-        );
-
-        /** @var string $rcheck */
-        $rcheck = self::ge_tobytes($R);
-
-        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
-        ParagonIE_Sodium_Compat::$fastMult = $orig;
-
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $S
-     * @return bool
-     * @throws 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_Core_Curve25519_Ge_P3 $A */
+		$A = self::ge_frombytes_negate_vartime($pk);
+
+		/** @var string $hDigest */
+		$hDigest = hash(
+			'sha512',
+			self::substr($sig, 0, 32) .
+				self::substr($pk, 0, 32) .
+				$message,
+			true
+		);
+
+		/** @var string $h */
+		$h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+		/** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
+		$R = self::ge_double_scalarmult_vartime(
+			$h,
+			$A,
+			self::substr($sig, 32)
+		);
+
+		/** @var string $rcheck */
+		$rcheck = self::ge_tobytes($R);
+
+		// Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+		ParagonIE_Sodium_Compat::$fastMult = $orig;
+
+		return self::verify_32($rcheck, self::substr($sig, 0, 32));
+	}
+
+	/**
+	 * @internal You should not use this directly from another application
+	 *
+	 * @param string $S
+	 * @return bool
+	 * @throws Exception
+	 */
+	public static function check_S_lt_L($S)
+	{
+		if (self::strlen($S) < 32) {
+			throw new Exception('Signature must be 32 bytes');
+		}
+		static $L = array(
+			0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
+			0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
+		);
+		$c = 0;
+		$n = 1;
+		$i = 32;
+
+		do {
+			--$i;
+			$x = self::chrToInt($S[$i]);
+			$c |= (
+				(($x - $L[$i]) >> 8) & $n
+			);
+			$n &= (
+				(($x ^ $L[$i]) - 1) >> 8
+			);
+		} while ($i !== 0);
+
+		return $c === 0;
+	}
+
+	/**
+	 * @param string $R
+	 * @return bool
+	 */
+	public static function small_order($R)
+	{
+		static $blacklist = array(
+			/* 0 (order 4) */
+			array(
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+			),
+			/* 1 (order 1) */
+			array(
+				0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+			),
+			/* 2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+			array(
+				0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+				0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+				0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+				0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05
+			),
+			/* 55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+			array(
+				0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+				0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+				0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+				0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a
+			),
+			/* p-1 (order 2) */
+			array(
+				0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+				0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+				0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+				0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85
+			),
+			/* p (order 4) */
+			array(
+				0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+				0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+				0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+				0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa
+			),
+			/* p+1 (order 1) */
+			array(
+				0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+			),
+			/* p+2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+			array(
+				0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+			),
+			/* p+55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+			array(
+				0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+			),
+			/* 2p-1 (order 2) */
+			array(
+				0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+			),
+			/* 2p (order 4) */
+			array(
+				0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+			),
+			/* 2p+1 (order 1) */
+			array(
+				0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+			)
+		);
+		$countBlacklist = count($blacklist);
+
+		for ($i = 0; $i < $countBlacklist; ++$i) {
+			$c = 0;
+			for ($j = 0; $j < 32; ++$j) {
+				$c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
+			}
+			if ($c === 0) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

Spacing +83 added lines, -83 removed lines

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

Braces +13 added lines, -26 removed lines

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

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

Indentation +346 added lines, -346 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
-    return;
+	return;
 }
 
 /**
@@ -9,349 +9,349 @@ 
  */
 class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
 {
-    /**
-     * @var array<int, int>
-     */
-    protected $buffer = array();
-
-    /**
-     * @var bool
-     */
-    protected $final = false;
-
-    /**
-     * @var array<int, int>
-     */
-    public $h;
-
-    /**
-     * @var int
-     */
-    protected $leftover = 0;
-
-    /**
-     * @var int[]
-     */
-    public $r;
-
-    /**
-     * @var int[]
-     */
-    public $pad;
-
-    /**
-     * ParagonIE_Sodium_Core_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(
-            (int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
-            (int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
-            (int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
-            (int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
-            (int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
-        );
-
-        /* h = 0 */
-        $this->h = array(0, 0, 0, 0, 0);
-
-        /* save pad for later */
-        $this->pad = array(
-            self::load_4(self::substr($key, 16, 4)),
-            self::load_4(self::substr($key, 20, 4)),
-            self::load_4(self::substr($key, 24, 4)),
-            self::load_4(self::substr($key, 28, 4)),
-        );
-
-        $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_Core_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_Core_Poly1305::BLOCK_SIZE) {
-                // We still don't have enough to run $this->blocks()
-                return $this;
-            }
-
-            $this->blocks(
-                static::intArrayToString($this->buffer),
-                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
-            );
-            $this->leftover = 0;
-        }
-
-        /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-            $want = $bytes & ~(ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-                $block = self::substr($message, 0, $want);
-                if (self::strlen($block) >= ParagonIE_Sodium_Core_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 = $this->final ? 0 : 1 << 24; /* 1 << 128 */
-        $r0 = (int) $this->r[0];
-        $r1 = (int) $this->r[1];
-        $r2 = (int) $this->r[2];
-        $r3 = (int) $this->r[3];
-        $r4 = (int) $this->r[4];
-
-        $s1 = self::mul($r1, 5, 3);
-        $s2 = self::mul($r2, 5, 3);
-        $s3 = self::mul($r3, 5, 3);
-        $s4 = self::mul($r4, 5, 3);
-
-        $h0 = $this->h[0];
-        $h1 = $this->h[1];
-        $h2 = $this->h[2];
-        $h3 = $this->h[3];
-        $h4 = $this->h[4];
-
-        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-            /* h += m[i] */
-            $h0 +=  self::load_4(self::substr($message, 0, 4))       & 0x3ffffff;
-            $h1 += (self::load_4(self::substr($message, 3, 4)) >> 2) & 0x3ffffff;
-            $h2 += (self::load_4(self::substr($message, 6, 4)) >> 4) & 0x3ffffff;
-            $h3 += (self::load_4(self::substr($message, 9, 4)) >> 6) & 0x3ffffff;
-            $h4 += (self::load_4(self::substr($message, 12, 4)) >> 8) | $hibit;
-
-            /* h *= r */
-            $d0 = (
-                self::mul($h0, $r0) +
-                self::mul($h1, $s4) +
-                self::mul($h2, $s3) +
-                self::mul($h3, $s2) +
-                self::mul($h4, $s1)
-            );
-
-            $d1 = (
-                self::mul($h0, $r1) +
-                self::mul($h1, $r0) +
-                self::mul($h2, $s4) +
-                self::mul($h3, $s3) +
-                self::mul($h4, $s2)
-            );
-
-            $d2 = (
-                self::mul($h0, $r2) +
-                self::mul($h1, $r1) +
-                self::mul($h2, $r0) +
-                self::mul($h3, $s4) +
-                self::mul($h4, $s3)
-            );
-
-            $d3 = (
-                self::mul($h0, $r3) +
-                self::mul($h1, $r2) +
-                self::mul($h2, $r1) +
-                self::mul($h3, $r0) +
-                self::mul($h4, $s4)
-            );
-
-            $d4 = (
-                self::mul($h0, $r4) +
-                self::mul($h1, $r3) +
-                self::mul($h2, $r2) +
-                self::mul($h3, $r1) +
-                self::mul($h4, $r0)
-            );
-
-            /* (partial) h %= p */
-            $c = $d0 >> 26;
-            $h0 = $d0 & 0x3ffffff;
-            $d1 += $c;
-            $c = $d1 >> 26;
-            $h1 = $d1 & 0x3ffffff;
-            $d2 += $c;
-            $c = $d2 >> 26;
-            $h2 = $d2 & 0x3ffffff;
-            $d3 += $c;
-            $c = $d3 >> 26;
-            $h3 = $d3 & 0x3ffffff;
-            $d4 += $c;
-            $c = $d4 >> 26;
-            $h4 = $d4 & 0x3ffffff;
-            $h0 += (int) self::mul($c, 5, 3);
-            $c = $h0 >> 26;
-            $h0 &= 0x3ffffff;
-            $h1 += $c;
-
-            // Chop off the left 32 bytes.
-            $message = self::substr(
-                $message,
-                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
-            );
-            $bytes -= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE;
-        }
-
-        $this->h = array(
-            (int) ($h0 & 0xffffffff),
-            (int) ($h1 & 0xffffffff),
-            (int) ($h2 & 0xffffffff),
-            (int) ($h3 & 0xffffffff),
-            (int) ($h4 & 0xffffffff)
-        );
-        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_Core_Poly1305::BLOCK_SIZE; ++$i) {
-                $this->buffer[$i] = 0;
-            }
-            $this->final = true;
-            $this->blocks(
-                self::substr(
-                    static::intArrayToString($this->buffer),
-                    0,
-                    ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
-                ),
-                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
-            );
-        }
-
-        $h0 = (int) $this->h[0];
-        $h1 = (int) $this->h[1];
-        $h2 = (int) $this->h[2];
-        $h3 = (int) $this->h[3];
-        $h4 = (int) $this->h[4];
-
-        $c = $h1 >> 26;
-        $h1 &= 0x3ffffff;
-        $h2 += $c;
-        $c = $h2 >> 26;
-        $h2 &= 0x3ffffff;
-        $h3 += $c;
-        $c = $h3 >> 26;
-        $h3 &= 0x3ffffff;
-        $h4 += $c;
-        $c = $h4 >> 26;
-        $h4 &= 0x3ffffff;
-        $h0 += self::mul($c, 5, 3);
-        $c = $h0 >> 26;
-        $h0 &= 0x3ffffff;
-        $h1 += $c;
-
-        /* compute h + -p */
-        $g0 = $h0 + 5;
-        $c = $g0 >> 26;
-        $g0 &= 0x3ffffff;
-        $g1 = $h1 + $c;
-        $c = $g1 >> 26;
-        $g1 &= 0x3ffffff;
-        $g2 = $h2 + $c;
-        $c = $g2 >> 26;
-        $g2 &= 0x3ffffff;
-        $g3 = $h3 + $c;
-        $c = $g3 >> 26;
-        $g3 &= 0x3ffffff;
-        $g4 = ($h4 + $c - (1 << 26)) & 0xffffffff;
-
-        /* select h if h < p, or h + -p if h >= p */
-        $mask = ($g4 >> 31) - 1;
-
-        $g0 &= $mask;
-        $g1 &= $mask;
-        $g2 &= $mask;
-        $g3 &= $mask;
-        $g4 &= $mask;
-
-        $mask = ~$mask & 0xffffffff;
-        $h0 = ($h0 & $mask) | $g0;
-        $h1 = ($h1 & $mask) | $g1;
-        $h2 = ($h2 & $mask) | $g2;
-        $h3 = ($h3 & $mask) | $g3;
-        $h4 = ($h4 & $mask) | $g4;
-
-        /* h = h % (2^128) */
-        $h0 = (($h0) | ($h1 << 26)) & 0xffffffff;
-        $h1 = (($h1 >>  6) | ($h2 << 20)) & 0xffffffff;
-        $h2 = (($h2 >> 12) | ($h3 << 14)) & 0xffffffff;
-        $h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
-
-        /* mac = (h + pad) % (2^128) */
-        $f = ($h0 + $this->pad[0]);
-        $h0 = (int) $f;
-        $f = ($h1 + $this->pad[1] + ($f >> 32));
-        $h1 = (int) $f;
-        $f = ($h2 + $this->pad[2] + ($f >> 32));
-        $h2 = (int) $f;
-        $f = ($h3 + $this->pad[3] + ($f >> 32));
-        $h3 = (int) $f;
-
-        return self::store32_le($h0 & 0xffffffff) .
-            self::store32_le($h1 & 0xffffffff) .
-            self::store32_le($h2 & 0xffffffff) .
-            self::store32_le($h3 & 0xffffffff);
-    }
+	/**
+	 * @var array<int, int>
+	 */
+	protected $buffer = array();
+
+	/**
+	 * @var bool
+	 */
+	protected $final = false;
+
+	/**
+	 * @var array<int, int>
+	 */
+	public $h;
+
+	/**
+	 * @var int
+	 */
+	protected $leftover = 0;
+
+	/**
+	 * @var int[]
+	 */
+	public $r;
+
+	/**
+	 * @var int[]
+	 */
+	public $pad;
+
+	/**
+	 * ParagonIE_Sodium_Core_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(
+			(int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
+			(int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
+			(int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
+			(int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
+			(int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
+		);
+
+		/* h = 0 */
+		$this->h = array(0, 0, 0, 0, 0);
+
+		/* save pad for later */
+		$this->pad = array(
+			self::load_4(self::substr($key, 16, 4)),
+			self::load_4(self::substr($key, 20, 4)),
+			self::load_4(self::substr($key, 24, 4)),
+			self::load_4(self::substr($key, 28, 4)),
+		);
+
+		$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_Core_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_Core_Poly1305::BLOCK_SIZE) {
+				// We still don't have enough to run $this->blocks()
+				return $this;
+			}
+
+			$this->blocks(
+				static::intArrayToString($this->buffer),
+				ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+			);
+			$this->leftover = 0;
+		}
+
+		/* process full blocks */
+		if ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+			$want = $bytes & ~(ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1);
+			if ($want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+				$block = self::substr($message, 0, $want);
+				if (self::strlen($block) >= ParagonIE_Sodium_Core_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 = $this->final ? 0 : 1 << 24; /* 1 << 128 */
+		$r0 = (int) $this->r[0];
+		$r1 = (int) $this->r[1];
+		$r2 = (int) $this->r[2];
+		$r3 = (int) $this->r[3];
+		$r4 = (int) $this->r[4];
+
+		$s1 = self::mul($r1, 5, 3);
+		$s2 = self::mul($r2, 5, 3);
+		$s3 = self::mul($r3, 5, 3);
+		$s4 = self::mul($r4, 5, 3);
+
+		$h0 = $this->h[0];
+		$h1 = $this->h[1];
+		$h2 = $this->h[2];
+		$h3 = $this->h[3];
+		$h4 = $this->h[4];
+
+		while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+			/* h += m[i] */
+			$h0 +=  self::load_4(self::substr($message, 0, 4))       & 0x3ffffff;
+			$h1 += (self::load_4(self::substr($message, 3, 4)) >> 2) & 0x3ffffff;
+			$h2 += (self::load_4(self::substr($message, 6, 4)) >> 4) & 0x3ffffff;
+			$h3 += (self::load_4(self::substr($message, 9, 4)) >> 6) & 0x3ffffff;
+			$h4 += (self::load_4(self::substr($message, 12, 4)) >> 8) | $hibit;
+
+			/* h *= r */
+			$d0 = (
+				self::mul($h0, $r0) +
+				self::mul($h1, $s4) +
+				self::mul($h2, $s3) +
+				self::mul($h3, $s2) +
+				self::mul($h4, $s1)
+			);
+
+			$d1 = (
+				self::mul($h0, $r1) +
+				self::mul($h1, $r0) +
+				self::mul($h2, $s4) +
+				self::mul($h3, $s3) +
+				self::mul($h4, $s2)
+			);
+
+			$d2 = (
+				self::mul($h0, $r2) +
+				self::mul($h1, $r1) +
+				self::mul($h2, $r0) +
+				self::mul($h3, $s4) +
+				self::mul($h4, $s3)
+			);
+
+			$d3 = (
+				self::mul($h0, $r3) +
+				self::mul($h1, $r2) +
+				self::mul($h2, $r1) +
+				self::mul($h3, $r0) +
+				self::mul($h4, $s4)
+			);
+
+			$d4 = (
+				self::mul($h0, $r4) +
+				self::mul($h1, $r3) +
+				self::mul($h2, $r2) +
+				self::mul($h3, $r1) +
+				self::mul($h4, $r0)
+			);
+
+			/* (partial) h %= p */
+			$c = $d0 >> 26;
+			$h0 = $d0 & 0x3ffffff;
+			$d1 += $c;
+			$c = $d1 >> 26;
+			$h1 = $d1 & 0x3ffffff;
+			$d2 += $c;
+			$c = $d2 >> 26;
+			$h2 = $d2 & 0x3ffffff;
+			$d3 += $c;
+			$c = $d3 >> 26;
+			$h3 = $d3 & 0x3ffffff;
+			$d4 += $c;
+			$c = $d4 >> 26;
+			$h4 = $d4 & 0x3ffffff;
+			$h0 += (int) self::mul($c, 5, 3);
+			$c = $h0 >> 26;
+			$h0 &= 0x3ffffff;
+			$h1 += $c;
+
+			// Chop off the left 32 bytes.
+			$message = self::substr(
+				$message,
+				ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+			);
+			$bytes -= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE;
+		}
+
+		$this->h = array(
+			(int) ($h0 & 0xffffffff),
+			(int) ($h1 & 0xffffffff),
+			(int) ($h2 & 0xffffffff),
+			(int) ($h3 & 0xffffffff),
+			(int) ($h4 & 0xffffffff)
+		);
+		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_Core_Poly1305::BLOCK_SIZE; ++$i) {
+				$this->buffer[$i] = 0;
+			}
+			$this->final = true;
+			$this->blocks(
+				self::substr(
+					static::intArrayToString($this->buffer),
+					0,
+					ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+				),
+				ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+			);
+		}
+
+		$h0 = (int) $this->h[0];
+		$h1 = (int) $this->h[1];
+		$h2 = (int) $this->h[2];
+		$h3 = (int) $this->h[3];
+		$h4 = (int) $this->h[4];
+
+		$c = $h1 >> 26;
+		$h1 &= 0x3ffffff;
+		$h2 += $c;
+		$c = $h2 >> 26;
+		$h2 &= 0x3ffffff;
+		$h3 += $c;
+		$c = $h3 >> 26;
+		$h3 &= 0x3ffffff;
+		$h4 += $c;
+		$c = $h4 >> 26;
+		$h4 &= 0x3ffffff;
+		$h0 += self::mul($c, 5, 3);
+		$c = $h0 >> 26;
+		$h0 &= 0x3ffffff;
+		$h1 += $c;
+
+		/* compute h + -p */
+		$g0 = $h0 + 5;
+		$c = $g0 >> 26;
+		$g0 &= 0x3ffffff;
+		$g1 = $h1 + $c;
+		$c = $g1 >> 26;
+		$g1 &= 0x3ffffff;
+		$g2 = $h2 + $c;
+		$c = $g2 >> 26;
+		$g2 &= 0x3ffffff;
+		$g3 = $h3 + $c;
+		$c = $g3 >> 26;
+		$g3 &= 0x3ffffff;
+		$g4 = ($h4 + $c - (1 << 26)) & 0xffffffff;
+
+		/* select h if h < p, or h + -p if h >= p */
+		$mask = ($g4 >> 31) - 1;
+
+		$g0 &= $mask;
+		$g1 &= $mask;
+		$g2 &= $mask;
+		$g3 &= $mask;
+		$g4 &= $mask;
+
+		$mask = ~$mask & 0xffffffff;
+		$h0 = ($h0 & $mask) | $g0;
+		$h1 = ($h1 & $mask) | $g1;
+		$h2 = ($h2 & $mask) | $g2;
+		$h3 = ($h3 & $mask) | $g3;
+		$h4 = ($h4 & $mask) | $g4;
+
+		/* h = h % (2^128) */
+		$h0 = (($h0) | ($h1 << 26)) & 0xffffffff;
+		$h1 = (($h1 >>  6) | ($h2 << 20)) & 0xffffffff;
+		$h2 = (($h2 >> 12) | ($h3 << 14)) & 0xffffffff;
+		$h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
+
+		/* mac = (h + pad) % (2^128) */
+		$f = ($h0 + $this->pad[0]);
+		$h0 = (int) $f;
+		$f = ($h1 + $this->pad[1] + ($f >> 32));
+		$h1 = (int) $f;
+		$f = ($h2 + $this->pad[2] + ($f >> 32));
+		$h2 = (int) $f;
+		$f = ($h3 + $this->pad[3] + ($f >> 32));
+		$h3 = (int) $f;
+
+		return self::store32_le($h0 & 0xffffffff) .
+			self::store32_le($h1 & 0xffffffff) .
+			self::store32_le($h2 & 0xffffffff) .
+			self::store32_le($h3 & 0xffffffff);
+	}
 }

Spacing +101 added lines, -101 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Poly1305_State', false ) ) {
     return;
 }
 
@@ -47,31 +47,31 @@ 
      * @param string $key
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '')
+    public function __construct( $key = '' )
     {
-        if (self::strlen($key) < 32) {
+        if ( self::strlen( $key ) < 32 ) {
             throw new InvalidArgumentException(
                 'Poly1305 requires a 32-byte key'
             );
         }
         /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
         $this->r = array(
-            (int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
-            (int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
-            (int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
-            (int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
-            (int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
+            (int) ( ( self::load_4( self::substr( $key, 0, 4 ) ) ) & 0x3ffffff ),
+            (int) ( ( self::load_4( self::substr( $key, 3, 4 ) ) >> 2 ) & 0x3ffff03 ),
+            (int) ( ( self::load_4( self::substr( $key, 6, 4 ) ) >> 4 ) & 0x3ffc0ff ),
+            (int) ( ( self::load_4( self::substr( $key, 9, 4 ) ) >> 6 ) & 0x3f03fff ),
+            (int) ( ( self::load_4( self::substr( $key, 12, 4 ) ) >> 8 ) & 0x00fffff )
         );
 
         /* h = 0 */
-        $this->h = array(0, 0, 0, 0, 0);
+        $this->h = array( 0, 0, 0, 0, 0 );
 
         /* save pad for later */
         $this->pad = array(
-            self::load_4(self::substr($key, 16, 4)),
-            self::load_4(self::substr($key, 20, 4)),
-            self::load_4(self::substr($key, 24, 4)),
-            self::load_4(self::substr($key, 28, 4)),
+            self::load_4( self::substr( $key, 16, 4 ) ),
+            self::load_4( self::substr( $key, 20, 4 ) ),
+            self::load_4( self::substr( $key, 24, 4 ) ),
+            self::load_4( self::substr( $key, 28, 4 ) ),
         );
 
         $this->leftover = 0;
@@ -84,53 +84,53 @@ 
      * @param string $message
      * @return self
      */
-    public function update($message = '')
+    public function update( $message = '' )
     {
-        $bytes = self::strlen($message);
+        $bytes = self::strlen( $message );
 
         /* handle leftover */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $want = ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - $this->leftover;
-            if ($want > $bytes) {
+            if ( $want > $bytes ) {
                 $want = $bytes;
             }
-            for ($i = 0; $i < $want; ++$i) {
-                $mi = self::chrToInt($message[$i]);
+            for ( $i = 0; $i < $want; ++$i ) {
+                $mi = self::chrToInt( $message[$i] );
                 $this->buffer[$this->leftover + $i] = $mi;
             }
             // We snip off the leftmost bytes.
-            $message = self::substr($message, $want);
-            $bytes = self::strlen($message);
+            $message = self::substr( $message, $want );
+            $bytes = self::strlen( $message );
             $this->leftover += $want;
-            if ($this->leftover < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+            if ( $this->leftover < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
                 // We still don't have enough to run $this->blocks()
                 return $this;
             }
 
             $this->blocks(
-                static::intArrayToString($this->buffer),
+                static::intArrayToString( $this->buffer ),
                 ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
             );
             $this->leftover = 0;
         }
 
         /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-            $want = $bytes & ~(ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-                $block = self::substr($message, 0, $want);
-                if (self::strlen($block) >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
-                    $this->blocks($block, $want);
-                    $message = self::substr($message, $want);
-                    $bytes = self::strlen($message);
+        if ( $bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
+            $want = $bytes & ~( ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1 );
+            if ( $want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
+                $block = self::substr( $message, 0, $want );
+                if ( self::strlen( $block ) >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
+                    $this->blocks( $block, $want );
+                    $message = self::substr( $message, $want );
+                    $bytes = self::strlen( $message );
                 }
             }
         }
 
         /* store leftover */
-        if ($bytes) {
-            for ($i = 0; $i < $bytes; ++$i) {
-                $mi = self::chrToInt($message[$i]);
+        if ( $bytes ) {
+            for ( $i = 0; $i < $bytes; ++$i ) {
+                $mi = self::chrToInt( $message[$i] );
                 $this->buffer[$this->leftover + $i] = $mi;
             }
             $this->leftover = (int) $this->leftover + $bytes;
@@ -145,10 +145,10 @@ 
      * @param int $bytes
      * @return self
      */
-    public function blocks($message, $bytes)
+    public function blocks( $message, $bytes )
     {
-        if (self::strlen($message) < 16) {
-            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
+        if ( self::strlen( $message ) < 16 ) {
+            $message = str_pad( $message, 16, "\x00", STR_PAD_RIGHT );
         }
         $hibit = $this->final ? 0 : 1 << 24; /* 1 << 128 */
         $r0 = (int) $this->r[0];
@@ -157,10 +157,10 @@ 
         $r3 = (int) $this->r[3];
         $r4 = (int) $this->r[4];
 
-        $s1 = self::mul($r1, 5, 3);
-        $s2 = self::mul($r2, 5, 3);
-        $s3 = self::mul($r3, 5, 3);
-        $s4 = self::mul($r4, 5, 3);
+        $s1 = self::mul( $r1, 5, 3 );
+        $s2 = self::mul( $r2, 5, 3 );
+        $s3 = self::mul( $r3, 5, 3 );
+        $s4 = self::mul( $r4, 5, 3 );
 
         $h0 = $this->h[0];
         $h1 = $this->h[1];
@@ -168,53 +168,53 @@ 
         $h3 = $this->h[3];
         $h4 = $this->h[4];
 
-        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+        while ( $bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE ) {
             /* h += m[i] */
-            $h0 +=  self::load_4(self::substr($message, 0, 4))       & 0x3ffffff;
-            $h1 += (self::load_4(self::substr($message, 3, 4)) >> 2) & 0x3ffffff;
-            $h2 += (self::load_4(self::substr($message, 6, 4)) >> 4) & 0x3ffffff;
-            $h3 += (self::load_4(self::substr($message, 9, 4)) >> 6) & 0x3ffffff;
-            $h4 += (self::load_4(self::substr($message, 12, 4)) >> 8) | $hibit;
+            $h0 += self::load_4( self::substr( $message, 0, 4 ) ) & 0x3ffffff;
+            $h1 += ( self::load_4( self::substr( $message, 3, 4 ) ) >> 2 ) & 0x3ffffff;
+            $h2 += ( self::load_4( self::substr( $message, 6, 4 ) ) >> 4 ) & 0x3ffffff;
+            $h3 += ( self::load_4( self::substr( $message, 9, 4 ) ) >> 6 ) & 0x3ffffff;
+            $h4 += ( self::load_4( self::substr( $message, 12, 4 ) ) >> 8 ) | $hibit;
 
             /* h *= r */
             $d0 = (
-                self::mul($h0, $r0) +
-                self::mul($h1, $s4) +
-                self::mul($h2, $s3) +
-                self::mul($h3, $s2) +
-                self::mul($h4, $s1)
+                self::mul( $h0, $r0 ) +
+                self::mul( $h1, $s4 ) +
+                self::mul( $h2, $s3 ) +
+                self::mul( $h3, $s2 ) +
+                self::mul( $h4, $s1 )
             );
 
             $d1 = (
-                self::mul($h0, $r1) +
-                self::mul($h1, $r0) +
-                self::mul($h2, $s4) +
-                self::mul($h3, $s3) +
-                self::mul($h4, $s2)
+                self::mul( $h0, $r1 ) +
+                self::mul( $h1, $r0 ) +
+                self::mul( $h2, $s4 ) +
+                self::mul( $h3, $s3 ) +
+                self::mul( $h4, $s2 )
             );
 
             $d2 = (
-                self::mul($h0, $r2) +
-                self::mul($h1, $r1) +
-                self::mul($h2, $r0) +
-                self::mul($h3, $s4) +
-                self::mul($h4, $s3)
+                self::mul( $h0, $r2 ) +
+                self::mul( $h1, $r1 ) +
+                self::mul( $h2, $r0 ) +
+                self::mul( $h3, $s4 ) +
+                self::mul( $h4, $s3 )
             );
 
             $d3 = (
-                self::mul($h0, $r3) +
-                self::mul($h1, $r2) +
-                self::mul($h2, $r1) +
-                self::mul($h3, $r0) +
-                self::mul($h4, $s4)
+                self::mul( $h0, $r3 ) +
+                self::mul( $h1, $r2 ) +
+                self::mul( $h2, $r1 ) +
+                self::mul( $h3, $r0 ) +
+                self::mul( $h4, $s4 )
             );
 
             $d4 = (
-                self::mul($h0, $r4) +
-                self::mul($h1, $r3) +
-                self::mul($h2, $r2) +
-                self::mul($h3, $r1) +
-                self::mul($h4, $r0)
+                self::mul( $h0, $r4 ) +
+                self::mul( $h1, $r3 ) +
+                self::mul( $h2, $r2 ) +
+                self::mul( $h3, $r1 ) +
+                self::mul( $h4, $r0 )
             );
 
             /* (partial) h %= p */
@@ -232,7 +232,7 @@ 
             $d4 += $c;
             $c = $d4 >> 26;
             $h4 = $d4 & 0x3ffffff;
-            $h0 += (int) self::mul($c, 5, 3);
+            $h0 += (int) self::mul( $c, 5, 3 );
             $c = $h0 >> 26;
             $h0 &= 0x3ffffff;
             $h1 += $c;
@@ -246,11 +246,11 @@ 
         }
 
         $this->h = array(
-            (int) ($h0 & 0xffffffff),
-            (int) ($h1 & 0xffffffff),
-            (int) ($h2 & 0xffffffff),
-            (int) ($h3 & 0xffffffff),
-            (int) ($h4 & 0xffffffff)
+            (int) ( $h0 & 0xffffffff ),
+            (int) ( $h1 & 0xffffffff ),
+            (int) ( $h2 & 0xffffffff ),
+            (int) ( $h3 & 0xffffffff ),
+            (int) ( $h4 & 0xffffffff )
         );
         return $this;
     }
@@ -263,16 +263,16 @@ 
     public function finish()
     {
         /* process the remaining block */
-        if ($this->leftover) {
+        if ( $this->leftover ) {
             $i = $this->leftover;
             $this->buffer[$i++] = 1;
-            for (; $i < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE; ++$i) {
+            for ( ; $i < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE; ++$i ) {
                 $this->buffer[$i] = 0;
             }
             $this->final = true;
             $this->blocks(
                 self::substr(
-                    static::intArrayToString($this->buffer),
+                    static::intArrayToString( $this->buffer ),
                     0,
                     ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
                 ),
@@ -297,7 +297,7 @@ 
         $h4 += $c;
         $c = $h4 >> 26;
         $h4 &= 0x3ffffff;
-        $h0 += self::mul($c, 5, 3);
+        $h0 += self::mul( $c, 5, 3 );
         $c = $h0 >> 26;
         $h0 &= 0x3ffffff;
         $h1 += $c;
@@ -315,10 +315,10 @@ 
         $g3 = $h3 + $c;
         $c = $g3 >> 26;
         $g3 &= 0x3ffffff;
-        $g4 = ($h4 + $c - (1 << 26)) & 0xffffffff;
+        $g4 = ( $h4 + $c - ( 1 << 26 ) ) & 0xffffffff;
 
         /* select h if h < p, or h + -p if h >= p */
-        $mask = ($g4 >> 31) - 1;
+        $mask = ( $g4 >> 31 ) - 1;
 
         $g0 &= $mask;
         $g1 &= $mask;
@@ -327,31 +327,31 @@ 
         $g4 &= $mask;
 
         $mask = ~$mask & 0xffffffff;
-        $h0 = ($h0 & $mask) | $g0;
-        $h1 = ($h1 & $mask) | $g1;
-        $h2 = ($h2 & $mask) | $g2;
-        $h3 = ($h3 & $mask) | $g3;
-        $h4 = ($h4 & $mask) | $g4;
+        $h0 = ( $h0 & $mask ) | $g0;
+        $h1 = ( $h1 & $mask ) | $g1;
+        $h2 = ( $h2 & $mask ) | $g2;
+        $h3 = ( $h3 & $mask ) | $g3;
+        $h4 = ( $h4 & $mask ) | $g4;
 
         /* h = h % (2^128) */
-        $h0 = (($h0) | ($h1 << 26)) & 0xffffffff;
-        $h1 = (($h1 >>  6) | ($h2 << 20)) & 0xffffffff;
-        $h2 = (($h2 >> 12) | ($h3 << 14)) & 0xffffffff;
-        $h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
+        $h0 = ( ( $h0 ) | ( $h1 << 26 ) ) & 0xffffffff;
+        $h1 = ( ( $h1 >> 6 ) | ( $h2 << 20 ) ) & 0xffffffff;
+        $h2 = ( ( $h2 >> 12 ) | ( $h3 << 14 ) ) & 0xffffffff;
+        $h3 = ( ( $h3 >> 18 ) | ( $h4 << 8 ) ) & 0xffffffff;
 
         /* mac = (h + pad) % (2^128) */
-        $f = ($h0 + $this->pad[0]);
+        $f = ( $h0 + $this->pad[0] );
         $h0 = (int) $f;
-        $f = ($h1 + $this->pad[1] + ($f >> 32));
+        $f = ( $h1 + $this->pad[1] + ( $f >> 32 ) );
         $h1 = (int) $f;
-        $f = ($h2 + $this->pad[2] + ($f >> 32));
+        $f = ( $h2 + $this->pad[2] + ( $f >> 32 ) );
         $h2 = (int) $f;
-        $f = ($h3 + $this->pad[3] + ($f >> 32));
+        $f = ( $h3 + $this->pad[3] + ( $f >> 32 ) );
         $h3 = (int) $f;
 
-        return self::store32_le($h0 & 0xffffffff) .
-            self::store32_le($h1 & 0xffffffff) .
-            self::store32_le($h2 & 0xffffffff) .
-            self::store32_le($h3 & 0xffffffff);
+        return self::store32_le( $h0 & 0xffffffff ) .
+            self::store32_le( $h1 & 0xffffffff ) .
+            self::store32_le( $h2 & 0xffffffff ) .
+            self::store32_le( $h3 & 0xffffffff );
     }
 }

Braces +5 added lines, -10 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Class ParagonIE_Sodium_Core_Poly1305_State
  */
-class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
-{
+class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util {
     /**
      * @var array<int, int>
      */
@@ -47,8 +46,7 @@ 
      * @param string $key
      * @throws InvalidArgumentException
      */
-    public function __construct($key = '')
-    {
+    public function __construct($key = '') {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Poly1305 requires a 32-byte key'
@@ -84,8 +82,7 @@ 
      * @param string $message
      * @return self
      */
-    public function update($message = '')
-    {
+    public function update($message = '') {
         $bytes = self::strlen($message);
 
         /* handle leftover */
@@ -145,8 +142,7 @@ 
      * @param int $bytes
      * @return self
      */
-    public function blocks($message, $bytes)
-    {
+    public function blocks($message, $bytes) {
         if (self::strlen($message) < 16) {
             $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
         }
@@ -260,8 +256,7 @@ 
      *
      * @return string
      */
-    public function finish()
-    {
+    public function finish() {
         /* process the remaining block */
         if ($this->leftover) {
             $i = $this->leftover;

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

Indentation +50 added lines, -50 removed lines

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

Spacing +5 added lines, -5 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_P3
  */
-class ParagonIE_Sodium_Core_Curve25519_Ge_P3
-{
+class ParagonIE_Sodium_Core_Curve25519_Ge_P3 {
     /**
      * @var ParagonIE_Sodium_Core_Curve25519_Fe
      */

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

Indentation +50 added lines, -50 removed lines

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

Spacing +5 added lines, -5 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
  */
-class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
-{
+class ParagonIE_Sodium_Core_Curve25519_Ge_Cached {
     /**
      * @var ParagonIE_Sodium_Core_Curve25519_Fe
      */

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

Indentation +50 added lines, -50 removed lines

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

Spacing +5 added lines, -5 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
  */
-class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
-{
+class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 {
     /**
      * @var ParagonIE_Sodium_Core_Curve25519_Fe
      */

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

Indentation +40 added lines, -40 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Precomp', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Curve25519_Ge_Precomp', false ) ) {
     return;
 }
 
@@ -38,15 +38,15 @@ 
         ParagonIE_Sodium_Core_Curve25519_Fe $yminusx = null,
         ParagonIE_Sodium_Core_Curve25519_Fe $xy2d = null
     ) {
-        if ($yplusx === null) {
+        if ( $yplusx === null ) {
             $yplusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
         $this->yplusx = $yplusx;
-        if ($yminusx === null) {
+        if ( $yminusx === null ) {
             $yminusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
         $this->yminusx = $yminusx;
-        if ($xy2d === null) {
+        if ( $xy2d === null ) {
             $xy2d = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
         $this->xy2d = $xy2d;

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
  */
-class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
-{
+class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp {
     /**
      * @var ParagonIE_Sodium_Core_Curve25519_Fe
      */