Edit File by line

$s0 -= $carry0 << 21;

[3500] Fix | Delete

// carry1 = s1 >> 21;

[3501] Fix | Delete

// s2 += carry1;

[3502] Fix | Delete

// s1 -= carry1 * ((uint64_t) 1L << 21);

[3503] Fix | Delete

$carry1 = $s1 >> 21;

[3504] Fix | Delete

$s2 += $carry1;

[3505] Fix | Delete

$s1 -= $carry1 << 21;

[3506] Fix | Delete

// carry2 = s2 >> 21;

[3507] Fix | Delete

// s3 += carry2;

[3508] Fix | Delete

// s2 -= carry2 * ((uint64_t) 1L << 21);

[3509] Fix | Delete

$carry2 = $s2 >> 21;

[3510] Fix | Delete

$s3 += $carry2;

[3511] Fix | Delete

$s2 -= $carry2 << 21;

[3512] Fix | Delete

// carry3 = s3 >> 21;

[3513] Fix | Delete

// s4 += carry3;

[3514] Fix | Delete

// s3 -= carry3 * ((uint64_t) 1L << 21);

[3515] Fix | Delete

$carry3 = $s3 >> 21;

[3516] Fix | Delete

$s4 += $carry3;

[3517] Fix | Delete

$s3 -= $carry3 << 21;

[3518] Fix | Delete

// carry4 = s4 >> 21;

[3519] Fix | Delete

// s5 += carry4;

[3520] Fix | Delete

// s4 -= carry4 * ((uint64_t) 1L << 21);

[3521] Fix | Delete

$carry4 = $s4 >> 21;

[3522] Fix | Delete

$s5 += $carry4;

[3523] Fix | Delete

$s4 -= $carry4 << 21;

[3524] Fix | Delete

// carry5 = s5 >> 21;

[3525] Fix | Delete

// s6 += carry5;

[3526] Fix | Delete

// s5 -= carry5 * ((uint64_t) 1L << 21);

[3527] Fix | Delete

$carry5 = $s5 >> 21;

[3528] Fix | Delete

$s6 += $carry5;

[3529] Fix | Delete

$s5 -= $carry5 << 21;

[3530] Fix | Delete

// carry6 = s6 >> 21;

[3531] Fix | Delete

// s7 += carry6;

[3532] Fix | Delete

// s6 -= carry6 * ((uint64_t) 1L << 21);

[3533] Fix | Delete

$carry6 = $s6 >> 21;

[3534] Fix | Delete

$s7 += $carry6;

[3535] Fix | Delete

$s6 -= $carry6 << 21;

[3536] Fix | Delete

// carry7 = s7 >> 21;

[3537] Fix | Delete

// s8 += carry7;

[3538] Fix | Delete

// s7 -= carry7 * ((uint64_t) 1L << 21);

[3539] Fix | Delete

$carry7 = $s7 >> 21;

[3540] Fix | Delete

$s8 += $carry7;

[3541] Fix | Delete

$s7 -= $carry7 << 21;

[3542] Fix | Delete

// carry8 = s8 >> 21;

[3543] Fix | Delete

// s9 += carry8;

[3544] Fix | Delete

// s8 -= carry8 * ((uint64_t) 1L << 21);

[3545] Fix | Delete

$carry8 = $s8 >> 21;

[3546] Fix | Delete

$s9 += $carry8;

[3547] Fix | Delete

$s8 -= $carry8 << 21;

[3548] Fix | Delete

// carry9 = s9 >> 21;

[3549] Fix | Delete

// s10 += carry9;

[3550] Fix | Delete

// s9 -= carry9 * ((uint64_t) 1L << 21);

[3551] Fix | Delete

$carry9 = $s9 >> 21;

[3552] Fix | Delete

$s10 += $carry9;

[3553] Fix | Delete

$s9 -= $carry9 << 21;

[3554] Fix | Delete

// carry10 = s10 >> 21;

[3555] Fix | Delete

// s11 += carry10;

[3556] Fix | Delete

