Skip to content
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

Update dependencies #783

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update dependencies #783

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a5f30e
update rand to 0.9
getong Mar 2, 2025
f3fb565
update bitcoin_hashes to 0.16
getong Mar 3, 2025
2791338
update getrandom to 0.3
getong Mar 3, 2025
78e7479
rename thread_rng() to rng()
getong Mar 4, 2025
57a61b3
add default-features = false to getrandom
getong Mar 7, 2025
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.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ global-context-less-secure = ["global-context"]
secp256k1-sys = { version = "0.11.0", default-features = false, path = "./secp256k1-sys" }

hashes = { package = "bitcoin_hashes", version = "0.16", default-features = false, optional = true }
rand = { version = "0.9", default-features = false, optional = true }
rand = { version = "0.9", default-features = false, features = ["thread_rng"], optional = true }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't object to his but long term it'd be cool to propagate the feature.

serde = { version = "1.0.103", default-features = false, optional = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/generate_keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use secp256k1::{PublicKey, Secp256k1, SecretKey};

fn main() {
let secp = Secp256k1::new();
let mut rng = rand::thread_rng();
let mut rng = rand::rng();
// First option:
let (seckey, pubkey) = secp.generate_keypair(&mut rng);

Expand Down
2 changes: 1 addition & 1 deletion examples/sign_verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extern crate hashes;
extern crate secp256k1;

use hashes::{sha256, Hash};
use hashes::sha256;
use secp256k1::{ecdsa, Error, Message, PublicKey, Secp256k1, SecretKey, Signing, Verification};

fn verify<C: Verification>(
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_verify_recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extern crate hashes;
extern crate secp256k1;

use hashes::{sha256, Hash};
use hashes::sha256;
use secp256k1::{ecdsa, Error, Message, PublicKey, Secp256k1, SecretKey, Signing, Verification};

fn recover<C: Verification>(
Expand Down
8 changes: 4 additions & 4 deletions src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub mod global {
/// ```
/// # #[cfg(all(feature = "global-context", feature = "rand", feature = "std"))] {
/// use secp256k1::{PublicKey, SECP256K1};
/// let _ = SECP256K1.generate_keypair(&mut rand::thread_rng());
/// let _ = SECP256K1.generate_keypair(&mut rand::rng());
/// # }
/// ```
pub static SECP256K1: &GlobalContext = &GlobalContext { __private: () };
Expand Down Expand Up @@ -180,9 +180,9 @@ mod alloc_only {
/// ```
/// # #[cfg(all(feature = "rand", feature = "std"))] {
/// # use secp256k1::Secp256k1;
/// # use secp256k1::rand::{thread_rng, RngCore};
/// # use secp256k1::rand::{rng, RngCore};
/// let mut ctx = Secp256k1::new();
/// # let mut rng = thread_rng();
/// # let mut rng = rng();
/// # let mut seed = [0u8; 32];
/// # rng.fill_bytes(&mut seed);
/// // let seed = <32 bytes of random data>
Expand Down Expand Up @@ -216,7 +216,7 @@ mod alloc_only {
not(feature = "global-context-less-secure")
))]
{
ctx.randomize(&mut rand::thread_rng());
ctx.randomize(&mut rand::rng());
}

#[allow(clippy::let_and_return)] // as for unusted_mut
Expand Down
18 changes: 9 additions & 9 deletions src/ecdh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ const SHARED_SECRET_SIZE: usize = constants::SECRET_KEY_SIZE;
/// # use secp256k1::{rand, Secp256k1};
/// # use secp256k1::ecdh::SharedSecret;
/// let s = Secp256k1::new();
/// let (sk1, pk1) = s.generate_keypair(&mut rand::thread_rng());
/// let (sk2, pk2) = s.generate_keypair(&mut rand::thread_rng());
/// let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
/// let (sk2, pk2) = s.generate_keypair(&mut rand::rng());
/// let sec1 = SharedSecret::new(&pk2, &sk1);
/// let sec2 = SharedSecret::new(&pk1, &sk2);
/// assert_eq!(sec1, sec2);
Expand Down Expand Up @@ -116,8 +116,8 @@ impl AsRef<[u8]> for SharedSecret {
/// # use secp256k1::hashes::{Hash, sha512};
///
/// let s = Secp256k1::new();
/// let (sk1, pk1) = s.generate_keypair(&mut rand::thread_rng());
/// let (sk2, pk2) = s.generate_keypair(&mut rand::thread_rng());
/// let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
/// let (sk2, pk2) = s.generate_keypair(&mut rand::rng());
///
/// let point1 = ecdh::shared_secret_point(&pk2, &sk1);
/// let secret1 = sha512::Hash::hash(&point1);
Expand Down Expand Up @@ -197,8 +197,8 @@ mod tests {
#[cfg(all(feature = "rand", feature = "std"))]
fn ecdh() {
let s = Secp256k1::signing_only();
let (sk1, pk1) = s.generate_keypair(&mut rand::thread_rng());
let (sk2, pk2) = s.generate_keypair(&mut rand::thread_rng());
let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
let (sk2, pk2) = s.generate_keypair(&mut rand::rng());

let sec1 = SharedSecret::new(&pk2, &sk1);
let sec2 = SharedSecret::new(&pk1, &sk2);
Expand Down Expand Up @@ -233,8 +233,8 @@ mod tests {
use crate::ecdh::shared_secret_point;

let s = Secp256k1::signing_only();
let (sk1, _) = s.generate_keypair(&mut rand::thread_rng());
let (_, pk2) = s.generate_keypair(&mut rand::thread_rng());
let (sk1, _) = s.generate_keypair(&mut rand::rng());
let (_, pk2) = s.generate_keypair(&mut rand::rng());

let secret_sys = SharedSecret::new(&pk2, &sk1);

Expand Down Expand Up @@ -286,7 +286,7 @@ mod benches {
#[bench]
pub fn bench_ecdh(bh: &mut Bencher) {
let s = Secp256k1::signing_only();
let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
let (sk, pk) = s.generate_keypair(&mut rand::rng());

bh.iter(|| {
let res = SharedSecret::new(&pk, &sk);
Expand Down
2 changes: 1 addition & 1 deletion src/ecdsa/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ impl<C: Verification> Secp256k1<C> {
/// # use secp256k1::{rand, Secp256k1, Message, Error};
/// #
/// # let secp = Secp256k1::new();
/// # let (secret_key, public_key) = secp.generate_keypair(&mut rand::thread_rng());
/// # let (secret_key, public_key) = secp.generate_keypair(&mut rand::rng());
/// #
/// let message = Message::from_digest_slice(&[0xab; 32]).expect("32 bytes");
/// let sig = secp.sign_ecdsa(message, &secret_key);
Expand Down
34 changes: 17 additions & 17 deletions src/ecdsa/recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ mod tests {
let vrfy = Secp256k1::verification_only();
let full = Secp256k1::new();

let msg = crate::random_32_bytes(&mut rand::thread_rng());
let msg = crate::random_32_bytes(&mut rand::rng());
let msg = Message::from_digest_slice(&msg).unwrap();

// Try key generation
let (sk, pk) = full.generate_keypair(&mut rand::thread_rng());
let (sk, pk) = full.generate_keypair(&mut rand::rng());

// Try signing
assert_eq!(sign.sign_ecdsa_recoverable(msg, &sk), full.sign_ecdsa_recoverable(msg, &sk));
Expand All @@ -290,7 +290,7 @@ mod tests {
#[rustfmt::skip]
fn sign() {
let mut s = Secp256k1::new();
s.randomize(&mut rand::thread_rng());
s.randomize(&mut rand::rng());

let sk = SecretKey::from_slice(&ONE).unwrap();
let msg = Message::from_digest_slice(&ONE).unwrap();
Expand All @@ -315,7 +315,7 @@ mod tests {
#[rustfmt::skip]
fn sign_with_noncedata() {
let mut s = Secp256k1::new();
s.randomize(&mut rand::thread_rng());
s.randomize(&mut rand::rng());

let sk = SecretKey::from_slice(&ONE).unwrap();
let msg = Message::from_digest_slice(&ONE).unwrap();
Expand All @@ -339,17 +339,17 @@ mod tests {
#[cfg(all(feature = "rand", feature = "std"))]
fn sign_and_verify_fail() {
let mut s = Secp256k1::new();
s.randomize(&mut rand::thread_rng());
s.randomize(&mut rand::rng());

let msg = crate::random_32_bytes(&mut rand::thread_rng());
let msg = crate::random_32_bytes(&mut rand::rng());
let msg = Message::from_digest_slice(&msg).unwrap();

let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
let (sk, pk) = s.generate_keypair(&mut rand::rng());

let sigr = s.sign_ecdsa_recoverable(msg, &sk);
let sig = sigr.to_standard();

let msg = crate::random_32_bytes(&mut rand::thread_rng());
let msg = crate::random_32_bytes(&mut rand::rng());
let msg = Message::from_digest_slice(&msg).unwrap();
assert_eq!(s.verify_ecdsa(msg, &sig, &pk), Err(Error::IncorrectSignature));

Expand All @@ -361,12 +361,12 @@ mod tests {
#[cfg(all(feature = "rand", feature = "std"))]
fn sign_with_recovery() {
let mut s = Secp256k1::new();
s.randomize(&mut rand::thread_rng());
s.randomize(&mut rand::rng());

let msg = crate::random_32_bytes(&mut rand::thread_rng());
let msg = crate::random_32_bytes(&mut rand::rng());
let msg = Message::from_digest_slice(&msg).unwrap();

let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
let (sk, pk) = s.generate_keypair(&mut rand::rng());

let sig = s.sign_ecdsa_recoverable(msg, &sk);

Expand All @@ -377,14 +377,14 @@ mod tests {
#[cfg(all(feature = "rand", feature = "std"))]
fn sign_with_recovery_and_noncedata() {
let mut s = Secp256k1::new();
s.randomize(&mut rand::thread_rng());
s.randomize(&mut rand::rng());

let msg = crate::random_32_bytes(&mut rand::thread_rng());
let msg = crate::random_32_bytes(&mut rand::rng());
let msg = Message::from_digest_slice(&msg).unwrap();

let noncedata = [42u8; 32];

let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
let (sk, pk) = s.generate_keypair(&mut rand::rng());

let sig = s.sign_ecdsa_recoverable_with_noncedata(msg, &sk, &noncedata);

Expand All @@ -395,7 +395,7 @@ mod tests {
#[cfg(all(feature = "rand", feature = "std"))]
fn bad_recovery() {
let mut s = Secp256k1::new();
s.randomize(&mut rand::thread_rng());
s.randomize(&mut rand::rng());

let msg = Message::from_digest_slice(&[0x55; 32]).unwrap();

Expand Down Expand Up @@ -467,9 +467,9 @@ mod benches {
#[bench]
pub fn bench_recover(bh: &mut Bencher) {
let s = Secp256k1::new();
let msg = crate::random_32_bytes(&mut rand::thread_rng());
let msg = crate::random_32_bytes(&mut rand::rng());
let msg = Message::from_digest_slice(&msg).unwrap();
let (sk, _) = s.generate_keypair(&mut rand::thread_rng());
let (sk, _) = s.generate_keypair(&mut rand::rng());
let sig = s.sign_ecdsa_recoverable(&msg, &sk);

bh.iter(|| {
Expand Down
Loading
Loading