Skip to content

Preliminary wNAF support #1714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Apr 8, 2026
Merged

Preliminary wNAF support #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bignp256/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", features = ["sec1"] }

# optional dependencies
belt-block = { version = "0.2.0-rc.3", optional = true }
Expand All @@ -38,7 +38,7 @@ signature = { version = "3.0.0-rc.10", optional = true }

[dev-dependencies]
criterion = "0.7"
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["dev"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["dev"] }
hex-literal = "1"
primeorder = { version = "0.14.0-rc.8", features = ["dev"] }
proptest = "1"
Expand Down
4 changes: 2 additions & 2 deletions bp256/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }

# optional dependencies
ecdsa = { version = "0.17.0-rc.16", optional = true, default-features = false, features = ["der"] }
Expand All @@ -24,7 +24,7 @@ sha2 = { version = "0.11", optional = true, default-features = false }

[dev-dependencies]
criterion = "0.7"
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["dev"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["dev"] }

[features]
default = ["pkcs8", "std"]
Expand Down
4 changes: 2 additions & 2 deletions bp384/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }

# optional dependencies
ecdsa = { version = "0.17.0-rc.16", optional = true, default-features = false, features = ["der"] }
Expand All @@ -24,7 +24,7 @@ sha2 = { version = "0.11", optional = true, default-features = false }

[dev-dependencies]
criterion = "0.7"
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["dev"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["dev"] }