// s10 -= carry10 * ((uint64_t) 1L << 21);

[3557] Fix | Delete

$carry10 = $s10 >> 21;

[3558] Fix | Delete

$s11 += $carry10;

[3559] Fix | Delete

$s10 -= $carry10 << 21;

[3560] Fix | Delete

// carry11 = s11 >> 21;

[3561] Fix | Delete

// s12 += carry11;

[3562] Fix | Delete

// s11 -= carry11 * ((uint64_t) 1L << 21);

[3563] Fix | Delete

$carry11 = $s11 >> 21;

[3564] Fix | Delete

$s12 += $carry11;

[3565] Fix | Delete

$s11 -= $carry11 << 21;

[3566] Fix | Delete

[3567] Fix | Delete

// s0 += s12 * 666643;

[3568] Fix | Delete

// s1 += s12 * 470296;

[3569] Fix | Delete

// s2 += s12 * 654183;

[3570] Fix | Delete

// s3 -= s12 * 997805;

[3571] Fix | Delete

// s4 += s12 * 136657;

[3572] Fix | Delete

// s5 -= s12 * 683901;

[3573] Fix | Delete

$s0 += self::mul($s12, 666643, 20);

[3574] Fix | Delete

$s1 += self::mul($s12, 470296, 19);

[3575] Fix | Delete

$s2 += self::mul($s12, 654183, 20);

[3576] Fix | Delete

$s3 -= self::mul($s12, 997805, 20);

[3577] Fix | Delete

$s4 += self::mul($s12, 136657, 18);

[3578] Fix | Delete

$s5 -= self::mul($s12, 683901, 20);

[3579] Fix | Delete

[3580] Fix | Delete

// carry0 = s0 >> 21;

[3581] Fix | Delete

// s1 += carry0;

[3582] Fix | Delete

// s0 -= carry0 * ((uint64_t) 1L << 21);

[3583] Fix | Delete

$carry0 = $s0 >> 21;

[3584] Fix | Delete

$s1 += $carry0;

[3585] Fix | Delete

$s0 -= $carry0 << 21;

[3586] Fix | Delete

// carry1 = s1 >> 21;

[3587] Fix | Delete

// s2 += carry1;

[3588] Fix | Delete

// s1 -= carry1 * ((uint64_t) 1L << 21);

[3589] Fix | Delete

$carry1 = $s1 >> 21;

[3590] Fix | Delete

$s2 += $carry1;

[3591] Fix | Delete

$s1 -= $carry1 << 21;

[3592] Fix | Delete

// carry2 = s2 >> 21;

[3593] Fix | Delete

// s3 += carry2;

[3594] Fix | Delete

// s2 -= carry2 * ((uint64_t) 1L << 21);

[3595] Fix | Delete

$carry2 = $s2 >> 21;

[3596] Fix | Delete

$s3 += $carry2;

[3597] Fix | Delete

$s2 -= $carry2 << 21;

[3598] Fix | Delete

// carry3 = s3 >> 21;

[3599] Fix | Delete

// s4 += carry3;

[3600] Fix | Delete

// s3 -= carry3 * ((uint64_t) 1L << 21);

[3601] Fix | Delete

$carry3 = $s3 >> 21;

[3602] Fix | Delete

$s4 += $carry3;

[3603] Fix | Delete

$s3 -= $carry3 << 21;

[3604] Fix | Delete

// carry4 = s4 >> 21;

[3605] Fix | Delete

// s5 += carry4;

[3606] Fix | Delete

// s4 -= carry4 * ((uint64_t) 1L << 21);

[3607] Fix | Delete

$carry4 = $s4 >> 21;

[3608] Fix | Delete

$s5 += $carry4;

[3609] Fix | Delete

$s4 -= $carry4 << 21;

[3610] Fix | Delete

// carry5 = s5 >> 21;

[3611] Fix | Delete

// s6 += carry5;

[3612] Fix | Delete

// s5 -= carry5 * ((uint64_t) 1L << 21);

