Skip to content

ecdsa: add bounds for RFC6979 to DigestPrimitive::Digest #568

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
Nov 2, 2022
Merged

ecdsa: add bounds for RFC6979 to DigestPrimitive::Digest #568

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
16 changes: 7 additions & 9 deletions ecdsa/src/hazmat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ use {
use {
core::cmp,
elliptic_curve::{bigint::Encoding, FieldSize},
signature::{digest::Digest, PrehashSignature},
signature::{
digest::{core_api::BlockSizeUser, Digest, FixedOutputReset},
PrehashSignature,
},
};

#[cfg(any(feature = "arithmetic", feature = "digest"))]
Expand All @@ -39,11 +42,8 @@ use crate::{
#[cfg(all(feature = "arithmetic", feature = "digest"))]
use signature::digest::FixedOutput;

#[cfg(all(feature = "rfc6979"))]
use {
elliptic_curve::ScalarCore,
signature::digest::{core_api::BlockSizeUser, FixedOutputReset},
};
#[cfg(feature = "rfc6979")]
use elliptic_curve::ScalarCore;

/// Try to sign the given prehashed message using ECDSA.
///
Expand Down Expand Up @@ -218,9 +218,7 @@ where
pub trait DigestPrimitive: PrimeCurve {
/// Preferred digest to use when computing ECDSA signatures for this
/// elliptic curve. This is typically a member of the SHA-2 family.
// TODO(tarcieri): add BlockSizeUser + FixedOutput(Reset) bounds in next breaking release
// These bounds ensure the digest algorithm can be used for HMAC-DRBG for RFC6979
type Digest: Digest;
type Digest: BlockSizeUser + Digest + FixedOutputReset;

/// Compute field bytes for a prehash (message digest), either zero-padding
/// or truncating if the prehash size does not match the field size.
Expand Down
2 changes: 1 addition & 1 deletion ecdsa/src/sign.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ where
impl<C> PrehashSigner<Signature<C>> for SigningKey<C>
where
C: PrimeCurve + ProjectiveArithmetic + DigestPrimitive,
C::Digest: BlockSizeUser + FixedOutput<OutputSize = FieldSize<C>> + FixedOutputReset,
C::Digest: FixedOutput<OutputSize = FieldSize<C>>,
C::UInt: for<'a> From<&'a Scalar<C>>,
Scalar<C>: Invert<Output = CtOption<Scalar<C>>> + Reduce<C::UInt> + SignPrimitive<C>,
SignatureSize<C>: ArrayLength<u8>,
Expand Down