Skip to content

ecdsa: remove Generate trait #159

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
Sep 9, 2020
Merged

ecdsa: remove Generate trait #159

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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions ecdsa/src/dev/curve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use elliptic_curve::{
digest::Digest,
ff::{Field, PrimeField},
group,
ops::Invert,
point::Generator,
rand_core::RngCore,
scalar::ScalarBits,
Expand Down Expand Up @@ -317,14 +316,6 @@ impl FromDigest<ExampleCurve> for Scalar {
}
}

impl Invert for Scalar {
type Output = Self;

fn invert(&self) -> CtOption<Self> {
unimplemented!();
}
}

impl Zeroize for Scalar {
fn zeroize(&mut self) {
self.0.as_mut().zeroize()
Expand Down
23 changes: 8 additions & 15 deletions ecdsa/src/sign.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::{
use core::convert::TryInto;
use elliptic_curve::{
generic_array::ArrayLength, ops::Invert, scalar::NonZeroScalar, weierstrass::Curve,
zeroize::Zeroize, Arithmetic, ElementBytes, FromBytes, FromDigest, Generate, SecretKey,
zeroize::Zeroize, Arithmetic, ElementBytes, FromBytes, FromDigest, SecretKey,
};
use signature::{
digest::{BlockInput, Digest, FixedOutput, Reset, Update},
Expand All @@ -39,6 +39,13 @@ where
C::Scalar: FromDigest<C> + Invert<Output = C::Scalar> + SignPrimitive<C> + Zeroize,
SignatureSize<C>: ArrayLength<u8>,
{
/// Generate a cryptographically random [`SigningKey`].
pub fn random(rng: impl CryptoRng + RngCore) -> Self {
Self {
secret_scalar: NonZeroScalar::random(rng),
}
}

/// Initialize signing key from a raw scalar serialized as a byte slice.
// TODO(tarcieri): PKCS#8 support
pub fn new(bytes: &[u8]) -> Result<Self, Error> {
Expand Down Expand Up @@ -71,20 +78,6 @@ where
}
}

impl<C> Generate for SigningKey<C>
where
C: Curve + Arithmetic,
C::Scalar: FromDigest<C> + Invert<Output = C::Scalar> + SignPrimitive<C> + Zeroize,
NonZeroScalar<C>: Generate,
SignatureSize<C>: ArrayLength<u8>,
{
fn generate(rng: impl CryptoRng + RngCore) -> Self {
Self {
secret_scalar: NonZeroScalar::generate(rng),
}
}
}

impl<C, D> DigestSigner<D, Signature<C>> for SigningKey<C>
where
C: Curve + Arithmetic,
Expand Down