[3613] Fix | Delete

$carry5 = $s5 >> 21;

[3614] Fix | Delete

$s6 += $carry5;

[3615] Fix | Delete

$s5 -= $carry5 << 21;

[3616] Fix | Delete

// carry6 = s6 >> 21;

[3617] Fix | Delete

// s7 += carry6;

[3618] Fix | Delete

// s6 -= carry6 * ((uint64_t) 1L << 21);

[3619] Fix | Delete

$carry6 = $s6 >> 21;

[3620] Fix | Delete

$s7 += $carry6;

[3621] Fix | Delete

$s6 -= $carry6 << 21;

[3622] Fix | Delete

// carry7 = s7 >> 21;

[3623] Fix | Delete

// s8 += carry7;

[3624] Fix | Delete

// s7 -= carry7 * ((uint64_t) 1L << 21);

[3625] Fix | Delete

$carry7 = $s7 >> 21;

[3626] Fix | Delete

$s8 += $carry7;

[3627] Fix | Delete

$s7 -= $carry7 << 21;

[3628] Fix | Delete

// carry8 = s8 >> 21;

[3629] Fix | Delete

// s9 += carry8;

[3630] Fix | Delete

// s8 -= carry8 * ((uint64_t) 1L << 21);

[3631] Fix | Delete

$carry8 = $s8 >> 21;

[3632] Fix | Delete

$s9 += $carry8;

[3633] Fix | Delete

$s8 -= $carry8 << 21;

[3634] Fix | Delete

// carry9 = s9 >> 21;

[3635] Fix | Delete

// s10 += carry9;

[3636] Fix | Delete

// s9 -= carry9 * ((uint64_t) 1L << 21);

[3637] Fix | Delete

$carry9 = $s9 >> 21;

[3638] Fix | Delete

$s10 += $carry9;

[3639] Fix | Delete

$s9 -= $carry9 << 21;

[3640] Fix | Delete

// carry10 = s10 >> 21;

[3641] Fix | Delete

// s11 += carry10;

[3642] Fix | Delete

// s10 -= carry10 * ((uint64_t) 1L << 21);

[3643] Fix | Delete

$carry10 = $s10 >> 21;

[3644] Fix | Delete

$s11 += $carry10;

[3645] Fix | Delete

$s10 -= $carry10 << 21;

[3646] Fix | Delete

[3647] Fix | Delete

$s = array_fill(0, 32, 0);

[3648] Fix | Delete

// s[0] = s0 >> 0;

[3649] Fix | Delete

$s[0] = $s0 >> 0;

[3650] Fix | Delete

// s[1] = s0 >> 8;

[3651] Fix | Delete

$s[1] = $s0 >> 8;

[3652] Fix | Delete

// s[2] = (s0 >> 16) | (s1 * ((uint64_t) 1 << 5));

[3653] Fix | Delete

$s[2] = ($s0 >> 16) | ($s1 << 5);

[3654] Fix | Delete

// s[3] = s1 >> 3;

[3655] Fix | Delete

$s[3] = $s1 >> 3;

[3656] Fix | Delete

// s[4] = s1 >> 11;

[3657] Fix | Delete

$s[4] = $s1 >> 11;

[3658] Fix | Delete

// s[5] = (s1 >> 19) | (s2 * ((uint64_t) 1 << 2));

[3659] Fix | Delete

$s[5] = ($s1 >> 19) | ($s2 << 2);

[3660] Fix | Delete

// s[6] = s2 >> 6;

[3661] Fix | Delete

$s[6] = $s2 >> 6;

[3662] Fix | Delete

// s[7] = (s2 >> 14) | (s3 * ((uint64_t) 1 << 7));

[3663] Fix | Delete

$s[7] = ($s2 >> 14) | ($s3 << 7);

[3664] Fix | Delete

// s[8] = s3 >> 1;

[3665] Fix | Delete

$s[8] = $s3 >> 1;

[3666] Fix | Delete

// s[9] = s3 >> 9;

[3667] Fix | Delete

