gravityview / GravityView

vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P2', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Curve25519_Ge_P2', false ) ) {
     return;
 }
 
@@ -38,15 +38,15 @@ 
         ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
         ParagonIE_Sodium_Core_Curve25519_Fe $z = 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;

vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php

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;

vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php

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;

vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php

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;

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

Spacing +263 added lines, -263 removed lines

@@ -15,10 +15,10 @@ 
      * @param int $b
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_cneg(ParagonIE_Sodium_Core_Curve25519_Fe $f, $b)
+    public static function fe_cneg( ParagonIE_Sodium_Core_Curve25519_Fe $f, $b )
     {
-        $negf = self::fe_neg($f);
-        return self::fe_cmov($f, $negf, $b);
+        $negf = self::fe_neg( $f );
+        return self::fe_cmov( $f, $negf, $b );
     }
 
     /**
@@ -26,9 +26,9 @@ 
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      * @throws SodiumException
      */
-    public static function fe_abs(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_abs( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
-        return self::fe_cneg($f, self::fe_isnegative($f));
+        return self::fe_cneg( $f, self::fe_isnegative( $f ) );
     }
 
     /**
@@ -40,20 +40,20 @@ 
      * @return int
      * @throws SodiumException
      */
-    public static function fe_iszero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_iszero( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         static $zero;
-        if ($zero === null) {
-            $zero = str_repeat("\x00", 32);
+        if ( $zero === null ) {
+            $zero = str_repeat( "\x00", 32 );
         }
         /** @var string $zero */
-        $str = self::fe_tobytes($f);
+        $str = self::fe_tobytes( $f );
 
         $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($str[$i]);
+        for ( $i = 0; $i < 32; ++$i ) {
+            $d |= self::chrToInt( $str[ $i ] );
         }
-        return (($d - 1) >> 31) & 1;
+        return ( ( $d - 1 ) >> 31 ) & 1;
     }
 
 
@@ -68,15 +68,15 @@ 
         ParagonIE_Sodium_Core_Curve25519_Fe $u,
         ParagonIE_Sodium_Core_Curve25519_Fe $v
     ) {
-        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1);
+        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$sqrtm1 );
 
         $v3 = self::fe_mul(
-            self::fe_sq($v),
+            self::fe_sq( $v ),
             $v
         ); /* v3 = v^3 */
         $x = self::fe_mul(
             self::fe_mul(
-                self::fe_sq($v3),
+                self::fe_sq( $v3 ),
                 $u
             ),
             $v
@@ -84,30 +84,30 @@ 
 
         $x = self::fe_mul(
             self::fe_mul(
-                self::fe_pow22523($x), /* x = (uv^7)^((q-5)/8) */
+                self::fe_pow22523( $x ), /* x = (uv^7)^((q-5)/8) */
                 $v3
             ),
             $u
         ); /* x = uv^3(uv^7)^((q-5)/8) */
 
         $vxx = self::fe_mul(
-            self::fe_sq($x),
+            self::fe_sq( $x ),
             $v
         ); /* vx^2 */
 
-        $m_root_check = self::fe_sub($vxx, $u); /* vx^2-u */
-        $p_root_check = self::fe_add($vxx, $u); /* vx^2+u */
-        $f_root_check = self::fe_mul($u, $sqrtm1); /* u*sqrt(-1) */
-        $f_root_check = self::fe_add($vxx, $f_root_check); /* vx^2+u*sqrt(-1) */
+        $m_root_check = self::fe_sub( $vxx, $u ); /* vx^2-u */
+        $p_root_check = self::fe_add( $vxx, $u ); /* vx^2+u */
+        $f_root_check = self::fe_mul( $u, $sqrtm1 ); /* u*sqrt(-1) */
+        $f_root_check = self::fe_add( $vxx, $f_root_check ); /* vx^2+u*sqrt(-1) */
 
-        $has_m_root = self::fe_iszero($m_root_check);
-        $has_p_root = self::fe_iszero($p_root_check);
-        $has_f_root = self::fe_iszero($f_root_check);
+        $has_m_root = self::fe_iszero( $m_root_check );
+        $has_p_root = self::fe_iszero( $p_root_check );
+        $has_f_root = self::fe_iszero( $f_root_check );
 
-        $x_sqrtm1 = self::fe_mul($x, $sqrtm1); /* x*sqrt(-1) */
+        $x_sqrtm1 = self::fe_mul( $x, $sqrtm1 ); /* x*sqrt(-1) */
 
         $x = self::fe_abs(
-            self::fe_cmov($x, $x_sqrtm1, $has_p_root | $has_f_root)
+            self::fe_cmov( $x, $x_sqrtm1, $has_p_root | $has_f_root )
         );
         return array(
             'x' => $x,
@@ -120,17 +120,17 @@ 
      * @return int
      * @throws SodiumException
      */
-    public static function ristretto255_point_is_canonical($s)
+    public static function ristretto255_point_is_canonical( $s )
     {
-        $c = (self::chrToInt($s[31]) & 0x7f) ^ 0x7f;
-        for ($i = 30; $i > 0; --$i) {
-            $c |= self::chrToInt($s[$i]) ^ 0xff;
+        $c = ( self::chrToInt( $s[ 31 ] ) & 0x7f ) ^ 0x7f;
+        for ( $i = 30; $i > 0; --$i ) {
+            $c |= self::chrToInt( $s[ $i ] ) ^ 0xff;
         }
-        $c = ($c - 1) >> 8;
-        $d = (0xed - 1 - self::chrToInt($s[0])) >> 8;
-        $e = self::chrToInt($s[31]) >> 7;
+        $c = ( $c - 1 ) >> 8;
+        $d = ( 0xed - 1 - self::chrToInt( $s[ 0 ] ) ) >> 8;
+        $e = self::chrToInt( $s[ 31 ] ) >> 7;
 
-        return 1 - ((($c & $d) | $e | self::chrToInt($s[0])) & 1);
+        return 1 - ( ( ( $c & $d ) | $e | self::chrToInt( $s[ 0 ] ) ) & 1 );
     }
 
     /**
@@ -139,53 +139,53 @@ 
      * @return array{h: ParagonIE_Sodium_Core_Curve25519_Ge_P3, res: int}
      * @throws SodiumException
      */
-    public static function ristretto255_frombytes($s, $skipCanonicalCheck = false)
+    public static function ristretto255_frombytes( $s, $skipCanonicalCheck = false )
     {
-        if (!$skipCanonicalCheck) {
-            if (!self::ristretto255_point_is_canonical($s)) {
-                throw new SodiumException('S is not canonical');
+        if ( ! $skipCanonicalCheck ) {
+            if ( ! self::ristretto255_point_is_canonical( $s ) ) {
+                throw new SodiumException( 'S is not canonical' );
             }
         }
 
-        $s_ = self::fe_frombytes($s);
-        $ss = self::fe_sq($s_); /* ss = s^2 */
+        $s_ = self::fe_frombytes( $s );
+        $ss = self::fe_sq( $s_ ); /* ss = s^2 */
 
-        $u1 = self::fe_sub(self::fe_1(), $ss); /* u1 = 1-ss */
-        $u1u1 = self::fe_sq($u1); /* u1u1 = u1^2 */
+        $u1 = self::fe_sub( self::fe_1(), $ss ); /* u1 = 1-ss */
+        $u1u1 = self::fe_sq( $u1 ); /* u1u1 = u1^2 */
 
-        $u2 = self::fe_add(self::fe_1(), $ss); /* u2 = 1+ss */
-        $u2u2 = self::fe_sq($u2); /* u2u2 = u2^2 */
+        $u2 = self::fe_add( self::fe_1(), $ss ); /* u2 = 1+ss */
+        $u2u2 = self::fe_sq( $u2 ); /* u2u2 = u2^2 */
 
         $v = self::fe_mul(
-            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d),
+            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$d ),
             $u1u1
         ); /* v = d*u1^2 */
-        $v = self::fe_neg($v); /* v = -d*u1^2 */
-        $v = self::fe_sub($v, $u2u2); /* v = -(d*u1^2)-u2^2 */
-        $v_u2u2 = self::fe_mul($v, $u2u2); /* v_u2u2 = v*u2^2 */
+        $v = self::fe_neg( $v ); /* v = -d*u1^2 */
+        $v = self::fe_sub( $v, $u2u2 ); /* v = -(d*u1^2)-u2^2 */
+        $v_u2u2 = self::fe_mul( $v, $u2u2 ); /* v_u2u2 = v*u2^2 */
 
         // fe25519_1(one);
         // notsquare = ristretto255_sqrt_ratio_m1(inv_sqrt, one, v_u2u2);
         $one = self::fe_1();
-        $result = self::ristretto255_sqrt_ratio_m1($one, $v_u2u2);
-        $inv_sqrt = $result['x'];
-        $notsquare = $result['nonsquare'];
+        $result = self::ristretto255_sqrt_ratio_m1( $one, $v_u2u2 );
+        $inv_sqrt = $result[ 'x' ];
+        $notsquare = $result[ 'nonsquare' ];
 
         $h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
 
-        $h->X = self::fe_mul($inv_sqrt, $u2);
-        $h->Y = self::fe_mul(self::fe_mul($inv_sqrt, $h->X), $v);
+        $h->X = self::fe_mul( $inv_sqrt, $u2 );
+        $h->Y = self::fe_mul( self::fe_mul( $inv_sqrt, $h->X ), $v );
 
-        $h->X = self::fe_mul($h->X, $s_);
+        $h->X = self::fe_mul( $h->X, $s_ );
         $h->X = self::fe_abs(
-            self::fe_add($h->X, $h->X)
+            self::fe_add( $h->X, $h->X )
         );
-        $h->Y = self::fe_mul($u1, $h->Y);
+        $h->Y = self::fe_mul( $u1, $h->Y );
         $h->Z = self::fe_1();
-        $h->T = self::fe_mul($h->X, $h->Y);
+        $h->T = self::fe_mul( $h->X, $h->Y );
 
-        $res = - ((1 - $notsquare) | self::fe_isnegative($h->T) | self::fe_iszero($h->Y));
-        return array('h' => $h, 'res' => $res);
+        $res = - ( ( 1 - $notsquare ) | self::fe_isnegative( $h->T ) | self::fe_iszero( $h->Y ) );
+        return array( 'h' => $h, 'res' => $res );
     }
 
     /**
@@ -193,45 +193,45 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
+    public static function ristretto255_p3_tobytes( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h )
     {
-        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1);
-        $invsqrtamd = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$invsqrtamd);
+        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$sqrtm1 );
+        $invsqrtamd = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$invsqrtamd );
 
-        $u1 = self::fe_add($h->Z, $h->Y); /* u1 = Z+Y */
-        $zmy = self::fe_sub($h->Z, $h->Y); /* zmy = Z-Y */
-        $u1 = self::fe_mul($u1, $zmy); /* u1 = (Z+Y)*(Z-Y) */
-        $u2 = self::fe_mul($h->X, $h->Y); /* u2 = X*Y */
+        $u1 = self::fe_add( $h->Z, $h->Y ); /* u1 = Z+Y */
+        $zmy = self::fe_sub( $h->Z, $h->Y ); /* zmy = Z-Y */
+        $u1 = self::fe_mul( $u1, $zmy ); /* u1 = (Z+Y)*(Z-Y) */
+        $u2 = self::fe_mul( $h->X, $h->Y ); /* u2 = X*Y */
 
-        $u1_u2u2 = self::fe_mul(self::fe_sq($u2), $u1); /* u1_u2u2 = u1*u2^2 */
+        $u1_u2u2 = self::fe_mul( self::fe_sq( $u2 ), $u1 ); /* u1_u2u2 = u1*u2^2 */
         $one = self::fe_1();
 
         // fe25519_1(one);
         // (void) ristretto255_sqrt_ratio_m1(inv_sqrt, one, u1_u2u2);
-        $result = self::ristretto255_sqrt_ratio_m1($one, $u1_u2u2);
-        $inv_sqrt = $result['x'];
+        $result = self::ristretto255_sqrt_ratio_m1( $one, $u1_u2u2 );
+        $inv_sqrt = $result[ 'x' ];
 
-        $den1 = self::fe_mul($inv_sqrt, $u1); /* den1 = inv_sqrt*u1 */
-        $den2 = self::fe_mul($inv_sqrt, $u2); /* den2 = inv_sqrt*u2 */
-        $z_inv = self::fe_mul($h->T, self::fe_mul($den1, $den2)); /* z_inv = den1*den2*T */
+        $den1 = self::fe_mul( $inv_sqrt, $u1 ); /* den1 = inv_sqrt*u1 */
+        $den2 = self::fe_mul( $inv_sqrt, $u2 ); /* den2 = inv_sqrt*u2 */
+        $z_inv = self::fe_mul( $h->T, self::fe_mul( $den1, $den2 ) ); /* z_inv = den1*den2*T */
 
-        $ix = self::fe_mul($h->X, $sqrtm1); /* ix = X*sqrt(-1) */
-        $iy = self::fe_mul($h->Y, $sqrtm1); /* iy = Y*sqrt(-1) */
-        $eden = self::fe_mul($den1, $invsqrtamd);
+        $ix = self::fe_mul( $h->X, $sqrtm1 ); /* ix = X*sqrt(-1) */
+        $iy = self::fe_mul( $h->Y, $sqrtm1 ); /* iy = Y*sqrt(-1) */
+        $eden = self::fe_mul( $den1, $invsqrtamd );
 
-        $t_z_inv =  self::fe_mul($h->T, $z_inv); /* t_z_inv = T*z_inv */
-        $rotate = self::fe_isnegative($t_z_inv);
+        $t_z_inv = self::fe_mul( $h->T, $z_inv ); /* t_z_inv = T*z_inv */
+        $rotate = self::fe_isnegative( $t_z_inv );
 
-        $x_ = self::fe_copy($h->X);
-        $y_ = self::fe_copy($h->Y);
-        $den_inv = self::fe_copy($den2);
+        $x_ = self::fe_copy( $h->X );
+        $y_ = self::fe_copy( $h->Y );
+        $den_inv = self::fe_copy( $den2 );
 
-        $x_ = self::fe_cmov($x_, $iy, $rotate);
-        $y_ = self::fe_cmov($y_, $ix, $rotate);
-        $den_inv = self::fe_cmov($den_inv, $eden, $rotate);
+        $x_ = self::fe_cmov( $x_, $iy, $rotate );
+        $y_ = self::fe_cmov( $y_, $ix, $rotate );
+        $den_inv = self::fe_cmov( $den_inv, $eden, $rotate );
 
-        $x_z_inv = self::fe_mul($x_, $z_inv);
-        $y_ = self::fe_cneg($y_, self::fe_isnegative($x_z_inv));
+        $x_z_inv = self::fe_mul( $x_, $z_inv );
+        $y_ = self::fe_cneg( $y_, self::fe_isnegative( $x_z_inv ) );
 
 
         // fe25519_sub(s_, h->Z, y_);
@@ -242,7 +242,7 @@ 
             self::fe_abs(
                 self::fe_mul(
                     $den_inv,
-                    self::fe_sub($h->Z, $y_)
+                    self::fe_sub( $h->Z, $y_ )
                 )
             )
         );
@@ -254,39 +254,39 @@ 
      *
      * @throws SodiumException
      */
-    public static function ristretto255_elligator(ParagonIE_Sodium_Core_Curve25519_Fe $t)
+    public static function ristretto255_elligator( ParagonIE_Sodium_Core_Curve25519_Fe $t )
     {
-        $sqrtm1   = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1);
-        $onemsqd  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$onemsqd);
-        $d        = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
-        $sqdmone  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqdmone);
-        $sqrtadm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtadm1);
+        $sqrtm1   = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$sqrtm1 );
+        $onemsqd  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$onemsqd );
+        $d        = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$d );
+        $sqdmone  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$sqdmone );
+        $sqrtadm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$sqrtadm1 );
 
         $one = self::fe_1();
