Skip to content

Commit 8c4b261

Browse files
committed
ecdsa: use new Reduce trait
Uses the `Reduce` trait added in RustCrypto/traits#1949
1 parent 282873b commit 8c4b261

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dsa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rust-version = "1.85"
1818
[dependencies]
1919
der = { version = "0.8.0-rc.7", features = ["alloc"] }
2020
digest = "0.11.0-rc.0"
21-
crypto-bigint = { version = "=0.7.0-pre.7", default-features = false, features = ["alloc", "zeroize"] }
21+
crypto-bigint = { version = "0.7.0-rc.0", default-features = false, features = ["alloc", "zeroize"] }
2222
crypto-primes = { version = "=0.7.0-pre.1", default-features = false }
2323
rfc6979 = { version = "0.5.0-rc.0" }
2424
sha2 = { version = "0.11.0-rc.0", default-features = false }

ecdsa/src/hazmat.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ where
113113
C: EcdsaCurve + CurveArithmetic,
114114
SignatureSize<C>: ArraySize,
115115
{
116-
let z = <Scalar<C> as Reduce<C::Uint>>::reduce_bytes(z);
116+
let z = Scalar::<C>::reduce(z);
117117

118118
// Compute scalar inversion of 𝑘.
119119
let k_inv = k.invert();
@@ -123,7 +123,7 @@ where
123123

124124
// Lift x-coordinate of 𝑹 (element of base field) into a serialized big
125125
// integer, then reduce it into an element of the scalar field.
126-
let r = Scalar::<C>::reduce_bytes(&R.x());
126+
let r = Scalar::<C>::reduce(&R.x());
127127

128128
// Compute 𝒔 as a signature over 𝒓 and 𝒛.
129129
let s = *k_inv * (z + (r * d.as_ref()));
@@ -176,7 +176,7 @@ where
176176
// transform and an extra modular reduction:
177177
//
178178
// h = bits2int(H(m)) mod q
179-
let z2 = <Scalar<C> as Reduce<C::Uint>>::reduce_bytes(z);
179+
let z2 = Scalar::<C>::reduce(z);
180180

181181
let k = NonZeroScalar::<C>::from_repr(rfc6979::generate_k::<D, _>(
182182
&d.to_repr(),
@@ -211,7 +211,7 @@ where
211211
C: EcdsaCurve + CurveArithmetic,
212212
SignatureSize<C>: ArraySize,
213213
{
214-
let z = Scalar::<C>::reduce_bytes(z);
214+
let z = Scalar::<C>::reduce(z);
215215
let (r, s) = sig.split_scalars();
216216
let s_inv = *s.invert_vartime();
217217
let u1 = z * s_inv;
@@ -220,7 +220,7 @@ where
220220
.to_affine()
221221
.x();
222222

223-
if *r == Scalar::<C>::reduce_bytes(&x) {
223+
if *r == Scalar::<C>::reduce(&x) {
224224
Ok(())
225225
} else {
226226
Err(Error::new())

ecdsa/src/recovery.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ where
373373
recovery_id: RecoveryId,
374374
) -> Result<Self> {
375375
let (r, s) = signature.split_scalars();
376-
let z = <Scalar<C> as Reduce<C::Uint>>::reduce_bytes(&bits2field::<C>(prehash)?);
376+
let z = <Scalar<C> as Reduce<FieldBytes<C>>>::reduce(&bits2field::<C>(prehash)?);
377377

378378
let r_bytes = if recovery_id.is_x_reduced() {
379379
Option::<C::Uint>::from(

0 commit comments

Comments
 (0)