gravityview /
GravityView
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_XChaCha20', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_XChaCha20', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -19,20 +19,20 @@ discard block |
||
| 19 | 19 | * @throws SodiumException |
| 20 | 20 | * @throws TypeError |
| 21 | 21 | */ |
| 22 | - public static function stream($len = 64, $nonce = '', $key = '') |
|
| 22 | + public static function stream( $len = 64, $nonce = '', $key = '' ) |
|
| 23 | 23 | { |
| 24 | - if (self::strlen($nonce) !== 24) { |
|
| 25 | - throw new SodiumException('Nonce must be 24 bytes long'); |
|
| 24 | + if ( self::strlen( $nonce ) !== 24 ) { |
|
| 25 | + throw new SodiumException( 'Nonce must be 24 bytes long' ); |
|
| 26 | 26 | } |
| 27 | 27 | return self::encryptBytes( |
| 28 | 28 | new ParagonIE_Sodium_Core32_ChaCha20_Ctx( |
| 29 | 29 | self::hChaCha20( |
| 30 | - self::substr($nonce, 0, 16), |
|
| 30 | + self::substr( $nonce, 0, 16 ), |
|
| 31 | 31 | $key |
| 32 | 32 | ), |
| 33 | - self::substr($nonce, 16, 8) |
|
| 33 | + self::substr( $nonce, 16, 8 ) |
|
| 34 | 34 | ), |
| 35 | - str_repeat("\x00", $len) |
|
| 35 | + str_repeat( "\x00", $len ) |
|
| 36 | 36 | ); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -47,15 +47,15 @@ discard block |
||
| 47 | 47 | * @throws SodiumException |
| 48 | 48 | * @throws TypeError |
| 49 | 49 | */ |
| 50 | - public static function streamXorIc($message, $nonce = '', $key = '', $ic = '') |
|
| 50 | + public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' ) |
|
| 51 | 51 | { |
| 52 | - if (self::strlen($nonce) !== 24) { |
|
| 53 | - throw new SodiumException('Nonce must be 24 bytes long'); |
|
| 52 | + if ( self::strlen( $nonce ) !== 24 ) { |
|
| 53 | + throw new SodiumException( 'Nonce must be 24 bytes long' ); |
|
| 54 | 54 | } |
| 55 | 55 | return self::encryptBytes( |
| 56 | 56 | new ParagonIE_Sodium_Core32_ChaCha20_Ctx( |
| 57 | - self::hChaCha20(self::substr($nonce, 0, 16), $key), |
|
| 58 | - self::substr($nonce, 16, 8), |
|
| 57 | + self::hChaCha20( self::substr( $nonce, 0, 16 ), $key ), |
|
| 58 | + self::substr( $nonce, 16, 8 ), |
|
| 59 | 59 | $ic |
| 60 | 60 | ), |
| 61 | 61 | $message |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_X25519', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_X25519', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -27,67 +27,67 @@ discard block |
||
| 27 | 27 | ParagonIE_Sodium_Core32_Curve25519_Fe $g, |
| 28 | 28 | $b = 0 |
| 29 | 29 | ) { |
| 30 | - $f0 = (int) $f[0]->toInt(); |
|
| 31 | - $f1 = (int) $f[1]->toInt(); |
|
| 32 | - $f2 = (int) $f[2]->toInt(); |
|
| 33 | - $f3 = (int) $f[3]->toInt(); |
|
| 34 | - $f4 = (int) $f[4]->toInt(); |
|
| 35 | - $f5 = (int) $f[5]->toInt(); |
|
| 36 | - $f6 = (int) $f[6]->toInt(); |
|
| 37 | - $f7 = (int) $f[7]->toInt(); |
|
| 38 | - $f8 = (int) $f[8]->toInt(); |
|
| 39 | - $f9 = (int) $f[9]->toInt(); |
|
| 40 | - $g0 = (int) $g[0]->toInt(); |
|
| 41 | - $g1 = (int) $g[1]->toInt(); |
|
| 42 | - $g2 = (int) $g[2]->toInt(); |
|
| 43 | - $g3 = (int) $g[3]->toInt(); |
|
| 44 | - $g4 = (int) $g[4]->toInt(); |
|
| 45 | - $g5 = (int) $g[5]->toInt(); |
|
| 46 | - $g6 = (int) $g[6]->toInt(); |
|
| 47 | - $g7 = (int) $g[7]->toInt(); |
|
| 48 | - $g8 = (int) $g[8]->toInt(); |
|
| 49 | - $g9 = (int) $g[9]->toInt(); |
|
| 30 | + $f0 = (int)$f[ 0 ]->toInt(); |
|
| 31 | + $f1 = (int)$f[ 1 ]->toInt(); |
|
| 32 | + $f2 = (int)$f[ 2 ]->toInt(); |
|
| 33 | + $f3 = (int)$f[ 3 ]->toInt(); |
|
| 34 | + $f4 = (int)$f[ 4 ]->toInt(); |
|
| 35 | + $f5 = (int)$f[ 5 ]->toInt(); |
|
| 36 | + $f6 = (int)$f[ 6 ]->toInt(); |
|
| 37 | + $f7 = (int)$f[ 7 ]->toInt(); |
|
| 38 | + $f8 = (int)$f[ 8 ]->toInt(); |
|
| 39 | + $f9 = (int)$f[ 9 ]->toInt(); |
|
| 40 | + $g0 = (int)$g[ 0 ]->toInt(); |
|
| 41 | + $g1 = (int)$g[ 1 ]->toInt(); |
|
| 42 | + $g2 = (int)$g[ 2 ]->toInt(); |
|
| 43 | + $g3 = (int)$g[ 3 ]->toInt(); |
|
| 44 | + $g4 = (int)$g[ 4 ]->toInt(); |
|
| 45 | + $g5 = (int)$g[ 5 ]->toInt(); |
|
| 46 | + $g6 = (int)$g[ 6 ]->toInt(); |
|
| 47 | + $g7 = (int)$g[ 7 ]->toInt(); |
|
| 48 | + $g8 = (int)$g[ 8 ]->toInt(); |
|
| 49 | + $g9 = (int)$g[ 9 ]->toInt(); |
|
| 50 | 50 | $b = -$b; |
| 51 | 51 | /** @var int $x0 */ |
| 52 | - $x0 = ($f0 ^ $g0) & $b; |
|
| 52 | + $x0 = ( $f0 ^ $g0 ) & $b; |
|
| 53 | 53 | /** @var int $x1 */ |
| 54 | - $x1 = ($f1 ^ $g1) & $b; |
|
| 54 | + $x1 = ( $f1 ^ $g1 ) & $b; |
|
| 55 | 55 | /** @var int $x2 */ |
| 56 | - $x2 = ($f2 ^ $g2) & $b; |
|
| 56 | + $x2 = ( $f2 ^ $g2 ) & $b; |
|
| 57 | 57 | /** @var int $x3 */ |
| 58 | - $x3 = ($f3 ^ $g3) & $b; |
|
| 58 | + $x3 = ( $f3 ^ $g3 ) & $b; |
|
| 59 | 59 | /** @var int $x4 */ |
| 60 | - $x4 = ($f4 ^ $g4) & $b; |
|
| 60 | + $x4 = ( $f4 ^ $g4 ) & $b; |
|
| 61 | 61 | /** @var int $x5 */ |
| 62 | - $x5 = ($f5 ^ $g5) & $b; |
|
| 62 | + $x5 = ( $f5 ^ $g5 ) & $b; |
|
| 63 | 63 | /** @var int $x6 */ |
| 64 | - $x6 = ($f6 ^ $g6) & $b; |
|
| 64 | + $x6 = ( $f6 ^ $g6 ) & $b; |
|
| 65 | 65 | /** @var int $x7 */ |
| 66 | - $x7 = ($f7 ^ $g7) & $b; |
|
| 66 | + $x7 = ( $f7 ^ $g7 ) & $b; |
|
| 67 | 67 | /** @var int $x8 */ |
| 68 | - $x8 = ($f8 ^ $g8) & $b; |
|
| 68 | + $x8 = ( $f8 ^ $g8 ) & $b; |
|
| 69 | 69 | /** @var int $x9 */ |
| 70 | - $x9 = ($f9 ^ $g9) & $b; |
|
| 71 | - $f[0] = ParagonIE_Sodium_Core32_Int32::fromInt($f0 ^ $x0); |
|
| 72 | - $f[1] = ParagonIE_Sodium_Core32_Int32::fromInt($f1 ^ $x1); |
|
| 73 | - $f[2] = ParagonIE_Sodium_Core32_Int32::fromInt($f2 ^ $x2); |
|
| 74 | - $f[3] = ParagonIE_Sodium_Core32_Int32::fromInt($f3 ^ $x3); |
|
| 75 | - $f[4] = ParagonIE_Sodium_Core32_Int32::fromInt($f4 ^ $x4); |
|
| 76 | - $f[5] = ParagonIE_Sodium_Core32_Int32::fromInt($f5 ^ $x5); |
|
| 77 | - $f[6] = ParagonIE_Sodium_Core32_Int32::fromInt($f6 ^ $x6); |
|
| 78 | - $f[7] = ParagonIE_Sodium_Core32_Int32::fromInt($f7 ^ $x7); |
|
| 79 | - $f[8] = ParagonIE_Sodium_Core32_Int32::fromInt($f8 ^ $x8); |
|
| 80 | - $f[9] = ParagonIE_Sodium_Core32_Int32::fromInt($f9 ^ $x9); |
|
| 81 | - $g[0] = ParagonIE_Sodium_Core32_Int32::fromInt($g0 ^ $x0); |
|
| 82 | - $g[1] = ParagonIE_Sodium_Core32_Int32::fromInt($g1 ^ $x1); |
|
| 83 | - $g[2] = ParagonIE_Sodium_Core32_Int32::fromInt($g2 ^ $x2); |
|
| 84 | - $g[3] = ParagonIE_Sodium_Core32_Int32::fromInt($g3 ^ $x3); |
|
| 85 | - $g[4] = ParagonIE_Sodium_Core32_Int32::fromInt($g4 ^ $x4); |
|
| 86 | - $g[5] = ParagonIE_Sodium_Core32_Int32::fromInt($g5 ^ $x5); |
|
| 87 | - $g[6] = ParagonIE_Sodium_Core32_Int32::fromInt($g6 ^ $x6); |
|
| 88 | - $g[7] = ParagonIE_Sodium_Core32_Int32::fromInt($g7 ^ $x7); |
|
| 89 | - $g[8] = ParagonIE_Sodium_Core32_Int32::fromInt($g8 ^ $x8); |
|
| 90 | - $g[9] = ParagonIE_Sodium_Core32_Int32::fromInt($g9 ^ $x9); |
|
| 70 | + $x9 = ( $f9 ^ $g9 ) & $b; |
|
| 71 | + $f[ 0 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f0 ^ $x0 ); |
|
| 72 | + $f[ 1 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f1 ^ $x1 ); |
|
| 73 | + $f[ 2 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f2 ^ $x2 ); |
|
| 74 | + $f[ 3 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f3 ^ $x3 ); |
|
| 75 | + $f[ 4 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f4 ^ $x4 ); |
|
| 76 | + $f[ 5 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f5 ^ $x5 ); |
|
| 77 | + $f[ 6 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f6 ^ $x6 ); |
|
| 78 | + $f[ 7 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f7 ^ $x7 ); |
|
| 79 | + $f[ 8 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f8 ^ $x8 ); |
|
| 80 | + $f[ 9 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $f9 ^ $x9 ); |
|
| 81 | + $g[ 0 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g0 ^ $x0 ); |
|
| 82 | + $g[ 1 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g1 ^ $x1 ); |
|
| 83 | + $g[ 2 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g2 ^ $x2 ); |
|
| 84 | + $g[ 3 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g3 ^ $x3 ); |
|
| 85 | + $g[ 4 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g4 ^ $x4 ); |
|
| 86 | + $g[ 5 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g5 ^ $x5 ); |
|
| 87 | + $g[ 6 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g6 ^ $x6 ); |
|
| 88 | + $g[ 7 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g7 ^ $x7 ); |
|
| 89 | + $g[ 8 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g8 ^ $x8 ); |
|
| 90 | + $g[ 9 ] = ParagonIE_Sodium_Core32_Int32::fromInt( $g9 ^ $x9 ); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
@@ -100,60 +100,60 @@ discard block |
||
| 100 | 100 | * @psalm-suppress MixedAssignment |
| 101 | 101 | * @psalm-suppress MixedMethodCall |
| 102 | 102 | */ |
| 103 | - public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f) |
|
| 103 | + public static function fe_mul121666( ParagonIE_Sodium_Core32_Curve25519_Fe $f ) |
|
| 104 | 104 | { |
| 105 | 105 | /** @var array<int, ParagonIE_Sodium_Core32_Int64> $h */ |
| 106 | 106 | $h = array(); |
| 107 | - for ($i = 0; $i < 10; ++$i) { |
|
| 108 | - $h[$i] = $f[$i]->toInt64()->mulInt(121666, 17); |
|
| 107 | + for ( $i = 0; $i < 10; ++$i ) { |
|
| 108 | + $h[ $i ] = $f[ $i ]->toInt64()->mulInt( 121666, 17 ); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $carry9 = $h[9]->addInt(1 << 24)->shiftRight(25); |
|
| 112 | - $h[0] = $h[0]->addInt64($carry9->mulInt(19, 5)); |
|
| 113 | - $h[9] = $h[9]->subInt64($carry9->shiftLeft(25)); |
|
| 111 | + $carry9 = $h[ 9 ]->addInt( 1 << 24 )->shiftRight( 25 ); |
|
| 112 | + $h[ 0 ] = $h[ 0 ]->addInt64( $carry9->mulInt( 19, 5 ) ); |
|
| 113 | + $h[ 9 ] = $h[ 9 ]->subInt64( $carry9->shiftLeft( 25 ) ); |
|
| 114 | 114 | |
| 115 | - $carry1 = $h[1]->addInt(1 << 24)->shiftRight(25); |
|
| 116 | - $h[2] = $h[2]->addInt64($carry1); |
|
| 117 | - $h[1] = $h[1]->subInt64($carry1->shiftLeft(25)); |
|
| 115 | + $carry1 = $h[ 1 ]->addInt( 1 << 24 )->shiftRight( 25 ); |
|
| 116 | + $h[ 2 ] = $h[ 2 ]->addInt64( $carry1 ); |
|
| 117 | + $h[ 1 ] = $h[ 1 ]->subInt64( $carry1->shiftLeft( 25 ) ); |
|
| 118 | 118 | |
| 119 | - $carry3 = $h[3]->addInt(1 << 24)->shiftRight(25); |
|
| 120 | - $h[4] = $h[4]->addInt64($carry3); |
|
| 121 | - $h[3] = $h[3]->subInt64($carry3->shiftLeft(25)); |
|
| 119 | + $carry3 = $h[ 3 ]->addInt( 1 << 24 )->shiftRight( 25 ); |
|
| 120 | + $h[ 4 ] = $h[ 4 ]->addInt64( $carry3 ); |
|
| 121 | + $h[ 3 ] = $h[ 3 ]->subInt64( $carry3->shiftLeft( 25 ) ); |
|
| 122 | 122 | |
| 123 | - $carry5 = $h[5]->addInt(1 << 24)->shiftRight(25); |
|
| 124 | - $h[6] = $h[6]->addInt64($carry5); |
|
| 125 | - $h[5] = $h[5]->subInt64($carry5->shiftLeft(25)); |
|
| 123 | + $carry5 = $h[ 5 ]->addInt( 1 << 24 )->shiftRight( 25 ); |
|
| 124 | + $h[ 6 ] = $h[ 6 ]->addInt64( $carry5 ); |
|
| 125 | + $h[ 5 ] = $h[ 5 ]->subInt64( $carry5->shiftLeft( 25 ) ); |
|
| 126 | 126 | |
| 127 | - $carry7 = $h[7]->addInt(1 << 24)->shiftRight(25); |
|
| 128 | - $h[8] = $h[8]->addInt64($carry7); |
|
| 129 | - $h[7] = $h[7]->subInt64($carry7->shiftLeft(25)); |
|
| 127 | + $carry7 = $h[ 7 ]->addInt( 1 << 24 )->shiftRight( 25 ); |
|
| 128 | + $h[ 8 ] = $h[ 8 ]->addInt64( $carry7 ); |
|
| 129 | + $h[ 7 ] = $h[ 7 ]->subInt64( $carry7->shiftLeft( 25 ) ); |
|
| 130 | 130 | |
| 131 | - $carry0 = $h[0]->addInt(1 << 25)->shiftRight(26); |
|
| 132 | - $h[1] = $h[1]->addInt64($carry0); |
|
| 133 | - $h[0] = $h[0]->subInt64($carry0->shiftLeft(26)); |
|
| 131 | + $carry0 = $h[ 0 ]->addInt( 1 << 25 )->shiftRight( 26 ); |
|
| 132 | + $h[ 1 ] = $h[ 1 ]->addInt64( $carry0 ); |
|
| 133 | + $h[ 0 ] = $h[ 0 ]->subInt64( $carry0->shiftLeft( 26 ) ); |
|
| 134 | 134 | |
| 135 | - $carry2 = $h[2]->addInt(1 << 25)->shiftRight(26); |
|
| 136 | - $h[3] = $h[3]->addInt64($carry2); |
|
| 137 | - $h[2] = $h[2]->subInt64($carry2->shiftLeft(26)); |
|
| 135 | + $carry2 = $h[ 2 ]->addInt( 1 << 25 )->shiftRight( 26 ); |
|
| 136 | + $h[ 3 ] = $h[ 3 ]->addInt64( $carry2 ); |
|
| 137 | + $h[ 2 ] = $h[ 2 ]->subInt64( $carry2->shiftLeft( 26 ) ); |
|
| 138 | 138 | |
| 139 | - $carry4 = $h[4]->addInt(1 << 25)->shiftRight(26); |
|
| 140 | - $h[5] = $h[5]->addInt64($carry4); |
|
| 141 | - $h[4] = $h[4]->subInt64($carry4->shiftLeft(26)); |
|
| 139 | + $carry4 = $h[ 4 ]->addInt( 1 << 25 )->shiftRight( 26 ); |
|
| 140 | + $h[ 5 ] = $h[ 5 ]->addInt64( $carry4 ); |
|
| 141 | + $h[ 4 ] = $h[ 4 ]->subInt64( $carry4->shiftLeft( 26 ) ); |
|
| 142 | 142 | |
| 143 | - $carry6 = $h[6]->addInt(1 << 25)->shiftRight(26); |
|
| 144 | - $h[7] = $h[7]->addInt64($carry6); |
|
| 145 | - $h[6] = $h[6]->subInt64($carry6->shiftLeft(26)); |
|
| 143 | + $carry6 = $h[ 6 ]->addInt( 1 << 25 )->shiftRight( 26 ); |
|
| 144 | + $h[ 7 ] = $h[ 7 ]->addInt64( $carry6 ); |
|
| 145 | + $h[ 6 ] = $h[ 6 ]->subInt64( $carry6->shiftLeft( 26 ) ); |
|
| 146 | 146 | |
| 147 | - $carry8 = $h[8]->addInt(1 << 25)->shiftRight(26); |
|
| 148 | - $h[9] = $h[9]->addInt64($carry8); |
|
| 149 | - $h[8] = $h[8]->subInt64($carry8->shiftLeft(26)); |
|
| 147 | + $carry8 = $h[ 8 ]->addInt( 1 << 25 )->shiftRight( 26 ); |
|
| 148 | + $h[ 9 ] = $h[ 9 ]->addInt64( $carry8 ); |
|
| 149 | + $h[ 8 ] = $h[ 8 ]->subInt64( $carry8->shiftLeft( 26 ) ); |
|
| 150 | 150 | |
| 151 | - for ($i = 0; $i < 10; ++$i) { |
|
| 152 | - $h[$i] = $h[$i]->toInt32(); |
|
| 151 | + for ( $i = 0; $i < 10; ++$i ) { |
|
| 152 | + $h[ $i ] = $h[ $i ]->toInt32(); |
|
| 153 | 153 | } |
| 154 | 154 | /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h2 */ |
| 155 | 155 | $h2 = $h; |
| 156 | - return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h2); |
|
| 156 | + return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray( $h2 ); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -167,27 +167,27 @@ discard block |
||
| 167 | 167 | * @throws SodiumException |
| 168 | 168 | * @throws TypeError |
| 169 | 169 | */ |
| 170 | - public static function crypto_scalarmult_curve25519_ref10($n, $p) |
|
| 170 | + public static function crypto_scalarmult_curve25519_ref10( $n, $p ) |
|
| 171 | 171 | { |
| 172 | 172 | # for (i = 0;i < 32;++i) e[i] = n[i]; |
| 173 | 173 | $e = '' . $n; |
| 174 | 174 | # e[0] &= 248; |
| 175 | - $e[0] = self::intToChr( |
|
| 176 | - self::chrToInt($e[0]) & 248 |
|
| 175 | + $e[ 0 ] = self::intToChr( |
|
| 176 | + self::chrToInt( $e[ 0 ] ) & 248 |
|
| 177 | 177 | ); |
| 178 | 178 | # e[31] &= 127; |
| 179 | 179 | # e[31] |= 64; |
| 180 | - $e[31] = self::intToChr( |
|
| 181 | - (self::chrToInt($e[31]) & 127) | 64 |
|
| 180 | + $e[ 31 ] = self::intToChr( |
|
| 181 | + ( self::chrToInt( $e[ 31 ] ) & 127 ) | 64 |
|
| 182 | 182 | ); |
| 183 | 183 | # fe_frombytes(x1,p); |
| 184 | - $x1 = self::fe_frombytes($p); |
|
| 184 | + $x1 = self::fe_frombytes( $p ); |
|
| 185 | 185 | # fe_1(x2); |
| 186 | 186 | $x2 = self::fe_1(); |
| 187 | 187 | # fe_0(z2); |
| 188 | 188 | $z2 = self::fe_0(); |
| 189 | 189 | # fe_copy(x3,x1); |
| 190 | - $x3 = self::fe_copy($x1); |
|
| 190 | + $x3 = self::fe_copy( $x1 ); |
|
| 191 | 191 | # fe_1(z3); |
| 192 | 192 | $z3 = self::fe_1(); |
| 193 | 193 | |
@@ -196,12 +196,12 @@ discard block |
||
| 196 | 196 | $swap = 0; |
| 197 | 197 | |
| 198 | 198 | # for (pos = 254;pos >= 0;--pos) { |
| 199 | - for ($pos = 254; $pos >= 0; --$pos) { |
|
| 199 | + for ( $pos = 254; $pos >= 0; --$pos ) { |
|
| 200 | 200 | # b = e[pos / 8] >> (pos & 7); |
| 201 | 201 | /** @var int $b */ |
| 202 | 202 | $b = self::chrToInt( |
| 203 | - $e[(int) floor($pos / 8)] |
|
| 204 | - ) >> ($pos & 7); |
|
| 203 | + $e[ (int)floor( $pos / 8 ) ] |
|
| 204 | + ) >> ( $pos & 7 ); |
|
| 205 | 205 | # b &= 1; |
| 206 | 206 | $b &= 1; |
| 207 | 207 | |
@@ -209,83 +209,83 @@ discard block |
||
| 209 | 209 | $swap ^= $b; |
| 210 | 210 | |
| 211 | 211 | # fe_cswap(x2,x3,swap); |
| 212 | - self::fe_cswap($x2, $x3, $swap); |
|
| 212 | + self::fe_cswap( $x2, $x3, $swap ); |
|
| 213 | 213 | |
| 214 | 214 | # fe_cswap(z2,z3,swap); |
| 215 | - self::fe_cswap($z2, $z3, $swap); |
|
| 215 | + self::fe_cswap( $z2, $z3, $swap ); |
|
| 216 | 216 | |
| 217 | 217 | # swap = b; |
| 218 | 218 | /** @var int $swap */ |
| 219 | 219 | $swap = $b; |
| 220 | 220 | |
| 221 | 221 | # fe_sub(tmp0,x3,z3); |
| 222 | - $tmp0 = self::fe_sub($x3, $z3); |
|
| 222 | + $tmp0 = self::fe_sub( $x3, $z3 ); |
|
| 223 | 223 | |
| 224 | 224 | # fe_sub(tmp1,x2,z2); |
| 225 | - $tmp1 = self::fe_sub($x2, $z2); |
|
| 225 | + $tmp1 = self::fe_sub( $x2, $z2 ); |
|
| 226 | 226 | |
| 227 | 227 | # fe_add(x2,x2,z2); |
| 228 | - $x2 = self::fe_add($x2, $z2); |
|
| 228 | + $x2 = self::fe_add( $x2, $z2 ); |
|
| 229 | 229 | |
| 230 | 230 | # fe_add(z2,x3,z3); |
| 231 | - $z2 = self::fe_add($x3, $z3); |
|
| 231 | + $z2 = self::fe_add( $x3, $z3 ); |
|
| 232 | 232 | |
| 233 | 233 | # fe_mul(z3,tmp0,x2); |
| 234 | - $z3 = self::fe_mul($tmp0, $x2); |
|
| 234 | + $z3 = self::fe_mul( $tmp0, $x2 ); |
|
| 235 | 235 | |
| 236 | 236 | # fe_mul(z2,z2,tmp1); |
| 237 | - $z2 = self::fe_mul($z2, $tmp1); |
|
| 237 | + $z2 = self::fe_mul( $z2, $tmp1 ); |
|
| 238 | 238 | |
| 239 | 239 | # fe_sq(tmp0,tmp1); |
| 240 | - $tmp0 = self::fe_sq($tmp1); |
|
| 240 | + $tmp0 = self::fe_sq( $tmp1 ); |
|
| 241 | 241 | |
| 242 | 242 | # fe_sq(tmp1,x2); |
| 243 | - $tmp1 = self::fe_sq($x2); |
|
| 243 | + $tmp1 = self::fe_sq( $x2 ); |
|
| 244 | 244 | |
| 245 | 245 | # fe_add(x3,z3,z2); |
| 246 | - $x3 = self::fe_add($z3, $z2); |
|
| 246 | + $x3 = self::fe_add( $z3, $z2 ); |
|
| 247 | 247 | |
| 248 | 248 | # fe_sub(z2,z3,z2); |
| 249 | - $z2 = self::fe_sub($z3, $z2); |
|
| 249 | + $z2 = self::fe_sub( $z3, $z2 ); |
|
| 250 | 250 | |
| 251 | 251 | # fe_mul(x2,tmp1,tmp0); |
| 252 | - $x2 = self::fe_mul($tmp1, $tmp0); |
|
| 252 | + $x2 = self::fe_mul( $tmp1, $tmp0 ); |
|
| 253 | 253 | |
| 254 | 254 | # fe_sub(tmp1,tmp1,tmp0); |
| 255 | - $tmp1 = self::fe_sub($tmp1, $tmp0); |
|
| 255 | + $tmp1 = self::fe_sub( $tmp1, $tmp0 ); |
|
| 256 | 256 | |
| 257 | 257 | # fe_sq(z2,z2); |
| 258 | - $z2 = self::fe_sq($z2); |
|
| 258 | + $z2 = self::fe_sq( $z2 ); |
|
| 259 | 259 | |
| 260 | 260 | # fe_mul121666(z3,tmp1); |
| 261 | - $z3 = self::fe_mul121666($tmp1); |
|
| 261 | + $z3 = self::fe_mul121666( $tmp1 ); |
|
| 262 | 262 | |
| 263 | 263 | # fe_sq(x3,x3); |
| 264 | - $x3 = self::fe_sq($x3); |
|
| 264 | + $x3 = self::fe_sq( $x3 ); |
|
| 265 | 265 | |
| 266 | 266 | # fe_add(tmp0,tmp0,z3); |
| 267 | - $tmp0 = self::fe_add($tmp0, $z3); |
|
| 267 | + $tmp0 = self::fe_add( $tmp0, $z3 ); |
|
| 268 | 268 | |
| 269 | 269 | # fe_mul(z3,x1,z2); |
| 270 | - $z3 = self::fe_mul($x1, $z2); |
|
| 270 | + $z3 = self::fe_mul( $x1, $z2 ); |
|
| 271 | 271 | |
| 272 | 272 | # fe_mul(z2,tmp1,tmp0); |
| 273 | - $z2 = self::fe_mul($tmp1, $tmp0); |
|
| 273 | + $z2 = self::fe_mul( $tmp1, $tmp0 ); |
|
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | # fe_cswap(x2,x3,swap); |
| 277 | - self::fe_cswap($x2, $x3, $swap); |
|
| 277 | + self::fe_cswap( $x2, $x3, $swap ); |
|
| 278 | 278 | |
| 279 | 279 | # fe_cswap(z2,z3,swap); |
| 280 | - self::fe_cswap($z2, $z3, $swap); |
|
| 280 | + self::fe_cswap( $z2, $z3, $swap ); |
|
| 281 | 281 | |
| 282 | 282 | # fe_invert(z2,z2); |
| 283 | - $z2 = self::fe_invert($z2); |
|
| 283 | + $z2 = self::fe_invert( $z2 ); |
|
| 284 | 284 | |
| 285 | 285 | # fe_mul(x2,x2,z2); |
| 286 | - $x2 = self::fe_mul($x2, $z2); |
|
| 286 | + $x2 = self::fe_mul( $x2, $z2 ); |
|
| 287 | 287 | # fe_tobytes(q,x2); |
| 288 | - return (string) self::fe_tobytes($x2); |
|
| 288 | + return (string)self::fe_tobytes( $x2 ); |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | /** |
@@ -301,10 +301,10 @@ discard block |
||
| 301 | 301 | ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY, |
| 302 | 302 | ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ |
| 303 | 303 | ) { |
| 304 | - $tempX = self::fe_add($edwardsZ, $edwardsY); |
|
| 305 | - $tempZ = self::fe_sub($edwardsZ, $edwardsY); |
|
| 306 | - $tempZ = self::fe_invert($tempZ); |
|
| 307 | - return self::fe_mul($tempX, $tempZ); |
|
| 304 | + $tempX = self::fe_add( $edwardsZ, $edwardsY ); |
|
| 305 | + $tempZ = self::fe_sub( $edwardsZ, $edwardsY ); |
|
| 306 | + $tempZ = self::fe_invert( $tempZ ); |
|
| 307 | + return self::fe_mul( $tempX, $tempZ ); |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | /** |
@@ -315,31 +315,31 @@ discard block |
||
| 315 | 315 | * @throws SodiumException |
| 316 | 316 | * @throws TypeError |
| 317 | 317 | */ |
| 318 | - public static function crypto_scalarmult_curve25519_ref10_base($n) |
|
| 318 | + public static function crypto_scalarmult_curve25519_ref10_base( $n ) |
|
| 319 | 319 | { |
| 320 | 320 | # for (i = 0;i < 32;++i) e[i] = n[i]; |
| 321 | 321 | $e = '' . $n; |
| 322 | 322 | |
| 323 | 323 | # e[0] &= 248; |
| 324 | - $e[0] = self::intToChr( |
|
| 325 | - self::chrToInt($e[0]) & 248 |
|
| 324 | + $e[ 0 ] = self::intToChr( |
|
| 325 | + self::chrToInt( $e[ 0 ] ) & 248 |
|
| 326 | 326 | ); |
| 327 | 327 | |
| 328 | 328 | # e[31] &= 127; |
| 329 | 329 | # e[31] |= 64; |
| 330 | - $e[31] = self::intToChr( |
|
| 331 | - (self::chrToInt($e[31]) & 127) | 64 |
|
| 330 | + $e[ 31 ] = self::intToChr( |
|
| 331 | + ( self::chrToInt( $e[ 31 ] ) & 127 ) | 64 |
|
| 332 | 332 | ); |
| 333 | 333 | |
| 334 | - $A = self::ge_scalarmult_base($e); |
|
| 334 | + $A = self::ge_scalarmult_base( $e ); |
|
| 335 | 335 | if ( |
| 336 | - !($A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe) |
|
| 336 | + ! ( $A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe ) |
|
| 337 | 337 | || |
| 338 | - !($A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe) |
|
| 338 | + ! ( $A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe ) |
|
| 339 | 339 | ) { |
| 340 | - throw new TypeError('Null points encountered'); |
|
| 340 | + throw new TypeError( 'Null points encountered' ); |
|
| 341 | 341 | } |
| 342 | - $pk = self::edwards_to_montgomery($A->Y, $A->Z); |
|
| 343 | - return self::fe_tobytes($pk); |
|
| 342 | + $pk = self::edwards_to_montgomery( $A->Y, $A->Z ); |
|
| 343 | + return self::fe_tobytes( $pk ); |
|
| 344 | 344 | } |
| 345 | 345 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | * 0 is the higher 16 bits |
| 16 | 16 | * 1 is the lower 16 bits |
| 17 | 17 | */ |
| 18 | - public $limbs = array(0, 0); |
|
| 18 | + public $limbs = array( 0, 0 ); |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @var int |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | * @param array $array |
| 33 | 33 | * @param bool $unsignedInt |
| 34 | 34 | */ |
| 35 | - public function __construct($array = array(0, 0), $unsignedInt = false) |
|
| 35 | + public function __construct( $array = array( 0, 0 ), $unsignedInt = false ) |
|
| 36 | 36 | { |
| 37 | 37 | $this->limbs = array( |
| 38 | - (int) $array[0], |
|
| 39 | - (int) $array[1] |
|
| 38 | + (int)$array[ 0 ], |
|
| 39 | + (int)$array[ 1 ] |
|
| 40 | 40 | ); |
| 41 | 41 | $this->overflow = 0; |
| 42 | 42 | $this->unsignedInt = $unsignedInt; |
@@ -48,24 +48,24 @@ discard block |
||
| 48 | 48 | * @param ParagonIE_Sodium_Core32_Int32 $addend |
| 49 | 49 | * @return ParagonIE_Sodium_Core32_Int32 |
| 50 | 50 | */ |
| 51 | - public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend) |
|
| 51 | + public function addInt32( ParagonIE_Sodium_Core32_Int32 $addend ) |
|
| 52 | 52 | { |
| 53 | - $i0 = $this->limbs[0]; |
|
| 54 | - $i1 = $this->limbs[1]; |
|
| 55 | - $j0 = $addend->limbs[0]; |
|
| 56 | - $j1 = $addend->limbs[1]; |
|
| 53 | + $i0 = $this->limbs[ 0 ]; |
|
| 54 | + $i1 = $this->limbs[ 1 ]; |
|
| 55 | + $j0 = $addend->limbs[ 0 ]; |
|
| 56 | + $j1 = $addend->limbs[ 1 ]; |
|
| 57 | 57 | |
| 58 | - $r1 = $i1 + ($j1 & 0xffff); |
|
| 58 | + $r1 = $i1 + ( $j1 & 0xffff ); |
|
| 59 | 59 | $carry = $r1 >> 16; |
| 60 | 60 | |
| 61 | - $r0 = $i0 + ($j0 & 0xffff) + $carry; |
|
| 61 | + $r0 = $i0 + ( $j0 & 0xffff ) + $carry; |
|
| 62 | 62 | $carry = $r0 >> 16; |
| 63 | 63 | |
| 64 | 64 | $r0 &= 0xffff; |
| 65 | 65 | $r1 &= 0xffff; |
| 66 | 66 | |
| 67 | 67 | $return = new ParagonIE_Sodium_Core32_Int32( |
| 68 | - array($r0, $r1) |
|
| 68 | + array( $r0, $r1 ) |
|
| 69 | 69 | ); |
| 70 | 70 | $return->overflow = $carry; |
| 71 | 71 | $return->unsignedInt = $this->unsignedInt; |
@@ -80,26 +80,26 @@ discard block |
||
| 80 | 80 | * @throws SodiumException |
| 81 | 81 | * @throws TypeError |
| 82 | 82 | */ |
| 83 | - public function addInt($int) |
|
| 83 | + public function addInt( $int ) |
|
| 84 | 84 | { |
| 85 | - ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1); |
|
| 85 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 ); |
|
| 86 | 86 | /** @var int $int */ |
| 87 | - $int = (int) $int; |
|
| 87 | + $int = (int)$int; |
|
| 88 | 88 | |
| 89 | - $int = (int) $int; |
|
| 89 | + $int = (int)$int; |
|
| 90 | 90 | |
| 91 | - $i0 = $this->limbs[0]; |
|
| 92 | - $i1 = $this->limbs[1]; |
|
| 91 | + $i0 = $this->limbs[ 0 ]; |
|
| 92 | + $i1 = $this->limbs[ 1 ]; |
|
| 93 | 93 | |
| 94 | - $r1 = $i1 + ($int & 0xffff); |
|
| 94 | + $r1 = $i1 + ( $int & 0xffff ); |
|
| 95 | 95 | $carry = $r1 >> 16; |
| 96 | 96 | |
| 97 | - $r0 = $i0 + (($int >> 16) & 0xffff) + $carry; |
|
| 97 | + $r0 = $i0 + ( ( $int >> 16 ) & 0xffff ) + $carry; |
|
| 98 | 98 | $carry = $r0 >> 16; |
| 99 | 99 | $r0 &= 0xffff; |
| 100 | 100 | $r1 &= 0xffff; |
| 101 | 101 | $return = new ParagonIE_Sodium_Core32_Int32( |
| 102 | - array($r0, $r1) |
|
| 102 | + array( $r0, $r1 ) |
|
| 103 | 103 | ); |
| 104 | 104 | $return->overflow = $carry; |
| 105 | 105 | $return->unsignedInt = $this->unsignedInt; |
@@ -110,41 +110,41 @@ discard block |
||
| 110 | 110 | * @param int $b |
| 111 | 111 | * @return int |
| 112 | 112 | */ |
| 113 | - public function compareInt($b = 0) |
|
| 113 | + public function compareInt( $b = 0 ) |
|
| 114 | 114 | { |
| 115 | 115 | $gt = 0; |
| 116 | 116 | $eq = 1; |
| 117 | 117 | |
| 118 | 118 | $i = 2; |
| 119 | 119 | $j = 0; |
| 120 | - while ($i > 0) { |
|
| 120 | + while ( $i > 0 ) { |
|
| 121 | 121 | --$i; |
| 122 | 122 | /** @var int $x1 */ |
| 123 | - $x1 = $this->limbs[$i]; |
|
| 123 | + $x1 = $this->limbs[ $i ]; |
|
| 124 | 124 | /** @var int $x2 */ |
| 125 | - $x2 = ($b >> ($j << 4)) & 0xffff; |
|
| 125 | + $x2 = ( $b >> ( $j << 4 ) ) & 0xffff; |
|
| 126 | 126 | /** @var int $gt */ |
| 127 | - $gt |= (($x2 - $x1) >> 8) & $eq; |
|
| 127 | + $gt |= ( ( $x2 - $x1 ) >> 8 ) & $eq; |
|
| 128 | 128 | /** @var int $eq */ |
| 129 | - $eq &= (($x2 ^ $x1) - 1) >> 8; |
|
| 129 | + $eq &= ( ( $x2 ^ $x1 ) - 1 ) >> 8; |
|
| 130 | 130 | } |
| 131 | - return ($gt + $gt - $eq) + 1; |
|
| 131 | + return ( $gt + $gt - $eq ) + 1; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | 135 | * @param int $m |
| 136 | 136 | * @return ParagonIE_Sodium_Core32_Int32 |
| 137 | 137 | */ |
| 138 | - public function mask($m = 0) |
|
| 138 | + public function mask( $m = 0 ) |
|
| 139 | 139 | { |
| 140 | 140 | /** @var int $hi */ |
| 141 | - $hi = ($m >> 16) & 0xffff; |
|
| 141 | + $hi = ( $m >> 16 ) & 0xffff; |
|
| 142 | 142 | /** @var int $lo */ |
| 143 | - $lo = ($m & 0xffff); |
|
| 143 | + $lo = ( $m & 0xffff ); |
|
| 144 | 144 | return new ParagonIE_Sodium_Core32_Int32( |
| 145 | 145 | array( |
| 146 | - (int) ($this->limbs[0] & $hi), |
|
| 147 | - (int) ($this->limbs[1] & $lo) |
|
| 146 | + (int)( $this->limbs[ 0 ] & $hi ), |
|
| 147 | + (int)( $this->limbs[ 1 ] & $lo ) |
|
| 148 | 148 | ), |
| 149 | 149 | $this->unsignedInt |
| 150 | 150 | ); |
@@ -156,77 +156,77 @@ discard block |
||
| 156 | 156 | * @param int $baseLog2 |
| 157 | 157 | * @return array<int, int> |
| 158 | 158 | */ |
| 159 | - public function multiplyLong(array $a, array $b, $baseLog2 = 16) |
|
| 159 | + public function multiplyLong( array $a, array $b, $baseLog2 = 16 ) |
|
| 160 | 160 | { |
| 161 | - $a_l = count($a); |
|
| 162 | - $b_l = count($b); |
|
| 161 | + $a_l = count( $a ); |
|
| 162 | + $b_l = count( $b ); |
|
| 163 | 163 | /** @var array<int, int> $r */ |
| 164 | - $r = array_fill(0, $a_l + $b_l + 1, 0); |
|
| 164 | + $r = array_fill( 0, $a_l + $b_l + 1, 0 ); |
|
| 165 | 165 | $base = 1 << $baseLog2; |
| 166 | - for ($i = 0; $i < $a_l; ++$i) { |
|
| 167 | - $a_i = $a[$i]; |
|
| 168 | - for ($j = 0; $j < $a_l; ++$j) { |
|
| 169 | - $b_j = $b[$j]; |
|
| 170 | - $product = ($a_i * $b_j) + $r[$i + $j]; |
|
| 171 | - $carry = ($product >> $baseLog2 & 0xffff); |
|
| 172 | - $r[$i + $j] = ($product - (int) ($carry * $base)) & 0xffff; |
|
| 173 | - $r[$i + $j + 1] += $carry; |
|
| 166 | + for ( $i = 0; $i < $a_l; ++$i ) { |
|
| 167 | + $a_i = $a[ $i ]; |
|
| 168 | + for ( $j = 0; $j < $a_l; ++$j ) { |
|
| 169 | + $b_j = $b[ $j ]; |
|
| 170 | + $product = ( $a_i * $b_j ) + $r[ $i + $j ]; |
|
| 171 | + $carry = ( $product >> $baseLog2 & 0xffff ); |
|
| 172 | + $r[ $i + $j ] = ( $product - (int)( $carry * $base ) ) & 0xffff; |
|
| 173 | + $r[ $i + $j + 1 ] += $carry; |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | - return array_slice($r, 0, 5); |
|
| 176 | + return array_slice( $r, 0, 5 ); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | 180 | * @param int $int |
| 181 | 181 | * @return ParagonIE_Sodium_Core32_Int32 |
| 182 | 182 | */ |
| 183 | - public function mulIntFast($int) |
|
| 183 | + public function mulIntFast( $int ) |
|
| 184 | 184 | { |
| 185 | 185 | // Handle negative numbers |
| 186 | - $aNeg = ($this->limbs[0] >> 15) & 1; |
|
| 187 | - $bNeg = ($int >> 31) & 1; |
|
| 188 | - $a = array_reverse($this->limbs); |
|
| 186 | + $aNeg = ( $this->limbs[ 0 ] >> 15 ) & 1; |
|
| 187 | + $bNeg = ( $int >> 31 ) & 1; |
|
| 188 | + $a = array_reverse( $this->limbs ); |
|
| 189 | 189 | $b = array( |
| 190 | 190 | $int & 0xffff, |
| 191 | - ($int >> 16) & 0xffff |
|
| 191 | + ( $int >> 16 ) & 0xffff |
|
| 192 | 192 | ); |
| 193 | - if ($aNeg) { |
|
| 194 | - for ($i = 0; $i < 2; ++$i) { |
|
| 195 | - $a[$i] = ($a[$i] ^ 0xffff) & 0xffff; |
|
| 193 | + if ( $aNeg ) { |
|
| 194 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 195 | + $a[ $i ] = ( $a[ $i ] ^ 0xffff ) & 0xffff; |
|
| 196 | 196 | } |
| 197 | - ++$a[0]; |
|
| 197 | + ++$a[ 0 ]; |
|
| 198 | 198 | } |
| 199 | - if ($bNeg) { |
|
| 200 | - for ($i = 0; $i < 2; ++$i) { |
|
| 201 | - $b[$i] = ($b[$i] ^ 0xffff) & 0xffff; |
|
| 199 | + if ( $bNeg ) { |
|
| 200 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 201 | + $b[ $i ] = ( $b[ $i ] ^ 0xffff ) & 0xffff; |
|
| 202 | 202 | } |
| 203 | - ++$b[0]; |
|
| 203 | + ++$b[ 0 ]; |
|
| 204 | 204 | } |
| 205 | 205 | // Multiply |
| 206 | - $res = $this->multiplyLong($a, $b); |
|
| 206 | + $res = $this->multiplyLong( $a, $b ); |
|
| 207 | 207 | |
| 208 | 208 | // Re-apply negation to results |
| 209 | - if ($aNeg !== $bNeg) { |
|
| 210 | - for ($i = 0; $i < 2; ++$i) { |
|
| 211 | - $res[$i] = (0xffff ^ $res[$i]) & 0xffff; |
|
| 209 | + if ( $aNeg !== $bNeg ) { |
|
| 210 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 211 | + $res[ $i ] = ( 0xffff ^ $res[ $i ] ) & 0xffff; |
|
| 212 | 212 | } |
| 213 | 213 | // Handle integer overflow |
| 214 | 214 | $c = 1; |
| 215 | - for ($i = 0; $i < 2; ++$i) { |
|
| 216 | - $res[$i] += $c; |
|
| 217 | - $c = $res[$i] >> 16; |
|
| 218 | - $res[$i] &= 0xffff; |
|
| 215 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 216 | + $res[ $i ] += $c; |
|
| 217 | + $c = $res[ $i ] >> 16; |
|
| 218 | + $res[ $i ] &= 0xffff; |
|
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | // Return our values |
| 223 | 223 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 224 | 224 | $return->limbs = array( |
| 225 | - $res[1] & 0xffff, |
|
| 226 | - $res[0] & 0xffff |
|
| 225 | + $res[ 1 ] & 0xffff, |
|
| 226 | + $res[ 0 ] & 0xffff |
|
| 227 | 227 | ); |
| 228 | - if (count($res) > 2) { |
|
| 229 | - $return->overflow = $res[2] & 0xffff; |
|
| 228 | + if ( count( $res ) > 2 ) { |
|
| 229 | + $return->overflow = $res[ 2 ] & 0xffff; |
|
| 230 | 230 | } |
| 231 | 231 | $return->unsignedInt = $this->unsignedInt; |
| 232 | 232 | return $return; |
@@ -236,46 +236,46 @@ discard block |
||
| 236 | 236 | * @param ParagonIE_Sodium_Core32_Int32 $right |
| 237 | 237 | * @return ParagonIE_Sodium_Core32_Int32 |
| 238 | 238 | */ |
| 239 | - public function mulInt32Fast(ParagonIE_Sodium_Core32_Int32 $right) |
|
| 239 | + public function mulInt32Fast( ParagonIE_Sodium_Core32_Int32 $right ) |
|
| 240 | 240 | { |
| 241 | - $aNeg = ($this->limbs[0] >> 15) & 1; |
|
| 242 | - $bNeg = ($right->limbs[0] >> 15) & 1; |
|
| 243 | - |
|
| 244 | - $a = array_reverse($this->limbs); |
|
| 245 | - $b = array_reverse($right->limbs); |
|
| 246 | - if ($aNeg) { |
|
| 247 | - for ($i = 0; $i < 2; ++$i) { |
|
| 248 | - $a[$i] = ($a[$i] ^ 0xffff) & 0xffff; |
|
| 241 | + $aNeg = ( $this->limbs[ 0 ] >> 15 ) & 1; |
|
| 242 | + $bNeg = ( $right->limbs[ 0 ] >> 15 ) & 1; |
|
| 243 | + |
|
| 244 | + $a = array_reverse( $this->limbs ); |
|
| 245 | + $b = array_reverse( $right->limbs ); |
|
| 246 | + if ( $aNeg ) { |
|
| 247 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 248 | + $a[ $i ] = ( $a[ $i ] ^ 0xffff ) & 0xffff; |
|
| 249 | 249 | } |
| 250 | - ++$a[0]; |
|
| 250 | + ++$a[ 0 ]; |
|
| 251 | 251 | } |
| 252 | - if ($bNeg) { |
|
| 253 | - for ($i = 0; $i < 2; ++$i) { |
|
| 254 | - $b[$i] = ($b[$i] ^ 0xffff) & 0xffff; |
|
| 252 | + if ( $bNeg ) { |
|
| 253 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 254 | + $b[ $i ] = ( $b[ $i ] ^ 0xffff ) & 0xffff; |
|
| 255 | 255 | } |
| 256 | - ++$b[0]; |
|
| 256 | + ++$b[ 0 ]; |
|
| 257 | 257 | } |
| 258 | - $res = $this->multiplyLong($a, $b); |
|
| 259 | - if ($aNeg !== $bNeg) { |
|
| 260 | - if ($aNeg !== $bNeg) { |
|
| 261 | - for ($i = 0; $i < 2; ++$i) { |
|
| 262 | - $res[$i] = ($res[$i] ^ 0xffff) & 0xffff; |
|
| 258 | + $res = $this->multiplyLong( $a, $b ); |
|
| 259 | + if ( $aNeg !== $bNeg ) { |
|
| 260 | + if ( $aNeg !== $bNeg ) { |
|
| 261 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 262 | + $res[ $i ] = ( $res[ $i ] ^ 0xffff ) & 0xffff; |
|
| 263 | 263 | } |
| 264 | 264 | $c = 1; |
| 265 | - for ($i = 0; $i < 2; ++$i) { |
|
| 266 | - $res[$i] += $c; |
|
| 267 | - $c = $res[$i] >> 16; |
|
| 268 | - $res[$i] &= 0xffff; |
|
| 265 | + for ( $i = 0; $i < 2; ++$i ) { |
|
| 266 | + $res[ $i ] += $c; |
|
| 267 | + $c = $res[ $i ] >> 16; |
|
| 268 | + $res[ $i ] &= 0xffff; |
|
| 269 | 269 | } |
| 270 | 270 | } |
| 271 | 271 | } |
| 272 | 272 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 273 | 273 | $return->limbs = array( |
| 274 | - $res[1] & 0xffff, |
|
| 275 | - $res[0] & 0xffff |
|
| 274 | + $res[ 1 ] & 0xffff, |
|
| 275 | + $res[ 0 ] & 0xffff |
|
| 276 | 276 | ); |
| 277 | - if (count($res) > 2) { |
|
| 278 | - $return->overflow = $res[2]; |
|
| 277 | + if ( count( $res ) > 2 ) { |
|
| 278 | + $return->overflow = $res[ 2 ]; |
|
| 279 | 279 | } |
| 280 | 280 | return $return; |
| 281 | 281 | } |
@@ -287,19 +287,19 @@ discard block |
||
| 287 | 287 | * @throws SodiumException |
| 288 | 288 | * @throws TypeError |
| 289 | 289 | */ |
| 290 | - public function mulInt($int = 0, $size = 0) |
|
| 290 | + public function mulInt( $int = 0, $size = 0 ) |
|
| 291 | 291 | { |
| 292 | - ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1); |
|
| 293 | - ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2); |
|
| 294 | - if (ParagonIE_Sodium_Compat::$fastMult) { |
|
| 295 | - return $this->mulIntFast((int) $int); |
|
| 292 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 ); |
|
| 293 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $size, 'int', 2 ); |
|
| 294 | + if ( ParagonIE_Sodium_Compat::$fastMult ) { |
|
| 295 | + return $this->mulIntFast( (int)$int ); |
|
| 296 | 296 | } |
| 297 | 297 | /** @var int $int */ |
| 298 | - $int = (int) $int; |
|
| 298 | + $int = (int)$int; |
|
| 299 | 299 | /** @var int $size */ |
| 300 | - $size = (int) $size; |
|
| 300 | + $size = (int)$size; |
|
| 301 | 301 | |
| 302 | - if (!$size) { |
|
| 302 | + if ( ! $size ) { |
|
| 303 | 303 | $size = 31; |
| 304 | 304 | } |
| 305 | 305 | /** @var int $size */ |
@@ -311,13 +311,13 @@ discard block |
||
| 311 | 311 | // Initialize: |
| 312 | 312 | $ret0 = 0; |
| 313 | 313 | $ret1 = 0; |
| 314 | - $a0 = $a->limbs[0]; |
|
| 315 | - $a1 = $a->limbs[1]; |
|
| 314 | + $a0 = $a->limbs[ 0 ]; |
|
| 315 | + $a1 = $a->limbs[ 1 ]; |
|
| 316 | 316 | |
| 317 | 317 | /** @var int $size */ |
| 318 | 318 | /** @var int $i */ |
| 319 | - for ($i = $size; $i >= 0; --$i) { |
|
| 320 | - $m = (int) (-($int & 1)); |
|
| 319 | + for ( $i = $size; $i >= 0; --$i ) { |
|
| 320 | + $m = (int)(-( $int & 1 )); |
|
| 321 | 321 | $x0 = $a0 & $m; |
| 322 | 322 | $x1 = $a1 & $m; |
| 323 | 323 | |
@@ -329,15 +329,15 @@ discard block |
||
| 329 | 329 | $ret0 &= 0xffff; |
| 330 | 330 | $ret1 &= 0xffff; |
| 331 | 331 | |
| 332 | - $a1 = ($a1 << 1); |
|
| 332 | + $a1 = ( $a1 << 1 ); |
|
| 333 | 333 | $x1 = $a1 >> 16; |
| 334 | - $a0 = ($a0 << 1) | $x1; |
|
| 334 | + $a0 = ( $a0 << 1 ) | $x1; |
|
| 335 | 335 | $a0 &= 0xffff; |
| 336 | 336 | $a1 &= 0xffff; |
| 337 | 337 | $int >>= 1; |
| 338 | 338 | } |
| 339 | - $return->limbs[0] = $ret0; |
|
| 340 | - $return->limbs[1] = $ret1; |
|
| 339 | + $return->limbs[ 0 ] = $ret0; |
|
| 340 | + $return->limbs[ 1 ] = $ret1; |
|
| 341 | 341 | return $return; |
| 342 | 342 | } |
| 343 | 343 | |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | * @throws SodiumException |
| 349 | 349 | * @throws TypeError |
| 350 | 350 | */ |
| 351 | - public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0) |
|
| 351 | + public function mulInt32( ParagonIE_Sodium_Core32_Int32 $int, $size = 0 ) |
|
| 352 | 352 | { |
| 353 | - ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2); |
|
| 354 | - if (ParagonIE_Sodium_Compat::$fastMult) { |
|
| 355 | - return $this->mulInt32Fast($int); |
|
| 353 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $size, 'int', 2 ); |
|
| 354 | + if ( ParagonIE_Sodium_Compat::$fastMult ) { |
|
| 355 | + return $this->mulInt32Fast( $int ); |
|
| 356 | 356 | } |
| 357 | - if (!$size) { |
|
| 357 | + if ( ! $size ) { |
|
| 358 | 358 | $size = 31; |
| 359 | 359 | } |
| 360 | 360 | /** @var int $size */ |
@@ -367,15 +367,15 @@ discard block |
||
| 367 | 367 | // Initialize: |
| 368 | 368 | $ret0 = 0; |
| 369 | 369 | $ret1 = 0; |
| 370 | - $a0 = $a->limbs[0]; |
|
| 371 | - $a1 = $a->limbs[1]; |
|
| 372 | - $b0 = $b->limbs[0]; |
|
| 373 | - $b1 = $b->limbs[1]; |
|
| 370 | + $a0 = $a->limbs[ 0 ]; |
|
| 371 | + $a1 = $a->limbs[ 1 ]; |
|
| 372 | + $b0 = $b->limbs[ 0 ]; |
|
| 373 | + $b1 = $b->limbs[ 1 ]; |
|
| 374 | 374 | |
| 375 | 375 | /** @var int $size */ |
| 376 | 376 | /** @var int $i */ |
| 377 | - for ($i = $size; $i >= 0; --$i) { |
|
| 378 | - $m = (int) (-($b1 & 1)); |
|
| 377 | + for ( $i = $size; $i >= 0; --$i ) { |
|
| 378 | + $m = (int)(-( $b1 & 1 )); |
|
| 379 | 379 | $x0 = $a0 & $m; |
| 380 | 380 | $x1 = $a1 & $m; |
| 381 | 381 | |
@@ -387,22 +387,22 @@ discard block |
||
| 387 | 387 | $ret0 &= 0xffff; |
| 388 | 388 | $ret1 &= 0xffff; |
| 389 | 389 | |
| 390 | - $a1 = ($a1 << 1); |
|
| 390 | + $a1 = ( $a1 << 1 ); |
|
| 391 | 391 | $x1 = $a1 >> 16; |
| 392 | - $a0 = ($a0 << 1) | $x1; |
|
| 392 | + $a0 = ( $a0 << 1 ) | $x1; |
|
| 393 | 393 | $a0 &= 0xffff; |
| 394 | 394 | $a1 &= 0xffff; |
| 395 | 395 | |
| 396 | - $x0 = ($b0 & 1) << 16; |
|
| 397 | - $b0 = ($b0 >> 1); |
|
| 398 | - $b1 = (($b1 | $x0) >> 1); |
|
| 396 | + $x0 = ( $b0 & 1 ) << 16; |
|
| 397 | + $b0 = ( $b0 >> 1 ); |
|
| 398 | + $b1 = ( ( $b1 | $x0 ) >> 1 ); |
|
| 399 | 399 | |
| 400 | 400 | $b0 &= 0xffff; |
| 401 | 401 | $b1 &= 0xffff; |
| 402 | 402 | |
| 403 | 403 | } |
| 404 | - $return->limbs[0] = $ret0; |
|
| 405 | - $return->limbs[1] = $ret1; |
|
| 404 | + $return->limbs[ 0 ] = $ret0; |
|
| 405 | + $return->limbs[ 1 ] = $ret1; |
|
| 406 | 406 | |
| 407 | 407 | return $return; |
| 408 | 408 | } |
@@ -413,13 +413,13 @@ discard block |
||
| 413 | 413 | * @param ParagonIE_Sodium_Core32_Int32 $b |
| 414 | 414 | * @return ParagonIE_Sodium_Core32_Int32 |
| 415 | 415 | */ |
| 416 | - public function orInt32(ParagonIE_Sodium_Core32_Int32 $b) |
|
| 416 | + public function orInt32( ParagonIE_Sodium_Core32_Int32 $b ) |
|
| 417 | 417 | { |
| 418 | 418 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 419 | 419 | $return->unsignedInt = $this->unsignedInt; |
| 420 | 420 | $return->limbs = array( |
| 421 | - (int) ($this->limbs[0] | $b->limbs[0]), |
|
| 422 | - (int) ($this->limbs[1] | $b->limbs[1]) |
|
| 421 | + (int)( $this->limbs[ 0 ] | $b->limbs[ 0 ] ), |
|
| 422 | + (int)( $this->limbs[ 1 ] | $b->limbs[ 1 ] ) |
|
| 423 | 423 | ); |
| 424 | 424 | /** @var int overflow */ |
| 425 | 425 | $return->overflow = $this->overflow | $b->overflow; |
@@ -430,18 +430,18 @@ discard block |
||
| 430 | 430 | * @param int $b |
| 431 | 431 | * @return bool |
| 432 | 432 | */ |
| 433 | - public function isGreaterThan($b = 0) |
|
| 433 | + public function isGreaterThan( $b = 0 ) |
|
| 434 | 434 | { |
| 435 | - return $this->compareInt($b) > 0; |
|
| 435 | + return $this->compareInt( $b ) > 0; |
|
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | /** |
| 439 | 439 | * @param int $b |
| 440 | 440 | * @return bool |
| 441 | 441 | */ |
| 442 | - public function isLessThanInt($b = 0) |
|
| 442 | + public function isLessThanInt( $b = 0 ) |
|
| 443 | 443 | { |
| 444 | - return $this->compareInt($b) < 0; |
|
| 444 | + return $this->compareInt( $b ) < 0; |
|
| 445 | 445 | } |
| 446 | 446 | |
| 447 | 447 | /** |
@@ -451,43 +451,43 @@ discard block |
||
| 451 | 451 | * @throws TypeError |
| 452 | 452 | * @psalm-suppress MixedArrayAccess |
| 453 | 453 | */ |
| 454 | - public function rotateLeft($c = 0) |
|
| 454 | + public function rotateLeft( $c = 0 ) |
|
| 455 | 455 | { |
| 456 | - ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1); |
|
| 456 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 ); |
|
| 457 | 457 | /** @var int $c */ |
| 458 | - $c = (int) $c; |
|
| 458 | + $c = (int)$c; |
|
| 459 | 459 | |
| 460 | 460 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 461 | 461 | $return->unsignedInt = $this->unsignedInt; |
| 462 | 462 | $c &= 31; |
| 463 | - if ($c === 0) { |
|
| 463 | + if ( $c === 0 ) { |
|
| 464 | 464 | // NOP, but we want a copy. |
| 465 | 465 | $return->limbs = $this->limbs; |
| 466 | 466 | } else { |
| 467 | 467 | /** @var int $c */ |
| 468 | 468 | |
| 469 | 469 | /** @var int $idx_shift */ |
| 470 | - $idx_shift = ($c >> 4) & 1; |
|
| 470 | + $idx_shift = ( $c >> 4 ) & 1; |
|
| 471 | 471 | |
| 472 | 472 | /** @var int $sub_shift */ |
| 473 | 473 | $sub_shift = $c & 15; |
| 474 | 474 | |
| 475 | 475 | /** @var array<int, int> $limbs */ |
| 476 | - $limbs =& $return->limbs; |
|
| 476 | + $limbs = & $return->limbs; |
|
| 477 | 477 | |
| 478 | 478 | /** @var array<int, int> $myLimbs */ |
| 479 | - $myLimbs =& $this->limbs; |
|
| 479 | + $myLimbs = & $this->limbs; |
|
| 480 | 480 | |
| 481 | - for ($i = 1; $i >= 0; --$i) { |
|
| 481 | + for ( $i = 1; $i >= 0; --$i ) { |
|
| 482 | 482 | /** @var int $j */ |
| 483 | - $j = ($i + $idx_shift) & 1; |
|
| 483 | + $j = ( $i + $idx_shift ) & 1; |
|
| 484 | 484 | /** @var int $k */ |
| 485 | - $k = ($i + $idx_shift + 1) & 1; |
|
| 486 | - $limbs[$i] = (int) ( |
|
| 485 | + $k = ( $i + $idx_shift + 1 ) & 1; |
|
| 486 | + $limbs[ $i ] = (int)( |
|
| 487 | 487 | ( |
| 488 | - ((int) ($myLimbs[$j]) << $sub_shift) |
|
| 488 | + ( (int)( $myLimbs[ $j ] ) << $sub_shift ) |
|
| 489 | 489 | | |
| 490 | - ((int) ($myLimbs[$k]) >> (16 - $sub_shift)) |
|
| 490 | + ( (int)( $myLimbs[ $k ] ) >> ( 16 - $sub_shift ) ) |
|
| 491 | 491 | ) & 0xffff |
| 492 | 492 | ); |
| 493 | 493 | } |
@@ -504,44 +504,44 @@ discard block |
||
| 504 | 504 | * @throws TypeError |
| 505 | 505 | * @psalm-suppress MixedArrayAccess |
| 506 | 506 | */ |
| 507 | - public function rotateRight($c = 0) |
|
| 507 | + public function rotateRight( $c = 0 ) |
|
| 508 | 508 | { |
| 509 | - ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1); |
|
| 509 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 ); |
|
| 510 | 510 | /** @var int $c */ |
| 511 | - $c = (int) $c; |
|
| 511 | + $c = (int)$c; |
|
| 512 | 512 | |
| 513 | 513 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 514 | 514 | $return->unsignedInt = $this->unsignedInt; |
| 515 | 515 | $c &= 31; |
| 516 | 516 | /** @var int $c */ |
| 517 | - if ($c === 0) { |
|
| 517 | + if ( $c === 0 ) { |
|
| 518 | 518 | // NOP, but we want a copy. |
| 519 | 519 | $return->limbs = $this->limbs; |
| 520 | 520 | } else { |
| 521 | 521 | /** @var int $c */ |
| 522 | 522 | |
| 523 | 523 | /** @var int $idx_shift */ |
| 524 | - $idx_shift = ($c >> 4) & 1; |
|
| 524 | + $idx_shift = ( $c >> 4 ) & 1; |
|
| 525 | 525 | |
| 526 | 526 | /** @var int $sub_shift */ |
| 527 | 527 | $sub_shift = $c & 15; |
| 528 | 528 | |
| 529 | 529 | /** @var array<int, int> $limbs */ |
| 530 | - $limbs =& $return->limbs; |
|
| 530 | + $limbs = & $return->limbs; |
|
| 531 | 531 | |
| 532 | 532 | /** @var array<int, int> $myLimbs */ |
| 533 | - $myLimbs =& $this->limbs; |
|
| 533 | + $myLimbs = & $this->limbs; |
|
| 534 | 534 | |
| 535 | - for ($i = 1; $i >= 0; --$i) { |
|
| 535 | + for ( $i = 1; $i >= 0; --$i ) { |
|
| 536 | 536 | /** @var int $j */ |
| 537 | - $j = ($i - $idx_shift) & 1; |
|
| 537 | + $j = ( $i - $idx_shift ) & 1; |
|
| 538 | 538 | /** @var int $k */ |
| 539 | - $k = ($i - $idx_shift - 1) & 1; |
|
| 540 | - $limbs[$i] = (int) ( |
|
| 539 | + $k = ( $i - $idx_shift - 1 ) & 1; |
|
| 540 | + $limbs[ $i ] = (int)( |
|
| 541 | 541 | ( |
| 542 | - ((int) ($myLimbs[$j]) >> (int) ($sub_shift)) |
|
| 542 | + ( (int)( $myLimbs[ $j ] ) >> (int)( $sub_shift ) ) |
|
| 543 | 543 | | |
| 544 | - ((int) ($myLimbs[$k]) << (16 - (int) ($sub_shift))) |
|
| 544 | + ( (int)( $myLimbs[ $k ] ) << ( 16 - (int)( $sub_shift ) ) ) |
|
| 545 | 545 | ) & 0xffff |
| 546 | 546 | ); |
| 547 | 547 | } |
@@ -553,9 +553,9 @@ discard block |
||
| 553 | 553 | * @param bool $bool |
| 554 | 554 | * @return self |
| 555 | 555 | */ |
| 556 | - public function setUnsignedInt($bool = false) |
|
| 556 | + public function setUnsignedInt( $bool = false ) |
|
| 557 | 557 | { |
| 558 | - $this->unsignedInt = !empty($bool); |
|
| 558 | + $this->unsignedInt = ! empty( $bool ); |
|
| 559 | 559 | return $this; |
| 560 | 560 | } |
| 561 | 561 | |
@@ -565,32 +565,32 @@ discard block |
||
| 565 | 565 | * @throws SodiumException |
| 566 | 566 | * @throws TypeError |
| 567 | 567 | */ |
| 568 | - public function shiftLeft($c = 0) |
|
| 568 | + public function shiftLeft( $c = 0 ) |
|
| 569 | 569 | { |
| 570 | - ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1); |
|
| 570 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 ); |
|
| 571 | 571 | /** @var int $c */ |
| 572 | - $c = (int) $c; |
|
| 572 | + $c = (int)$c; |
|
| 573 | 573 | |
| 574 | 574 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 575 | 575 | $return->unsignedInt = $this->unsignedInt; |
| 576 | 576 | $c &= 63; |
| 577 | 577 | /** @var int $c */ |
| 578 | - if ($c === 0) { |
|
| 578 | + if ( $c === 0 ) { |
|
| 579 | 579 | $return->limbs = $this->limbs; |
| 580 | - } elseif ($c < 0) { |
|
| 580 | + } elseif ( $c < 0 ) { |
|
| 581 | 581 | /** @var int $c */ |
| 582 | 582 | return $this->shiftRight(-$c); |
| 583 | 583 | } else { |
| 584 | 584 | /** @var int $c */ |
| 585 | 585 | /** @var int $tmp */ |
| 586 | - $tmp = $this->limbs[1] << $c; |
|
| 587 | - $return->limbs[1] = (int)($tmp & 0xffff); |
|
| 586 | + $tmp = $this->limbs[ 1 ] << $c; |
|
| 587 | + $return->limbs[ 1 ] = (int)( $tmp & 0xffff ); |
|
| 588 | 588 | /** @var int $carry */ |
| 589 | 589 | $carry = $tmp >> 16; |
| 590 | 590 | |
| 591 | 591 | /** @var int $tmp */ |
| 592 | - $tmp = ($this->limbs[0] << $c) | ($carry & 0xffff); |
|
| 593 | - $return->limbs[0] = (int) ($tmp & 0xffff); |
|
| 592 | + $tmp = ( $this->limbs[ 0 ] << $c ) | ( $carry & 0xffff ); |
|
| 593 | + $return->limbs[ 0 ] = (int)( $tmp & 0xffff ); |
|
| 594 | 594 | } |
| 595 | 595 | return $return; |
| 596 | 596 | } |
@@ -603,39 +603,39 @@ discard block |
||
| 603 | 603 | * @psalm-suppress MixedAssignment |
| 604 | 604 | * @psalm-suppress MixedOperand |
| 605 | 605 | */ |
| 606 | - public function shiftRight($c = 0) |
|
| 606 | + public function shiftRight( $c = 0 ) |
|
| 607 | 607 | { |
| 608 | - ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1); |
|
| 608 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $c, 'int', 1 ); |
|
| 609 | 609 | /** @var int $c */ |
| 610 | - $c = (int) $c; |
|
| 610 | + $c = (int)$c; |
|
| 611 | 611 | |
| 612 | 612 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 613 | 613 | $return->unsignedInt = $this->unsignedInt; |
| 614 | 614 | $c &= 63; |
| 615 | 615 | /** @var int $c */ |
| 616 | - if ($c >= 16) { |
|
| 616 | + if ( $c >= 16 ) { |
|
| 617 | 617 | $return->limbs = array( |
| 618 | - (int) ($this->overflow & 0xffff), |
|
| 619 | - (int) ($this->limbs[0]) |
|
| 618 | + (int)( $this->overflow & 0xffff ), |
|
| 619 | + (int)( $this->limbs[ 0 ] ) |
|
| 620 | 620 | ); |
| 621 | 621 | $return->overflow = $this->overflow >> 16; |
| 622 | - return $return->shiftRight($c & 15); |
|
| 622 | + return $return->shiftRight( $c & 15 ); |
|
| 623 | 623 | } |
| 624 | - if ($c === 0) { |
|
| 624 | + if ( $c === 0 ) { |
|
| 625 | 625 | $return->limbs = $this->limbs; |
| 626 | - } elseif ($c < 0) { |
|
| 626 | + } elseif ( $c < 0 ) { |
|
| 627 | 627 | /** @var int $c */ |
| 628 | 628 | return $this->shiftLeft(-$c); |
| 629 | 629 | } else { |
| 630 | - if (!is_int($c)) { |
|
| 630 | + if ( ! is_int( $c ) ) { |
|
| 631 | 631 | throw new TypeError(); |
| 632 | 632 | } |
| 633 | 633 | /** @var int $c */ |
| 634 | 634 | // $return->limbs[0] = (int) (($this->limbs[0] >> $c) & 0xffff); |
| 635 | - $carryLeft = (int) ($this->overflow & ((1 << ($c + 1)) - 1)); |
|
| 636 | - $return->limbs[0] = (int) ((($this->limbs[0] >> $c) | ($carryLeft << (16 - $c))) & 0xffff); |
|
| 637 | - $carryRight = (int) ($this->limbs[0] & ((1 << ($c + 1)) - 1)); |
|
| 638 | - $return->limbs[1] = (int) ((($this->limbs[1] >> $c) | ($carryRight << (16 - $c))) & 0xffff); |
|
| 635 | + $carryLeft = (int)( $this->overflow & ( ( 1 << ( $c + 1 ) ) - 1 ) ); |
|
| 636 | + $return->limbs[ 0 ] = (int)( ( ( $this->limbs[ 0 ] >> $c ) | ( $carryLeft << ( 16 - $c ) ) ) & 0xffff ); |
|
| 637 | + $carryRight = (int)( $this->limbs[ 0 ] & ( ( 1 << ( $c + 1 ) ) - 1 ) ); |
|
| 638 | + $return->limbs[ 1 ] = (int)( ( ( $this->limbs[ 1 ] >> $c ) | ( $carryRight << ( 16 - $c ) ) ) & 0xffff ); |
|
| 639 | 639 | $return->overflow >>= $c; |
| 640 | 640 | } |
| 641 | 641 | return $return; |
@@ -649,24 +649,24 @@ discard block |
||
| 649 | 649 | * @throws SodiumException |
| 650 | 650 | * @throws TypeError |
| 651 | 651 | */ |
| 652 | - public function subInt($int) |
|
| 652 | + public function subInt( $int ) |
|
| 653 | 653 | { |
| 654 | - ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1); |
|
| 654 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $int, 'int', 1 ); |
|
| 655 | 655 | /** @var int $int */ |
| 656 | - $int = (int) $int; |
|
| 656 | + $int = (int)$int; |
|
| 657 | 657 | |
| 658 | 658 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 659 | 659 | $return->unsignedInt = $this->unsignedInt; |
| 660 | 660 | |
| 661 | 661 | /** @var int $tmp */ |
| 662 | - $tmp = $this->limbs[1] - ($int & 0xffff); |
|
| 662 | + $tmp = $this->limbs[ 1 ] - ( $int & 0xffff ); |
|
| 663 | 663 | /** @var int $carry */ |
| 664 | 664 | $carry = $tmp >> 16; |
| 665 | - $return->limbs[1] = (int) ($tmp & 0xffff); |
|
| 665 | + $return->limbs[ 1 ] = (int)( $tmp & 0xffff ); |
|
| 666 | 666 | |
| 667 | 667 | /** @var int $tmp */ |
| 668 | - $tmp = $this->limbs[0] - (($int >> 16) & 0xffff) + $carry; |
|
| 669 | - $return->limbs[0] = (int) ($tmp & 0xffff); |
|
| 668 | + $tmp = $this->limbs[ 0 ] - ( ( $int >> 16 ) & 0xffff ) + $carry; |
|
| 669 | + $return->limbs[ 0 ] = (int)( $tmp & 0xffff ); |
|
| 670 | 670 | return $return; |
| 671 | 671 | } |
| 672 | 672 | |
@@ -676,20 +676,20 @@ discard block |
||
| 676 | 676 | * @param ParagonIE_Sodium_Core32_Int32 $b |
| 677 | 677 | * @return ParagonIE_Sodium_Core32_Int32 |
| 678 | 678 | */ |
| 679 | - public function subInt32(ParagonIE_Sodium_Core32_Int32 $b) |
|
| 679 | + public function subInt32( ParagonIE_Sodium_Core32_Int32 $b ) |
|
| 680 | 680 | { |
| 681 | 681 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 682 | 682 | $return->unsignedInt = $this->unsignedInt; |
| 683 | 683 | |
| 684 | 684 | /** @var int $tmp */ |
| 685 | - $tmp = $this->limbs[1] - ($b->limbs[1] & 0xffff); |
|
| 685 | + $tmp = $this->limbs[ 1 ] - ( $b->limbs[ 1 ] & 0xffff ); |
|
| 686 | 686 | /** @var int $carry */ |
| 687 | 687 | $carry = $tmp >> 16; |
| 688 | - $return->limbs[1] = (int) ($tmp & 0xffff); |
|
| 688 | + $return->limbs[ 1 ] = (int)( $tmp & 0xffff ); |
|
| 689 | 689 | |
| 690 | 690 | /** @var int $tmp */ |
| 691 | - $tmp = $this->limbs[0] - ($b->limbs[0] & 0xffff) + $carry; |
|
| 692 | - $return->limbs[0] = (int) ($tmp & 0xffff); |
|
| 691 | + $tmp = $this->limbs[ 0 ] - ( $b->limbs[ 0 ] & 0xffff ) + $carry; |
|
| 692 | + $return->limbs[ 0 ] = (int)( $tmp & 0xffff ); |
|
| 693 | 693 | return $return; |
| 694 | 694 | } |
| 695 | 695 | |
@@ -699,13 +699,13 @@ discard block |
||
| 699 | 699 | * @param ParagonIE_Sodium_Core32_Int32 $b |
| 700 | 700 | * @return ParagonIE_Sodium_Core32_Int32 |
| 701 | 701 | */ |
| 702 | - public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b) |
|
| 702 | + public function xorInt32( ParagonIE_Sodium_Core32_Int32 $b ) |
|
| 703 | 703 | { |
| 704 | 704 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 705 | 705 | $return->unsignedInt = $this->unsignedInt; |
| 706 | 706 | $return->limbs = array( |
| 707 | - (int) ($this->limbs[0] ^ $b->limbs[0]), |
|
| 708 | - (int) ($this->limbs[1] ^ $b->limbs[1]) |
|
| 707 | + (int)( $this->limbs[ 0 ] ^ $b->limbs[ 0 ] ), |
|
| 708 | + (int)( $this->limbs[ 1 ] ^ $b->limbs[ 1 ] ) |
|
| 709 | 709 | ); |
| 710 | 710 | return $return; |
| 711 | 711 | } |
@@ -716,16 +716,16 @@ discard block |
||
| 716 | 716 | * @throws SodiumException |
| 717 | 717 | * @throws TypeError |
| 718 | 718 | */ |
| 719 | - public static function fromInt($signed) |
|
| 719 | + public static function fromInt( $signed ) |
|
| 720 | 720 | { |
| 721 | - ParagonIE_Sodium_Core32_Util::declareScalarType($signed, 'int', 1);; |
|
| 721 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $signed, 'int', 1 ); ; |
|
| 722 | 722 | /** @var int $signed */ |
| 723 | - $signed = (int) $signed; |
|
| 723 | + $signed = (int)$signed; |
|
| 724 | 724 | |
| 725 | 725 | return new ParagonIE_Sodium_Core32_Int32( |
| 726 | 726 | array( |
| 727 | - (int) (($signed >> 16) & 0xffff), |
|
| 728 | - (int) ($signed & 0xffff) |
|
| 727 | + (int)( ( $signed >> 16 ) & 0xffff ), |
|
| 728 | + (int)( $signed & 0xffff ) |
|
| 729 | 729 | ) |
| 730 | 730 | ); |
| 731 | 731 | } |
@@ -736,21 +736,21 @@ discard block |
||
| 736 | 736 | * @throws SodiumException |
| 737 | 737 | * @throws TypeError |
| 738 | 738 | */ |
| 739 | - public static function fromString($string) |
|
| 739 | + public static function fromString( $string ) |
|
| 740 | 740 | { |
| 741 | - ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1); |
|
| 742 | - $string = (string) $string; |
|
| 743 | - if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) { |
|
| 741 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $string, 'string', 1 ); |
|
| 742 | + $string = (string)$string; |
|
| 743 | + if ( ParagonIE_Sodium_Core32_Util::strlen( $string ) !== 4 ) { |
|
| 744 | 744 | throw new RangeException( |
| 745 | - 'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.' |
|
| 745 | + 'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen( $string ) . ' given.' |
|
| 746 | 746 | ); |
| 747 | 747 | } |
| 748 | 748 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 749 | 749 | |
| 750 | - $return->limbs[0] = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8); |
|
| 751 | - $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff); |
|
| 752 | - $return->limbs[1] = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8); |
|
| 753 | - $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff); |
|
| 750 | + $return->limbs[ 0 ] = (int)( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 0 ] ) & 0xff ) << 8 ); |
|
| 751 | + $return->limbs[ 0 ] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 1 ] ) & 0xff ); |
|
| 752 | + $return->limbs[ 1 ] = (int)( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 2 ] ) & 0xff ) << 8 ); |
|
| 753 | + $return->limbs[ 1 ] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 3 ] ) & 0xff ); |
|
| 754 | 754 | return $return; |
| 755 | 755 | } |
| 756 | 756 | |
@@ -760,21 +760,21 @@ discard block |
||
| 760 | 760 | * @throws SodiumException |
| 761 | 761 | * @throws TypeError |
| 762 | 762 | */ |
| 763 | - public static function fromReverseString($string) |
|
| 763 | + public static function fromReverseString( $string ) |
|
| 764 | 764 | { |
| 765 | - ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1); |
|
| 766 | - $string = (string) $string; |
|
| 767 | - if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) { |
|
| 765 | + ParagonIE_Sodium_Core32_Util::declareScalarType( $string, 'string', 1 ); |
|
| 766 | + $string = (string)$string; |
|
| 767 | + if ( ParagonIE_Sodium_Core32_Util::strlen( $string ) !== 4 ) { |
|
| 768 | 768 | throw new RangeException( |
| 769 | - 'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.' |
|
| 769 | + 'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen( $string ) . ' given.' |
|
| 770 | 770 | ); |
| 771 | 771 | } |
| 772 | 772 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 773 | 773 | |
| 774 | - $return->limbs[0] = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8); |
|
| 775 | - $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff); |
|
| 776 | - $return->limbs[1] = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8); |
|
| 777 | - $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff); |
|
| 774 | + $return->limbs[ 0 ] = (int)( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 3 ] ) & 0xff ) << 8 ); |
|
| 775 | + $return->limbs[ 0 ] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 2 ] ) & 0xff ); |
|
| 776 | + $return->limbs[ 1 ] = (int)( ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 1 ] ) & 0xff ) << 8 ); |
|
| 777 | + $return->limbs[ 1 ] |= ( ParagonIE_Sodium_Core32_Util::chrToInt( $string[ 0 ] ) & 0xff ); |
|
| 778 | 778 | return $return; |
| 779 | 779 | } |
| 780 | 780 | |
@@ -783,7 +783,7 @@ discard block |
||
| 783 | 783 | */ |
| 784 | 784 | public function toArray() |
| 785 | 785 | { |
| 786 | - return array((int) ($this->limbs[0] << 16 | $this->limbs[1])); |
|
| 786 | + return array( (int)( $this->limbs[ 0 ] << 16 | $this->limbs[ 1 ] ) ); |
|
| 787 | 787 | } |
| 788 | 788 | |
| 789 | 789 | /** |
@@ -793,10 +793,10 @@ discard block |
||
| 793 | 793 | public function toString() |
| 794 | 794 | { |
| 795 | 795 | return |
| 796 | - ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) . |
|
| 797 | - ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) . |
|
| 798 | - ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) . |
|
| 799 | - ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff); |
|
| 796 | + ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[ 0 ] >> 8 ) & 0xff ) . |
|
| 797 | + ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[ 0 ] & 0xff ) . |
|
| 798 | + ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[ 1 ] >> 8 ) & 0xff ) . |
|
| 799 | + ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[ 1 ] & 0xff ); |
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | 802 | /** |
@@ -804,10 +804,10 @@ discard block |
||
| 804 | 804 | */ |
| 805 | 805 | public function toInt() |
| 806 | 806 | { |
| 807 | - return (int) ( |
|
| 808 | - (($this->limbs[0] & 0xffff) << 16) |
|
| 807 | + return (int)( |
|
| 808 | + ( ( $this->limbs[ 0 ] & 0xffff ) << 16 ) |
|
| 809 | 809 | | |
| 810 | - ($this->limbs[1] & 0xffff) |
|
| 810 | + ( $this->limbs[ 1 ] & 0xffff ) |
|
| 811 | 811 | ); |
| 812 | 812 | } |
| 813 | 813 | |
@@ -817,10 +817,10 @@ discard block |
||
| 817 | 817 | public function toInt32() |
| 818 | 818 | { |
| 819 | 819 | $return = new ParagonIE_Sodium_Core32_Int32(); |
| 820 | - $return->limbs[0] = (int) ($this->limbs[0] & 0xffff); |
|
| 821 | - $return->limbs[1] = (int) ($this->limbs[1] & 0xffff); |
|
| 820 | + $return->limbs[ 0 ] = (int)( $this->limbs[ 0 ] & 0xffff ); |
|
| 821 | + $return->limbs[ 1 ] = (int)( $this->limbs[ 1 ] & 0xffff ); |
|
| 822 | 822 | $return->unsignedInt = $this->unsignedInt; |
| 823 | - $return->overflow = (int) ($this->overflow & 0x7fffffff); |
|
| 823 | + $return->overflow = (int)( $this->overflow & 0x7fffffff ); |
|
| 824 | 824 | return $return; |
| 825 | 825 | } |
| 826 | 826 | |
@@ -831,16 +831,16 @@ discard block |
||
| 831 | 831 | { |
| 832 | 832 | $return = new ParagonIE_Sodium_Core32_Int64(); |
| 833 | 833 | $return->unsignedInt = $this->unsignedInt; |
| 834 | - if ($this->unsignedInt) { |
|
| 835 | - $return->limbs[0] += (($this->overflow >> 16) & 0xffff); |
|
| 836 | - $return->limbs[1] += (($this->overflow) & 0xffff); |
|
| 834 | + if ( $this->unsignedInt ) { |
|
| 835 | + $return->limbs[ 0 ] += ( ( $this->overflow >> 16 ) & 0xffff ); |
|
| 836 | + $return->limbs[ 1 ] += ( ( $this->overflow ) & 0xffff ); |
|
| 837 | 837 | } else { |
| 838 | - $neg = -(($this->limbs[0] >> 15) & 1); |
|
| 839 | - $return->limbs[0] = (int)($neg & 0xffff); |
|
| 840 | - $return->limbs[1] = (int)($neg & 0xffff); |
|
| 838 | + $neg = -( ( $this->limbs[ 0 ] >> 15 ) & 1 ); |
|
| 839 | + $return->limbs[ 0 ] = (int)( $neg & 0xffff ); |
|
| 840 | + $return->limbs[ 1 ] = (int)( $neg & 0xffff ); |
|
| 841 | 841 | } |
| 842 | - $return->limbs[2] = (int) ($this->limbs[0] & 0xffff); |
|
| 843 | - $return->limbs[3] = (int) ($this->limbs[1] & 0xffff); |
|
| 842 | + $return->limbs[ 2 ] = (int)( $this->limbs[ 0 ] & 0xffff ); |
|
| 843 | + $return->limbs[ 3 ] = (int)( $this->limbs[ 1 ] & 0xffff ); |
|
| 844 | 844 | return $return; |
| 845 | 845 | } |
| 846 | 846 | |
@@ -850,10 +850,10 @@ discard block |
||
| 850 | 850 | */ |
| 851 | 851 | public function toReverseString() |
| 852 | 852 | { |
| 853 | - return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) . |
|
| 854 | - ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) . |
|
| 855 | - ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) . |
|
| 856 | - ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff); |
|
| 853 | + return ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[ 1 ] & 0xff ) . |
|
| 854 | + ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[ 1 ] >> 8 ) & 0xff ) . |
|
| 855 | + ParagonIE_Sodium_Core32_Util::intToChr( $this->limbs[ 0 ] & 0xff ) . |
|
| 856 | + ParagonIE_Sodium_Core32_Util::intToChr( ( $this->limbs[ 0 ] >> 8 ) & 0xff ); |
|
| 857 | 857 | } |
| 858 | 858 | |
| 859 | 859 | /** |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | { |
| 864 | 864 | try { |
| 865 | 865 | return $this->toString(); |
| 866 | - } catch (TypeError $ex) { |
|
| 866 | + } catch ( TypeError $ex ) { |
|
| 867 | 867 | // PHP engine can't handle exceptions from __toString() |
| 868 | 868 | return ''; |
| 869 | 869 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_Poly1305', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_Poly1305', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -20,18 +20,18 @@ discard block |
||
| 20 | 20 | * @throws SodiumException |
| 21 | 21 | * @throws TypeError |
| 22 | 22 | */ |
| 23 | - public static function onetimeauth($m, $key) |
|
| 23 | + public static function onetimeauth( $m, $key ) |
|
| 24 | 24 | { |
| 25 | - if (self::strlen($key) < 32) { |
|
| 25 | + if ( self::strlen( $key ) < 32 ) { |
|
| 26 | 26 | throw new InvalidArgumentException( |
| 27 | 27 | 'Key must be 32 bytes long.' |
| 28 | 28 | ); |
| 29 | 29 | } |
| 30 | 30 | $state = new ParagonIE_Sodium_Core32_Poly1305_State( |
| 31 | - self::substr($key, 0, 32) |
|
| 31 | + self::substr( $key, 0, 32 ) |
|
| 32 | 32 | ); |
| 33 | 33 | return $state |
| 34 | - ->update($m) |
|
| 34 | + ->update( $m ) |
|
| 35 | 35 | ->finish(); |
| 36 | 36 | } |
| 37 | 37 | |
@@ -45,19 +45,19 @@ discard block |
||
| 45 | 45 | * @throws SodiumException |
| 46 | 46 | * @throws TypeError |
| 47 | 47 | */ |
| 48 | - public static function onetimeauth_verify($mac, $m, $key) |
|
| 48 | + public static function onetimeauth_verify( $mac, $m, $key ) |
|
| 49 | 49 | { |
| 50 | - if (self::strlen($key) < 32) { |
|
| 50 | + if ( self::strlen( $key ) < 32 ) { |
|
| 51 | 51 | throw new InvalidArgumentException( |
| 52 | 52 | 'Key must be 32 bytes long.' |
| 53 | 53 | ); |
| 54 | 54 | } |
| 55 | 55 | $state = new ParagonIE_Sodium_Core32_Poly1305_State( |
| 56 | - self::substr($key, 0, 32) |
|
| 56 | + self::substr( $key, 0, 32 ) |
|
| 57 | 57 | ); |
| 58 | 58 | $calc = $state |
| 59 | - ->update($m) |
|
| 59 | + ->update( $m ) |
|
| 60 | 60 | ->finish(); |
| 61 | - return self::verify_16($calc, $mac); |
|
| 61 | + return self::verify_16( $calc, $mac ); |
|
| 62 | 62 | } |
| 63 | 63 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_XSalsa20', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_XSalsa20', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -21,12 +21,12 @@ discard block |
||
| 21 | 21 | * @throws SodiumException |
| 22 | 22 | * @throws TypeError |
| 23 | 23 | */ |
| 24 | - public static function xsalsa20($len, $nonce, $key) |
|
| 24 | + public static function xsalsa20( $len, $nonce, $key ) |
|
| 25 | 25 | { |
| 26 | 26 | $ret = self::salsa20( |
| 27 | 27 | $len, |
| 28 | - self::substr($nonce, 16, 8), |
|
| 29 | - self::hsalsa20($nonce, $key) |
|
| 28 | + self::substr( $nonce, 16, 8 ), |
|
| 29 | + self::hsalsa20( $nonce, $key ) |
|
| 30 | 30 | ); |
| 31 | 31 | return $ret; |
| 32 | 32 | } |
@@ -43,12 +43,12 @@ discard block |
||
| 43 | 43 | * @throws SodiumException |
| 44 | 44 | * @throws TypeError |
| 45 | 45 | */ |
| 46 | - public static function xsalsa20_xor($message, $nonce, $key) |
|
| 46 | + public static function xsalsa20_xor( $message, $nonce, $key ) |
|
| 47 | 47 | { |
| 48 | 48 | return self::xorStrings( |
| 49 | 49 | $message, |
| 50 | 50 | self::xsalsa20( |
| 51 | - self::strlen($message), |
|
| 51 | + self::strlen( $message ), |
|
| 52 | 52 | $nonce, |
| 53 | 53 | $key |
| 54 | 54 | ) |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_ChaCha20', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_ChaCha20', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -34,22 +34,22 @@ discard block |
||
| 34 | 34 | /** @var ParagonIE_Sodium_Core32_Int32 $d */ |
| 35 | 35 | |
| 36 | 36 | # a = PLUS(a,b); d = ROTATE(XOR(d,a),16); |
| 37 | - $a = $a->addInt32($b); |
|
| 38 | - $d = $d->xorInt32($a)->rotateLeft(16); |
|
| 37 | + $a = $a->addInt32( $b ); |
|
| 38 | + $d = $d->xorInt32( $a )->rotateLeft( 16 ); |
|
| 39 | 39 | |
| 40 | 40 | # c = PLUS(c,d); b = ROTATE(XOR(b,c),12); |
| 41 | - $c = $c->addInt32($d); |
|
| 42 | - $b = $b->xorInt32($c)->rotateLeft(12); |
|
| 41 | + $c = $c->addInt32( $d ); |
|
| 42 | + $b = $b->xorInt32( $c )->rotateLeft( 12 ); |
|
| 43 | 43 | |
| 44 | 44 | # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); |
| 45 | - $a = $a->addInt32($b); |
|
| 46 | - $d = $d->xorInt32($a)->rotateLeft(8); |
|
| 45 | + $a = $a->addInt32( $b ); |
|
| 46 | + $d = $d->xorInt32( $a )->rotateLeft( 8 ); |
|
| 47 | 47 | |
| 48 | 48 | # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); |
| 49 | - $c = $c->addInt32($d); |
|
| 50 | - $b = $b->xorInt32($c)->rotateLeft(7); |
|
| 49 | + $c = $c->addInt32( $d ); |
|
| 50 | + $b = $b->xorInt32( $c )->rotateLeft( 7 ); |
|
| 51 | 51 | |
| 52 | - return array($a, $b, $c, $d); |
|
| 52 | + return array( $a, $b, $c, $d ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx, |
| 67 | 67 | $message = '' |
| 68 | 68 | ) { |
| 69 | - $bytes = self::strlen($message); |
|
| 69 | + $bytes = self::strlen( $message ); |
|
| 70 | 70 | |
| 71 | 71 | /** @var ParagonIE_Sodium_Core32_Int32 $x0 */ |
| 72 | 72 | /** @var ParagonIE_Sodium_Core32_Int32 $x1 */ |
@@ -104,54 +104,54 @@ discard block |
||
| 104 | 104 | j15 = ctx->input[15]; |
| 105 | 105 | */ |
| 106 | 106 | /** @var ParagonIE_Sodium_Core32_Int32 $j0 */ |
| 107 | - $j0 = $ctx[0]; |
|
| 107 | + $j0 = $ctx[ 0 ]; |
|
| 108 | 108 | /** @var ParagonIE_Sodium_Core32_Int32 $j1 */ |
| 109 | - $j1 = $ctx[1]; |
|
| 109 | + $j1 = $ctx[ 1 ]; |
|
| 110 | 110 | /** @var ParagonIE_Sodium_Core32_Int32 $j2 */ |
| 111 | - $j2 = $ctx[2]; |
|
| 111 | + $j2 = $ctx[ 2 ]; |
|
| 112 | 112 | /** @var ParagonIE_Sodium_Core32_Int32 $j3 */ |
| 113 | - $j3 = $ctx[3]; |
|
| 113 | + $j3 = $ctx[ 3 ]; |
|
| 114 | 114 | /** @var ParagonIE_Sodium_Core32_Int32 $j4 */ |
| 115 | - $j4 = $ctx[4]; |
|
| 115 | + $j4 = $ctx[ 4 ]; |
|
| 116 | 116 | /** @var ParagonIE_Sodium_Core32_Int32 $j5 */ |
| 117 | - $j5 = $ctx[5]; |
|
| 117 | + $j5 = $ctx[ 5 ]; |
|
| 118 | 118 | /** @var ParagonIE_Sodium_Core32_Int32 $j6 */ |
| 119 | - $j6 = $ctx[6]; |
|
| 119 | + $j6 = $ctx[ 6 ]; |
|
| 120 | 120 | /** @var ParagonIE_Sodium_Core32_Int32 $j7 */ |
| 121 | - $j7 = $ctx[7]; |
|
| 121 | + $j7 = $ctx[ 7 ]; |
|
| 122 | 122 | /** @var ParagonIE_Sodium_Core32_Int32 $j8 */ |
| 123 | - $j8 = $ctx[8]; |
|
| 123 | + $j8 = $ctx[ 8 ]; |
|
| 124 | 124 | /** @var ParagonIE_Sodium_Core32_Int32 $j9 */ |
| 125 | - $j9 = $ctx[9]; |
|
| 125 | + $j9 = $ctx[ 9 ]; |
|
| 126 | 126 | /** @var ParagonIE_Sodium_Core32_Int32 $j10 */ |
| 127 | - $j10 = $ctx[10]; |
|
| 127 | + $j10 = $ctx[ 10 ]; |
|
| 128 | 128 | /** @var ParagonIE_Sodium_Core32_Int32 $j11 */ |
| 129 | - $j11 = $ctx[11]; |
|
| 129 | + $j11 = $ctx[ 11 ]; |
|
| 130 | 130 | /** @var ParagonIE_Sodium_Core32_Int32 $j12 */ |
| 131 | - $j12 = $ctx[12]; |
|
| 131 | + $j12 = $ctx[ 12 ]; |
|
| 132 | 132 | /** @var ParagonIE_Sodium_Core32_Int32 $j13 */ |
| 133 | - $j13 = $ctx[13]; |
|
| 133 | + $j13 = $ctx[ 13 ]; |
|
| 134 | 134 | /** @var ParagonIE_Sodium_Core32_Int32 $j14 */ |
| 135 | - $j14 = $ctx[14]; |
|
| 135 | + $j14 = $ctx[ 14 ]; |
|
| 136 | 136 | /** @var ParagonIE_Sodium_Core32_Int32 $j15 */ |
| 137 | - $j15 = $ctx[15]; |
|
| 137 | + $j15 = $ctx[ 15 ]; |
|
| 138 | 138 | |
| 139 | 139 | $c = ''; |
| 140 | - for (;;) { |
|
| 141 | - if ($bytes < 64) { |
|
| 142 | - $message .= str_repeat("\x00", 64 - $bytes); |
|
| 140 | + for ( ;; ) { |
|
| 141 | + if ( $bytes < 64 ) { |
|
| 142 | + $message .= str_repeat( "\x00", 64 - $bytes ); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - $x0 = clone $j0; |
|
| 146 | - $x1 = clone $j1; |
|
| 147 | - $x2 = clone $j2; |
|
| 148 | - $x3 = clone $j3; |
|
| 149 | - $x4 = clone $j4; |
|
| 150 | - $x5 = clone $j5; |
|
| 151 | - $x6 = clone $j6; |
|
| 152 | - $x7 = clone $j7; |
|
| 153 | - $x8 = clone $j8; |
|
| 154 | - $x9 = clone $j9; |
|
| 145 | + $x0 = clone $j0; |
|
| 146 | + $x1 = clone $j1; |
|
| 147 | + $x2 = clone $j2; |
|
| 148 | + $x3 = clone $j3; |
|
| 149 | + $x4 = clone $j4; |
|
| 150 | + $x5 = clone $j5; |
|
| 151 | + $x6 = clone $j6; |
|
| 152 | + $x7 = clone $j7; |
|
| 153 | + $x8 = clone $j8; |
|
| 154 | + $x9 = clone $j9; |
|
| 155 | 155 | $x10 = clone $j10; |
| 156 | 156 | $x11 = clone $j11; |
| 157 | 157 | $x12 = clone $j12; |
@@ -160,30 +160,30 @@ discard block |
||
| 160 | 160 | $x15 = clone $j15; |
| 161 | 161 | |
| 162 | 162 | # for (i = 20; i > 0; i -= 2) { |
| 163 | - for ($i = 20; $i > 0; $i -= 2) { |
|
| 163 | + for ( $i = 20; $i > 0; $i -= 2 ) { |
|
| 164 | 164 | # QUARTERROUND( x0, x4, x8, x12) |
| 165 | - list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12); |
|
| 165 | + list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 ); |
|
| 166 | 166 | |
| 167 | 167 | # QUARTERROUND( x1, x5, x9, x13) |
| 168 | - list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13); |
|
| 168 | + list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 ); |
|
| 169 | 169 | |
| 170 | 170 | # QUARTERROUND( x2, x6, x10, x14) |
| 171 | - list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14); |
|
| 171 | + list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 ); |
|
| 172 | 172 | |
| 173 | 173 | # QUARTERROUND( x3, x7, x11, x15) |
| 174 | - list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15); |
|
| 174 | + list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 ); |
|
| 175 | 175 | |
| 176 | 176 | # QUARTERROUND( x0, x5, x10, x15) |
| 177 | - list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15); |
|
| 177 | + list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 ); |
|
| 178 | 178 | |
| 179 | 179 | # QUARTERROUND( x1, x6, x11, x12) |
| 180 | - list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12); |
|
| 180 | + list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 ); |
|
| 181 | 181 | |
| 182 | 182 | # QUARTERROUND( x2, x7, x8, x13) |
| 183 | - list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13); |
|
| 183 | + list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 ); |
|
| 184 | 184 | |
| 185 | 185 | # QUARTERROUND( x3, x4, x9, x14) |
| 186 | - list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14); |
|
| 186 | + list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 ); |
|
| 187 | 187 | } |
| 188 | 188 | /* |
| 189 | 189 | x0 = PLUS(x0, j0); |
@@ -203,22 +203,22 @@ discard block |
||
| 203 | 203 | x14 = PLUS(x14, j14); |
| 204 | 204 | x15 = PLUS(x15, j15); |
| 205 | 205 | */ |
| 206 | - $x0 = $x0->addInt32($j0); |
|
| 207 | - $x1 = $x1->addInt32($j1); |
|
| 208 | - $x2 = $x2->addInt32($j2); |
|
| 209 | - $x3 = $x3->addInt32($j3); |
|
| 210 | - $x4 = $x4->addInt32($j4); |
|
| 211 | - $x5 = $x5->addInt32($j5); |
|
| 212 | - $x6 = $x6->addInt32($j6); |
|
| 213 | - $x7 = $x7->addInt32($j7); |
|
| 214 | - $x8 = $x8->addInt32($j8); |
|
| 215 | - $x9 = $x9->addInt32($j9); |
|
| 216 | - $x10 = $x10->addInt32($j10); |
|
| 217 | - $x11 = $x11->addInt32($j11); |
|
| 218 | - $x12 = $x12->addInt32($j12); |
|
| 219 | - $x13 = $x13->addInt32($j13); |
|
| 220 | - $x14 = $x14->addInt32($j14); |
|
| 221 | - $x15 = $x15->addInt32($j15); |
|
| 206 | + $x0 = $x0->addInt32( $j0 ); |
|
| 207 | + $x1 = $x1->addInt32( $j1 ); |
|
| 208 | + $x2 = $x2->addInt32( $j2 ); |
|
| 209 | + $x3 = $x3->addInt32( $j3 ); |
|
| 210 | + $x4 = $x4->addInt32( $j4 ); |
|
| 211 | + $x5 = $x5->addInt32( $j5 ); |
|
| 212 | + $x6 = $x6->addInt32( $j6 ); |
|
| 213 | + $x7 = $x7->addInt32( $j7 ); |
|
| 214 | + $x8 = $x8->addInt32( $j8 ); |
|
| 215 | + $x9 = $x9->addInt32( $j9 ); |
|
| 216 | + $x10 = $x10->addInt32( $j10 ); |
|
| 217 | + $x11 = $x11->addInt32( $j11 ); |
|
| 218 | + $x12 = $x12->addInt32( $j12 ); |
|
| 219 | + $x13 = $x13->addInt32( $j13 ); |
|
| 220 | + $x14 = $x14->addInt32( $j14 ); |
|
| 221 | + $x15 = $x15->addInt32( $j15 ); |
|
| 222 | 222 | |
| 223 | 223 | /* |
| 224 | 224 | x0 = XOR(x0, LOAD32_LE(m + 0)); |
@@ -238,22 +238,22 @@ discard block |
||
| 238 | 238 | x14 = XOR(x14, LOAD32_LE(m + 56)); |
| 239 | 239 | x15 = XOR(x15, LOAD32_LE(m + 60)); |
| 240 | 240 | */ |
| 241 | - $x0 = $x0->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 0, 4))); |
|
| 242 | - $x1 = $x1->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 4, 4))); |
|
| 243 | - $x2 = $x2->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 8, 4))); |
|
| 244 | - $x3 = $x3->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4))); |
|
| 245 | - $x4 = $x4->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 16, 4))); |
|
| 246 | - $x5 = $x5->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 20, 4))); |
|
| 247 | - $x6 = $x6->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 24, 4))); |
|
| 248 | - $x7 = $x7->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 28, 4))); |
|
| 249 | - $x8 = $x8->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 32, 4))); |
|
| 250 | - $x9 = $x9->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 36, 4))); |
|
| 251 | - $x10 = $x10->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 40, 4))); |
|
| 252 | - $x11 = $x11->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 44, 4))); |
|
| 253 | - $x12 = $x12->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 48, 4))); |
|
| 254 | - $x13 = $x13->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 52, 4))); |
|
| 255 | - $x14 = $x14->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 56, 4))); |
|
| 256 | - $x15 = $x15->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 60, 4))); |
|
| 241 | + $x0 = $x0->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 0, 4 ) ) ); |
|
| 242 | + $x1 = $x1->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 4, 4 ) ) ); |
|
| 243 | + $x2 = $x2->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 8, 4 ) ) ); |
|
| 244 | + $x3 = $x3->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 12, 4 ) ) ); |
|
| 245 | + $x4 = $x4->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 16, 4 ) ) ); |
|
| 246 | + $x5 = $x5->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 20, 4 ) ) ); |
|
| 247 | + $x6 = $x6->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 24, 4 ) ) ); |
|
| 248 | + $x7 = $x7->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 28, 4 ) ) ); |
|
| 249 | + $x8 = $x8->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 32, 4 ) ) ); |
|
| 250 | + $x9 = $x9->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 36, 4 ) ) ); |
|
| 251 | + $x10 = $x10->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 40, 4 ) ) ); |
|
| 252 | + $x11 = $x11->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 44, 4 ) ) ); |
|
| 253 | + $x12 = $x12->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 48, 4 ) ) ); |
|
| 254 | + $x13 = $x13->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 52, 4 ) ) ); |
|
| 255 | + $x14 = $x14->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 56, 4 ) ) ); |
|
| 256 | + $x15 = $x15->xorInt32( ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 60, 4 ) ) ); |
|
| 257 | 257 | |
| 258 | 258 | /* |
| 259 | 259 | j12 = PLUSONE(j12); |
@@ -262,9 +262,9 @@ discard block |
||
| 262 | 262 | } |
| 263 | 263 | */ |
| 264 | 264 | /** @var ParagonIE_Sodium_Core32_Int32 $j12 */ |
| 265 | - $j12 = $j12->addInt(1); |
|
| 266 | - if ($j12->limbs[0] === 0 && $j12->limbs[1] === 0) { |
|
| 267 | - $j13 = $j13->addInt(1); |
|
| 265 | + $j12 = $j12->addInt( 1 ); |
|
| 266 | + if ( $j12->limbs[ 0 ] === 0 && $j12->limbs[ 1 ] === 0 ) { |
|
| 267 | + $j13 = $j13->addInt( 1 ); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | /* |
@@ -304,23 +304,23 @@ discard block |
||
| 304 | 304 | $x15->toReverseString(); |
| 305 | 305 | |
| 306 | 306 | /* Partial block */ |
| 307 | - if ($bytes < 64) { |
|
| 308 | - $c .= self::substr($block, 0, $bytes); |
|
| 307 | + if ( $bytes < 64 ) { |
|
| 308 | + $c .= self::substr( $block, 0, $bytes ); |
|
| 309 | 309 | break; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /* Full block */ |
| 313 | 313 | $c .= $block; |
| 314 | 314 | $bytes -= 64; |
| 315 | - if ($bytes <= 0) { |
|
| 315 | + if ( $bytes <= 0 ) { |
|
| 316 | 316 | break; |
| 317 | 317 | } |
| 318 | - $message = self::substr($message, 64); |
|
| 318 | + $message = self::substr( $message, 64 ); |
|
| 319 | 319 | } |
| 320 | 320 | /* end for(;;) loop */ |
| 321 | 321 | |
| 322 | - $ctx[12] = $j12; |
|
| 323 | - $ctx[13] = $j13; |
|
| 322 | + $ctx[ 12 ] = $j12; |
|
| 323 | + $ctx[ 13 ] = $j13; |
|
| 324 | 324 | return $c; |
| 325 | 325 | } |
| 326 | 326 | |
@@ -334,11 +334,11 @@ discard block |
||
| 334 | 334 | * @throws SodiumException |
| 335 | 335 | * @throws TypeError |
| 336 | 336 | */ |
| 337 | - public static function stream($len = 64, $nonce = '', $key = '') |
|
| 337 | + public static function stream( $len = 64, $nonce = '', $key = '' ) |
|
| 338 | 338 | { |
| 339 | 339 | return self::encryptBytes( |
| 340 | - new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce), |
|
| 341 | - str_repeat("\x00", $len) |
|
| 340 | + new ParagonIE_Sodium_Core32_ChaCha20_Ctx( $key, $nonce ), |
|
| 341 | + str_repeat( "\x00", $len ) |
|
| 342 | 342 | ); |
| 343 | 343 | } |
| 344 | 344 | |
@@ -352,11 +352,11 @@ discard block |
||
| 352 | 352 | * @throws SodiumException |
| 353 | 353 | * @throws TypeError |
| 354 | 354 | */ |
| 355 | - public static function ietfStream($len, $nonce = '', $key = '') |
|
| 355 | + public static function ietfStream( $len, $nonce = '', $key = '' ) |
|
| 356 | 356 | { |
| 357 | 357 | return self::encryptBytes( |
| 358 | - new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce), |
|
| 359 | - str_repeat("\x00", $len) |
|
| 358 | + new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx( $key, $nonce ), |
|
| 359 | + str_repeat( "\x00", $len ) |
|
| 360 | 360 | ); |
| 361 | 361 | } |
| 362 | 362 | |
@@ -371,10 +371,10 @@ discard block |
||
| 371 | 371 | * @throws SodiumException |
| 372 | 372 | * @throws TypeError |
| 373 | 373 | */ |
| 374 | - public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '') |
|
| 374 | + public static function ietfStreamXorIc( $message, $nonce = '', $key = '', $ic = '' ) |
|
| 375 | 375 | { |
| 376 | 376 | return self::encryptBytes( |
| 377 | - new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic), |
|
| 377 | + new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx( $key, $nonce, $ic ), |
|
| 378 | 378 | $message |
| 379 | 379 | ); |
| 380 | 380 | } |
@@ -390,10 +390,10 @@ discard block |
||
| 390 | 390 | * @throws SodiumException |
| 391 | 391 | * @throws TypeError |
| 392 | 392 | */ |
| 393 | - public static function streamXorIc($message, $nonce = '', $key = '', $ic = '') |
|
| 393 | + public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' ) |
|
| 394 | 394 | { |
| 395 | 395 | return self::encryptBytes( |
| 396 | - new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic), |
|
| 396 | + new ParagonIE_Sodium_Core32_ChaCha20_Ctx( $key, $nonce, $ic ), |
|
| 397 | 397 | $message |
| 398 | 398 | ); |
| 399 | 399 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_HChaCha20', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_HChaCha20', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -17,35 +17,35 @@ discard block |
||
| 17 | 17 | * @throws SodiumException |
| 18 | 18 | * @throws TypeError |
| 19 | 19 | */ |
| 20 | - public static function hChaCha20($in = '', $key = '', $c = null) |
|
| 20 | + public static function hChaCha20( $in = '', $key = '', $c = null ) |
|
| 21 | 21 | { |
| 22 | 22 | $ctx = array(); |
| 23 | 23 | |
| 24 | - if ($c === null) { |
|
| 25 | - $ctx[0] = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865)); |
|
| 26 | - $ctx[1] = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e)); |
|
| 27 | - $ctx[2] = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32)); |
|
| 28 | - $ctx[3] = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574)); |
|
| 24 | + if ( $c === null ) { |
|
| 25 | + $ctx[ 0 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x6170, 0x7865 ) ); |
|
| 26 | + $ctx[ 1 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x3320, 0x646e ) ); |
|
| 27 | + $ctx[ 2 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x7962, 0x2d32 ) ); |
|
| 28 | + $ctx[ 3 ] = new ParagonIE_Sodium_Core32_Int32( array( 0x6b20, 0x6574 ) ); |
|
| 29 | 29 | } else { |
| 30 | - $ctx[0] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4)); |
|
| 31 | - $ctx[1] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4)); |
|
| 32 | - $ctx[2] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4)); |
|
| 33 | - $ctx[3] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4)); |
|
| 30 | + $ctx[ 0 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 0, 4 ) ); |
|
| 31 | + $ctx[ 1 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 4, 4 ) ); |
|
| 32 | + $ctx[ 2 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 8, 4 ) ); |
|
| 33 | + $ctx[ 3 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 12, 4 ) ); |
|
| 34 | 34 | } |
| 35 | - $ctx[4] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4)); |
|
| 36 | - $ctx[5] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4)); |
|
| 37 | - $ctx[6] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4)); |
|
| 38 | - $ctx[7] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4)); |
|
| 39 | - $ctx[8] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4)); |
|
| 40 | - $ctx[9] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4)); |
|
| 41 | - $ctx[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4)); |
|
| 42 | - $ctx[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4)); |
|
| 43 | - $ctx[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4)); |
|
| 44 | - $ctx[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4)); |
|
| 45 | - $ctx[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4)); |
|
| 46 | - $ctx[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4)); |
|
| 35 | + $ctx[ 4 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 0, 4 ) ); |
|
| 36 | + $ctx[ 5 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 4, 4 ) ); |
|
| 37 | + $ctx[ 6 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 8, 4 ) ); |
|
| 38 | + $ctx[ 7 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 12, 4 ) ); |
|
| 39 | + $ctx[ 8 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 16, 4 ) ); |
|
| 40 | + $ctx[ 9 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 20, 4 ) ); |
|
| 41 | + $ctx[ 10 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 24, 4 ) ); |
|
| 42 | + $ctx[ 11 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 28, 4 ) ); |
|
| 43 | + $ctx[ 12 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 0, 4 ) ); |
|
| 44 | + $ctx[ 13 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 4, 4 ) ); |
|
| 45 | + $ctx[ 14 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 8, 4 ) ); |
|
| 46 | + $ctx[ 15 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 12, 4 ) ); |
|
| 47 | 47 | |
| 48 | - return self::hChaCha20Bytes($ctx); |
|
| 48 | + return self::hChaCha20Bytes( $ctx ); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | /** |
@@ -54,65 +54,65 @@ discard block |
||
| 54 | 54 | * @throws SodiumException |
| 55 | 55 | * @throws TypeError |
| 56 | 56 | */ |
| 57 | - protected static function hChaCha20Bytes(array $ctx) |
|
| 57 | + protected static function hChaCha20Bytes( array $ctx ) |
|
| 58 | 58 | { |
| 59 | 59 | /** @var ParagonIE_Sodium_Core32_Int32 $x0 */ |
| 60 | - $x0 = $ctx[0]; |
|
| 60 | + $x0 = $ctx[ 0 ]; |
|
| 61 | 61 | /** @var ParagonIE_Sodium_Core32_Int32 $x1 */ |
| 62 | - $x1 = $ctx[1]; |
|
| 62 | + $x1 = $ctx[ 1 ]; |
|
| 63 | 63 | /** @var ParagonIE_Sodium_Core32_Int32 $x2 */ |
| 64 | - $x2 = $ctx[2]; |
|
| 64 | + $x2 = $ctx[ 2 ]; |
|
| 65 | 65 | /** @var ParagonIE_Sodium_Core32_Int32 $x3 */ |
| 66 | - $x3 = $ctx[3]; |
|
| 66 | + $x3 = $ctx[ 3 ]; |
|
| 67 | 67 | /** @var ParagonIE_Sodium_Core32_Int32 $x4 */ |
| 68 | - $x4 = $ctx[4]; |
|
| 68 | + $x4 = $ctx[ 4 ]; |
|
| 69 | 69 | /** @var ParagonIE_Sodium_Core32_Int32 $x5 */ |
| 70 | - $x5 = $ctx[5]; |
|
| 70 | + $x5 = $ctx[ 5 ]; |
|
| 71 | 71 | /** @var ParagonIE_Sodium_Core32_Int32 $x6 */ |
| 72 | - $x6 = $ctx[6]; |
|
| 72 | + $x6 = $ctx[ 6 ]; |
|
| 73 | 73 | /** @var ParagonIE_Sodium_Core32_Int32 $x7 */ |
| 74 | - $x7 = $ctx[7]; |
|
| 74 | + $x7 = $ctx[ 7 ]; |
|
| 75 | 75 | /** @var ParagonIE_Sodium_Core32_Int32 $x8 */ |
| 76 | - $x8 = $ctx[8]; |
|
| 76 | + $x8 = $ctx[ 8 ]; |
|
| 77 | 77 | /** @var ParagonIE_Sodium_Core32_Int32 $x9 */ |
| 78 | - $x9 = $ctx[9]; |
|
| 78 | + $x9 = $ctx[ 9 ]; |
|
| 79 | 79 | /** @var ParagonIE_Sodium_Core32_Int32 $x10 */ |
| 80 | - $x10 = $ctx[10]; |
|
| 80 | + $x10 = $ctx[ 10 ]; |
|
| 81 | 81 | /** @var ParagonIE_Sodium_Core32_Int32 $x11 */ |
| 82 | - $x11 = $ctx[11]; |
|
| 82 | + $x11 = $ctx[ 11 ]; |
|
| 83 | 83 | /** @var ParagonIE_Sodium_Core32_Int32 $x12 */ |
| 84 | - $x12 = $ctx[12]; |
|
| 84 | + $x12 = $ctx[ 12 ]; |
|
| 85 | 85 | /** @var ParagonIE_Sodium_Core32_Int32 $x13 */ |
| 86 | - $x13 = $ctx[13]; |
|
| 86 | + $x13 = $ctx[ 13 ]; |
|
| 87 | 87 | /** @var ParagonIE_Sodium_Core32_Int32 $x14 */ |
| 88 | - $x14 = $ctx[14]; |
|
| 88 | + $x14 = $ctx[ 14 ]; |
|
| 89 | 89 | /** @var ParagonIE_Sodium_Core32_Int32 $x15 */ |
| 90 | - $x15 = $ctx[15]; |
|
| 90 | + $x15 = $ctx[ 15 ]; |
|
| 91 | 91 | |
| 92 | - for ($i = 0; $i < 10; ++$i) { |
|
| 92 | + for ( $i = 0; $i < 10; ++$i ) { |
|
| 93 | 93 | # QUARTERROUND( x0, x4, x8, x12) |
| 94 | - list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12); |
|
| 94 | + list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 ); |
|
| 95 | 95 | |
| 96 | 96 | # QUARTERROUND( x1, x5, x9, x13) |
| 97 | - list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13); |
|
| 97 | + list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 ); |
|
| 98 | 98 | |
| 99 | 99 | # QUARTERROUND( x2, x6, x10, x14) |
| 100 | - list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14); |
|
| 100 | + list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 ); |
|
| 101 | 101 | |
| 102 | 102 | # QUARTERROUND( x3, x7, x11, x15) |
| 103 | - list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15); |
|
| 103 | + list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 ); |
|
| 104 | 104 | |
| 105 | 105 | # QUARTERROUND( x0, x5, x10, x15) |
| 106 | - list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15); |
|
| 106 | + list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 ); |
|
| 107 | 107 | |
| 108 | 108 | # QUARTERROUND( x1, x6, x11, x12) |
| 109 | - list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12); |
|
| 109 | + list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 ); |
|
| 110 | 110 | |
| 111 | 111 | # QUARTERROUND( x2, x7, x8, x13) |
| 112 | - list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13); |
|
| 112 | + list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 ); |
|
| 113 | 113 | |
| 114 | 114 | # QUARTERROUND( x3, x4, x9, x14) |
| 115 | - list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14); |
|
| 115 | + list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 ); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | return $x0->toReverseString() . |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_HSalsa20', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_HSalsa20', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | * @throws SodiumException |
| 25 | 25 | * @throws TypeError |
| 26 | 26 | */ |
| 27 | - public static function hsalsa20($in, $k, $c = null) |
|
| 27 | + public static function hsalsa20( $in, $k, $c = null ) |
|
| 28 | 28 | { |
| 29 | 29 | /** |
| 30 | 30 | * @var ParagonIE_Sodium_Core32_Int32 $x0 |
@@ -60,73 +60,73 @@ discard block |
||
| 60 | 60 | * @var ParagonIE_Sodium_Core32_Int32 $j14 |
| 61 | 61 | * @var ParagonIE_Sodium_Core32_Int32 $j15 |
| 62 | 62 | */ |
| 63 | - if (self::strlen($k) < 32) { |
|
| 64 | - throw new RangeException('Key must be 32 bytes long'); |
|
| 63 | + if ( self::strlen( $k ) < 32 ) { |
|
| 64 | + throw new RangeException( 'Key must be 32 bytes long' ); |
|
| 65 | 65 | } |
| 66 | - if ($c === null) { |
|
| 67 | - $x0 = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865)); |
|
| 68 | - $x5 = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e)); |
|
| 69 | - $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32)); |
|
| 70 | - $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574)); |
|
| 66 | + if ( $c === null ) { |
|
| 67 | + $x0 = new ParagonIE_Sodium_Core32_Int32( array( 0x6170, 0x7865 ) ); |
|
| 68 | + $x5 = new ParagonIE_Sodium_Core32_Int32( array( 0x3320, 0x646e ) ); |
|
| 69 | + $x10 = new ParagonIE_Sodium_Core32_Int32( array( 0x7962, 0x2d32 ) ); |
|
| 70 | + $x15 = new ParagonIE_Sodium_Core32_Int32( array( 0x6b20, 0x6574 ) ); |
|
| 71 | 71 | } else { |
| 72 | - $x0 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4)); |
|
| 73 | - $x5 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4)); |
|
| 74 | - $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4)); |
|
| 75 | - $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4)); |
|
| 72 | + $x0 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 0, 4 ) ); |
|
| 73 | + $x5 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 4, 4 ) ); |
|
| 74 | + $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 8, 4 ) ); |
|
| 75 | + $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $c, 12, 4 ) ); |
|
| 76 | 76 | } |
| 77 | - $x1 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4)); |
|
| 78 | - $x2 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4)); |
|
| 79 | - $x3 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4)); |
|
| 80 | - $x4 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4)); |
|
| 81 | - $x6 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4)); |
|
| 82 | - $x7 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4)); |
|
| 83 | - $x8 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4)); |
|
| 84 | - $x9 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4)); |
|
| 85 | - $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4)); |
|
| 86 | - $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4)); |
|
| 87 | - $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4)); |
|
| 88 | - $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4)); |
|
| 77 | + $x1 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 0, 4 ) ); |
|
| 78 | + $x2 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 4, 4 ) ); |
|
| 79 | + $x3 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 8, 4 ) ); |
|
| 80 | + $x4 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 12, 4 ) ); |
|
| 81 | + $x6 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 0, 4 ) ); |
|
| 82 | + $x7 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 4, 4 ) ); |
|
| 83 | + $x8 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 8, 4 ) ); |
|
| 84 | + $x9 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $in, 12, 4 ) ); |
|
| 85 | + $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 16, 4 ) ); |
|
| 86 | + $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 20, 4 ) ); |
|
| 87 | + $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 24, 4 ) ); |
|
| 88 | + $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $k, 28, 4 ) ); |
|
| 89 | 89 | |
| 90 | - for ($i = self::ROUNDS; $i > 0; $i -= 2) { |
|
| 91 | - $x4 = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7)); |
|
| 92 | - $x8 = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9)); |
|
| 93 | - $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13)); |
|
| 94 | - $x0 = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18)); |
|
| 90 | + for ( $i = self::ROUNDS; $i > 0; $i -= 2 ) { |
|
| 91 | + $x4 = $x4->xorInt32( $x0->addInt32( $x12 )->rotateLeft( 7 ) ); |
|
| 92 | + $x8 = $x8->xorInt32( $x4->addInt32( $x0 )->rotateLeft( 9 ) ); |
|
| 93 | + $x12 = $x12->xorInt32( $x8->addInt32( $x4 )->rotateLeft( 13 ) ); |
|
| 94 | + $x0 = $x0->xorInt32( $x12->addInt32( $x8 )->rotateLeft( 18 ) ); |
|
| 95 | 95 | |
| 96 | - $x9 = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7)); |
|
| 97 | - $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9)); |
|
| 98 | - $x1 = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13)); |
|
| 99 | - $x5 = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18)); |
|
| 96 | + $x9 = $x9->xorInt32( $x5->addInt32( $x1 )->rotateLeft( 7 ) ); |
|
| 97 | + $x13 = $x13->xorInt32( $x9->addInt32( $x5 )->rotateLeft( 9 ) ); |
|
| 98 | + $x1 = $x1->xorInt32( $x13->addInt32( $x9 )->rotateLeft( 13 ) ); |
|
| 99 | + $x5 = $x5->xorInt32( $x1->addInt32( $x13 )->rotateLeft( 18 ) ); |
|
| 100 | 100 | |
| 101 | - $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7)); |
|
| 102 | - $x2 = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9)); |
|
| 103 | - $x6 = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13)); |
|
| 104 | - $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18)); |
|
| 101 | + $x14 = $x14->xorInt32( $x10->addInt32( $x6 )->rotateLeft( 7 ) ); |
|
| 102 | + $x2 = $x2->xorInt32( $x14->addInt32( $x10 )->rotateLeft( 9 ) ); |
|
| 103 | + $x6 = $x6->xorInt32( $x2->addInt32( $x14 )->rotateLeft( 13 ) ); |
|
| 104 | + $x10 = $x10->xorInt32( $x6->addInt32( $x2 )->rotateLeft( 18 ) ); |
|
| 105 | 105 | |
| 106 | - $x3 = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7)); |
|
| 107 | - $x7 = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9)); |
|
| 108 | - $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13)); |
|
| 109 | - $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18)); |
|
| 106 | + $x3 = $x3->xorInt32( $x15->addInt32( $x11 )->rotateLeft( 7 ) ); |
|
| 107 | + $x7 = $x7->xorInt32( $x3->addInt32( $x15 )->rotateLeft( 9 ) ); |
|
| 108 | + $x11 = $x11->xorInt32( $x7->addInt32( $x3 )->rotateLeft( 13 ) ); |
|
| 109 | + $x15 = $x15->xorInt32( $x11->addInt32( $x7 )->rotateLeft( 18 ) ); |
|
| 110 | 110 | |
| 111 | - $x1 = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7)); |
|
| 112 | - $x2 = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9)); |
|
| 113 | - $x3 = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13)); |
|
| 114 | - $x0 = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18)); |
|
| 111 | + $x1 = $x1->xorInt32( $x0->addInt32( $x3 )->rotateLeft( 7 ) ); |
|
| 112 | + $x2 = $x2->xorInt32( $x1->addInt32( $x0 )->rotateLeft( 9 ) ); |
|
| 113 | + $x3 = $x3->xorInt32( $x2->addInt32( $x1 )->rotateLeft( 13 ) ); |
|
| 114 | + $x0 = $x0->xorInt32( $x3->addInt32( $x2 )->rotateLeft( 18 ) ); |
|
| 115 | 115 | |
| 116 | - $x6 = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7)); |
|
| 117 | - $x7 = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9)); |
|
| 118 | - $x4 = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13)); |
|
| 119 | - $x5 = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18)); |
|
| 116 | + $x6 = $x6->xorInt32( $x5->addInt32( $x4 )->rotateLeft( 7 ) ); |
|
| 117 | + $x7 = $x7->xorInt32( $x6->addInt32( $x5 )->rotateLeft( 9 ) ); |
|
| 118 | + $x4 = $x4->xorInt32( $x7->addInt32( $x6 )->rotateLeft( 13 ) ); |
|
| 119 | + $x5 = $x5->xorInt32( $x4->addInt32( $x7 )->rotateLeft( 18 ) ); |
|
| 120 | 120 | |
| 121 | - $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7)); |
|
| 122 | - $x8 = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9)); |
|
| 123 | - $x9 = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13)); |
|
| 124 | - $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18)); |
|
| 121 | + $x11 = $x11->xorInt32( $x10->addInt32( $x9 )->rotateLeft( 7 ) ); |
|
| 122 | + $x8 = $x8->xorInt32( $x11->addInt32( $x10 )->rotateLeft( 9 ) ); |
|
| 123 | + $x9 = $x9->xorInt32( $x8->addInt32( $x11 )->rotateLeft( 13 ) ); |
|
| 124 | + $x10 = $x10->xorInt32( $x9->addInt32( $x8 )->rotateLeft( 18 ) ); |
|
| 125 | 125 | |
| 126 | - $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7)); |
|
| 127 | - $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9)); |
|
| 128 | - $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13)); |
|
| 129 | - $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18)); |
|
| 126 | + $x12 = $x12->xorInt32( $x15->addInt32( $x14 )->rotateLeft( 7 ) ); |
|
| 127 | + $x13 = $x13->xorInt32( $x12->addInt32( $x15 )->rotateLeft( 9 ) ); |
|
| 128 | + $x14 = $x14->xorInt32( $x13->addInt32( $x12 )->rotateLeft( 13 ) ); |
|
| 129 | + $x15 = $x15->xorInt32( $x14->addInt32( $x13 )->rotateLeft( 18 ) ); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | return $x0->toReverseString() . |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (class_exists('ParagonIE_Sodium_Core32_Poly1305_State', false)) { |
|
| 3 | +if ( class_exists( 'ParagonIE_Sodium_Core32_Poly1305_State', false ) ) { |
|
| 4 | 4 | return; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | * @throws SodiumException |
| 50 | 50 | * @throws TypeError |
| 51 | 51 | */ |
| 52 | - public function __construct($key = '') |
|
| 52 | + public function __construct( $key = '' ) |
|
| 53 | 53 | { |
| 54 | - if (self::strlen($key) < 32) { |
|
| 54 | + if ( self::strlen( $key ) < 32 ) { |
|
| 55 | 55 | throw new InvalidArgumentException( |
| 56 | 56 | 'Poly1305 requires a 32-byte key' |
| 57 | 57 | ); |
@@ -59,50 +59,50 @@ discard block |
||
| 59 | 59 | /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */ |
| 60 | 60 | $this->r = array( |
| 61 | 61 | // st->r[0] = ... |
| 62 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4)) |
|
| 63 | - ->setUnsignedInt(true) |
|
| 64 | - ->mask(0x3ffffff), |
|
| 62 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 0, 4 ) ) |
|
| 63 | + ->setUnsignedInt( true ) |
|
| 64 | + ->mask( 0x3ffffff ), |
|
| 65 | 65 | // st->r[1] = ... |
| 66 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 3, 4)) |
|
| 67 | - ->setUnsignedInt(true) |
|
| 68 | - ->shiftRight(2) |
|
| 69 | - ->mask(0x3ffff03), |
|
| 66 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 3, 4 ) ) |
|
| 67 | + ->setUnsignedInt( true ) |
|
| 68 | + ->shiftRight( 2 ) |
|
| 69 | + ->mask( 0x3ffff03 ), |
|
| 70 | 70 | // st->r[2] = ... |
| 71 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 6, 4)) |
|
| 72 | - ->setUnsignedInt(true) |
|
| 73 | - ->shiftRight(4) |
|
| 74 | - ->mask(0x3ffc0ff), |
|
| 71 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 6, 4 ) ) |
|
| 72 | + ->setUnsignedInt( true ) |
|
| 73 | + ->shiftRight( 4 ) |
|
| 74 | + ->mask( 0x3ffc0ff ), |
|
| 75 | 75 | // st->r[3] = ... |
| 76 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 9, 4)) |
|
| 77 | - ->setUnsignedInt(true) |
|
| 78 | - ->shiftRight(6) |
|
| 79 | - ->mask(0x3f03fff), |
|
| 76 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 9, 4 ) ) |
|
| 77 | + ->setUnsignedInt( true ) |
|
| 78 | + ->shiftRight( 6 ) |
|
| 79 | + ->mask( 0x3f03fff ), |
|
| 80 | 80 | // st->r[4] = ... |
| 81 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4)) |
|
| 82 | - ->setUnsignedInt(true) |
|
| 83 | - ->shiftRight(8) |
|
| 84 | - ->mask(0x00fffff) |
|
| 81 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 12, 4 ) ) |
|
| 82 | + ->setUnsignedInt( true ) |
|
| 83 | + ->shiftRight( 8 ) |
|
| 84 | + ->mask( 0x00fffff ) |
|
| 85 | 85 | ); |
| 86 | 86 | |
| 87 | 87 | /* h = 0 */ |
| 88 | 88 | $this->h = array( |
| 89 | - new ParagonIE_Sodium_Core32_Int32(array(0, 0), true), |
|
| 90 | - new ParagonIE_Sodium_Core32_Int32(array(0, 0), true), |
|
| 91 | - new ParagonIE_Sodium_Core32_Int32(array(0, 0), true), |
|
| 92 | - new ParagonIE_Sodium_Core32_Int32(array(0, 0), true), |
|
| 93 | - new ParagonIE_Sodium_Core32_Int32(array(0, 0), true) |
|
| 89 | + new ParagonIE_Sodium_Core32_Int32( array( 0, 0 ), true ), |
|
| 90 | + new ParagonIE_Sodium_Core32_Int32( array( 0, 0 ), true ), |
|
| 91 | + new ParagonIE_Sodium_Core32_Int32( array( 0, 0 ), true ), |
|
| 92 | + new ParagonIE_Sodium_Core32_Int32( array( 0, 0 ), true ), |
|
| 93 | + new ParagonIE_Sodium_Core32_Int32( array( 0, 0 ), true ) |
|
| 94 | 94 | ); |
| 95 | 95 | |
| 96 | 96 | /* save pad for later */ |
| 97 | 97 | $this->pad = array( |
| 98 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4)) |
|
| 99 | - ->setUnsignedInt(true)->toInt64(), |
|
| 100 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4)) |
|
| 101 | - ->setUnsignedInt(true)->toInt64(), |
|
| 102 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4)) |
|
| 103 | - ->setUnsignedInt(true)->toInt64(), |
|
| 104 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4)) |
|
| 105 | - ->setUnsignedInt(true)->toInt64(), |
|
| 98 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 16, 4 ) ) |
|
| 99 | + ->setUnsignedInt( true )->toInt64(), |
|
| 100 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 20, 4 ) ) |
|
| 101 | + ->setUnsignedInt( true )->toInt64(), |
|
| 102 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 24, 4 ) ) |
|
| 103 | + ->setUnsignedInt( true )->toInt64(), |
|
| 104 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 28, 4 ) ) |
|
| 105 | + ->setUnsignedInt( true )->toInt64(), |
|
| 106 | 106 | ); |
| 107 | 107 | |
| 108 | 108 | $this->leftover = 0; |
@@ -117,59 +117,59 @@ discard block |
||
| 117 | 117 | * @throws SodiumException |
| 118 | 118 | * @throws TypeError |
| 119 | 119 | */ |
| 120 | - public function update($message = '') |
|
| 120 | + public function update( $message = '' ) |
|
| 121 | 121 | { |
| 122 | - $bytes = self::strlen($message); |
|
| 122 | + $bytes = self::strlen( $message ); |
|
| 123 | 123 | |
| 124 | 124 | /* handle leftover */ |
| 125 | - if ($this->leftover) { |
|
| 125 | + if ( $this->leftover ) { |
|
| 126 | 126 | /** @var int $want */ |
| 127 | 127 | $want = ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - $this->leftover; |
| 128 | - if ($want > $bytes) { |
|
| 128 | + if ( $want > $bytes ) { |
|
| 129 | 129 | $want = $bytes; |
| 130 | 130 | } |
| 131 | - for ($i = 0; $i < $want; ++$i) { |
|
| 132 | - $mi = self::chrToInt($message[$i]); |
|
| 133 | - $this->buffer[$this->leftover + $i] = $mi; |
|
| 131 | + for ( $i = 0; $i < $want; ++$i ) { |
|
| 132 | + $mi = self::chrToInt( $message[ $i ] ); |
|
| 133 | + $this->buffer[ $this->leftover + $i ] = $mi; |
|
| 134 | 134 | } |
| 135 | 135 | // We snip off the leftmost bytes. |
| 136 | - $message = self::substr($message, $want); |
|
| 137 | - $bytes = self::strlen($message); |
|
| 136 | + $message = self::substr( $message, $want ); |
|
| 137 | + $bytes = self::strlen( $message ); |
|
| 138 | 138 | $this->leftover += $want; |
| 139 | - if ($this->leftover < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) { |
|
| 139 | + if ( $this->leftover < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) { |
|
| 140 | 140 | // We still don't have enough to run $this->blocks() |
| 141 | 141 | return $this; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | $this->blocks( |
| 145 | - self::intArrayToString($this->buffer), |
|
| 145 | + self::intArrayToString( $this->buffer ), |
|
| 146 | 146 | ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE |
| 147 | 147 | ); |
| 148 | 148 | $this->leftover = 0; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /* process full blocks */ |
| 152 | - if ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) { |
|
| 152 | + if ( $bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) { |
|
| 153 | 153 | /** @var int $want */ |
| 154 | - $want = $bytes & ~(ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1); |
|
| 155 | - if ($want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) { |
|
| 154 | + $want = $bytes & ~( ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1 ); |
|
| 155 | + if ( $want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) { |
|
| 156 | 156 | /** @var string $block */ |
| 157 | - $block = self::substr($message, 0, $want); |
|
| 158 | - if (self::strlen($block) >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) { |
|
| 159 | - $this->blocks($block, $want); |
|
| 160 | - $message = self::substr($message, $want); |
|
| 161 | - $bytes = self::strlen($message); |
|
| 157 | + $block = self::substr( $message, 0, $want ); |
|
| 158 | + if ( self::strlen( $block ) >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) { |
|
| 159 | + $this->blocks( $block, $want ); |
|
| 160 | + $message = self::substr( $message, $want ); |
|
| 161 | + $bytes = self::strlen( $message ); |
|
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /* store leftover */ |
| 167 | - if ($bytes) { |
|
| 168 | - for ($i = 0; $i < $bytes; ++$i) { |
|
| 169 | - $mi = self::chrToInt($message[$i]); |
|
| 170 | - $this->buffer[$this->leftover + $i] = $mi; |
|
| 167 | + if ( $bytes ) { |
|
| 168 | + for ( $i = 0; $i < $bytes; ++$i ) { |
|
| 169 | + $mi = self::chrToInt( $message[ $i ] ); |
|
| 170 | + $this->buffer[ $this->leftover + $i ] = $mi; |
|
| 171 | 171 | } |
| 172 | - $this->leftover = (int) $this->leftover + $bytes; |
|
| 172 | + $this->leftover = (int)$this->leftover + $bytes; |
|
| 173 | 173 | } |
| 174 | 174 | return $this; |
| 175 | 175 | } |
@@ -183,14 +183,14 @@ discard block |
||
| 183 | 183 | * @throws SodiumException |
| 184 | 184 | * @throws TypeError |
| 185 | 185 | */ |
| 186 | - public function blocks($message, $bytes) |
|
| 186 | + public function blocks( $message, $bytes ) |
|
| 187 | 187 | { |
| 188 | - if (self::strlen($message) < 16) { |
|
| 189 | - $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT); |
|
| 188 | + if ( self::strlen( $message ) < 16 ) { |
|
| 189 | + $message = str_pad( $message, 16, "\x00", STR_PAD_RIGHT ); |
|
| 190 | 190 | } |
| 191 | - $hibit = ParagonIE_Sodium_Core32_Int32::fromInt((int) ($this->final ? 0 : 1 << 24)); /* 1 << 128 */ |
|
| 192 | - $hibit->setUnsignedInt(true); |
|
| 193 | - $zero = new ParagonIE_Sodium_Core32_Int64(array(0, 0, 0, 0), true); |
|
| 191 | + $hibit = ParagonIE_Sodium_Core32_Int32::fromInt( (int)( $this->final ? 0 : 1 << 24 ) ); /* 1 << 128 */ |
|
| 192 | + $hibit->setUnsignedInt( true ); |
|
| 193 | + $zero = new ParagonIE_Sodium_Core32_Int64( array( 0, 0, 0, 0 ), true ); |
|
| 194 | 194 | /** |
| 195 | 195 | * @var ParagonIE_Sodium_Core32_Int64 $d0 |
| 196 | 196 | * @var ParagonIE_Sodium_Core32_Int64 $d1 |
@@ -209,110 +209,110 @@ discard block |
||
| 209 | 209 | * @var ParagonIE_Sodium_Core32_Int32 $h3 |
| 210 | 210 | * @var ParagonIE_Sodium_Core32_Int32 $h4 |
| 211 | 211 | */ |
| 212 | - $r0 = $this->r[0]->toInt64(); |
|
| 213 | - $r1 = $this->r[1]->toInt64(); |
|
| 214 | - $r2 = $this->r[2]->toInt64(); |
|
| 215 | - $r3 = $this->r[3]->toInt64(); |
|
| 216 | - $r4 = $this->r[4]->toInt64(); |
|
| 217 | - |
|
| 218 | - $s1 = $r1->toInt64()->mulInt(5, 3); |
|
| 219 | - $s2 = $r2->toInt64()->mulInt(5, 3); |
|
| 220 | - $s3 = $r3->toInt64()->mulInt(5, 3); |
|
| 221 | - $s4 = $r4->toInt64()->mulInt(5, 3); |
|
| 222 | - |
|
| 223 | - $h0 = $this->h[0]; |
|
| 224 | - $h1 = $this->h[1]; |
|
| 225 | - $h2 = $this->h[2]; |
|
| 226 | - $h3 = $this->h[3]; |
|
| 227 | - $h4 = $this->h[4]; |
|
| 228 | - |
|
| 229 | - while ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) { |
|
| 212 | + $r0 = $this->r[ 0 ]->toInt64(); |
|
| 213 | + $r1 = $this->r[ 1 ]->toInt64(); |
|
| 214 | + $r2 = $this->r[ 2 ]->toInt64(); |
|
| 215 | + $r3 = $this->r[ 3 ]->toInt64(); |
|
| 216 | + $r4 = $this->r[ 4 ]->toInt64(); |
|
| 217 | + |
|
| 218 | + $s1 = $r1->toInt64()->mulInt( 5, 3 ); |
|
| 219 | + $s2 = $r2->toInt64()->mulInt( 5, 3 ); |
|
| 220 | + $s3 = $r3->toInt64()->mulInt( 5, 3 ); |
|
| 221 | + $s4 = $r4->toInt64()->mulInt( 5, 3 ); |
|
| 222 | + |
|
| 223 | + $h0 = $this->h[ 0 ]; |
|
| 224 | + $h1 = $this->h[ 1 ]; |
|
| 225 | + $h2 = $this->h[ 2 ]; |
|
| 226 | + $h3 = $this->h[ 3 ]; |
|
| 227 | + $h4 = $this->h[ 4 ]; |
|
| 228 | + |
|
| 229 | + while ( $bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE ) { |
|
| 230 | 230 | /* h += m[i] */ |
| 231 | 231 | $h0 = $h0->addInt32( |
| 232 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 0, 4)) |
|
| 233 | - ->mask(0x3ffffff) |
|
| 232 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 0, 4 ) ) |
|
| 233 | + ->mask( 0x3ffffff ) |
|
| 234 | 234 | )->toInt64(); |
| 235 | 235 | $h1 = $h1->addInt32( |
| 236 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 3, 4)) |
|
| 237 | - ->shiftRight(2) |
|
| 238 | - ->mask(0x3ffffff) |
|
| 236 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 3, 4 ) ) |
|
| 237 | + ->shiftRight( 2 ) |
|
| 238 | + ->mask( 0x3ffffff ) |
|
| 239 | 239 | )->toInt64(); |
| 240 | 240 | $h2 = $h2->addInt32( |
| 241 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 6, 4)) |
|
| 242 | - ->shiftRight(4) |
|
| 243 | - ->mask(0x3ffffff) |
|
| 241 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 6, 4 ) ) |
|
| 242 | + ->shiftRight( 4 ) |
|
| 243 | + ->mask( 0x3ffffff ) |
|
| 244 | 244 | )->toInt64(); |
| 245 | 245 | $h3 = $h3->addInt32( |
| 246 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 9, 4)) |
|
| 247 | - ->shiftRight(6) |
|
| 248 | - ->mask(0x3ffffff) |
|
| 246 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 9, 4 ) ) |
|
| 247 | + ->shiftRight( 6 ) |
|
| 248 | + ->mask( 0x3ffffff ) |
|
| 249 | 249 | )->toInt64(); |
| 250 | 250 | $h4 = $h4->addInt32( |
| 251 | - ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4)) |
|
| 252 | - ->shiftRight(8) |
|
| 253 | - ->orInt32($hibit) |
|
| 251 | + ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $message, 12, 4 ) ) |
|
| 252 | + ->shiftRight( 8 ) |
|
| 253 | + ->orInt32( $hibit ) |
|
| 254 | 254 | )->toInt64(); |
| 255 | 255 | |
| 256 | 256 | /* h *= r */ |
| 257 | 257 | $d0 = $zero |
| 258 | - ->addInt64($h0->mulInt64($r0, 25)) |
|
| 259 | - ->addInt64($s4->mulInt64($h1, 26)) |
|
| 260 | - ->addInt64($s3->mulInt64($h2, 26)) |
|
| 261 | - ->addInt64($s2->mulInt64($h3, 26)) |
|
| 262 | - ->addInt64($s1->mulInt64($h4, 26)); |
|
| 258 | + ->addInt64( $h0->mulInt64( $r0, 25 ) ) |
|
| 259 | + ->addInt64( $s4->mulInt64( $h1, 26 ) ) |
|
| 260 | + ->addInt64( $s3->mulInt64( $h2, 26 ) ) |
|
| 261 | + ->addInt64( $s2->mulInt64( $h3, 26 ) ) |
|
| 262 | + ->addInt64( $s1->mulInt64( $h4, 26 ) ); |
|
| 263 | 263 | |
| 264 | 264 | $d1 = $zero |
| 265 | - ->addInt64($h0->mulInt64($r1, 25)) |
|
| 266 | - ->addInt64($h1->mulInt64($r0, 25)) |
|
| 267 | - ->addInt64($s4->mulInt64($h2, 26)) |
|
| 268 | - ->addInt64($s3->mulInt64($h3, 26)) |
|
| 269 | - ->addInt64($s2->mulInt64($h4, 26)); |
|
| 265 | + ->addInt64( $h0->mulInt64( $r1, 25 ) ) |
|
| 266 | + ->addInt64( $h1->mulInt64( $r0, 25 ) ) |
|
| 267 | + ->addInt64( $s4->mulInt64( $h2, 26 ) ) |
|
| 268 | + ->addInt64( $s3->mulInt64( $h3, 26 ) ) |
|
| 269 | + ->addInt64( $s2->mulInt64( $h4, 26 ) ); |
|
| 270 | 270 | |
| 271 | 271 | $d2 = $zero |
| 272 | - ->addInt64($h0->mulInt64($r2, 25)) |
|
| 273 | - ->addInt64($h1->mulInt64($r1, 25)) |
|
| 274 | - ->addInt64($h2->mulInt64($r0, 25)) |
|
| 275 | - ->addInt64($s4->mulInt64($h3, 26)) |
|
| 276 | - ->addInt64($s3->mulInt64($h4, 26)); |
|
| 272 | + ->addInt64( $h0->mulInt64( $r2, 25 ) ) |
|
| 273 | + ->addInt64( $h1->mulInt64( $r1, 25 ) ) |
|
| 274 | + ->addInt64( $h2->mulInt64( $r0, 25 ) ) |
|
| 275 | + ->addInt64( $s4->mulInt64( $h3, 26 ) ) |
|
| 276 | + ->addInt64( $s3->mulInt64( $h4, 26 ) ); |
|
| 277 | 277 | |
| 278 | 278 | $d3 = $zero |
| 279 | - ->addInt64($h0->mulInt64($r3, 25)) |
|
| 280 | - ->addInt64($h1->mulInt64($r2, 25)) |
|
| 281 | - ->addInt64($h2->mulInt64($r1, 25)) |
|
| 282 | - ->addInt64($h3->mulInt64($r0, 25)) |
|
| 283 | - ->addInt64($s4->mulInt64($h4, 26)); |
|
| 279 | + ->addInt64( $h0->mulInt64( $r3, 25 ) ) |
|
| 280 | + ->addInt64( $h1->mulInt64( $r2, 25 ) ) |
|
| 281 | + ->addInt64( $h2->mulInt64( $r1, 25 ) ) |
|
| 282 | + ->addInt64( $h3->mulInt64( $r0, 25 ) ) |
|
| 283 | + ->addInt64( $s4->mulInt64( $h4, 26 ) ); |
|
| 284 | 284 | |
| 285 | 285 | $d4 = $zero |
| 286 | - ->addInt64($h0->mulInt64($r4, 25)) |
|
| 287 | - ->addInt64($h1->mulInt64($r3, 25)) |
|
| 288 | - ->addInt64($h2->mulInt64($r2, 25)) |
|
| 289 | - ->addInt64($h3->mulInt64($r1, 25)) |
|
| 290 | - ->addInt64($h4->mulInt64($r0, 25)); |
|
| 286 | + ->addInt64( $h0->mulInt64( $r4, 25 ) ) |
|
| 287 | + ->addInt64( $h1->mulInt64( $r3, 25 ) ) |
|
| 288 | + ->addInt64( $h2->mulInt64( $r2, 25 ) ) |
|
| 289 | + ->addInt64( $h3->mulInt64( $r1, 25 ) ) |
|
| 290 | + ->addInt64( $h4->mulInt64( $r0, 25 ) ); |
|
| 291 | 291 | |
| 292 | 292 | /* (partial) h %= p */ |
| 293 | - $c = $d0->shiftRight(26); |
|
| 294 | - $h0 = $d0->toInt32()->mask(0x3ffffff); |
|
| 295 | - $d1 = $d1->addInt64($c); |
|
| 293 | + $c = $d0->shiftRight( 26 ); |
|
| 294 | + $h0 = $d0->toInt32()->mask( 0x3ffffff ); |
|
| 295 | + $d1 = $d1->addInt64( $c ); |
|
| 296 | 296 | |
| 297 | - $c = $d1->shiftRight(26); |
|
| 298 | - $h1 = $d1->toInt32()->mask(0x3ffffff); |
|
| 299 | - $d2 = $d2->addInt64($c); |
|
| 297 | + $c = $d1->shiftRight( 26 ); |
|
| 298 | + $h1 = $d1->toInt32()->mask( 0x3ffffff ); |
|
| 299 | + $d2 = $d2->addInt64( $c ); |
|
| 300 | 300 | |
| 301 | - $c = $d2->shiftRight(26); |
|
| 302 | - $h2 = $d2->toInt32()->mask(0x3ffffff); |
|
| 303 | - $d3 = $d3->addInt64($c); |
|
| 301 | + $c = $d2->shiftRight( 26 ); |
|
| 302 | + $h2 = $d2->toInt32()->mask( 0x3ffffff ); |
|
| 303 | + $d3 = $d3->addInt64( $c ); |
|
| 304 | 304 | |
| 305 | - $c = $d3->shiftRight(26); |
|
| 306 | - $h3 = $d3->toInt32()->mask(0x3ffffff); |
|
| 307 | - $d4 = $d4->addInt64($c); |
|
| 305 | + $c = $d3->shiftRight( 26 ); |
|
| 306 | + $h3 = $d3->toInt32()->mask( 0x3ffffff ); |
|
| 307 | + $d4 = $d4->addInt64( $c ); |
|
| 308 | 308 | |
| 309 | - $c = $d4->shiftRight(26); |
|
| 310 | - $h4 = $d4->toInt32()->mask(0x3ffffff); |
|
| 311 | - $h0 = $h0->addInt32($c->toInt32()->mulInt(5, 3)); |
|
| 309 | + $c = $d4->shiftRight( 26 ); |
|
| 310 | + $h4 = $d4->toInt32()->mask( 0x3ffffff ); |
|
| 311 | + $h0 = $h0->addInt32( $c->toInt32()->mulInt( 5, 3 ) ); |
|
| 312 | 312 | |
| 313 | - $c = $h0->shiftRight(26); |
|
| 314 | - $h0 = $h0->mask(0x3ffffff); |
|
| 315 | - $h1 = $h1->addInt32($c); |
|
| 313 | + $c = $h0->shiftRight( 26 ); |
|
| 314 | + $h0 = $h0->mask( 0x3ffffff ); |
|
| 315 | + $h1 = $h1->addInt32( $c ); |
|
| 316 | 316 | |
| 317 | 317 | // Chop off the left 32 bytes. |
| 318 | 318 | $message = self::substr( |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */ |
| 326 | - $this->h = array($h0, $h1, $h2, $h3, $h4); |
|
| 326 | + $this->h = array( $h0, $h1, $h2, $h3, $h4 ); |
|
| 327 | 327 | return $this; |
| 328 | 328 | } |
| 329 | 329 | |
@@ -337,16 +337,16 @@ discard block |
||
| 337 | 337 | public function finish() |
| 338 | 338 | { |
| 339 | 339 | /* process the remaining block */ |
| 340 | - if ($this->leftover) { |
|
| 340 | + if ( $this->leftover ) { |
|
| 341 | 341 | $i = $this->leftover; |
| 342 | - $this->buffer[$i++] = 1; |
|
| 343 | - for (; $i < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE; ++$i) { |
|
| 344 | - $this->buffer[$i] = 0; |
|
| 342 | + $this->buffer[ $i++ ] = 1; |
|
| 343 | + for ( ; $i < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE; ++$i ) { |
|
| 344 | + $this->buffer[ $i ] = 0; |
|
| 345 | 345 | } |
| 346 | 346 | $this->final = true; |
| 347 | 347 | $this->blocks( |
| 348 | 348 | self::substr( |
| 349 | - self::intArrayToString($this->buffer), |
|
| 349 | + self::intArrayToString( $this->buffer ), |
|
| 350 | 350 | 0, |
| 351 | 351 | ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE |
| 352 | 352 | ), |
@@ -367,80 +367,80 @@ discard block |
||
| 367 | 367 | * @var ParagonIE_Sodium_Core32_Int32 $h3 |
| 368 | 368 | * @var ParagonIE_Sodium_Core32_Int32 $h4 |
| 369 | 369 | */ |
| 370 | - $h0 = $this->h[0]; |
|
| 371 | - $h1 = $this->h[1]; |
|
| 372 | - $h2 = $this->h[2]; |
|
| 373 | - $h3 = $this->h[3]; |
|
| 374 | - $h4 = $this->h[4]; |
|
| 370 | + $h0 = $this->h[ 0 ]; |
|
| 371 | + $h1 = $this->h[ 1 ]; |
|
| 372 | + $h2 = $this->h[ 2 ]; |
|
| 373 | + $h3 = $this->h[ 3 ]; |
|
| 374 | + $h4 = $this->h[ 4 ]; |
|
| 375 | 375 | |
| 376 | - $c = $h1->shiftRight(26); # $c = $h1 >> 26; |
|
| 377 | - $h1 = $h1->mask(0x3ffffff); # $h1 &= 0x3ffffff; |
|
| 376 | + $c = $h1->shiftRight( 26 ); # $c = $h1 >> 26; |
|
| 377 | + $h1 = $h1->mask( 0x3ffffff ); # $h1 &= 0x3ffffff; |
|
| 378 | 378 | |
| 379 | - $h2 = $h2->addInt32($c); # $h2 += $c; |
|
| 380 | - $c = $h2->shiftRight(26); # $c = $h2 >> 26; |
|
| 381 | - $h2 = $h2->mask(0x3ffffff); # $h2 &= 0x3ffffff; |
|
| 379 | + $h2 = $h2->addInt32( $c ); # $h2 += $c; |
|
| 380 | + $c = $h2->shiftRight( 26 ); # $c = $h2 >> 26; |
|
| 381 | + $h2 = $h2->mask( 0x3ffffff ); # $h2 &= 0x3ffffff; |
|
| 382 | 382 | |
| 383 | - $h3 = $h3->addInt32($c); # $h3 += $c; |
|
| 384 | - $c = $h3->shiftRight(26); # $c = $h3 >> 26; |
|
| 385 | - $h3 = $h3->mask(0x3ffffff); # $h3 &= 0x3ffffff; |
|
| 383 | + $h3 = $h3->addInt32( $c ); # $h3 += $c; |
|
| 384 | + $c = $h3->shiftRight( 26 ); # $c = $h3 >> 26; |
|
| 385 | + $h3 = $h3->mask( 0x3ffffff ); # $h3 &= 0x3ffffff; |
|
| 386 | 386 | |
| 387 | - $h4 = $h4->addInt32($c); # $h4 += $c; |
|
| 388 | - $c = $h4->shiftRight(26); # $c = $h4 >> 26; |
|
| 389 | - $h4 = $h4->mask(0x3ffffff); # $h4 &= 0x3ffffff; |
|
| 387 | + $h4 = $h4->addInt32( $c ); # $h4 += $c; |
|
| 388 | + $c = $h4->shiftRight( 26 ); # $c = $h4 >> 26; |
|
| 389 | + $h4 = $h4->mask( 0x3ffffff ); # $h4 &= 0x3ffffff; |
|
| 390 | 390 | |
| 391 | - $h0 = $h0->addInt32($c->mulInt(5, 3)); # $h0 += self::mul($c, 5); |
|
| 392 | - $c = $h0->shiftRight(26); # $c = $h0 >> 26; |
|
| 393 | - $h0 = $h0->mask(0x3ffffff); # $h0 &= 0x3ffffff; |
|
| 394 | - $h1 = $h1->addInt32($c); # $h1 += $c; |
|
| 391 | + $h0 = $h0->addInt32( $c->mulInt( 5, 3 ) ); # $h0 += self::mul($c, 5); |
|
| 392 | + $c = $h0->shiftRight( 26 ); # $c = $h0 >> 26; |
|
| 393 | + $h0 = $h0->mask( 0x3ffffff ); # $h0 &= 0x3ffffff; |
|
| 394 | + $h1 = $h1->addInt32( $c ); # $h1 += $c; |
|
| 395 | 395 | |
| 396 | 396 | /* compute h + -p */ |
| 397 | - $g0 = $h0->addInt(5); |
|
| 398 | - $c = $g0->shiftRight(26); |
|
| 399 | - $g0 = $g0->mask(0x3ffffff); |
|
| 400 | - $g1 = $h1->addInt32($c); |
|
| 401 | - $c = $g1->shiftRight(26); |
|
| 402 | - $g1 = $g1->mask(0x3ffffff); |
|
| 403 | - $g2 = $h2->addInt32($c); |
|
| 404 | - $c = $g2->shiftRight(26); |
|
| 405 | - $g2 = $g2->mask(0x3ffffff); |
|
| 406 | - $g3 = $h3->addInt32($c); |
|
| 407 | - $c = $g3->shiftRight(26); |
|
| 408 | - $g3 = $g3->mask(0x3ffffff); |
|
| 409 | - $g4 = $h4->addInt32($c)->subInt(1 << 26); |
|
| 397 | + $g0 = $h0->addInt( 5 ); |
|
| 398 | + $c = $g0->shiftRight( 26 ); |
|
| 399 | + $g0 = $g0->mask( 0x3ffffff ); |
|
| 400 | + $g1 = $h1->addInt32( $c ); |
|
| 401 | + $c = $g1->shiftRight( 26 ); |
|
| 402 | + $g1 = $g1->mask( 0x3ffffff ); |
|
| 403 | + $g2 = $h2->addInt32( $c ); |
|
| 404 | + $c = $g2->shiftRight( 26 ); |
|
| 405 | + $g2 = $g2->mask( 0x3ffffff ); |
|
| 406 | + $g3 = $h3->addInt32( $c ); |
|
| 407 | + $c = $g3->shiftRight( 26 ); |
|
| 408 | + $g3 = $g3->mask( 0x3ffffff ); |
|
| 409 | + $g4 = $h4->addInt32( $c )->subInt( 1 << 26 ); |
|
| 410 | 410 | |
| 411 | 411 | # $mask = ($g4 >> 31) - 1; |
| 412 | 412 | /* select h if h < p, or h + -p if h >= p */ |
| 413 | - $mask = (int) (($g4->toInt() >> 31) + 1); |
|
| 413 | + $mask = (int)( ( $g4->toInt() >> 31 ) + 1 ); |
|
| 414 | 414 | |
| 415 | - $g0 = $g0->mask($mask); |
|
| 416 | - $g1 = $g1->mask($mask); |
|
| 417 | - $g2 = $g2->mask($mask); |
|
| 418 | - $g3 = $g3->mask($mask); |
|
| 419 | - $g4 = $g4->mask($mask); |
|
| 415 | + $g0 = $g0->mask( $mask ); |
|
| 416 | + $g1 = $g1->mask( $mask ); |
|
| 417 | + $g2 = $g2->mask( $mask ); |
|
| 418 | + $g3 = $g3->mask( $mask ); |
|
| 419 | + $g4 = $g4->mask( $mask ); |
|
| 420 | 420 | |
| 421 | 421 | /** @var int $mask */ |
| 422 | - $mask = (~$mask) & 0xffffffff; |
|
| 422 | + $mask = ( ~$mask ) & 0xffffffff; |
|
| 423 | 423 | |
| 424 | - $h0 = $h0->mask($mask)->orInt32($g0); |
|
| 425 | - $h1 = $h1->mask($mask)->orInt32($g1); |
|
| 426 | - $h2 = $h2->mask($mask)->orInt32($g2); |
|
| 427 | - $h3 = $h3->mask($mask)->orInt32($g3); |
|
| 428 | - $h4 = $h4->mask($mask)->orInt32($g4); |
|
| 424 | + $h0 = $h0->mask( $mask )->orInt32( $g0 ); |
|
| 425 | + $h1 = $h1->mask( $mask )->orInt32( $g1 ); |
|
| 426 | + $h2 = $h2->mask( $mask )->orInt32( $g2 ); |
|
| 427 | + $h3 = $h3->mask( $mask )->orInt32( $g3 ); |
|
| 428 | + $h4 = $h4->mask( $mask )->orInt32( $g4 ); |
|
| 429 | 429 | |
| 430 | 430 | /* h = h % (2^128) */ |
| 431 | - $h0 = $h0->orInt32($h1->shiftLeft(26)); |
|
| 432 | - $h1 = $h1->shiftRight(6)->orInt32($h2->shiftLeft(20)); |
|
| 433 | - $h2 = $h2->shiftRight(12)->orInt32($h3->shiftLeft(14)); |
|
| 434 | - $h3 = $h3->shiftRight(18)->orInt32($h4->shiftLeft(8)); |
|
| 431 | + $h0 = $h0->orInt32( $h1->shiftLeft( 26 ) ); |
|
| 432 | + $h1 = $h1->shiftRight( 6 )->orInt32( $h2->shiftLeft( 20 ) ); |
|
| 433 | + $h2 = $h2->shiftRight( 12 )->orInt32( $h3->shiftLeft( 14 ) ); |
|
| 434 | + $h3 = $h3->shiftRight( 18 )->orInt32( $h4->shiftLeft( 8 ) ); |
|
| 435 | 435 | |
| 436 | 436 | /* mac = (h + pad) % (2^128) */ |
| 437 | - $f = $h0->toInt64()->addInt64($this->pad[0]); |
|
| 437 | + $f = $h0->toInt64()->addInt64( $this->pad[ 0 ] ); |
|
| 438 | 438 | $h0 = $f->toInt32(); |
| 439 | - $f = $h1->toInt64()->addInt64($this->pad[1])->addInt($h0->overflow); |
|
| 439 | + $f = $h1->toInt64()->addInt64( $this->pad[ 1 ] )->addInt( $h0->overflow ); |
|
| 440 | 440 | $h1 = $f->toInt32(); |
| 441 | - $f = $h2->toInt64()->addInt64($this->pad[2])->addInt($h1->overflow); |
|
| 441 | + $f = $h2->toInt64()->addInt64( $this->pad[ 2 ] )->addInt( $h1->overflow ); |
|
| 442 | 442 | $h2 = $f->toInt32(); |
| 443 | - $f = $h3->toInt64()->addInt64($this->pad[3])->addInt($h2->overflow); |
|
| 443 | + $f = $h3->toInt64()->addInt64( $this->pad[ 3 ] )->addInt( $h2->overflow ); |
|
| 444 | 444 | $h3 = $f->toInt32(); |
| 445 | 445 | |
| 446 | 446 | return $h0->toReverseString() . |