-        $r   = self::fe_mul($sqrtm1, self::fe_sq($t));         /* r = sqrt(-1)*t^2 */
-        $u   = self::fe_mul(self::fe_add($r, $one), $onemsqd); /* u = (r+1)*(1-d^2) */
-        $c   = self::fe_neg(self::fe_1());                     /* c = -1 */
-        $rpd = self::fe_add($r, $d);                           /* rpd = r+d */
+        $r   = self::fe_mul( $sqrtm1, self::fe_sq( $t ) ); /* r = sqrt(-1)*t^2 */
+        $u   = self::fe_mul( self::fe_add( $r, $one ), $onemsqd ); /* u = (r+1)*(1-d^2) */
+        $c   = self::fe_neg( self::fe_1() ); /* c = -1 */
+        $rpd = self::fe_add( $r, $d ); /* rpd = r+d */
 
         $v = self::fe_mul(
             self::fe_sub(
                 $c,
-                self::fe_mul($r, $d)
+                self::fe_mul( $r, $d )
             ),
             $rpd
         ); /* v = (c-r*d)*(r+d) */
 
-        $result = self::ristretto255_sqrt_ratio_m1($u, $v);
-        $s = $result['x'];
-        $wasnt_square = 1 - $result['nonsquare'];
+        $result = self::ristretto255_sqrt_ratio_m1( $u, $v );
+        $s = $result[ 'x' ];
+        $wasnt_square = 1 - $result[ 'nonsquare' ];
 
         $s_prime = self::fe_neg(
             self::fe_abs(
-                self::fe_mul($s, $t)
+                self::fe_mul( $s, $t )
             )
         ); /* s_prime = -|s*t| */
