Skip to content

Commit b2cc300

Browse files
tarcieritarcieri
committed
ecdsa: rename DigestPrimitive to DigestAlgorithm
This name better gets the intent across
1 parent ade6fdb commit b2cc300

6 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎ecdsa/src/der.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ fn find_scalar_range(outer: &[u8], inner: &[u8]) -> Result<Range<usize>> {
399399
#[cfg(all(feature = "digest", feature = "hazmat"))]
400400
impl<C> signature::PrehashSignature for Signature<C>
401401
where
402-
C: EcdsaCurve + crate::hazmat::DigestPrimitive,
402+
C: EcdsaCurve + crate::hazmat::DigestAlgorithm,
403403
MaxSize<C>: ArraySize,
404404
<FieldBytesSize<C> as Add>::Output: Add<MaxOverhead> + ArraySize,
405405
{

‎ecdsa/src/hazmat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use crate::{Signature, elliptic_curve::array::ArraySize};
5353
///
5454
/// [1]: https://github.com/RustCrypto/traits/tree/master/signature/derive
5555
#[cfg(feature = "digest")]
56-
pub trait DigestPrimitive: EcdsaCurve {
56+
pub trait DigestAlgorithm: EcdsaCurve {
5757
/// Preferred digest to use when computing ECDSA signatures for this
5858
/// elliptic curve. This is typically a member of the SHA-2 family.
5959
type Digest: BlockSizeUser + Digest + FixedOutput + FixedOutputReset;
@@ -62,7 +62,7 @@ pub trait DigestPrimitive: EcdsaCurve {
6262
#[cfg(feature = "digest")]
6363
impl<C> PrehashSignature for Signature<C>
6464
where
65-
C: DigestPrimitive,
65+
C: DigestAlgorithm,
6666
<FieldBytesSize<C> as core::ops::Add>::Output: ArraySize,
6767
{
6868
type Digest = C::Digest;

‎ecdsa/src/lib.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,12 +467,12 @@ where
467467
#[cfg(all(feature = "digest", feature = "hazmat"))]
468468
impl<C> AssociatedOid for Signature<C>
469469
where
470-
C: hazmat::DigestPrimitive,
470+
C: hazmat::DigestAlgorithm,
471471
C::Digest: AssociatedOid,
472472
{
473473
const OID: ObjectIdentifier = match ecdsa_oid_for_digest(C::Digest::OID) {
474474
Some(oid) => oid,
475-
None => panic!("no RFC5758 ECDSA OID defined for DigestPrimitive::Digest"),
475+
None => panic!("no RFC5758 ECDSA OID defined for DigestAlgorithm::Digest"),
476476
};
477477
}
478478

@@ -721,29 +721,29 @@ where
721721
}
722722

723723
/// NOTE: this implementation assumes the default digest for the given elliptic
724-
/// curve as defined by [`hazmat::DigestPrimitive`].
724+
/// curve as defined by [`hazmat::DigestAlgorithm`].
725725
///
726726
/// When working with alternative digests, you will need to use e.g.
727727
/// [`SignatureWithOid::new_with_digest`].
728728
#[cfg(all(feature = "digest", feature = "hazmat"))]
729729
impl<C> SignatureEncoding for SignatureWithOid<C>
730730
where
731-
C: hazmat::DigestPrimitive,
731+
C: hazmat::DigestAlgorithm,
732732
C::Digest: AssociatedOid,
733733
SignatureSize<C>: ArraySize,
734734
{
735735
type Repr = SignatureBytes<C>;
736736
}
737737

738738
/// NOTE: this implementation assumes the default digest for the given elliptic
739-
/// curve as defined by [`hazmat::DigestPrimitive`].
739+
/// curve as defined by [`hazmat::DigestAlgorithm`].
740740
///
741741
/// When working with alternative digests, you will need to use e.g.
742742
/// [`SignatureWithOid::new_with_digest`].
743743
#[cfg(all(feature = "digest", feature = "hazmat"))]
744744
impl<C> TryFrom<&[u8]> for SignatureWithOid<C>
745745
where
746-
C: hazmat::DigestPrimitive,
746+
C: hazmat::DigestAlgorithm,
747747
C::Digest: AssociatedOid,
748748
SignatureSize<C>: ArraySize,
749749
{

‎ecdsa/src/recovery.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use {
3030
use {
3131
crate::{
3232
EcdsaCurve, Signature, SignatureSize,
33-
hazmat::{DigestPrimitive, bits2field},
33+
hazmat::{DigestAlgorithm, bits2field},
3434
},
3535
elliptic_curve::{CurveArithmetic, Scalar, array::ArraySize, ops::Invert},
3636
signature::digest::Digest,
@@ -100,7 +100,7 @@ impl RecoveryId {
100100
signature: &Signature<C>,
101101
) -> Result<Self>
102102
where
103-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
103+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
104104
AffinePoint<C>: DecompressPoint<C> + FromEncodedPoint<C> + ToEncodedPoint<C>,
105105
FieldBytesSize<C>: sec1::ModulusSize,
106106
SignatureSize<C>: ArraySize,
@@ -179,7 +179,7 @@ impl From<RecoveryId> for u8 {
179179
#[cfg(feature = "signing")]
180180
impl<C> SigningKey<C>
181181
where
182-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
182+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
183183
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
184184
SignatureSize<C>: ArraySize,
185185
{
@@ -228,7 +228,7 @@ where
228228
#[cfg(feature = "signing")]
229229
impl<C, D> DigestSigner<D, (Signature<C>, RecoveryId)> for SigningKey<C>
230230
where
231-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
231+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
232232
D: Digest,
233233
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
234234
SignatureSize<C>: ArraySize,
@@ -241,7 +241,7 @@ where
241241
#[cfg(feature = "signing")]
242242
impl<C> RandomizedPrehashSigner<(Signature<C>, RecoveryId)> for SigningKey<C>
243243
where
244-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
244+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
245245
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
246246
SignatureSize<C>: ArraySize,
247247
{
@@ -257,7 +257,7 @@ where
257257
#[cfg(feature = "signing")]
258258
impl<C, D> RandomizedDigestSigner<D, (Signature<C>, RecoveryId)> for SigningKey<C>
259259
where
260-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
260+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
261261
D: Digest + FixedOutput,
262262
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
263263
SignatureSize<C>: ArraySize,
@@ -274,7 +274,7 @@ where
274274
#[cfg(feature = "signing")]
275275
impl<C> PrehashSigner<(Signature<C>, RecoveryId)> for SigningKey<C>
276276
where
277-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
277+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
278278
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
279279
SignatureSize<C>: ArraySize,
280280
{
@@ -286,7 +286,7 @@ where
286286
#[cfg(feature = "signing")]
287287
impl<C> Signer<(Signature<C>, RecoveryId)> for SigningKey<C>
288288
where
289-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
289+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
290290
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
291291
SignatureSize<C>: ArraySize,
292292
{
@@ -298,7 +298,7 @@ where
298298
#[cfg(feature = "signing")]
299299
impl<C> MultipartSigner<(Signature<C>, RecoveryId)> for SigningKey<C>
300300
where
301-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
301+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
302302
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
303303
SignatureSize<C>: ArraySize,
304304
{
@@ -320,14 +320,14 @@ where
320320
/// Recover a [`VerifyingKey`] from the given message, signature, and
321321
/// [`RecoveryId`].
322322
///
323-
/// The message is first hashed using this curve's [`DigestPrimitive`].
323+
/// The message is first hashed using this curve's [`DigestAlgorithm`].
324324
pub fn recover_from_msg(
325325
msg: &[u8],
326326
signature: &Signature<C>,
327327
recovery_id: RecoveryId,
328328
) -> Result<Self>
329329
where
330-
C: DigestPrimitive,
330+
C: DigestAlgorithm,
331331
{
332332
Self::recover_from_digest(C::Digest::new_with_prefix(msg), signature, recovery_id)
333333
}

‎ecdsa/src/signing.rs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::{
44
EcdsaCurve, Error, Result, Signature, SignatureSize, SignatureWithOid, ecdsa_oid_for_digest,
5-
hazmat::{DigestPrimitive, bits2field, sign_prehashed_rfc6979},
5+
hazmat::{DigestAlgorithm, bits2field, sign_prehashed_rfc6979},
66
};
77
use core::fmt::{self, Debug};
88
use digest::{Digest, FixedOutput, const_oid::AssociatedOid};
@@ -140,7 +140,7 @@ where
140140
/// [RFC6979 § 3.2]: https://tools.ietf.org/html/rfc6979#section-3
141141
impl<C, D> DigestSigner<D, Signature<C>> for SigningKey<C>
142142
where
143-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
143+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
144144
D: Digest + FixedOutput,
145145
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
146146
SignatureSize<C>: ArraySize,
@@ -156,7 +156,7 @@ where
156156
/// [RFC6979 § 3.2]: https://tools.ietf.org/html/rfc6979#section-3
157157
impl<C> PrehashSigner<Signature<C>> for SigningKey<C>
158158
where
159-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
159+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
160160
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
161161
SignatureSize<C>: ArraySize,
162162
{
@@ -172,7 +172,7 @@ where
172172
/// [RFC6979 § 3.2]: https://tools.ietf.org/html/rfc6979#section-3
173173
impl<C> Signer<Signature<C>> for SigningKey<C>
174174
where
175-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
175+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
176176
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
177177
SignatureSize<C>: ArraySize,
178178
{
@@ -183,7 +183,7 @@ where
183183

184184
impl<C> MultipartSigner<Signature<C>> for SigningKey<C>
185185
where
186-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
186+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
187187
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
188188
SignatureSize<C>: ArraySize,
189189
{
@@ -196,7 +196,7 @@ where
196196

197197
impl<C, D> RandomizedDigestSigner<D, Signature<C>> for SigningKey<C>
198198
where
199-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
199+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
200200
D: Digest + FixedOutput,
201201
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
202202
SignatureSize<C>: ArraySize,
@@ -212,7 +212,7 @@ where
212212

213213
impl<C> RandomizedPrehashSigner<Signature<C>> for SigningKey<C>
214214
where
215-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
215+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
216216
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
217217
SignatureSize<C>: ArraySize,
218218
{
@@ -239,7 +239,7 @@ where
239239
impl<C> RandomizedSigner<Signature<C>> for SigningKey<C>
240240
where
241241
Self: RandomizedDigestSigner<C::Digest, Signature<C>>,
242-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
242+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
243243
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
244244
SignatureSize<C>: ArraySize,
245245
{
@@ -255,7 +255,7 @@ where
255255
impl<C> RandomizedMultipartSigner<Signature<C>> for SigningKey<C>
256256
where
257257
Self: RandomizedDigestSigner<C::Digest, Signature<C>>,
258-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
258+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
259259
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
260260
SignatureSize<C>: ArraySize,
261261
{
@@ -272,7 +272,7 @@ where
272272

273273
impl<C, D> DigestSigner<D, SignatureWithOid<C>> for SigningKey<C>
274274
where
275-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
275+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
276276
D: AssociatedOid + Digest + FixedOutput,
277277
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
278278
SignatureSize<C>: ArraySize,
@@ -286,7 +286,7 @@ where
286286

287287
impl<C> Signer<SignatureWithOid<C>> for SigningKey<C>
288288
where
289-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
289+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
290290
C::Digest: AssociatedOid,
291291
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
292292
SignatureSize<C>: ArraySize,
@@ -298,7 +298,7 @@ where
298298

299299
impl<C> MultipartSigner<SignatureWithOid<C>> for SigningKey<C>
300300
where
301-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
301+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
302302
C::Digest: AssociatedOid,
303303
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
304304
SignatureSize<C>: ArraySize,
@@ -313,7 +313,7 @@ where
313313
#[cfg(feature = "der")]
314314
impl<C> PrehashSigner<der::Signature<C>> for SigningKey<C>
315315
where
316-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
316+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
317317
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
318318
SignatureSize<C>: ArraySize,
319319
der::MaxSize<C>: ArraySize,
@@ -327,7 +327,7 @@ where
327327
#[cfg(feature = "der")]
328328
impl<C> Signer<der::Signature<C>> for SigningKey<C>
329329
where
330-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
330+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
331331
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
332332
SignatureSize<C>: ArraySize,
333333
der::MaxSize<C>: ArraySize,
@@ -341,7 +341,7 @@ where
341341
#[cfg(feature = "der")]
342342
impl<C, D> RandomizedDigestSigner<D, der::Signature<C>> for SigningKey<C>
343343
where
344-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
344+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
345345
D: Digest + FixedOutput,
346346
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
347347
SignatureSize<C>: ArraySize,
@@ -361,7 +361,7 @@ where
361361
#[cfg(feature = "der")]
362362
impl<C> RandomizedPrehashSigner<der::Signature<C>> for SigningKey<C>
363363
where
364-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
364+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
365365
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
366366
SignatureSize<C>: ArraySize,
367367
der::MaxSize<C>: ArraySize,
@@ -380,7 +380,7 @@ where
380380
#[cfg(feature = "der")]
381381
impl<D, C> DigestSigner<D, der::Signature<C>> for SigningKey<C>
382382
where
383-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
383+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
384384
D: Digest + FixedOutput,
385385
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
386386
SignatureSize<C>: ArraySize,
@@ -395,7 +395,7 @@ where
395395
#[cfg(feature = "der")]
396396
impl<C> RandomizedSigner<der::Signature<C>> for SigningKey<C>
397397
where
398-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
398+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
399399
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
400400
SignatureSize<C>: ArraySize,
401401
der::MaxSize<C>: ArraySize,
@@ -413,7 +413,7 @@ where
413413
#[cfg(feature = "der")]
414414
impl<C> RandomizedMultipartSigner<der::Signature<C>> for SigningKey<C>
415415
where
416-
C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
416+
C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
417417
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
418418
SignatureSize<C>: ArraySize,
419419
der::MaxSize<C>: ArraySize,

0 commit comments

Comments
 (0)