Move curve.rs to edwards.rs

src/constants.rs

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

src/constants_32bit.rs

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

src/constants_64bit.rs

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

src/decaf.rs

@@ -37,11 +37,11 @@ use core::ops::{Add, Sub, Neg};
 use core::ops::{AddAssign, SubAssign};
 use core::ops::{Mul, MulAssign};
 
-use curve;
-use curve::ExtendedPoint;
-use curve::CompletedPoint;
-use curve::EdwardsBasepointTable;
-use curve::Identity;
+use edwards;
+use edwards::ExtendedPoint;
+use edwards::CompletedPoint;
+use edwards::EdwardsBasepointTable;
+use edwards::Identity;
 use scalar::Scalar;
 
 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>,
 {
     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
@@ -648,7 +648,7 @@ impl ConditionallyAssignable for DecafPoint {
     /// #
     /// # use subtle::ConditionallyAssignable;
     /// #
-    /// # use curve25519_dalek::curve::Identity;
+    /// # use curve25519_dalek::edwards::Identity;
     /// # use curve25519_dalek::decaf::DecafPoint;
     /// # use curve25519_dalek::constants;
     /// # fn main() {
@@ -711,7 +711,7 @@ pub mod vartime {
               J: IntoIterator<Item = &'b DecafPoint>
     {
         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 constants;
-    use curve::CompressedEdwardsY;
-    use curve::Identity;
-    use curve::ValidityCheck;
+    use edwards::CompressedEdwardsY;
+    use edwards::Identity;
+    use edwards::ValidityCheck;
     use super::*;
 
     #[cfg(feature = "serde")]

src/lib.rs

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