-        $s = self::fe_cmov($s, $s_prime, $wasnt_square);
-        $c = self::fe_cmov($c, $r, $wasnt_square);
+        $s = self::fe_cmov( $s, $s_prime, $wasnt_square );
+        $c = self::fe_cmov( $c, $r, $wasnt_square );
 
         // fe25519_sub(n, r, one);            /* n = r-1 */
         // fe25519_mul(n, n, c);              /* n = c*(r-1) */
@@ -295,7 +295,7 @@ 
         $n = self::fe_sub(
             self::fe_mul(
                 self::fe_mul(
-                    self::fe_sub($r, $one),
+                    self::fe_sub( $r, $one ),
                     $c
                 ),
                 $sqdmone
@@ -304,20 +304,20 @@ 
         ); /* n =  c*(r-1)*(d-1)^2-v */
 
         $w0 = self::fe_mul(
-            self::fe_add($s, $s),
+            self::fe_add( $s, $s ),
             $v
         ); /* w0 = 2s*v */
 
-        $w1 = self::fe_mul($n, $sqrtadm1); /* w1 = n*sqrt(ad-1) */
-        $ss = self::fe_sq($s); /* ss = s^2 */
-        $w2 = self::fe_sub($one, $ss); /* w2 = 1-s^2 */
-        $w3 = self::fe_add($one, $ss); /* w3 = 1+s^2 */
+        $w1 = self::fe_mul( $n, $sqrtadm1 ); /* w1 = n*sqrt(ad-1) */
+        $ss = self::fe_sq( $s ); /* ss = s^2 */
+        $w2 = self::fe_sub( $one, $ss ); /* w2 = 1-s^2 */
+        $w3 = self::fe_add( $one, $ss ); /* w3 = 1+s^2 */
 
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
-            self::fe_mul($w0, $w3),
-            self::fe_mul($w2, $w1),
-            self::fe_mul($w1, $w3),
-            self::fe_mul($w0, $w2)
+            self::fe_mul( $w0, $w3 ),
+            self::fe_mul( $w2, $w1 ),
+            self::fe_mul( $w1, $w3 ),
+            self::fe_mul( $w0, $w2 )
         );
     }
 