$s[9] = $s3 >> 9;

[3668] Fix | Delete

// s[10] = (s3 >> 17) | (s4 * ((uint64_t) 1 << 4));

[3669] Fix | Delete

$s[10] = ($s3 >> 17) | ($s4 << 4);

[3670] Fix | Delete

// s[11] = s4 >> 4;

[3671] Fix | Delete

$s[11] = $s4 >> 4;

[3672] Fix | Delete

// s[12] = s4 >> 12;

[3673] Fix | Delete

$s[12] = $s4 >> 12;

[3674] Fix | Delete

// s[13] = (s4 >> 20) | (s5 * ((uint64_t) 1 << 1));

[3675] Fix | Delete

$s[13] = ($s4 >> 20) | ($s5 << 1);

[3676] Fix | Delete

// s[14] = s5 >> 7;

[3677] Fix | Delete

$s[14] = $s5 >> 7;

[3678] Fix | Delete

// s[15] = (s5 >> 15) | (s6 * ((uint64_t) 1 << 6));

[3679] Fix | Delete

$s[15] = ($s5 >> 15) | ($s6 << 6);

[3680] Fix | Delete

// s[16] = s6 >> 2;

[3681] Fix | Delete

$s[16] = $s6 >> 2;

[3682] Fix | Delete

// s[17] = s6 >> 10;

[3683] Fix | Delete

$s[17] = $s6 >> 10;

[3684] Fix | Delete

// s[18] = (s6 >> 18) | (s7 * ((uint64_t) 1 << 3));

[3685] Fix | Delete

$s[18] = ($s6 >> 18) | ($s7 << 3);

[3686] Fix | Delete

// s[19] = s7 >> 5;

[3687] Fix | Delete

$s[19] = $s7 >> 5;

[3688] Fix | Delete

// s[20] = s7 >> 13;

[3689] Fix | Delete

$s[20] = $s7 >> 13;

[3690] Fix | Delete

// s[21] = s8 >> 0;

[3691] Fix | Delete

$s[21] = $s8 >> 0;

[3692] Fix | Delete

// s[22] = s8 >> 8;

[3693] Fix | Delete

$s[22] = $s8 >> 8;

[3694] Fix | Delete

// s[23] = (s8 >> 16) | (s9 * ((uint64_t) 1 << 5));

[3695] Fix | Delete

$s[23] = ($s8 >> 16) | ($s9 << 5);

[3696] Fix | Delete

// s[24] = s9 >> 3;

[3697] Fix | Delete

$s[24] = $s9 >> 3;

[3698] Fix | Delete

// s[25] = s9 >> 11;

[3699] Fix | Delete

$s[25] = $s9 >> 11;

[3700] Fix | Delete

// s[26] = (s9 >> 19) | (s10 * ((uint64_t) 1 << 2));

[3701] Fix | Delete

$s[26] = ($s9 >> 19) | ($s10 << 2);

[3702] Fix | Delete

// s[27] = s10 >> 6;

[3703] Fix | Delete

$s[27] = $s10 >> 6;

[3704] Fix | Delete

// s[28] = (s10 >> 14) | (s11 * ((uint64_t) 1 << 7));

[3705] Fix | Delete

$s[28] = ($s10 >> 14) | ($s11 << 7);

[3706] Fix | Delete

// s[29] = s11 >> 1;

[3707] Fix | Delete

$s[29] = $s11 >> 1;

[3708] Fix | Delete

// s[30] = s11 >> 9;

[3709] Fix | Delete

$s[30] = $s11 >> 9;

[3710] Fix | Delete

// s[31] = s11 >> 17;

[3711] Fix | Delete

$s[31] = $s11 >> 17;

[3712] Fix | Delete

return self::intArrayToString($s);

[3713] Fix | Delete

}

[3714] Fix | Delete

[3715] Fix | Delete

