From 88c8c58d8d914279f8aa809413fd53f4929f7de4 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Tue, 2 Apr 2024 11:06:24 +1100 Subject: [PATCH 1/2] Fix import warnings Recent rustc upgrade introduced some new warnings for incorrect imports, fix them. --- src/ecdsa/serialized_signature.rs | 1 - src/key.rs | 1 - src/schnorr.rs | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ecdsa/serialized_signature.rs b/src/ecdsa/serialized_signature.rs index fceaa73b5..f8be36a29 100644 --- a/src/ecdsa/serialized_signature.rs +++ b/src/ecdsa/serialized_signature.rs @@ -8,7 +8,6 @@ //! serialized signatures and since it's a bit more complicated it has its own module. use core::borrow::Borrow; -use core::convert::TryFrom; use core::{fmt, ops}; pub use into_iter::IntoIter; diff --git a/src/key.rs b/src/key.rs index 84255cf00..48b1463b3 100644 --- a/src/key.rs +++ b/src/key.rs @@ -3,7 +3,6 @@ //! Public and secret keys. //! -use core::convert::TryFrom; use core::ops::{self, BitXor}; use core::{fmt, ptr, str}; diff --git a/src/schnorr.rs b/src/schnorr.rs index b284dcbcb..e8c767b8a 100644 --- a/src/schnorr.rs +++ b/src/schnorr.rs @@ -12,9 +12,7 @@ use crate::ffi::{self, CPtr}; use crate::key::{Keypair, XOnlyPublicKey}; #[cfg(feature = "global-context")] use crate::SECP256K1; -use crate::{ - constants, from_hex, impl_array_newtype, Error, Message, Secp256k1, Signing, Verification, -}; +use crate::{constants, from_hex, Error, Message, Secp256k1, Signing, Verification}; /// Represents a schnorr signature. #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] From 9f28cf6ad01157da2dfb35639db7f624f958cc69 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Tue, 2 Apr 2024 09:07:08 +1100 Subject: [PATCH 2/2] Deprecate ThirtyTwoByteHash The implementations of `ThirtyTwoByteHash` for types from the `hashes` crate are problematic during upgrades because both `bitcoin` and `secp256k1` depend on `hashes` and when the versions of `hashes` get out of sync usage of the trait breaks. Deprecate the `ThirtyTwoByteHash` trait and remove the impls for types from `bitcoin_hashes`. Add an explanation in the changelog because its too long to go in the deprecation message. --- CHANGELOG.md | 9 +++++ api/all-features.txt | 8 ----- src/key.rs | 30 +++-------------- src/lib.rs | 79 +++++++------------------------------------- 4 files changed, 25 insertions(+), 101 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9bcc7599..0d2794340 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Unreleased +* Deprecate `ThirtyTwoByteHash` + + This trait turned out to be problematic during upgrade because we support a ranged dependency for + `bitcoin_hashes`. Consider implementing `From for Message` for your type iff your type is a 32 + byte hash (ie, output from a hash algorithm that produces a 32 byte digest like sha256). When + using the impl, consider using `Message::from` instead of `hash.into()` because we will be + introducing generics in a future version and the compiler will not be able to work out the target + type. + * Bump MSRV to Rust `v1.56.1` * Upgrade `hashes` using range dependency `version = ">= 0.12, <= 0.14"`. diff --git a/api/all-features.txt b/api/all-features.txt index 88d8ad19f..d39db602d 100644 --- a/api/all-features.txt +++ b/api/all-features.txt @@ -519,8 +519,6 @@ impl secp256k1_sys::CPtr for secp256k1::PublicKey impl secp256k1_sys::CPtr for secp256k1::schnorr::Signature impl secp256k1_sys::CPtr for secp256k1::SecretKey impl secp256k1_sys::CPtr for secp256k1::XOnlyPublicKey -impl secp256k1::ThirtyTwoByteHash for bitcoin_hashes::sha256d::Hash -impl secp256k1::ThirtyTwoByteHash for bitcoin_hashes::sha256::Hash impl secp256k1::Verification for secp256k1::All impl secp256k1::Verification for secp256k1::VerifyOnly impl secp256k1::XOnlyPublicKey @@ -532,7 +530,6 @@ impl serde::ser::Serialize for secp256k1::PublicKey impl serde::ser::Serialize for secp256k1::schnorr::Signature impl serde::ser::Serialize for secp256k1::SecretKey impl serde::ser::Serialize for secp256k1::XOnlyPublicKey -impl secp256k1::ThirtyTwoByteHash for bitcoin_hashes::sha256t::Hash impl core::convert::From for secp256k1::Message impl core::convert::From for secp256k1::SecretKey #[non_exhaustive] pub struct secp256k1::scalar::OutOfRangeError @@ -580,9 +577,6 @@ pub enum secp256k1::SignOnly pub enum secp256k1::VerifyOnly pub extern crate secp256k1::hashes pub fn &'a secp256k1::ecdsa::serialized_signature::SerializedSignature::into_iter(self) -> Self::IntoIter -pub fn bitcoin_hashes::sha256d::Hash::into_32(self) -> [u8; 32] -pub fn bitcoin_hashes::sha256::Hash::into_32(self) -> [u8; 32] -pub fn bitcoin_hashes::sha256t::Hash::into_32(self) -> [u8; 32] pub fn i32::from(parity: secp256k1::Parity) -> i32 pub fn secp256k1::All::clone(&self) -> secp256k1::All pub fn secp256k1::All::cmp(&self, other: &secp256k1::All) -> core::cmp::Ordering @@ -772,7 +766,6 @@ pub fn secp256k1::Message::eq(&self, other: &secp256k1::Message) -> bool pub fn secp256k1::Message::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result pub fn secp256k1::Message::from_digest(digest: [u8; 32]) -> secp256k1::Message pub fn secp256k1::Message::from_digest_slice(digest: &[u8]) -> core::result::Result -pub fn secp256k1::Message::from_hashed_data(data: &[u8]) -> Self pub fn secp256k1::Message::from_slice(digest: &[u8]) -> core::result::Result pub fn secp256k1::Message::from(t: T) -> secp256k1::Message pub fn secp256k1::Message::hash<__H: core::hash::Hasher>(&self, state: &mut __H) @@ -904,7 +897,6 @@ pub fn secp256k1::SecretKey::deserialize>(d: D) pub fn secp256k1::SecretKey::display_secret(&self) -> DisplaySecret pub fn secp256k1::SecretKey::eq(&self, other: &Self) -> bool pub fn secp256k1::SecretKey::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result -pub fn secp256k1::SecretKey::from_hashed_data(data: &[u8]) -> Self pub fn secp256k1::SecretKey::from_keypair(keypair: &secp256k1::Keypair) -> Self pub fn secp256k1::SecretKey::from(pair: &'a secp256k1::Keypair) -> Self pub fn secp256k1::SecretKey::from(pair: secp256k1::Keypair) -> Self diff --git a/src/key.rs b/src/key.rs index 48b1463b3..012f09d36 100644 --- a/src/key.rs +++ b/src/key.rs @@ -13,13 +13,14 @@ use crate::ellswift::ElligatorSwift; use crate::ffi::types::c_uint; use crate::ffi::{self, CPtr}; use crate::Error::{self, InvalidPublicKey, InvalidPublicKeySum, InvalidSecretKey}; +#[cfg(feature = "hashes")] +#[allow(deprecated)] +use crate::ThirtyTwoByteHash; #[cfg(feature = "global-context")] use crate::SECP256K1; use crate::{ constants, ecdsa, from_hex, schnorr, Message, Scalar, Secp256k1, Signing, Verification, }; -#[cfg(feature = "hashes")] -use crate::{hashes, ThirtyTwoByteHash}; /// Secret key - a 256-bit key used to create ECDSA and Taproot signatures. /// @@ -256,30 +257,6 @@ impl SecretKey { SecretKey(sk) } - /// Constructs a [`SecretKey`] by hashing `data` with hash algorithm `H`. - /// - /// Requires the feature `hashes` to be enabled. - /// - /// # Examples - /// - /// ``` - /// # #[cfg(feature="hashes")] { - /// use secp256k1::hashes::{sha256, Hash}; - /// use secp256k1::SecretKey; - /// - /// let sk1 = SecretKey::from_hashed_data::("Hello world!".as_bytes()); - /// // is equivalent to - /// let sk2 = SecretKey::from(sha256::Hash::hash("Hello world!".as_bytes())); - /// - /// assert_eq!(sk1, sk2); - /// # } - /// ``` - #[cfg(feature = "hashes")] - #[inline] - pub fn from_hashed_data(data: &[u8]) -> Self { - ::hash(data).into() - } - /// Returns the secret key as a byte value. #[inline] pub fn secret_bytes(&self) -> [u8; constants::SECRET_KEY_SIZE] { self.0 } @@ -372,6 +349,7 @@ impl SecretKey { } #[cfg(feature = "hashes")] +#[allow(deprecated)] impl From for SecretKey { /// Converts a 32-byte hash directly to a secret key without error paths. fn from(t: T) -> SecretKey { diff --git a/src/lib.rs b/src/lib.rs index 2c5bf60ca..20ff5d44e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -31,11 +31,12 @@ //! # #[cfg(all(feature = "rand-std", feature = "hashes-std"))] { //! use secp256k1::rand::rngs::OsRng; //! use secp256k1::{Secp256k1, Message}; -//! use secp256k1::hashes::sha256; +//! use secp256k1::hashes::{sha256, Hash}; //! //! let secp = Secp256k1::new(); //! let (secret_key, public_key) = secp.generate_keypair(&mut OsRng); -//! let message = Message::from_hashed_data::("Hello World!".as_bytes()); +//! let digest = sha256::Hash::hash("Hello World!".as_bytes()); +//! let message = Message::from_digest(digest.to_byte_array()); //! //! let sig = secp.sign_ecdsa(&message, &secret_key); //! assert!(secp.verify_ecdsa(&message, &sig, &public_key).is_ok()); @@ -47,10 +48,11 @@ //! ```rust //! # #[cfg(all(feature = "global-context", feature = "hashes-std", feature = "rand-std"))] { //! use secp256k1::{generate_keypair, Message}; -//! use secp256k1::hashes::sha256; +//! use secp256k1::hashes::{sha256, Hash}; //! //! let (secret_key, public_key) = generate_keypair(&mut rand::thread_rng()); -//! let message = Message::from_hashed_data::("Hello World!".as_bytes()); +//! let digest = sha256::Hash::hash("Hello World!".as_bytes()); +//! let message = Message::from_digest(digest.to_byte_array()); //! //! let sig = secret_key.sign_ecdsa(message); //! assert!(sig.verify(&message, &public_key).is_ok()); @@ -176,8 +178,6 @@ use core::{fmt, mem, str}; #[cfg(all(feature = "global-context", feature = "std"))] pub use context::global::{self, SECP256K1}; -#[cfg(feature = "hashes")] -use hashes::Hash; #[cfg(feature = "rand")] pub use rand; pub use secp256k1_sys as ffi; @@ -198,26 +198,15 @@ pub use crate::scalar::Scalar; /// Trait describing something that promises to be a 32-byte random number; in particular, /// it has negligible probability of being zero or overflowing the group order. Such objects /// may be converted to `Message`s without any error paths. +#[deprecated( + since = "0.29.0", + note = "Please see v0.29.0 rust-secp256k1/CHANGELOG.md for suggestion" +)] pub trait ThirtyTwoByteHash { /// Converts the object into a 32-byte array fn into_32(self) -> [u8; 32]; } -#[cfg(feature = "hashes")] -impl ThirtyTwoByteHash for hashes::sha256::Hash { - fn into_32(self) -> [u8; 32] { self.to_byte_array() } -} - -#[cfg(feature = "hashes")] -impl ThirtyTwoByteHash for hashes::sha256d::Hash { - fn into_32(self) -> [u8; 32] { self.to_byte_array() } -} - -#[cfg(feature = "hashes")] -impl ThirtyTwoByteHash for hashes::sha256t::Hash { - fn into_32(self) -> [u8; 32] { self.to_byte_array() } -} - /// A (hashed) message input to an ECDSA signature. #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct Message([u8; constants::MESSAGE_SIZE]); @@ -225,7 +214,7 @@ impl_array_newtype!(Message, u8, constants::MESSAGE_SIZE); impl_pretty_debug!(Message); impl Message { - /// **If you just want to sign an arbitrary message use `Message::from_hashed_data` instead.** + /// Creates a [`Message`] from a 32 byte slice `digest`. /// /// Converts a `MESSAGE_SIZE`-byte slice to a message object. **WARNING:** the slice has to be a /// cryptographically secure hash of the actual message that's going to be signed. Otherwise @@ -239,8 +228,6 @@ impl Message { /// Creates a [`Message`] from a `digest`. /// - /// **If you just want to sign an arbitrary message use `Message::from_hashed_data` instead.** - /// /// The `digest` array has to be a cryptographically secure hash of the actual message that's /// going to be signed. Otherwise the result of signing isn't a [secure signature]. /// @@ -250,8 +237,6 @@ impl Message { /// Creates a [`Message`] from a 32 byte slice `digest`. /// - /// **If you just want to sign an arbitrary message use `Message::from_hashed_data` instead.** - /// /// The slice has to be 32 bytes long and be a cryptographically secure hash of the actual /// message that's going to be signed. Otherwise the result of signing isn't a [secure /// signature]. @@ -272,31 +257,9 @@ impl Message { _ => Err(Error::InvalidMessage), } } - - /// Constructs a [`Message`] by hashing `data` with hash algorithm `H`. - /// - /// Requires the feature `hashes` to be enabled. - /// - /// # Examples - /// - /// ``` - /// # #[cfg(feature = "hashes")] { - /// use secp256k1::hashes::{sha256, Hash}; - /// use secp256k1::Message; - /// - /// let m1 = Message::from_hashed_data::("Hello world!".as_bytes()); - /// // is equivalent to - /// let m2 = Message::from(sha256::Hash::hash("Hello world!".as_bytes())); - /// - /// assert_eq!(m1, m2); - /// # } - /// ``` - #[cfg(feature = "hashes")] - pub fn from_hashed_data(data: &[u8]) -> Self { - ::hash(data).into() - } } +#[allow(deprecated)] impl From for Message { /// Converts a 32-byte hash directly to a message without error paths. fn from(t: T) -> Message { Message(t.into_32()) } @@ -1043,24 +1006,6 @@ mod tests { let sig = SECP256K1.sign_ecdsa(&msg, &sk); assert!(SECP256K1.verify_ecdsa(&msg, &sig, &pk).is_ok()); } - - #[cfg(feature = "hashes")] - #[test] - fn test_from_hash() { - use hashes::{sha256, sha256d, Hash}; - - let test_bytes = "Hello world!".as_bytes(); - - let hash = sha256::Hash::hash(test_bytes); - let msg = Message::from(hash); - assert_eq!(msg.0, hash.to_byte_array()); - assert_eq!(msg, Message::from_hashed_data::(test_bytes)); - - let hash = sha256d::Hash::hash(test_bytes); - let msg = Message::from(hash); - assert_eq!(msg.0, hash.to_byte_array()); - assert_eq!(msg, Message::from_hashed_data::(test_bytes)); - } } #[cfg(bench)]