Skip to content
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

Jump to bottom

Add PrimeFieldBits support to Scalar #579

Merged
merged 11 commits into from
Sep 20, 2023
Merged

Add PrimeFieldBits support to Scalar #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b63cb2
Add PrimeFieldBits support to Scalar
kayabaNerve Sep 12, 2023
22c0d80
Sane char_le_bits
kayabaNerve Sep 12, 2023
6fe7d8b
Add bits feature
kayabaNerve Sep 12, 2023
dc276b1
Correct bits feature flagging
kayabaNerve Sep 12, 2023
5b6d4de
FieldBits, fmt
kayabaNerve Sep 12, 2023
9f8aec1
fmt, again, due to my fault
kayabaNerve Sep 12, 2023
268da71
Merge branch 'main' into patch-2
kayabaNerve Sep 12, 2023
5abdf53
group-bits feature flag
kayabaNerve Sep 12, 2023
f5c321b
Update CHANGELOG.md
kayabaNerve Sep 19, 2023
4dbf578
Merge branch 'main' into patch-2
rozbb Sep 20, 2023
1d57d14
Use BASEPOINT_ORDER_PRIVATE instead of BASEPOINT_ORDER
rozbb Sep 20, 2023
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
4 changes: 4 additions & 0 deletions curve25519-dalek/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ major series.

## 4.x series

### Unreleased

* Add implementation for `PrimeFieldBits`, behind the `group-bits` feature flag.

### 4.1.1

* Mark `constants::BASEPOINT_ORDER` deprecated from pub API
Expand Down
4 changes: 3 additions & 1 deletion curve25519-dalek/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ rustdoc-args = [
"--html-in-header", "docs/assets/rustdoc-include-katex-header.html",
"--cfg", "docsrs",
]
features = ["serde", "rand_core", "digest", "legacy_compatibility", "group"]
features = ["serde", "rand_core", "digest", "legacy_compatibility", "group-bits"]

[dev-dependencies]
sha2 = { version = "0.10", default-features = false }
Expand All @@ -48,6 +48,7 @@ required-features = ["alloc", "rand_core"]

[dependencies]
cfg-if = "1"
ff = { version = "0.13", default-features = false, optional = true }
group = { version = "0.13", default-features = false, optional = true }
rand_core = { version = "0.6.4", default-features = false, optional = true }
digest = { version = "0.10", default-features = false, optional = true }
Expand All @@ -67,6 +68,7 @@ alloc = ["zeroize?/alloc"]
precomputed-tables = []
legacy_compatibility = []
group = ["dep:group", "rand_core"]
group-bits = ["group", "ff/bits"]
kayabaNerve marked this conversation as resolved.
Show resolved Hide resolved

[target.'cfg(all(not(curve25519_dalek_backend = "fiat"), not(curve25519_dalek_backend = "serial"), target_arch = "x86_64"))'.dependencies]
curve25519-dalek-derive = { version = "0.1", path = "../curve25519-dalek-derive" }
15 changes: 15 additions & 0 deletions curve25519-dalek/src/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ use core::ops::{Sub, SubAssign};

use cfg_if::cfg_if;

#[cfg(feature = "group-bits")]
use group::ff::{FieldBits, PrimeFieldBits};
#[cfg(feature = "group")]
use {
group::ff::{Field, FromUniformBytes, PrimeField},
Expand Down Expand Up @@ -1321,6 +1323,19 @@ impl PrimeField for Scalar {
};
}

#[cfg(feature = "group-bits")]
impl PrimeFieldBits for Scalar {
type ReprBits = [u8; 32];

fn to_le_bits(&self) -> FieldBits<Self::ReprBits> {
self.to_repr().into()
}

fn char_le_bits() -> FieldBits<Self::ReprBits> {
constants::BASEPOINT_ORDER_PRIVATE.to_bytes().into()
}
}

#[cfg(feature = "group")]
impl FromUniformBytes<64> for Scalar {
fn from_uniform_bytes(bytes: &[u8; 64]) -> Self {
Expand Down