/**

[3716] Fix | Delete

* @param string $s

[3717] Fix | Delete

* @return string

[3718] Fix | Delete

[3719] Fix | Delete

public static function sc25519_sq($s)

[3720] Fix | Delete

{

[3721] Fix | Delete

return self::sc25519_mul($s, $s);

[3722] Fix | Delete

}

[3723] Fix | Delete

[3724] Fix | Delete

/**

[3725] Fix | Delete

* @param string $s

[3726] Fix | Delete

* @param int $n

[3727] Fix | Delete

* @param string $a

[3728] Fix | Delete

* @return string

[3729] Fix | Delete

[3730] Fix | Delete

public static function sc25519_sqmul($s, $n, $a)

[3731] Fix | Delete

{

[3732] Fix | Delete

for ($i = 0; $i < $n; ++$i) {

[3733] Fix | Delete

$s = self::sc25519_sq($s);

[3734] Fix | Delete

}

[3735] Fix | Delete

return self::sc25519_mul($s, $a);

[3736] Fix | Delete

}

[3737] Fix | Delete

[3738] Fix | Delete

/**

[3739] Fix | Delete

* @param string $s

[3740] Fix | Delete

* @return string

[3741] Fix | Delete

[3742] Fix | Delete

public static function sc25519_invert($s)

[3743] Fix | Delete

{

[3744] Fix | Delete

$_10 = self::sc25519_sq($s);

[3745] Fix | Delete

$_11 = self::sc25519_mul($s, $_10);

[3746] Fix | Delete

$_100 = self::sc25519_mul($s, $_11);

[3747] Fix | Delete

$_1000 = self::sc25519_sq($_100);

[3748] Fix | Delete

$_1010 = self::sc25519_mul($_10, $_1000);

[3749] Fix | Delete

$_1011 = self::sc25519_mul($s, $_1010);

[3750] Fix | Delete

$_10000 = self::sc25519_sq($_1000);

[3751] Fix | Delete

$_10110 = self::sc25519_sq($_1011);

[3752] Fix | Delete

$_100000 = self::sc25519_mul($_1010, $_10110);

[3753] Fix | Delete

$_100110 = self::sc25519_mul($_10000, $_10110);

[3754] Fix | Delete

$_1000000 = self::sc25519_sq($_100000);

[3755] Fix | Delete

$_1010000 = self::sc25519_mul($_10000, $_1000000);

[3756] Fix | Delete

$_1010011 = self::sc25519_mul($_11, $_1010000);

[3757] Fix | Delete

$_1100011 = self::sc25519_mul($_10000, $_1010011);

[3758] Fix | Delete

$_1100111 = self::sc25519_mul($_100, $_1100011);

[3759] Fix | Delete

$_1101011 = self::sc25519_mul($_100, $_1100111);

[3760] Fix | Delete

$_10010011 = self::sc25519_mul($_1000000, $_1010011);

[3761] Fix | Delete

$_10010111 = self::sc25519_mul($_100, $_10010011);

[3762] Fix | Delete

$_10111101 = self::sc25519_mul($_100110, $_10010111);

[3763] Fix | Delete

$_11010011 = self::sc25519_mul($_10110, $_10111101);

[3764] Fix | Delete

$_11100111 = self::sc25519_mul($_1010000, $_10010111);

[3765] Fix | Delete

$_11101011 = self::sc25519_mul($_100, $_11100111);

[3766] Fix | Delete

$_11110101 = self::sc25519_mul($_1010, $_11101011);

[3767] Fix | Delete

[3768] Fix | Delete

$recip = self::sc25519_mul($_1011, $_11110101);

[3769] Fix | Delete

$recip = self::sc25519_sqmul($recip, 126, $_1010011);

[3770] Fix | Delete

$recip = self::sc25519_sqmul($recip, 9, $_10);

[3771] Fix | Delete

$recip = self::sc25519_mul($recip, $_11110101);

[3772] Fix | Delete

$recip = self::sc25519_sqmul($recip, 7, $_1100111);

[3773] Fix | Delete

$recip = self::sc25519_sqmul($recip, 9, $_11110101);

[3774] Fix | Delete

$recip = self::sc25519_sqmul($recip, 11, $_10111101);

[3775] Fix | Delete

$recip = self::sc25519_sqmul($recip, 8, $_11100111);

[3776] Fix | Delete

$recip = self::sc25519_sqmul($recip, 9, $_1101011);

[3777] Fix | Delete

$recip = self::sc25519_sqmul($recip, 6, $_1011);

[3778] Fix | Delete

$recip = self::sc25519_sqmul($recip, 14, $_10010011);

[3779] Fix | Delete

$recip = self::sc25519_sqmul($recip, 10, $_1100011);

[3780] Fix | Delete

$recip = self::sc25519_sqmul($recip, 9, $_10010111);

[3781] Fix | Delete

$recip = self::sc25519_sqmul($recip, 10, $_11110101);

[3782] Fix | Delete

$recip = self::sc25519_sqmul($recip, 8, $_11010011);

[3783] Fix | Delete

return self::sc25519_sqmul($recip, 8, $_11101011);

[3784] Fix | Delete

}

[3785] Fix | Delete

[3786] Fix | Delete

/**

[3787] Fix | Delete

* @param string $s

[3788] Fix | Delete

* @return string

[3789] Fix | Delete

[3790] Fix | Delete

public static function clamp($s)

[3791] Fix | Delete

{

[3792] Fix | Delete

$s_ = self::stringToIntArray($s);

[3793] Fix | Delete

$s_[0] &= 248;

[3794] Fix | Delete

$s_[31] |= 64;

[3795] Fix | Delete

$s_[31] &= 128;

[3796] Fix | Delete

return self::intArrayToString($s_);

[3797] Fix | Delete

}

[3798] Fix | Delete

[3799] Fix | Delete

/**

[3800] Fix | Delete

* Ensure limbs are less than 28 bits long to prevent float promotion.

[3801] Fix | Delete

[3802] Fix | Delete

* This uses a constant-time conditional swap under the hood.

[3803] Fix | Delete

[3804] Fix | Delete

* @param ParagonIE_Sodium_Core_Curve25519_Fe $f

[3805] Fix | Delete

* @return ParagonIE_Sodium_Core_Curve25519_Fe

[3806] Fix | Delete

[3807] Fix | Delete

public static function fe_normalize(ParagonIE_Sodium_Core_Curve25519_Fe $f)

[3808] Fix | Delete

{

[3809] Fix | Delete

$x = (PHP_INT_SIZE << 3) - 1; // 31 or 63

[3810] Fix | Delete

[3811] Fix | Delete

$g = self::fe_copy($f);

[3812] Fix | Delete

for ($i = 0; $i < 10; ++$i) {

[3813] Fix | Delete

$mask = -(($g[$i] >> $x) & 1);

[3814] Fix | Delete

[3815] Fix | Delete

[3816] Fix | Delete

* Get two candidate normalized values for $g[$i], depending on the sign of $g[$i]:

[3817] Fix | Delete

[3818] Fix | Delete

$a = $g[$i] & 0x7ffffff;

[3819] Fix | Delete

$b = -((-$g[$i]) & 0x7ffffff);

[3820] Fix | Delete

[3821] Fix | Delete

[3822] Fix | Delete

* Return the appropriate candidate value, based on the sign of the original input:

[3823] Fix | Delete

[3824] Fix | Delete

* The following is equivalent to this ternary:

[3825] Fix | Delete

[3826] Fix | Delete

* $g[$i] = (($g[$i] >> $x) & 1) ? $a : $b;

[3827] Fix | Delete

[3828] Fix | Delete

* Except what's written doesn't contain timing leaks.

[3829] Fix | Delete

[3830] Fix | Delete

$g[$i] = ($a ^ (($a ^ $b) & $mask));

[3831] Fix | Delete

}

[3832] Fix | Delete

return $g;

[3833] Fix | Delete

}

[3834] Fix | Delete

}

[3835] Fix | Delete

[3836] Fix | Delete

1 ...3 4 5 6 78