saymrwulf/risc0-curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/risc0-curve25519-dalek-source.git synced 2026-09-07 20:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move curve.rs to edwards.rs

Browse source
This commit is contained in:
Henry de Valence 2017-08-02 22:35:12 -07:00
parent 9d20a4aca0
commit 8ad02e2f57
6 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/constants.rs
View file

@ -19,7 +19,7 @@
#![allow(missing_docs)] #![allow(missing_docs)]
#![allow(non_snake_case)] #![allow(non_snake_case)]
use curve::CompressedEdwardsY; use edwards::CompressedEdwardsY;
#[cfg(feature = "yolocrypto")] #[cfg(feature = "yolocrypto")]
use decaf::{DecafPoint, DecafBasepointTable}; use decaf::{DecafPoint, DecafBasepointTable};
use scalar::Scalar; use scalar::Scalar;
@ -86,8 +86,8 @@ pub const DECAF_ED25519_BASEPOINT_TABLE: DecafBasepointTable
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use field::FieldElement; use field::FieldElement;
use curve::IsIdentity; use edwards::IsIdentity;
use curve::ValidityCheck; use edwards::ValidityCheck;
use constants; use constants;
#[test] #[test]

6
src/constants_32bit.rs
View file

@ -20,9 +20,9 @@
#![allow(non_snake_case)] #![allow(non_snake_case)]
use field_32bit::FieldElement32; use field_32bit::FieldElement32;
use curve::ExtendedPoint; use edwards::ExtendedPoint;
use curve::AffineNielsPoint; use edwards::AffineNielsPoint;
use curve::EdwardsBasepointTable; use edwards::EdwardsBasepointTable;
pub const d: FieldElement32 = FieldElement32([ pub const d: FieldElement32 = FieldElement32([
-10913610, 13857413, -15372611, 6949391, 114729, -10913610, 13857413, -15372611, 6949391, 114729,

6
src/constants_64bit.rs
View file

@ -20,9 +20,9 @@
#![allow(non_snake_case)] #![allow(non_snake_case)]
use field_64bit::FieldElement64; use field_64bit::FieldElement64;
use curve::ExtendedPoint; use edwards::ExtendedPoint;
use curve::AffineNielsPoint; use edwards::AffineNielsPoint;
use curve::EdwardsBasepointTable; use edwards::EdwardsBasepointTable;
pub const p: FieldElement64 = FieldElement64([2251799813685229, 2251799813685247, 2251799813685247, 2251799813685247, 2251799813685247]); pub const p: FieldElement64 = FieldElement64([2251799813685229, 2251799813685247, 2251799813685247, 2251799813685247, 2251799813685247]);

22
src/decaf.rs
View file

@ -37,11 +37,11 @@ use core::ops::{Add, Sub, Neg};
use core::ops::{AddAssign, SubAssign}; use core::ops::{AddAssign, SubAssign};
use core::ops::{Mul, MulAssign}; use core::ops::{Mul, MulAssign};
use curve; use edwards;
use curve::ExtendedPoint; use edwards::ExtendedPoint;
use curve::CompletedPoint; use edwards::CompletedPoint;
use curve::EdwardsBasepointTable; use edwards::EdwardsBasepointTable;
use curve::Identity; use edwards::Identity;
use scalar::Scalar; use scalar::Scalar;
use subtle::ConditionallyAssignable; use subtle::ConditionallyAssignable;
@ -598,7 +598,7 @@ pub fn multiscalar_mult<'a, 'b, I, J>(scalars: I, points: J) -> DecafPoint
J: IntoIterator<Item = &'b DecafPoint>, J: IntoIterator<Item = &'b DecafPoint>,
{ {
let extended_points = points.into_iter().map(|P| &P.0); let extended_points = points.into_iter().map(|P| &P.0);
DecafPoint(curve::multiscalar_mult(scalars, extended_points)) DecafPoint(edwards::multiscalar_mult(scalars, extended_points))
} }
/// Precomputation /// Precomputation
@ -648,7 +648,7 @@ impl ConditionallyAssignable for DecafPoint {
/// # /// #
/// # use subtle::ConditionallyAssignable; /// # use subtle::ConditionallyAssignable;
/// # /// #
/// # use curve25519_dalek::curve::Identity; /// # use curve25519_dalek::edwards::Identity;
/// # use curve25519_dalek::decaf::DecafPoint; /// # use curve25519_dalek::decaf::DecafPoint;
/// # use curve25519_dalek::constants; /// # use curve25519_dalek::constants;
/// # fn main() { /// # fn main() {
@ -711,7 +711,7 @@ pub mod vartime {
J: IntoIterator<Item = &'b DecafPoint> J: IntoIterator<Item = &'b DecafPoint>
{ {
let extended_points = points.into_iter().map(|P| &P.0); let extended_points = points.into_iter().map(|P| &P.0);
DecafPoint(curve::vartime::multiscalar_mult(scalars, extended_points)) DecafPoint(edwards::vartime::multiscalar_mult(scalars, extended_points))
} }
} }
@ -725,9 +725,9 @@ mod test {
use scalar::Scalar; use scalar::Scalar;
use constants; use constants;
use curve::CompressedEdwardsY; use edwards::CompressedEdwardsY;
use curve::Identity; use edwards::Identity;
use curve::ValidityCheck; use edwards::ValidityCheck;
use super::*; use super::*;
#[cfg(feature = "serde")] #[cfg(feature = "serde")]

0
src/curve.rs → src/edwards.rs
View file

2
src/lib.rs
View file

@ -72,7 +72,7 @@ mod field_32bit;
mod field_64bit; mod field_64bit;
pub mod scalar; pub mod scalar;
pub mod curve; pub mod edwards;
// Feature gate decaf while our implementation is unfinished and probably incorrect. // Feature gate decaf while our implementation is unfinished and probably incorrect.
#[cfg(feature = "yolocrypto")] #[cfg(feature = "yolocrypto")]