Skip to content

[WIP] elliptic-curve: transition from subtle to ctutils #2351

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

Draft
tarcieri wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[WIP] elliptic-curve: transition from subtle to ctutils #2351

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
21 changes: 10 additions & 11 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.

11 changes: 6 additions & 5 deletions elliptic-curve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,25 @@ and public/secret keys composed thereof.
"""

[dependencies]
array = { package = "hybrid-array", version = "0.4", default-features = false, features = ["zeroize"] }
bigint = { package = "crypto-bigint", version = "0.7", default-features = false, features = ["hybrid-array", "rand_core", "subtle", "zeroize"] }
array = { package = "hybrid-array", version = "0.4.10", default-features = false, features = ["ctutils", "zeroize"] }
bigint = { package = "crypto-bigint", version = "0.7", default-features = false, features = ["hybrid-array", "rand_core", "zeroize"] }
base16ct = "1"
ctutils = { version = "0.4", features = ["subtle"] }
common = { package = "crypto-common", version = "0.2", features = ["rand_core"] }
rand_core = { version = "0.10", default-features = false }
subtle = { version = "2.6", default-features = false }
zeroize = { version = "1.7", default-features = false }

# optional dependencies
digest = { version = "0.11", optional = true }
ff = { version = "0.14.0-rc.0", package = "rustcrypto-ff", optional = true, default-features = false }
group = { version = "0.14.0-rc.0", package = "rustcrypto-group", optional = true, default-features = false }
ff = { version = "0.14.0-rc.1", package = "rustcrypto-ff", optional = true, default-features = false }
group = { version = "0.14.0-rc.1", package = "rustcrypto-group", optional = true, default-features = false }
hkdf = { version = "0.13", optional = true, default-features = false }
hex-literal = { version = "1", optional = true }
once_cell = { version = "1.21", optional = true, default-features = false }
pem-rfc7468 = { version = "1", optional = true, features = ["alloc"] }
pkcs8 = { version = "0.11.0-rc.10", optional = true, default-features = false }
sec1 = { version = "0.8", optional = true, features = ["ctutils", "subtle", "zeroize"] }
sec1 = { version = "0.8.1", optional = true, features = ["ctutils", "zeroize"] }
serdect = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }

[dev-dependencies]
Expand Down
13 changes: 4 additions & 9 deletions elliptic-curve/src/arithmetic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@

use crate::{
Curve, CurveGroup, Error, FieldBytes, Group, NonZeroScalar, PrimeCurve, ScalarValue,
ctutils::{CtEq, CtSelect},
ctutils::{CtEq, CtOption, CtSelect},
ops::{Invert, LinearCombination, Mul, Reduce},
point::{AffineCoordinates, NonIdentity},
scalar::{FromUintUnchecked, IsHigh},
};
use bigint::modular::Retrieve;
use common::Generate;
use core::fmt::Debug;
use subtle::{ConditionallySelectable, ConstantTimeEq, CtOption};
use zeroize::DefaultIsZeroes;

/// Elliptic curve with an arithmetic implementation.
Expand All @@ -19,8 +18,6 @@ pub trait CurveArithmetic: Curve {
type AffinePoint: 'static
+ AffineCoordinates<FieldRepr = FieldBytes<Self>>
+ Copy
+ ConditionallySelectable
+ ConstantTimeEq
+ CtEq
+ CtSelect
+ Debug
Expand All @@ -46,9 +43,7 @@ pub trait CurveArithmetic: Curve {
/// - [`Sized`]
/// - [`Send`]
/// - [`Sync`]
type ProjectivePoint: ConditionallySelectable
+ ConstantTimeEq
+ CtEq
type ProjectivePoint: CtEq
+ CtSelect
+ Default
+ DefaultIsZeroes
Expand All @@ -68,8 +63,8 @@ pub trait CurveArithmetic: Curve {
/// - `'static`
/// - [`Copy`]
/// - [`Clone`]
/// - [`ConditionallySelectable`]
/// - [`ConstantTimeEq`]
/// - [`CtSelect`]
/// - [`CtEq`]
/// - [`Debug`]
/// - [`Default`]
/// - [`Send`]
Expand Down
Loading
Loading