@@ -326,32 +326,32 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_from_hash($h)
+    public static function ristretto255_from_hash( $h )
     {
-        if (self::strlen($h) !== 64) {
-            throw new SodiumException('Hash must be 64 bytes');
+        if ( self::strlen( $h ) !== 64 ) {
+            throw new SodiumException( 'Hash must be 64 bytes' );
         }
         //fe25519_frombytes(r0, h);
         //fe25519_frombytes(r1, h + 32);
-        $r0 = self::fe_frombytes(self::substr($h, 0, 32));
-        $r1 = self::fe_frombytes(self::substr($h, 32, 32));
+        $r0 = self::fe_frombytes( self::substr( $h, 0, 32 ) );
+        $r1 = self::fe_frombytes( self::substr( $h, 32, 32 ) );
 
         //ristretto255_elligator(&p0, r0);
         //ristretto255_elligator(&p1, r1);
-        $p0 = self::ristretto255_elligator($r0);
-        $p1 = self::ristretto255_elligator($r1);
+        $p0 = self::ristretto255_elligator( $r0 );
+        $p1 = self::ristretto255_elligator( $r1 );
 
         //ge25519_p3_to_cached(&p1_cached, &p1);
         //ge25519_add_cached(&p_p1p1, &p0, &p1_cached);
         $p_p1p1 = self::ge_add(
             $p0,
-            self::ge_p3_to_cached($p1)
+            self::ge_p3_to_cached( $p1 )
         );
 
         //ge25519_p1p1_to_p3(&p, &p_p1p1);
         //ristretto255_p3_tobytes(s, &p);
         return self::ristretto255_p3_tobytes(
-            self::ge_p1p1_to_p3($p_p1p1)
+            self::ge_p1p1_to_p3( $p_p1p1 )
         );
     }
 
@@ -360,10 +360,10 @@ 
      * @return int
      * @throws SodiumException
      */
-    public static function is_valid_point($p)
+    public static function is_valid_point( $p )
     {
-        $result = self::ristretto255_frombytes($p);
-        if ($result['res'] !== 0) {
+        $result = self::ristretto255_frombytes( $p );
+        if ( $result[ 'res' ] !== 0 ) {
             return 0;
         }
         return 1;
@@ -375,19 +375,19 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_add($p, $q)
+    public static function ristretto255_add( $p, $q )
     {
-        $p_res = self::ristretto255_frombytes($p);
-        $q_res = self::ristretto255_frombytes($q);
-        if ($p_res['res'] !== 0 || $q_res['res'] !== 0) {
-            throw new SodiumException('Could not add points');
+        $p_res = self::ristretto255_frombytes( $p );
+        $q_res = self::ristretto255_frombytes( $q );
+        if ( $p_res[ 'res' ] !== 0 || $q_res[ 'res' ] !== 0 ) {
+            throw new SodiumException( 'Could not add points' );
         }
-        $p_p3 = $p_res['h'];
-        $q_p3 = $q_res['h'];
-        $q_cached = self::ge_p3_to_cached($q_p3);
-        $r_p1p1 = self::ge_add($p_p3, $q_cached);
-        $r_p3 = self::ge_p1p1_to_p3($r_p1p1);
-        return self::ristretto255_p3_tobytes($r_p3);
+        $p_p3 = $p_res[ 'h' ];
+        $q_p3 = $q_res[ 'h' ];
+        $q_cached = self::ge_p3_to_cached( $q_p3 );
+        $r_p1p1 = self::ge_add( $p_p3, $q_cached );
+        $r_p3 = self::ge_p1p1_to_p3( $r_p1p1 );
+        return self::ristretto255_p3_tobytes( $r_p3 );
     }
 
     /**
@@ -396,19 +396,19 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_sub($p, $q)
+    public static function ristretto255_sub( $p, $q )
     {
-        $p_res = self::ristretto255_frombytes($p);
-        $q_res = self::ristretto255_frombytes($q);
-        if ($p_res['res'] !== 0 || $q_res['res'] !== 0) {
-            throw new SodiumException('Could not add points');
+        $p_res = self::ristretto255_frombytes( $p );
+        $q_res = self::ristretto255_frombytes( $q );
+        if ( $p_res[ 'res' ] !== 0 || $q_res[ 'res' ] !== 0 ) {
+            throw new SodiumException( 'Could not add points' );
         }
-        $p_p3 = $p_res['h'];
-        $q_p3 = $q_res['h'];
-        $q_cached = self::ge_p3_to_cached($q_p3);
-        $r_p1p1 = self::ge_sub($p_p3, $q_cached);
-        $r_p3 = self::ge_p1p1_to_p3($r_p1p1);
-        return self::ristretto255_p3_tobytes($r_p3);
+        $p_p3 = $p_res[ 'h' ];
+        $q_p3 = $q_res[ 'h' ];
+        $q_cached = self::ge_p3_to_cached( $q_p3 );
+        $r_p1p1 = self::ge_sub( $p_p3, $q_cached );
+        $r_p3 = self::ge_p1p1_to_p3( $r_p1p1 );
+        return self::ristretto255_p3_tobytes( $r_p3 );
     }
 
 
@@ -420,46 +420,46 @@ 
      * @throws SodiumException
      * @psalm-suppress PossiblyInvalidArgument hash API
      */
-    protected static function h2c_string_to_hash_sha256($hLen, $ctx, $msg)
+    protected static function h2c_string_to_hash_sha256( $hLen, $ctx, $msg )
     {
-        $h = array_fill(0, $hLen, 0);
-        $ctx_len = !is_null($ctx) ? self::strlen($ctx) : 0;
-        if ($hLen > 0xff) {
-            throw new SodiumException('Hash must be less than 256 bytes');
+        $h = array_fill( 0, $hLen, 0 );
+        $ctx_len = ! is_null( $ctx ) ? self::strlen( $ctx ) : 0;
+        if ( $hLen > 0xff ) {
+            throw new SodiumException( 'Hash must be less than 256 bytes' );
         }
 
-        if ($ctx_len > 0xff) {
-            $st = hash_init('sha256');
-            self::hash_update($st, "H2C-OVERSIZE-DST-");
-            self::hash_update($st, $ctx);
-            $ctx = hash_final($st, true);
+        if ( $ctx_len > 0xff ) {
+            $st = hash_init( 'sha256' );
+            self::hash_update( $st, "H2C-OVERSIZE-DST-" );
+            self::hash_update( $st, $ctx );
+            $ctx = hash_final( $st, true );
             $ctx_len = 32;
         }
-        $t = array(0, $hLen, 0);
-        $ux = str_repeat("\0", 64);
-        $st = hash_init('sha256');
-        self::hash_update($st, $ux);
-        self::hash_update($st, $msg);
-        self::hash_update($st, self::intArrayToString($t));
-        self::hash_update($st, $ctx);
-        self::hash_update($st, self::intToChr($ctx_len));
-        $u0 = hash_final($st, true);
-
-        for ($i = 0; $i < $hLen; $i += 64) {
-            $ux = self::xorStrings($ux, $u0);
-            ++$t[2];
-            $st = hash_init('sha256');
-            self::hash_update($st, $ux);
-            self::hash_update($st, self::intToChr($t[2]));
-            self::hash_update($st, $ctx);
-            self::hash_update($st, self::intToChr($ctx_len));
-            $ux = hash_final($st, true);
-            $amount = min($hLen - $i, 64);
-            for ($j = 0; $j < $amount; ++$j) {
-                $h[$i + $j] = self::chrToInt($ux[$i]);
+        $t = array( 0, $hLen, 0 );
+        $ux = str_repeat( "\0", 64 );
+        $st = hash_init( 'sha256' );
+        self::hash_update( $st, $ux );
+        self::hash_update( $st, $msg );
+        self::hash_update( $st, self::intArrayToString( $t ) );
+        self::hash_update( $st, $ctx );
+        self::hash_update( $st, self::intToChr( $ctx_len ) );
+        $u0 = hash_final( $st, true );
+
+        for ( $i = 0; $i < $hLen; $i += 64 ) {
+            $ux = self::xorStrings( $ux, $u0 );
+            ++$t[ 2 ];
+            $st = hash_init( 'sha256' );
+            self::hash_update( $st, $ux );
+            self::hash_update( $st, self::intToChr( $t[ 2 ] ) );
+            self::hash_update( $st, $ctx );
+            self::hash_update( $st, self::intToChr( $ctx_len ) );
+            $ux = hash_final( $st, true );
+            $amount = min( $hLen - $i, 64 );
+            for ( $j = 0; $j < $amount; ++$j ) {
+                $h[ $i + $j ] = self::chrToInt( $ux[ $i ] );
             }
         }
-        return self::intArrayToString(array_slice($h, 0, $hLen));
+        return self::intArrayToString( array_slice( $h, 0, $hLen ) );
     }
 
     /**
@@ -470,46 +470,46 @@ 
      * @throws SodiumException
      * @psalm-suppress PossiblyInvalidArgument hash API
      */
-    protected static function h2c_string_to_hash_sha512($hLen, $ctx, $msg)
+    protected static function h2c_string_to_hash_sha512( $hLen, $ctx, $msg )
     {
-        $h = array_fill(0, $hLen, 0);
-        $ctx_len = !is_null($ctx) ? self::strlen($ctx) : 0;
-        if ($hLen > 0xff) {
-            throw new SodiumException('Hash must be less than 256 bytes');
+        $h = array_fill( 0, $hLen, 0 );
+        $ctx_len = ! is_null( $ctx ) ? self::strlen( $ctx ) : 0;
+        if ( $hLen > 0xff ) {
+            throw new SodiumException( 'Hash must be less than 256 bytes' );
         }
 
-        if ($ctx_len > 0xff) {
-            $st = hash_init('sha256');
-            self::hash_update($st, "H2C-OVERSIZE-DST-");
-            self::hash_update($st, $ctx);
-            $ctx = hash_final($st, true);
+        if ( $ctx_len > 0xff ) {
+            $st = hash_init( 'sha256' );
+            self::hash_update( $st, "H2C-OVERSIZE-DST-" );
+            self::hash_update( $st, $ctx );
+            $ctx = hash_final( $st, true );
             $ctx_len = 32;
         }
-        $t = array(0, $hLen, 0);
-        $ux = str_repeat("\0", 128);
-        $st = hash_init('sha512');
-        self::hash_update($st, $ux);
-        self::hash_update($st, $msg);
-        self::hash_update($st, self::intArrayToString($t));
-        self::hash_update($st, $ctx);
-        self::hash_update($st, self::intToChr($ctx_len));
-        $u0 = hash_final($st, true);
-
-        for ($i = 0; $i < $hLen; $i += 128) {
-            $ux = self::xorStrings($ux, $u0);
-            ++$t[2];
-            $st = hash_init('sha512');
-            self::hash_update($st, $ux);
-            self::hash_update($st, self::intToChr($t[2]));
-            self::hash_update($st, $ctx);
-            self::hash_update($st, self::intToChr($ctx_len));
-            $ux = hash_final($st, true);
-            $amount = min($hLen - $i, 128);
-            for ($j = 0; $j < $amount; ++$j) {
-                $h[$i + $j] = self::chrToInt($ux[$i]);
+        $t = array( 0, $hLen, 0 );
+        $ux = str_repeat( "\0", 128 );
+        $st = hash_init( 'sha512' );
+        self::hash_update( $st, $ux );
+        self::hash_update( $st, $msg );
+        self::hash_update( $st, self::intArrayToString( $t ) );
+        self::hash_update( $st, $ctx );
+        self::hash_update( $st, self::intToChr( $ctx_len ) );
+        $u0 = hash_final( $st, true );
+
+        for ( $i = 0; $i < $hLen; $i += 128 ) {
+            $ux = self::xorStrings( $ux, $u0 );
+            ++$t[ 2 ];
+            $st = hash_init( 'sha512' );
+            self::hash_update( $st, $ux );
+            self::hash_update( $st, self::intToChr( $t[ 2 ] ) );
+            self::hash_update( $st, $ctx );
+            self::hash_update( $st, self::intToChr( $ctx_len ) );
+            $ux = hash_final( $st, true );
+            $amount = min( $hLen - $i, 128 );
+            for ( $j = 0; $j < $amount; ++$j ) {
+                $h[ $i + $j ] = self::chrToInt( $ux[ $i ] );
             }
         }
-        return self::intArrayToString(array_slice($h, 0, $hLen));
+        return self::intArrayToString( array_slice( $h, 0, $hLen ) );
     }
 
     /**
@@ -520,15 +520,15 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function h2c_string_to_hash($hLen, $ctx, $msg, $hash_alg)
+    public static function h2c_string_to_hash( $hLen, $ctx, $msg, $hash_alg )
     {
-        switch ($hash_alg) {
+        switch ( $hash_alg ) {
             case self::CORE_H2C_SHA256:
-                return self::h2c_string_to_hash_sha256($hLen, $ctx, $msg);
+                return self::h2c_string_to_hash_sha256( $hLen, $ctx, $msg );
             case self::CORE_H2C_SHA512:
-                return self::h2c_string_to_hash_sha512($hLen, $ctx, $msg);
+                return self::h2c_string_to_hash_sha512( $hLen, $ctx, $msg );
             default:
-                throw new SodiumException('Invalid H2C hash algorithm');
+                throw new SodiumException( 'Invalid H2C hash algorithm' );
         }
     }
 
@@ -539,10 +539,10 @@ 
      * @return string
      * @throws SodiumException
      */
-    protected static function _string_to_element($ctx, $msg, $hash_alg)
+    protected static function _string_to_element( $ctx, $msg, $hash_alg )
     {
         return self::ristretto255_from_hash(
-            self::h2c_string_to_hash(self::crypto_core_ristretto255_HASHBYTES, $ctx, $msg, $hash_alg)
+            self::h2c_string_to_hash( self::crypto_core_ristretto255_HASHBYTES, $ctx, $msg, $hash_alg )
         );
     }
 
@@ -554,7 +554,7 @@ 
     public static function ristretto255_random()
     {
         return self::ristretto255_from_hash(
-            ParagonIE_Sodium_Compat::randombytes_buf(self::crypto_core_ristretto255_HASHBYTES)
+            ParagonIE_Sodium_Compat::randombytes_buf( self::crypto_core_ristretto255_HASHBYTES )
         );
     }
 
@@ -572,9 +572,9 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_complement($s)
+    public static function ristretto255_scalar_complement( $s )
     {
-        return self::scalar_complement($s);
+        return self::scalar_complement( $s );
     }
 
 
@@ -582,9 +582,9 @@ 
      * @param string $s
      * @return string
      */
-    public static function ristretto255_scalar_invert($s)
+    public static function ristretto255_scalar_invert( $s )
     {
-        return self::sc25519_invert($s);
+        return self::sc25519_invert( $s );
     }
 
     /**
@@ -592,9 +592,9 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_negate($s)
+    public static function ristretto255_scalar_negate( $s )
     {
-        return self::scalar_negate($s);
+        return self::scalar_negate( $s );
     }
 
     /**
@@ -602,9 +602,9 @@ 
      * @param string $y
      * @return string
      */
-    public static function ristretto255_scalar_add($x, $y)
+    public static function ristretto255_scalar_add( $x, $y )
     {
-        return self::scalar_add($x, $y);
+        return self::scalar_add( $x, $y );
     }
 
     /**
@@ -612,9 +612,9 @@ 
      * @param string $y
      * @return string
      */
-    public static function ristretto255_scalar_sub($x, $y)
+    public static function ristretto255_scalar_sub( $x, $y )
     {
-        return self::scalar_sub($x, $y);
+        return self::scalar_sub( $x, $y );
     }
 
     /**
@@ -622,9 +622,9 @@ 
      * @param string $y
      * @return string
      */
-    public static function ristretto255_scalar_mul($x, $y)
+    public static function ristretto255_scalar_mul( $x, $y )
     {
-        return self::sc25519_mul($x, $y);
+        return self::sc25519_mul( $x, $y );
     }
 
     /**
@@ -634,28 +634,28 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_from_string($ctx, $msg, $hash_alg)
+    public static function ristretto255_scalar_from_string( $ctx, $msg, $hash_alg )
     {
-        $h = array_fill(0, 64, 0);
+        $h = array_fill( 0, 64, 0 );
         $h_be = self::stringToIntArray(
             self::h2c_string_to_hash(
                 self::HASH_SC_L, $ctx, $msg, $hash_alg
             )
         );
 
-        for ($i = 0; $i < self::HASH_SC_L; ++$i) {
-            $h[$i] = $h_be[self::HASH_SC_L - 1 - $i];
+        for ( $i = 0; $i < self::HASH_SC_L; ++$i ) {
+            $h[ $i ] = $h_be[ self::HASH_SC_L - 1 - $i ];
         }
-        return self::ristretto255_scalar_reduce(self::intArrayToString($h));
+        return self::ristretto255_scalar_reduce( self::intArrayToString( $h ) );
     }
 
     /**
      * @param string $s
      * @return string
      */
-    public static function ristretto255_scalar_reduce($s)
+    public static function ristretto255_scalar_reduce( $s )
     {
-        return self::sc_reduce($s);
+        return self::sc_reduce( $s );
     }
 
     /**
@@ -664,26 +664,26 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalarmult_ristretto255($n, $p)
+    public static function scalarmult_ristretto255( $n, $p )
     {
-        if (self::strlen($n) !== 32) {
-            throw new SodiumException('Scalar must be 32 bytes, ' . self::strlen($p) . ' given.');
+        if ( self::strlen( $n ) !== 32 ) {
+            throw new SodiumException( 'Scalar must be 32 bytes, ' . self::strlen( $p ) . ' given.' );
         }
-        if (self::strlen($p) !== 32) {
-            throw new SodiumException('Point must be 32 bytes, ' . self::strlen($p) . ' given.');
+        if ( self::strlen( $p ) !== 32 ) {
+            throw new SodiumException( 'Point must be 32 bytes, ' . self::strlen( $p ) . ' given.' );
         }
-        $result = self::ristretto255_frombytes($p);
-        if ($result['res'] !== 0) {
-            throw new SodiumException('Could not multiply points');
+        $result = self::ristretto255_frombytes( $p );
+        if ( $result[ 'res' ] !== 0 ) {
+            throw new SodiumException( 'Could not multiply points' );
         }
-        $P = $result['h'];
-
-        $t = self::stringToIntArray($n);
-        $t[31] &= 0x7f;
-        $Q = self::ge_scalarmult(self::intArrayToString($t), $P);
-        $q = self::ristretto255_p3_tobytes($Q);
-        if (ParagonIE_Sodium_Compat::is_zero($q)) {
-            throw new SodiumException('An unknown error has occurred');
+        $P = $result[ 'h' ];
+
+        $t = self::stringToIntArray( $n );
+        $t[ 31 ] &= 0x7f;
+        $Q = self::ge_scalarmult( self::intArrayToString( $t ), $P );
+        $q = self::ristretto255_p3_tobytes( $Q );
+        if ( ParagonIE_Sodium_Compat::is_zero( $q ) ) {
+            throw new SodiumException( 'An unknown error has occurred' );
         }
         return $q;
     }
@@ -693,14 +693,14 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function scalarmult_ristretto255_base($n)
+    public static function scalarmult_ristretto255_base( $n )
     {
-        $t = self::stringToIntArray($n);
-        $t[31] &= 0x7f;
-        $Q = self::ge_scalarmult_base(self::intArrayToString($t));
-        $q = self::ristretto255_p3_tobytes($Q);
-        if (ParagonIE_Sodium_Compat::is_zero($q)) {
-            throw new SodiumException('An unknown error has occurred');
+        $t = self::stringToIntArray( $n );
+        $t[ 31 ] &= 0x7f;
+        $Q = self::ge_scalarmult_base( self::intArrayToString( $t ) );
+        $q = self::ristretto255_p3_tobytes( $Q );
+        if ( ParagonIE_Sodium_Compat::is_zero( $q ) ) {
+            throw new SodiumException( 'An unknown error has occurred' );
         }
         return $q;
     }

vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false ) ) {
     return;
 }
 
@@ -21,18 +21,18 @@ 
      * @throws InvalidArgumentException
      * @throws TypeError
      */
-    public function __construct($key = '', $iv = '', $counter = '')
+    public function __construct( $key = '', $iv = '', $counter = '' )
     {
-        if (self::strlen($iv) !== 12) {
-            throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
+        if ( self::strlen( $iv ) !== 12 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 96-bit nonce in IETF mode.' );
         }
-        parent::__construct($key, self::substr($iv, 0, 8), $counter);
+        parent::__construct( $key, self::substr( $iv, 0, 8 ), $counter );
 
-        if (!empty($counter)) {
-            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
+        if ( ! empty( $counter ) ) {
+            $this->container[ 12 ] = self::load_4( self::substr( $counter, 0, 4 ) );
         }
-        $this->container[13] = self::load_4(self::substr($iv, 0, 4));
-        $this->container[14] = self::load_4(self::substr($iv, 4, 4));
-        $this->container[15] = self::load_4(self::substr($iv, 8, 4));
+        $this->container[ 13 ] = self::load_4( self::substr( $iv, 0, 4 ) );
+        $this->container[ 14 ] = self::load_4( self::substr( $iv, 4, 4 ) );
+        $this->container[ 15 ] = self::load_4( self::substr( $iv, 8, 4 ) );
     }
 }

vendor/paragonie/sodium_compat/src/SodiumException.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if (!class_exists('SodiumException', false)) {
+if ( ! class_exists( 'SodiumException', false ) ) {
     /**
      * Class SodiumException
      */

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

Spacing +221 added lines, -221 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_BLAKE2b', false ) ) {
     return;
 }
 
@@ -20,18 +20,18 @@ 
      * @var array<int, array<int, int>>
      */
     public static $sigma = array(
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
-        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
-        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
-        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
-        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
-        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
-        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
-        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
-        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
+        array( 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ),
+        array( 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 ),
+        array( 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 ),
+        array( 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 ),
+        array( 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 ),
+        array( 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 ),
+        array( 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 ),
+        array( 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 ),
+        array( 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 ),
+        array( 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 ),
+        array( 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ),
+        array( 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 )
     );
 
     const BLOCKBYTES = 128;
@@ -49,9 +49,9 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function new64($high, $low)
+    public static function new64( $high, $low )
     {
-        return ParagonIE_Sodium_Core32_Int64::fromInts($low, $high);
+        return ParagonIE_Sodium_Core32_Int64::fromInts( $low, $high );
     }
 
     /**
@@ -65,10 +65,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function to64($num)
+    protected static function to64( $num )
     {
-        list($hi, $lo) = self::numericTo64BitInteger($num);
-        return self::new64($hi, $lo);
+        list( $hi, $lo ) = self::numericTo64BitInteger( $num );
+        return self::new64( $hi, $lo );
     }
 
     /**
@@ -81,9 +81,9 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $y
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    protected static function add64($x, $y)
+    protected static function add64( $x, $y )
     {
-        return $x->addInt64($y);
+        return $x->addInt64( $y );
     }
 
     /**
@@ -94,9 +94,9 @@ 
      * @param ParagonIE_Sodium_Core32_Int64 $z
      * @return ParagonIE_Sodium_Core32_Int64
      */
-    public static function add364($x, $y, $z)
+    public static function add364( $x, $y, $z )
     {
-        return $x->addInt64($y)->addInt64($z);
+        return $x->addInt64( $y )->addInt64( $z );
     }
 
     /**
@@ -107,9 +107,9 @@ 
      * @return ParagonIE_Sodium_Core32_Int64
      * @throws TypeError
      */
-    public static function xor64(ParagonIE_Sodium_Core32_Int64 $x, ParagonIE_Sodium_Core32_Int64 $y)
+    public static function xor64( ParagonIE_Sodium_Core32_Int64 $x, ParagonIE_Sodium_Core32_Int64 $y )
     {
-        return $x->xorInt64($y);
+        return $x->xorInt64( $y );
     }
 
     /**
@@ -121,9 +121,9 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function rotr64(ParagonIE_Sodium_Core32_Int64 $x, $c)
+    public static function rotr64( ParagonIE_Sodium_Core32_Int64 $x, $c )
     {
-        return $x->rotateRight($c);
+        return $x->rotateRight( $c );
     }
 
     /**
@@ -135,19 +135,19 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function load64($x, $i)
+    public static function load64( $x, $i )
     {
         /** @var int $l */
-        $l = (int) ($x[$i])
-             | ((int) ($x[$i+1]) << 8)
-             | ((int) ($x[$i+2]) << 16)
-             | ((int) ($x[$i+3]) << 24);
+        $l = (int)( $x[ $i ] )
+             | ( (int)( $x[ $i + 1 ] ) << 8 )
+             | ( (int)( $x[ $i + 2 ] ) << 16 )
+             | ( (int)( $x[ $i + 3 ] ) << 24 );
         /** @var int $h */
-        $h = (int) ($x[$i+4])
-             | ((int) ($x[$i+5]) << 8)
-             | ((int) ($x[$i+6]) << 16)
-             | ((int) ($x[$i+7]) << 24);
-        return self::new64($h, $l);
+        $h = (int)( $x[ $i + 4 ] )
+             | ( (int)( $x[ $i + 5 ] ) << 8 )
+             | ( (int)( $x[ $i + 6 ] ) << 16 )
+             | ( (int)( $x[ $i + 7 ] ) << 24 );
+        return self::new64( $h, $l );
     }
 
     /**
@@ -164,17 +164,17 @@ 
      * @psalm-suppress MixedArrayAssignment
      * @psalm-suppress MixedArrayOffset
      */
-    public static function store64(SplFixedArray $x, $i, ParagonIE_Sodium_Core32_Int64 $u)
+    public static function store64( SplFixedArray $x, $i, ParagonIE_Sodium_Core32_Int64 $u )
     {
         $v = clone $u;
         $maxLength = $x->getSize() - 1;
-        for ($j = 0; $j < 8; ++$j) {
-            $k = 3 - ($j >> 1);
-            $x[$i] = $v->limbs[$k] & 0xff;
+        for ( $j = 0; $j < 8; ++$j ) {
+            $k = 3 - ( $j >> 1 );
+            $x[ $i ] = $v->limbs[ $k ] & 0xff;
             if (++$i > $maxLength) {
                 return;
             }
-            $v->limbs[$k] >>= 8;
+            $v->limbs[ $k ] >>= 8;
         }
     }
 
@@ -190,18 +190,18 @@ 
     public static function pseudoConstructor()
     {
         static $called = false;
-        if ($called) {
+        if ( $called ) {
             return;
         }
-        self::$iv = new SplFixedArray(8);
-        self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
-        self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
-        self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
-        self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
-        self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
-        self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
-        self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
-        self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
+        self::$iv = new SplFixedArray( 8 );
+        self::$iv[ 0 ] = self::new64( 0x6a09e667, 0xf3bcc908 );
+        self::$iv[ 1 ] = self::new64( 0xbb67ae85, 0x84caa73b );
+        self::$iv[ 2 ] = self::new64( 0x3c6ef372, 0xfe94f82b );
+        self::$iv[ 3 ] = self::new64( 0xa54ff53a, 0x5f1d36f1 );
+        self::$iv[ 4 ] = self::new64( 0x510e527f, 0xade682d1 );
+        self::$iv[ 5 ] = self::new64( 0x9b05688c, 0x2b3e6c1f );
+        self::$iv[ 6 ] = self::new64( 0x1f83d9ab, 0xfb41bd6b );
+        self::$iv[ 7 ] = self::new64( 0x5be0cd19, 0x137e2179 );
 
         $called = true;
     }
@@ -223,26 +223,26 @@ 
      */
     protected static function context()
     {
-        $ctx    = new SplFixedArray(6);
-        $ctx[0] = new SplFixedArray(8);   // h
-        $ctx[1] = new SplFixedArray(2);   // t
-        $ctx[2] = new SplFixedArray(2);   // f
-        $ctx[3] = new SplFixedArray(256); // buf
-        $ctx[4] = 0;                      // buflen
-        $ctx[5] = 0;                      // last_node (uint8_t)
-
-        for ($i = 8; $i--;) {
-            $ctx[0][$i] = self::$iv[$i];
+        $ctx    = new SplFixedArray( 6 );
+        $ctx[ 0 ] = new SplFixedArray( 8 ); // h
+        $ctx[ 1 ] = new SplFixedArray( 2 ); // t
+        $ctx[ 2 ] = new SplFixedArray( 2 ); // f
+        $ctx[ 3 ] = new SplFixedArray( 256 ); // buf
+        $ctx[ 4 ] = 0; // buflen
+        $ctx[ 5 ] = 0; // last_node (uint8_t)
+
+        for ( $i = 8; $i--; ) {
+            $ctx[ 0 ][ $i ] = self::$iv[ $i ];
         }
-        for ($i = 256; $i--;) {
-            $ctx[3][$i] = 0;
+        for ( $i = 256; $i--; ) {
+            $ctx[ 3 ][ $i ] = 0;
         }
 
-        $zero = self::new64(0, 0);
-        $ctx[1][0] = $zero;
-        $ctx[1][1] = $zero;
-        $ctx[2][0] = $zero;
-        $ctx[2][1] = $zero;
+        $zero = self::new64( 0, 0 );
+        $ctx[ 1 ][ 0 ] = $zero;
+        $ctx[ 1 ][ 1 ] = $zero;
+        $ctx[ 2 ][ 0 ] = $zero;
+        $ctx[ 2 ][ 1 ] = $zero;
 
         return $ctx;
     }
@@ -260,43 +260,43 @@ 
      * @psalm-suppress MixedArrayAssignment
      * @psalm-suppress MixedAssignment
      */
-    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
+    protected static function compress( SplFixedArray $ctx, SplFixedArray $buf )
     {
-        $m = new SplFixedArray(16);
-        $v = new SplFixedArray(16);
+        $m = new SplFixedArray( 16 );
+        $v = new SplFixedArray( 16 );
 
-        for ($i = 16; $i--;) {
-            $m[$i] = self::load64($buf, $i << 3);
+        for ( $i = 16; $i--; ) {
+            $m[ $i ] = self::load64( $buf, $i << 3 );
         }
 
-        for ($i = 8; $i--;) {
-            $v[$i] = $ctx[0][$i];
+        for ( $i = 8; $i--; ) {
+            $v[ $i ] = $ctx[ 0 ][ $i ];
         }
 
-        $v[ 8] = self::$iv[0];
-        $v[ 9] = self::$iv[1];
-        $v[10] = self::$iv[2];
-        $v[11] = self::$iv[3];
-
-        $v[12] = self::xor64($ctx[1][0], self::$iv[4]);
-        $v[13] = self::xor64($ctx[1][1], self::$iv[5]);
-        $v[14] = self::xor64($ctx[2][0], self::$iv[6]);
-        $v[15] = self::xor64($ctx[2][1], self::$iv[7]);
-
-        for ($r = 0; $r < 12; ++$r) {
-            $v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
-            $v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
-            $v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
-            $v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
-            $v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
-            $v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
-            $v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
-            $v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
+        $v[ 8 ] = self::$iv[ 0 ];
+        $v[ 9 ] = self::$iv[ 1 ];
+        $v[ 10 ] = self::$iv[ 2 ];
+        $v[ 11 ] = self::$iv[ 3 ];
+
+        $v[ 12 ] = self::xor64( $ctx[ 1 ][ 0 ], self::$iv[ 4 ] );
+        $v[ 13 ] = self::xor64( $ctx[ 1 ][ 1 ], self::$iv[ 5 ] );
+        $v[ 14 ] = self::xor64( $ctx[ 2 ][ 0 ], self::$iv[ 6 ] );
+        $v[ 15 ] = self::xor64( $ctx[ 2 ][ 1 ], self::$iv[ 7 ] );
+
+        for ( $r = 0; $r < 12; ++$r ) {
+            $v = self::G( $r, 0, 0, 4, 8, 12, $v, $m );
+            $v = self::G( $r, 1, 1, 5, 9, 13, $v, $m );
+            $v = self::G( $r, 2, 2, 6, 10, 14, $v, $m );
+            $v = self::G( $r, 3, 3, 7, 11, 15, $v, $m );
+            $v = self::G( $r, 4, 0, 5, 10, 15, $v, $m );
+            $v = self::G( $r, 5, 1, 6, 11, 12, $v, $m );
+            $v = self::G( $r, 6, 2, 7, 8, 13, $v, $m );
+            $v = self::G( $r, 7, 3, 4, 9, 14, $v, $m );
         }
 
-        for ($i = 8; $i--;) {
-            $ctx[0][$i] = self::xor64(
-                $ctx[0][$i], self::xor64($v[$i], $v[$i+8])
+        for ( $i = 8; $i--; ) {
+            $ctx[ 0 ][ $i ] = self::xor64(
+                $ctx[ 0 ][ $i ], self::xor64( $v[ $i ], $v[ $i + 8 ] )
             );
         }
     }
@@ -318,16 +318,16 @@ 
      * @psalm-suppress MixedArgument
      * @psalm-suppress MixedArrayOffset
      */
-    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
+    public static function G( $r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m )
     {
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
+        $v[ $a ] = self::add364( $v[ $a ], $v[ $b ], $m[ self::$sigma[ $r ][ $i << 1 ] ] );
+        $v[ $d ] = self::rotr64( self::xor64( $v[ $d ], $v[ $a ] ), 32 );
+        $v[ $c ] = self::add64( $v[ $c ], $v[ $d ] );
+        $v[ $b ] = self::rotr64( self::xor64( $v[ $b ], $v[ $c ] ), 24 );
+        $v[ $a ] = self::add364( $v[ $a ], $v[ $b ], $m[ self::$sigma[ $r ][ ( $i << 1 ) + 1 ] ] );
+        $v[ $d ] = self::rotr64( self::xor64( $v[ $d ], $v[ $a ] ), 16 );
+        $v[ $c ] = self::add64( $v[ $c ], $v[ $d ] );
+        $v[ $b ] = self::rotr64( self::xor64( $v[ $b ], $v[ $c ] ), 63 );
         return $v;
     }
 
@@ -343,25 +343,25 @@ 
      * @psalm-suppress MixedArrayAccess
      * @psalm-suppress MixedArrayAssignment
      */
-    public static function increment_counter($ctx, $inc)
+    public static function increment_counter( $ctx, $inc )
     {
-        if ($inc < 0) {
-            throw new SodiumException('Increasing by a negative number makes no sense.');
+        if ( $inc < 0 ) {
+            throw new SodiumException( 'Increasing by a negative number makes no sense.' );
         }
-        $t = self::to64($inc);
+        $t = self::to64( $inc );
         # S->t is $ctx[1] in our implementation
 
         # S->t[0] = ( uint64_t )( t >> 0 );
-        $ctx[1][0] = self::add64($ctx[1][0], $t);
+        $ctx[ 1 ][ 0 ] = self::add64( $ctx[ 1 ][ 0 ], $t );
 
         # S->t[1] += ( S->t[0] < inc );
-        if (!($ctx[1][0] instanceof ParagonIE_Sodium_Core32_Int64)) {
-            throw new TypeError('Not an int64');
+        if ( ! ( $ctx[ 1 ][ 0 ] instanceof ParagonIE_Sodium_Core32_Int64 ) ) {
+            throw new TypeError( 'Not an int64' );
         }
         /** @var ParagonIE_Sodium_Core32_Int64 $c*/
-        $c = $ctx[1][0];
-        if ($c->isLessThanInt($inc)) {
-            $ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
+        $c = $ctx[ 1 ][ 0 ];
+        if ( $c->isLessThanInt( $inc ) ) {
+            $ctx[ 1 ][ 1 ] = self::add64( $ctx[ 1 ][ 1 ], self::to64( 1 ) );
         }
     }
 
@@ -382,37 +382,37 @@ 
      * @psalm-suppress MixedMethodCall
      * @psalm-suppress MixedOperand
      */
-    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
+    public static function update( SplFixedArray $ctx, SplFixedArray $p, $plen )
     {
         self::pseudoConstructor();
 
         $offset = 0;
-        while ($plen > 0) {
-            $left = $ctx[4];
+        while ( $plen > 0 ) {
+            $left = $ctx[ 4 ];
             $fill = 256 - $left;
 
-            if ($plen > $fill) {
+            if ( $plen > $fill ) {
                 # memcpy( S->buf + left, in, fill ); /* Fill buffer */
-                for ($i = $fill; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
+                for ( $i = $fill; $i--; ) {
+                    $ctx[ 3 ][ $i + $left ] = $p[ $i + $offset ];
                 }
 
                 # S->buflen += fill;
-                $ctx[4] += $fill;
+                $ctx[ 4 ] += $fill;
 
                 # blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
-                self::increment_counter($ctx, 128);
+                self::increment_counter( $ctx, 128 );
 
                 # blake2b_compress( S, S->buf ); /* Compress */
-                self::compress($ctx, $ctx[3]);
+                self::compress( $ctx, $ctx[ 3 ] );
 
                 # memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
-                for ($i = 128; $i--;) {
-                    $ctx[3][$i] = $ctx[3][$i + 128];
+                for ( $i = 128; $i--; ) {
+                    $ctx[ 3 ][ $i ] = $ctx[ 3 ][ $i + 128 ];
                 }
 
                 # S->buflen -= BLAKE2B_BLOCKBYTES;
-                $ctx[4] -= 128;
+                $ctx[ 4 ] -= 128;
 
                 # in += fill;
                 $offset += $fill;
@@ -420,10 +420,10 @@ 
                 # inlen -= fill;
                 $plen -= $fill;
             } else {
-                for ($i = $plen; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
+                for ( $i = $plen; $i--; ) {
+                    $ctx[ 3 ][ $i + $left ] = $p[ $i + $offset ];
                 }
-                $ctx[4] += $plen;
+                $ctx[ 4 ] += $plen;
                 $offset += $plen;
                 $plen -= $plen;
             }
@@ -446,34 +446,34 @@ 
      * @psalm-suppress MixedMethodCall
      * @psalm-suppress MixedOperand
      */
-    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
+    public static function finish( SplFixedArray $ctx, SplFixedArray $out )
     {
         self::pseudoConstructor();
-        if ($ctx[4] > 128) {
-            self::increment_counter($ctx, 128);
-            self::compress($ctx, $ctx[3]);
-            $ctx[4] -= 128;
-            if ($ctx[4] > 128) {
-                throw new SodiumException('Failed to assert that buflen <= 128 bytes');
+        if ( $ctx[ 4 ] > 128 ) {
+            self::increment_counter( $ctx, 128 );
+            self::compress( $ctx, $ctx[ 3 ] );
+            $ctx[ 4 ] -= 128;
+            if ( $ctx[ 4 ] > 128 ) {
+                throw new SodiumException( 'Failed to assert that buflen <= 128 bytes' );
             }
-            for ($i = $ctx[4]; $i--;) {
-                $ctx[3][$i] = $ctx[3][$i + 128];
+            for ( $i = $ctx[ 4 ]; $i--; ) {
+                $ctx[ 3 ][ $i ] = $ctx[ 3 ][ $i + 128 ];
             }
         }
 
-        self::increment_counter($ctx, $ctx[4]);
-        $ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
+        self::increment_counter( $ctx, $ctx[ 4 ] );
+        $ctx[ 2 ][ 0 ] = self::new64( 0xffffffff, 0xffffffff );
 
-        for ($i = 256 - $ctx[4]; $i--;) {
+        for ( $i = 256 - $ctx[ 4 ]; $i--; ) {
             /** @var int $i */
-            $ctx[3][$i + $ctx[4]] = 0;
+            $ctx[ 3 ][ $i + $ctx[ 4 ] ] = 0;
         }
 
-        self::compress($ctx, $ctx[3]);
+        self::compress( $ctx, $ctx[ 3 ] );
 
-        $i = (int) (($out->getSize() - 1) / 8);
-        for (; $i >= 0; --$i) {
-            self::store64($out, $i << 3, $ctx[0][$i]);
+        $i = (int)( ( $out->getSize() - 1 ) / 8 );
+        for ( ; $i >= 0; --$i ) {
+            self::store64( $out, $i << 3, $ctx[ 0 ][ $i ] );
         }
         return $out;
     }
@@ -503,68 +503,68 @@ 
         self::pseudoConstructor();
         $klen = 0;
 
-        if ($key !== null) {
-            if (count($key) > 64) {
-                throw new SodiumException('Invalid key size');
+        if ( $key !== null ) {
+            if ( count( $key ) > 64 ) {
+                throw new SodiumException( 'Invalid key size' );
             }
-            $klen = count($key);
+            $klen = count( $key );
         }
 
-        if ($outlen > 64) {
-            throw new SodiumException('Invalid output size');
+        if ( $outlen > 64 ) {
+            throw new SodiumException( 'Invalid output size' );
         }
 
         $ctx = self::context();
 
-        $p = new SplFixedArray(64);
+        $p = new SplFixedArray( 64 );
         // Zero our param buffer...
-        for ($i = 64; --$i;) {
-            $p[$i] = 0;
+        for ( $i = 64; --$i; ) {
+            $p[ $i ] = 0;
         }
 
-        $p[0] = $outlen; // digest_length
-        $p[1] = $klen;   // key_length
-        $p[2] = 1;       // fanout
-        $p[3] = 1;       // depth
+        $p[ 0 ] = $outlen; // digest_length
+        $p[ 1 ] = $klen; // key_length
+        $p[ 2 ] = 1; // fanout
+        $p[ 3 ] = 1; // depth
 
-        if ($salt instanceof SplFixedArray) {
+        if ( $salt instanceof SplFixedArray ) {
             // salt: [32] through [47]
-            for ($i = 0; $i < 16; ++$i) {
-                $p[32 + $i] = (int) $salt[$i];
+            for ( $i = 0; $i < 16; ++$i ) {
+                $p[ 32 + $i ] = (int)$salt[ $i ];
             }
         }
-        if ($personal instanceof SplFixedArray) {
+        if ( $personal instanceof SplFixedArray ) {
             // personal: [48] through [63]
-            for ($i = 0; $i < 16; ++$i) {
-                $p[48 + $i] = (int) $personal[$i];
+            for ( $i = 0; $i < 16; ++$i ) {
+                $p[ 48 + $i ] = (int)$personal[ $i ];
             }
         }
 
-        $ctx[0][0] = self::xor64(
-            $ctx[0][0],
-            self::load64($p, 0)
+        $ctx[ 0 ][ 0 ] = self::xor64(
+            $ctx[ 0 ][ 0 ],
+            self::load64( $p, 0 )
         );
 
-        if ($salt instanceof SplFixedArray || $personal instanceof SplFixedArray) {
+        if ( $salt instanceof SplFixedArray || $personal instanceof SplFixedArray ) {
             // We need to do what blake2b_init_param() does:
-            for ($i = 1; $i < 8; ++$i) {
-                $ctx[0][$i] = self::xor64(
-                    $ctx[0][$i],
-                    self::load64($p, $i << 3)
+            for ( $i = 1; $i < 8; ++$i ) {
+                $ctx[ 0 ][ $i ] = self::xor64(
+                    $ctx[ 0 ][ $i ],
+                    self::load64( $p, $i << 3 )
                 );
             }
         }
 
-        if ($klen > 0 && $key instanceof SplFixedArray) {
-            $block = new SplFixedArray(128);
-            for ($i = 128; $i--;) {
-                $block[$i] = 0;
+        if ( $klen > 0 && $key instanceof SplFixedArray ) {
+            $block = new SplFixedArray( 128 );
+            for ( $i = 128; $i--; ) {
+                $block[ $i ] = 0;
             }
-            for ($i = $klen; $i--;) {
-                $block[$i] = $key[$i];
+            for ( $i = $klen; $i--; ) {
+                $block[ $i ] = $key[ $i ];
             }
-            self::update($ctx, $block, 128);
-            $ctx[4] = 128;
+            self::update( $ctx, $block, 128 );
+            $ctx[ 4 ] = 128;
         }
 
         return $ctx;
@@ -579,10 +579,10 @@ 
      * @return SplFixedArray
      * @psalm-suppress MixedArgumentTypeCoercion
      */
-    public static function stringToSplFixedArray($str = '')
+    public static function stringToSplFixedArray( $str = '' )
     {
-        $values = unpack('C*', $str);
-        return SplFixedArray::fromArray(array_values($values));
+        $values = unpack( 'C*', $str );
+        return SplFixedArray::fromArray( array_values( $values ) );
     }
 
     /**
@@ -593,15 +593,15 @@ 
      * @param SplFixedArray $a
      * @return string
      */
-    public static function SplFixedArrayToString(SplFixedArray $a)
+    public static function SplFixedArrayToString( SplFixedArray $a )
     {
         /**
          * @var array<int, string|int>
          */
         $arr = $a->toArray();
         $c = $a->count();
-        array_unshift($arr, str_repeat('C', $c));
-        return (string) (call_user_func_array('pack', $arr));
+        array_unshift( $arr, str_repeat( 'C', $c ) );
+        return (string)( call_user_func_array( 'pack', $arr ) );
     }
 
     /**
@@ -615,48 +615,48 @@ 
      * @psalm-suppress MixedArrayAssignment
      * @psalm-suppress MixedMethodCall
      */
-    public static function contextToString(SplFixedArray $ctx)
+    public static function contextToString( SplFixedArray $ctx )
     {
         $str = '';
         /** @var array<int, ParagonIE_Sodium_Core32_Int64> $ctxA */
-        $ctxA = $ctx[0]->toArray();
+        $ctxA = $ctx[ 0 ]->toArray();
 
         # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
-            if (!($ctxA[$i] instanceof ParagonIE_Sodium_Core32_Int64)) {
-                throw new TypeError('Not an instance of Int64');
+        for ( $i = 0; $i < 8; ++$i ) {
+            if ( ! ( $ctxA[ $i ] instanceof ParagonIE_Sodium_Core32_Int64 ) ) {
+                throw new TypeError( 'Not an instance of Int64' );
             }
             /** @var ParagonIE_Sodium_Core32_Int64 $ctxAi */
-            $ctxAi = $ctxA[$i];
+            $ctxAi = $ctxA[ $i ];
             $str .= $ctxAi->toReverseString();
         }
 
         # uint64_t t[2];
         # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
+        for ( $i = 1; $i < 3; ++$i ) {
             /** @var array<int, ParagonIE_Sodium_Core32_Int64> $ctxA */
-            $ctxA = $ctx[$i]->toArray();
+            $ctxA = $ctx[ $i ]->toArray();
             /** @var ParagonIE_Sodium_Core32_Int64 $ctxA1 */
-            $ctxA1 = $ctxA[0];
+            $ctxA1 = $ctxA[ 0 ];
             /** @var ParagonIE_Sodium_Core32_Int64 $ctxA2 */
-            $ctxA2 = $ctxA[1];
+            $ctxA2 = $ctxA[ 1 ];
 
             $str .= $ctxA1->toReverseString();
             $str .= $ctxA2->toReverseString();
         }
 
         # uint8_t buf[2 * 128];
-        $str .= self::SplFixedArrayToString($ctx[3]);
+        $str .= self::SplFixedArrayToString( $ctx[ 3 ] );
 
         /** @var int $ctx4 */
-        $ctx4 = $ctx[4];
+        $ctx4 = $ctx[ 4 ];
 
         # size_t buflen;
-        $str .= implode('', array(
-            self::intToChr($ctx4 & 0xff),
-            self::intToChr(($ctx4 >> 8) & 0xff),
-            self::intToChr(($ctx4 >> 16) & 0xff),
-            self::intToChr(($ctx4 >> 24) & 0xff),
+        $str .= implode( '', array(
+            self::intToChr( $ctx4 & 0xff ),
+            self::intToChr( ( $ctx4 >> 8 ) & 0xff ),
+            self::intToChr( ( $ctx4 >> 16 ) & 0xff ),
+            self::intToChr( ( $ctx4 >> 24 ) & 0xff ),
             "\x00\x00\x00\x00"
             /*
             self::intToChr(($ctx4 >> 32) & 0xff),
@@ -664,9 +664,9 @@ 
             self::intToChr(($ctx4 >> 48) & 0xff),
             self::intToChr(($ctx4 >> 56) & 0xff)
             */
-        ));
+        ) );
         # uint8_t last_node;
-        return $str . self::intToChr($ctx[5]) . str_repeat("\x00", 23);
+        return $str . self::intToChr( $ctx[ 5 ] ) . str_repeat( "\x00", 23 );
     }
 
     /**
@@ -682,37 +682,37 @@ 
      * @psalm-suppress MixedArrayAccess
      * @psalm-suppress MixedArrayAssignment
      */
-    public static function stringToContext($string)
+    public static function stringToContext( $string )
     {
         $ctx = self::context();
 
         # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
-            $ctx[0][$i] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($string, (($i << 3) + 0), 8)
+        for ( $i = 0; $i < 8; ++$i ) {
+            $ctx[ 0 ][ $i ] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
+                self::substr( $string, ( ( $i << 3 ) + 0 ), 8 )
             );
         }
 
         # uint64_t t[2];
         # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
-            $ctx[$i][1] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($string, 72 + (($i - 1) << 4), 8)
+        for ( $i = 1; $i < 3; ++$i ) {
+            $ctx[ $i ][ 1 ] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
+                self::substr( $string, 72 + ( ( $i - 1 ) << 4 ), 8 )
             );
-            $ctx[$i][0] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($string, 64 + (($i - 1) << 4), 8)
+            $ctx[ $i ][ 0 ] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
+                self::substr( $string, 64 + ( ( $i - 1 ) << 4 ), 8 )
             );
         }
 
         # uint8_t buf[2 * 128];
-        $ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
+        $ctx[ 3 ] = self::stringToSplFixedArray( self::substr( $string, 96, 256 ) );
 
         # uint8_t buf[2 * 128];
         $int = 0;
-        for ($i = 0; $i < 8; ++$i) {
-            $int |= self::chrToInt($string[352 + $i]) << ($i << 3);
+        for ( $i = 0; $i < 8; ++$i ) {
+            $int |= self::chrToInt( $string[ 352 + $i ] ) << ( $i << 3 );
         }
-        $ctx[4] = $int;
+        $ctx[ 4 ] = $int;
 
         return $ctx;
     }

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

Spacing +1 added lines, -1 removed lines

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