[features]
default = ["pkcs8", "std"]
Expand Down
2 changes: 1 addition & 1 deletion ed448-goldilocks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This crate also includes signing and verifying of Ed448 signatures.
"""

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", features = ["arithmetic", "pkcs8"] }
elliptic-curve = { version = "0.14.0-rc.30", features = ["arithmetic", "pkcs8"] }
hash2curve = "0.14.0-rc.11"
rand_core = { version = "0.10", default-features = false }
sha3 = { version = "0.11", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion hash2curve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rust-version = "1.85"

[dependencies]
digest = { version = "0.11" }
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["arithmetic"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["arithmetic"] }

[dev-dependencies]
hex-literal = "1"
Expand Down
2 changes: 1 addition & 1 deletion k256/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rust-version = "1.85"

[dependencies]
cpubits = "0.1"
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }
hash2curve = { version = "0.14.0-rc.11", optional = true }

# optional dependencies
Expand Down
7 changes: 5 additions & 2 deletions k256/src/arithmetic/field.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ use core::{
};
use elliptic_curve::{
Generate,
bigint::{Odd, U256, modular::Retrieve},
bigint::{ArrayEncoding, Odd, U256, modular::Retrieve},
ff::{self, Field, PrimeField},
ops::Invert,
rand_core::{TryCryptoRng, TryRng},
subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption},
zeroize::DefaultIsZeroes,
};

#[cfg(test)]
use num_bigint::{BigUint, ToBigUint};

Expand Down Expand Up @@ -319,6 +318,10 @@ impl PrimeField for FieldElement {
self.to_bytes()
}

fn to_le_repr(&self) -> Self::Repr {
self.0.normalize().to_u256().to_le_byte_array()
}

fn is_odd(&self) -> Choice {
self.is_odd()
}
Expand Down
11 changes: 10 additions & 1 deletion k256/src/arithmetic/projective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use elliptic_curve::{
};

#[cfg(feature = "alloc")]
use alloc::vec::Vec;
use {alloc::vec::Vec, elliptic_curve::group::WnafGroup};

#[rustfmt::skip]
const ENDOMORPHISM_BETA: FieldElement = FieldElement::from_bytes_unchecked(&[
Expand Down Expand Up @@ -524,6 +524,15 @@ impl PrimeCurve for ProjectivePoint {

impl PrimeGroup for ProjectivePoint {}

#[cfg(feature = "alloc")]
impl WnafGroup for ProjectivePoint {
fn recommended_wnaf_for_num_scalars(_num_scalars: usize) -> usize {
// TODO(tarcieri): provide a way for individual curves to configure this
// Returns a number between 2 and 22, inclusive.
4 // This seems to be a common starting point?
}
}

//
// `core::ops` trait impls
//
Expand Down
4 changes: 4 additions & 0 deletions k256/src/arithmetic/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,10 @@ impl PrimeField for Scalar {
self.to_bytes()
}

fn to_le_repr(&self) -> Self::Repr {
self.0.to_le_byte_array()
}

fn is_odd(&self) -> Choice {
self.0.is_odd().into()
}
Expand Down
2 changes: 1 addition & 1 deletion p192/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }

# optional dependencies
ecdsa-core = { version = "0.17.0-rc.16", package = "ecdsa", optional = true, default-features = false, features = ["der"] }
Expand Down
2 changes: 1 addition & 1 deletion p224/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }

# optional dependencies
ecdsa-core = { version = "0.17.0-rc.16", package = "ecdsa", optional = true, default-features = false, features = ["der"] }
Expand Down
2 changes: 1 addition & 1 deletion p256/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }

# optional dependencies
ecdsa-core = { version = "0.17.0-rc.16", package = "ecdsa", optional = true, default-features = false, features = ["der"] }
Expand Down
4 changes: 4 additions & 0 deletions p256/src/arithmetic/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,10 @@ impl PrimeField for Scalar {
self.to_bytes()
}

fn to_le_repr(&self) -> FieldBytes {
self.0.to_le_byte_array()
}

fn is_odd(&self) -> Choice {
self.0.is_odd().into()
}
Expand Down
18 changes: 18 additions & 0 deletions p256/tests/projective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ use p256::{
use primeorder::test_projective_arithmetic;
use proptest::{prelude::any, prop_compose, proptest};

#[cfg(feature = "alloc")]
use elliptic_curve::point::AffineCoordinates;

test_projective_arithmetic!(
AffinePoint,
ProjectivePoint,
Expand All @@ -32,6 +35,21 @@ fn projective_identity_to_bytes() {
assert_eq!([0; 33], ProjectivePoint::IDENTITY.to_bytes().as_slice());
}

#[cfg(feature = "alloc")]
#[test]
fn wnaf() {
for (k, coords) in ADD_TEST_VECTORS.iter().enumerate() {
let scalar = Scalar::from(k as u64 + 1);
let mut wnaf = ProjectivePoint::wnaf();
let mut wnaf_base = wnaf.base(ProjectivePoint::GENERATOR, 1);
let p = wnaf_base.scalar(&scalar).to_affine();

let (x, y) = (p.x(), p.y());
assert_eq!(x.0, coords.0);
assert_eq!(y.0, coords.1);
}
}

prop_compose! {
fn non_identity()(bytes in any::<[u8; 32]>()) -> NonIdentity<ProjectivePoint> {
NonIdentity::mul_by_generator(&NonZeroScalar::reduce_nonzero(&FieldBytes::from(bytes)))
Expand Down
2 changes: 1 addition & 1 deletion p384/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }

# optional dependencies
ecdsa-core = { version = "0.17.0-rc.16", package = "ecdsa", optional = true, default-features = false, features = ["der"] }
Expand Down
2 changes: 1 addition & 1 deletion p521/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rust-version = "1.85"

[dependencies]
base16ct = "1"
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["sec1"] }

# optional dependencies
ecdsa-core = { version = "0.17.0-rc.16", package = "ecdsa", optional = true, default-features = false, features = ["der"] }
Expand Down
7 changes: 7 additions & 0 deletions p521/src/arithmetic/field.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,13 @@ impl PrimeField for FieldElement {
self.to_bytes()
}

#[inline]
fn to_le_repr(&self) -> FieldBytes {
let mut ret = [0u8; 66];
fiat_p521_to_bytes(&mut ret, &self.0); // natively little-endian
ret.into()
}

#[inline]
fn is_odd(&self) -> Choice {
self.is_odd()
Expand Down
2 changes: 1 addition & 1 deletion primefield/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rust-version = "1.85"
[dependencies]
bigint = { version = "0.7.1", package = "crypto-bigint", default-features = false, features = ["rand_core", "hybrid-array", "subtle"] }
common = { package = "crypto-common", version = "0.2", features = ["rand_core"] }
ff = { version = "0.14.0-rc.0", package = "rustcrypto-ff", default-features = false }
ff = { version = "0.14.0-rc.1", package = "rustcrypto-ff", default-features = false }
subtle = { version = "2.6", default-features = false, features = ["const-generics"] }
rand_core = { version = "0.10", default-features = false }
zeroize = { version = "1.7", default-features = false }
5 changes: 5 additions & 0 deletions primefield/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,11 @@ macro_rules! monty_field_element {
self.0.to_repr()
}

#[inline]
fn to_le_repr(&self) -> Self::Repr {
self.0.to_le_repr()
}

#[inline]
fn is_odd(&self) -> $crate::subtle::Choice {
self.0.is_odd()
Expand Down
11 changes: 11 additions & 0 deletions primefield/src/monty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,17 @@ where
self.to_bytes()
}

fn to_le_repr(&self) -> Self::Repr {
match MOD::BYTE_ORDER {
ByteOrder::BigEndian => {
let mut bytes = self.to_bytes();
bytes.reverse();
bytes
}
ByteOrder::LittleEndian => self.to_bytes(),
}
}

fn is_odd(&self) -> Choice {
self.is_odd()
}
Expand Down
2 changes: 1 addition & 1 deletion primeorder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
elliptic-curve = { version = "0.14.0-rc.29", default-features = false, features = ["arithmetic", "sec1"] }
elliptic-curve = { version = "0.14.0-rc.30", default-features = false, features = ["arithmetic", "sec1"] }

# optional dependencies
serdect = { version = "0.4", optional = true, default-features = false }
Expand Down
Loading
Loading