saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-08 21:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Whitespace fixes.

Browse source
This commit is contained in:
Isis Lovecruft 2017-12-04 01:17:17 +00:00
parent 9824894eb1
commit c71d41ddcc
Failed to extract signature
8 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backend/u32/constants.rs
View file

@ -97,7 +97,7 @@ pub const ED25519_BASEPOINT_POINT: ExtendedPoint = ExtendedPoint{
/// array is `i*P`, where `P` is a point of order 8 generating Ɛ[8]. /// array is `i*P`, where `P` is a point of order 8 generating Ɛ[8].
/// ///
/// Thus Ɛ[4] is the points indexed by 0,2,4,6 and Ɛ[2] is the points /// Thus Ɛ[4] is the points indexed by 0,2,4,6 and Ɛ[2] is the points
/// indexed by 0,4. /// indexed by 0,4.
pub const EIGHT_TORSION: [ExtendedPoint; 8] = [ pub const EIGHT_TORSION: [ExtendedPoint; 8] = [
ExtendedPoint{ ExtendedPoint{
X: FieldElement32([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]), X: FieldElement32([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),

34
src/backend/u32/field.rs
View file

@ -38,11 +38,11 @@ use subtle::ConditionallyAssignable;
/// to \\(2\^{25+b}\\) or \\(2\^{26+b}\\), where \\(b = 1.75\\). /// to \\(2\^{25+b}\\) or \\(2\^{26+b}\\), where \\(b = 1.75\\).
/// ///
/// # Note /// # Note
/// ///
/// The `curve25519_dalek::field` module provides a type alias /// The `curve25519_dalek::field` module provides a type alias
/// `curve25519_dalek::field::FieldElement` to either `FieldElement64` /// `curve25519_dalek::field::FieldElement` to either `FieldElement64`
/// or `FieldElement32`. /// or `FieldElement32`.
/// ///
/// The backend-specific type `FieldElement32` should not be used /// The backend-specific type `FieldElement32` should not be used
/// outside of the `curve25519_dalek::field` module. /// outside of the `curve25519_dalek::field` module.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
@ -133,7 +133,7 @@ impl<'a, 'b> Mul<&'b FieldElement32> for &'a FieldElement32 {
let y1_19 = 19 * y[1]; // This fits in a u32 let y1_19 = 19 * y[1]; // This fits in a u32
let y2_19 = 19 * y[2]; // iff 26 + b + lg(19) < 32 let y2_19 = 19 * y[2]; // iff 26 + b + lg(19) < 32
let y3_19 = 19 * y[3]; // if b < 32 - 26 - 4.248 = 1.752 let y3_19 = 19 * y[3]; // if b < 32 - 26 - 4.248 = 1.752
let y4_19 = 19 * y[4]; let y4_19 = 19 * y[4];
let y5_19 = 19 * y[5]; // below, b<2.5: this is a bottleneck, let y5_19 = 19 * y[5]; // below, b<2.5: this is a bottleneck,
let y6_19 = 19 * y[6]; // could be avoided by promoting to let y6_19 = 19 * y[6]; // could be avoided by promoting to
let y7_19 = 19 * y[7]; // u64 here instead of in m() let y7_19 = 19 * y[7]; // u64 here instead of in m()
@ -181,7 +181,7 @@ impl<'a, 'b> Mul<&'b FieldElement32> for &'a FieldElement32 {
// How big is the contribution to z[i+j] from x[i], y[j]? // How big is the contribution to z[i+j] from x[i], y[j]?
// //
// Using the bounds above, we get: // Using the bounds above, we get:
// //
// i even, j even: x[i]*y[j] < 2^(26+b)*2^(26+b) = 2*2^(51+2*b) // i even, j even: x[i]*y[j] < 2^(26+b)*2^(26+b) = 2*2^(51+2*b)
// i odd, j even: x[i]*y[j] < 2^(25+b)*2^(26+b) = 1*2^(51+2*b) // i odd, j even: x[i]*y[j] < 2^(25+b)*2^(26+b) = 1*2^(51+2*b)
// i even, j odd: x[i]*y[j] < 2^(26+b)*2^(25+b) = 1*2^(51+2*b) // i even, j odd: x[i]*y[j] < 2^(26+b)*2^(25+b) = 1*2^(51+2*b)
@ -191,7 +191,7 @@ impl<'a, 'b> Mul<&'b FieldElement32> for &'a FieldElement32 {
// (since 2^255 - 19 = 0 mod p). This adds a factor of 19, so // (since 2^255 - 19 = 0 mod p). This adds a factor of 19, so
// we get the bounds (z0 is the biggest one, but calculated for // we get the bounds (z0 is the biggest one, but calculated for
// posterity here in case finer estimation is needed later): // posterity here in case finer estimation is needed later):
// //
// z0 < ( 2 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 )*2^(51 + 2b) = 249*2^(51 + 2*b) // z0 < ( 2 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 )*2^(51 + 2b) = 249*2^(51 + 2*b)
// z1 < ( 1 + 1 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 )*2^(51 + 2b) = 154*2^(51 + 2*b) // z1 < ( 1 + 1 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 + 1*19 )*2^(51 + 2b) = 154*2^(51 + 2*b)
// z2 < ( 2 + 1 + 2 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 )*2^(51 + 2b) = 195*2^(51 + 2*b) // z2 < ( 2 + 1 + 2 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 + 2*19 + 1*19 )*2^(51 + 2b) = 195*2^(51 + 2*b)
@ -232,15 +232,15 @@ impl FieldElement32 {
pub fn negate(&mut self) { pub fn negate(&mut self) {
// Compute -b as ((2^4 * p) - b) to avoid underflow. // Compute -b as ((2^4 * p) - b) to avoid underflow.
let neg = FieldElement32::reduce([ let neg = FieldElement32::reduce([
((0x3ffffed << 4) - self.0[0]) as u64, ((0x3ffffed << 4) - self.0[0]) as u64,
((0x1ffffff << 4) - self.0[1]) as u64, ((0x1ffffff << 4) - self.0[1]) as u64,
((0x3ffffff << 4) - self.0[2]) as u64, ((0x3ffffff << 4) - self.0[2]) as u64,
((0x1ffffff << 4) - self.0[3]) as u64, ((0x1ffffff << 4) - self.0[3]) as u64,
((0x3ffffff << 4) - self.0[4]) as u64, ((0x3ffffff << 4) - self.0[4]) as u64,
((0x1ffffff << 4) - self.0[5]) as u64, ((0x1ffffff << 4) - self.0[5]) as u64,
((0x3ffffff << 4) - self.0[6]) as u64, ((0x3ffffff << 4) - self.0[6]) as u64,
((0x1ffffff << 4) - self.0[7]) as u64, ((0x1ffffff << 4) - self.0[7]) as u64,
((0x3ffffff << 4) - self.0[8]) as u64, ((0x3ffffff << 4) - self.0[8]) as u64,
((0x1ffffff << 4) - self.0[9]) as u64, ((0x1ffffff << 4) - self.0[9]) as u64,
]); ]);
self.0 = neg.0; self.0 = neg.0;
@ -298,7 +298,7 @@ impl FieldElement32 {
// Since z[3] < 2^64, c < 2^(64-25) = 2^39, // Since z[3] < 2^64, c < 2^(64-25) = 2^39,
// so z[4] < 2^26 + 2^39 < 2^39.0002 // so z[4] < 2^26 + 2^39 < 2^39.0002
carry(&mut z, 4); carry(&mut z, 8); carry(&mut z, 4); carry(&mut z, 8);
// Now z[4] < 2^26 // Now z[4] < 2^26
// and z[5] < 2^25 + 2^13.0002 < 2^25.0004 (good enough) // and z[5] < 2^25 + 2^13.0002 < 2^25.0004 (good enough)
// Last carry has a multiplication by 19: // Last carry has a multiplication by 19:
@ -396,7 +396,7 @@ impl FieldElement32 {
const LOW_26_BITS: u32 = (1 << 26) - 1; const LOW_26_BITS: u32 = (1 << 26) - 1;
h[0] += 19*q; h[0] += 19*q;
// Now carry the result to compute r + 19q... // Now carry the result to compute r + 19q...
h[1] += h[0] >> 26; h[1] += h[0] >> 26;
h[0] = h[0] & LOW_26_BITS; h[0] = h[0] & LOW_26_BITS;
@ -416,7 +416,7 @@ impl FieldElement32 {
h[7] = h[7] & LOW_25_BITS; h[7] = h[7] & LOW_25_BITS;
h[9] += h[8] >> 26; h[9] += h[8] >> 26;
h[8] = h[8] & LOW_26_BITS; h[8] = h[8] & LOW_26_BITS;
// ... but instead of carrying the value // ... but instead of carrying the value
// (h[9] >> 25) = q*2^255 into another limb, // (h[9] >> 25) = q*2^255 into another limb,
// discard it, subtracting the value from h. // discard it, subtracting the value from h.

2
src/backend/u32/mod.rs
View file

@ -9,7 +9,7 @@
// - Henry de Valence <hdevalence@hdevalence.ca> // - Henry de Valence <hdevalence@hdevalence.ca>
//! The `u32` backend uses `u32`s and a `(u32, u32) -> u64` multiplier. //! The `u32` backend uses `u32`s and a `(u32, u32) -> u64` multiplier.
//! //!
//! This code is intended to be portable, but it requires that //! This code is intended to be portable, but it requires that
//! multiplication of two \\(32\\)-bit values to a \\(64\\)-bit result //! multiplication of two \\(32\\)-bit values to a \\(64\\)-bit result
//! is constant-time on the target platform. //! is constant-time on the target platform.

2
src/backend/u64/constants.rs
View file

@ -70,7 +70,7 @@ pub const ED25519_BASEPOINT_POINT: ExtendedPoint = ExtendedPoint{
/// array is `i*P`, where `P` is a point of order 8 generating Ɛ[8]. /// array is `i*P`, where `P` is a point of order 8 generating Ɛ[8].
/// ///
/// Thus Ɛ[4] is the points indexed by 0,2,4,6 and Ɛ[2] is the points /// Thus Ɛ[4] is the points indexed by 0,2,4,6 and Ɛ[2] is the points
/// indexed by 0,4. /// indexed by 0,4.
pub const EIGHT_TORSION: [ExtendedPoint; 8] = [ pub const EIGHT_TORSION: [ExtendedPoint; 8] = [
ExtendedPoint { ExtendedPoint {
X: FieldElement64([0, 0, 0, 0, 0]), X: FieldElement64([0, 0, 0, 0, 0]),

4
src/backend/u64/field.rs
View file

@ -27,11 +27,11 @@ use subtle::ConditionallyAssignable;
/// grow up to \\(2\^{54}\\) between reductions modulo \\(p\\). /// grow up to \\(2\^{54}\\) between reductions modulo \\(p\\).
/// ///
/// # Note /// # Note
/// ///
/// The `curve25519_dalek::field` module provides a type alias /// The `curve25519_dalek::field` module provides a type alias
/// `curve25519_dalek::field::FieldElement` to either `FieldElement64` /// `curve25519_dalek::field::FieldElement` to either `FieldElement64`
/// or `FieldElement32`. /// or `FieldElement32`.
/// ///
/// The backend-specific type `FieldElement64` should not be used /// The backend-specific type `FieldElement64` should not be used
/// outside of the `curve25519_dalek::field` module. /// outside of the `curve25519_dalek::field` module.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]

6
src/backend/u64/mod.rs
View file

@ -9,11 +9,11 @@
// - Henry de Valence <hdevalence@hdevalence.ca> // - Henry de Valence <hdevalence@hdevalence.ca>
//! The `u64` backend uses `u64`s and a `(u64, u64) -> u128` multiplier. //! The `u64` backend uses `u64`s and a `(u64, u64) -> u128` multiplier.
//! //!
//! On x86_64, the idiom `(x as u128) * (y as u128)` lowers to `MUL` //! On x86_64, the idiom `(x as u128) * (y as u128)` lowers to `MUL`
//! instructions taking 64-bit inputs and producing 128-bit outputs. On //! instructions taking 64-bit inputs and producing 128-bit outputs. On
//! other platforms, this implementation is not recommended. //! other platforms, this implementation is not recommended.
//! //!
//! On Haswell and newer, the BMI2 extension provides `MULX`, and on //! On Haswell and newer, the BMI2 extension provides `MULX`, and on
//! Broadwell and newer, the ADX extension provides `ADCX` and `ADOX` //! Broadwell and newer, the ADX extension provides `ADCX` and `ADOX`
//! (allowing the CPU to compute two carry chains in parallel). These //! (allowing the CPU to compute two carry chains in parallel). These

2
src/backend/u64/scalar.rs
View file

@ -16,7 +16,7 @@ use core::ops::{Index, IndexMut};
use constants; use constants;
/// The `Scalar64` struct represents an element in /// The `Scalar64` struct represents an element in
/// \\(\mathbb Z / \ell \mathbb Z\\) as 5 \\(52\\)-bit limbs. /// \\(\mathbb Z / \ell \mathbb Z\\) as 5 \\(52\\)-bit limbs.
#[derive(Copy,Clone)] #[derive(Copy,Clone)]
pub struct Scalar64(pub [u64; 5]); pub struct Scalar64(pub [u64; 5]);

4
src/curve_models/mod.rs
View file

@ -10,7 +10,7 @@
//! This module contains internal curve representations which are not part //! This module contains internal curve representations which are not part
//! of the public API. //! of the public API.
//! //!
//! # Curve representations //! # Curve representations
//! //!
//! Internally, we use several different models for the curve. Here //! Internally, we use several different models for the curve. Here
@ -62,7 +62,7 @@
//! $$ //! $$
//! \frac {W\_1} {W\_3} = \frac {XT} {ZT} = \frac X Z = x, //! \frac {W\_1} {W\_3} = \frac {XT} {ZT} = \frac X Z = x,
//! $$ //! $$
//! and //! and
//! $$ //! $$
//! \frac {W\_2} {W\_3} = \frac {YZ} {ZT} = \frac Y T = y, //! \frac {W\_2} {W\_3} = \frac {YZ} {ZT} = \frac Y T = y,
//! $$ //! $$