diff --git a/signature-crate/src/signer.rs b/signature-crate/src/signer.rs index 2348c48e..46ec9d0d 100644 --- a/signature-crate/src/signer.rs +++ b/signature-crate/src/signer.rs @@ -1,7 +1,7 @@ //! Traits for generating digital signatures #[cfg(feature = "digest")] -use crate::digest::{generic_array::GenericArray, Digest}; +use crate::digest::Digest; use crate::{error::Error, Signature}; /// Sign the provided message bytestring using `Self` (e.g. a cryptographic key @@ -37,18 +37,18 @@ where /// Attempt to sign the computed digest of the given message. fn try_sign_msg_digest(&self, msg: &[u8]) -> Result { - self.try_sign_digest(D::digest(msg)) + self.try_sign_digest(D::new().chain(msg)) } /// Sign the given prehashed message `Digest`, returning a signature. /// /// Panics in the event of a signing error. - fn sign_digest(&self, digest: GenericArray) -> S { + fn sign_digest(&self, digest: D) -> S { self.try_sign_digest(digest) .expect("signature operation failed") } /// Attempt to sign the given prehashed message `Digest`, returning a /// digital signature on success, or an error if something went wrong. - fn try_sign_digest(&self, digest: GenericArray) -> Result; + fn try_sign_digest(&self, digest: D) -> Result; } diff --git a/signature-crate/src/verifier.rs b/signature-crate/src/verifier.rs index 1612cbf1..96aa7c58 100644 --- a/signature-crate/src/verifier.rs +++ b/signature-crate/src/verifier.rs @@ -1,7 +1,7 @@ //! Trait for verifying digital signatures #[cfg(feature = "digest")] -use crate::digest::{generic_array::GenericArray, Digest}; +use crate::digest::Digest; use crate::{error::Error, Signature}; /// Verify the provided message bytestring using `Self` (e.g. a public key) @@ -23,13 +23,9 @@ where { /// Verify the signature against the computed `Digest` output. fn verify_msg_digest(&self, msg: &[u8], signature: &S) -> Result<(), Error> { - self.verify_digest(D::digest(msg), signature) + self.verify_digest(D::new().chain(msg), signature) } /// Verify the signature against the given `Digest` output. - fn verify_digest( - &self, - digest: GenericArray, - signature: &S, - ) -> Result<(), Error>; + fn verify_digest(&self, digest: D, signature: &S) -> Result<(), Error>; }