primeorder: mul_by_generator_and_mul_add_vartime method for PrimeCurveParams

Cargo.toml

@@ -27,4 +27,5 @@ hash2curve = { path = "hash2curve" }
 primefield = { path = "primefield" }
 primeorder = { path = "primeorder" }
 
+elliptic-curve = { git = "http://github.com/RustCrypto/traits.git" }
 rustcrypto-group = { git = "https://github.com/RustCrypto/group" }

p256/src/arithmetic.rs

@@ -68,4 +68,13 @@ impl PrimeCurveParams for NistP256 {
     fn mul_by_generator_vartime(k: &Scalar) -> ProjectivePoint {
         tables::BASEPOINT_TABLE_VARTIME.mul(k)
     }
+
+    #[cfg(all(feature = "alloc", feature = "precomputed-tables"))]
+    fn mul_by_generator_and_mul_add_vartime(
+        a: &Scalar,
+        b_scalar: &Scalar,
+        b_point: &ProjectivePoint,
+    ) -> ProjectivePoint {
+        tables::BASEPOINT_TABLE_VARTIME.lincomb(a, &[(*b_point, *b_scalar)])
+    }
 }

p384/src/arithmetic.rs

@@ -72,4 +72,13 @@ impl PrimeCurveParams for NistP384 {
     fn mul_by_generator_vartime(k: &Scalar) -> ProjectivePoint {
         tables::BASEPOINT_TABLE_VARTIME.mul(k)
     }
+
+    #[cfg(all(feature = "alloc", feature = "precomputed-tables"))]
+    fn mul_by_generator_and_mul_add_vartime(
+        a: &Scalar,
+        b_scalar: &Scalar,
+        b_point: &ProjectivePoint,
+    ) -> ProjectivePoint {
+        tables::BASEPOINT_TABLE_VARTIME.lincomb(a, &[(*b_point, *b_scalar)])
+    }
 }

p521/src/arithmetic.rs

@@ -77,4 +77,13 @@ impl PrimeCurveParams for NistP521 {
     fn mul_by_generator_vartime(k: &Scalar) -> ProjectivePoint {
         tables::BASEPOINT_TABLE_VARTIME.mul(k)
     }
+
+    #[cfg(all(feature = "alloc", feature = "precomputed-tables"))]
+    fn mul_by_generator_and_mul_add_vartime(
+        a: &Scalar,
+        b_scalar: &Scalar,
+        b_point: &ProjectivePoint,
+    ) -> ProjectivePoint {
+        tables::BASEPOINT_TABLE_VARTIME.lincomb(a, &[(*b_point, *b_scalar)])
+    }
 }

primeorder/src/lib.rs

@@ -29,7 +29,7 @@ pub use elliptic_curve::{
 
 use elliptic_curve::{
     CurveArithmetic, Generate,
-    ops::{Invert, MulVartime},
+    ops::{Invert, LinearCombination, MulVartime},
     subtle::CtOption,
 };
 
@@ -73,6 +73,19 @@ pub trait PrimeCurveParams:
     fn mul_by_generator_vartime(k: &Scalar<Self>) -> ProjectivePoint<Self> {
         ProjectivePoint::GENERATOR.mul_vartime(k)
     }
+
+    /// Multiply `a` by the generator of the prime-order subgroup, adding the result to the point
+    /// `P` multiplied by the scalar `b`, i.e. compute `aG + bP`.
+    fn mul_by_generator_and_mul_add_vartime(
+        a: &Scalar<Self>,
+        b_scalar: &Scalar<Self>,
+        b_point: &ProjectivePoint<Self>,
+    ) -> ProjectivePoint<Self> {
+        ProjectivePoint::<Self>::lincomb_vartime(&[
+            (ProjectivePoint::GENERATOR, *a),
+            (*b_point, *b_scalar),
+        ])
+    }
 }
 
 /// Trait which allows curves to specify a variable-time basepoint table.

primeorder/src/projective.rs

@@ -970,16 +970,13 @@ where
         C::mul_by_generator_vartime(scalar)
     }
 
-    // When we're guaranteed *not* to have basepoint tables available (because they need `alloc`)
-    // use linear combinations for this computation, but they're slower when they are available
-    // TODO(tarcieri): `WnafBase::multiscalar_mul` w\ basepoint table when `alloc` *is* available
-    #[cfg(not(feature = "alloc"))]
+    #[inline]
     fn mul_by_generator_and_mul_add_vartime(
         a: &Self::Scalar,
         b_scalar: &Self::Scalar,
         b_point: &Self,
     ) -> Self {
-        Self::lincomb(&[(Self::GENERATOR, *a), (*b_point, *b_scalar)])
+        C::mul_by_generator_and_mul_add_vartime(a, b_scalar, b_point)
     }
 }
 

sm2/src/arithmetic.rs

@@ -68,4 +68,13 @@ impl PrimeCurveParams for Sm2 {
     fn mul_by_generator_vartime(k: &Scalar) -> ProjectivePoint {
         tables::BASEPOINT_TABLE_VARTIME.mul(k)
     }
+
+    #[cfg(all(feature = "alloc", feature = "precomputed-tables"))]
+    fn mul_by_generator_and_mul_add_vartime(
+        a: &Scalar,
+        b_scalar: &Scalar,
+        b_point: &ProjectivePoint,
+    ) -> ProjectivePoint {
+        tables::BASEPOINT_TABLE_VARTIME.lincomb(a, &[(*b_point, *b_scalar)])
+    }
 }