Skip to content

Commit 56429b9

Browse files
committed
Merge #1654: chore(deps): update dependencies
f737ace fix: resolve compilation errors after dependency updates (Jose Celano) 046d5c9 chore(deps): update dependencies (Jose Celano) Pull request description: ``` cargo update Updating crates.io index Locking 98 packages to latest compatible versions Updating anyhow v1.0.100 -> v1.0.102 Updating arc-swap v1.8.0 -> v1.8.2 Updating async-compression v0.4.37 -> v0.4.40 Updating async-executor v1.13.3 -> v1.14.0 Updating aws-lc-rs v1.15.4 -> v1.16.0 Updating aws-lc-sys v0.37.0 -> v0.37.1 Updating bitflags v2.10.0 -> v2.11.0 Updating bollard v0.19.4 -> v0.20.1 Updating bollard-stubs v1.49.1-rc.28.4.0 -> v1.52.1-rc.29.1.3 Updating bumpalo v3.19.1 -> v3.20.2 Updating bytemuck v1.24.0 -> v1.25.0 Updating bytes v1.11.0 -> v1.11.1 Updating cc v1.2.54 -> v1.2.56 Adding chacha20 v0.10.0 Adding cipher v0.5.0 Updating clap v4.5.54 -> v4.5.60 Updating clap_builder v4.5.54 -> v4.5.60 Updating clap_derive v4.5.49 -> v4.5.55 Updating clap_lex v0.7.7 -> v1.0.0 Updating compression-codecs v0.4.36 -> v0.4.37 Adding cpufeatures v0.3.0 Updating criterion v0.8.1 -> v0.8.2 Updating criterion-plot v0.8.1 -> v0.8.2 Adding crypto-common v0.2.0 Updating deranged v0.5.5 -> v0.5.6 Adding env_filter v1.0.0 Updating env_logger v0.8.4 -> v0.11.9 Updating find-msvc-tools v0.1.8 -> v0.1.9 Updating flate2 v1.1.8 -> v1.1.9 Updating fs-err v3.2.2 -> v3.3.0 Updating futures v0.3.31 -> v0.3.32 Updating futures-channel v0.3.31 -> v0.3.32 Updating futures-core v0.3.31 -> v0.3.32 Updating futures-executor v0.3.31 -> v0.3.32 Updating futures-io v0.3.31 -> v0.3.32 Updating futures-macro v0.3.31 -> v0.3.32 Updating futures-sink v0.3.31 -> v0.3.32 Updating futures-task v0.3.31 -> v0.3.32 Updating futures-util v0.3.31 -> v0.3.32 Adding getrandom v0.4.1 Adding hybrid-array v0.4.7 Updating hyper-util v0.1.19 -> v0.1.20 Updating iana-time-zone v0.1.64 -> v0.1.65 Adding id-arena v2.3.0 Adding inout v0.2.2 Adding leb128fmt v0.1.0 Updating libc v0.2.180 -> v0.2.182 Updating local-ip-address v0.6.9 -> v0.6.10 Updating memchr v2.7.6 -> v2.8.0 Updating native-tls v0.2.14 -> v0.2.18 Updating neli v0.7.3 -> v0.7.4 Removing openssl-probe v0.1.6 Updating portable-atomic v1.13.0 -> v1.13.1 Updating portable-atomic-util v0.2.4 -> v0.2.5 Updating predicates v3.1.3 -> v3.1.4 Updating predicates-core v1.0.9 -> v1.0.10 Updating predicates-tree v1.0.12 -> v1.0.13 Adding prettyplease v0.2.37 Updating quickcheck v1.0.3 -> v1.1.0 Adding rand v0.10.0 Adding rand_core v0.10.0 Updating redox_syscall v0.7.0 -> v0.7.1 Updating regex v1.12.2 -> v1.12.3 Updating regex-automata v0.4.13 -> v0.4.14 Updating regex-syntax v0.8.8 -> v0.8.9 Updating reqwest v0.13.1 -> v0.13.2 Removing rustls-pemfile v2.2.0 Updating ryu v1.0.22 -> v1.0.23 Updating schemars v1.2.0 -> v1.2.1 Removing security-framework v2.11.1 Removing security-framework v3.5.1 Adding security-framework v3.7.0 Updating security-framework-sys v2.15.0 -> v2.17.0 Updating siphasher v1.0.1 -> v1.0.2 Updating slab v0.4.11 -> v0.4.12 Updating subprocess v0.2.13 -> v0.2.15 Updating syn v2.0.114 -> v2.0.117 Updating system-configuration v0.6.1 -> v0.7.0 Updating tempfile v3.24.0 -> v3.25.0 Updating testcontainers v0.26.3 -> v0.27.0 Updating time v0.3.46 -> v0.3.47 Updating time-macros v0.2.26 -> v0.2.27 Updating toml v0.9.11+spec-1.1.0 -> v0.9.12+spec-1.1.0 (available: v1.0.3+spec-1.1.0) Updating toml_parser v1.0.6+spec-1.1.0 -> v1.0.9+spec-1.1.0 Updating tonic v0.14.2 -> v0.14.5 Updating tonic-prost v0.14.2 -> v0.14.5 Updating unicode-ident v1.0.22 -> v1.0.24 Updating ureq v3.1.4 -> v3.2.0 Updating uuid v1.20.0 -> v1.21.0 Adding wasip3 v0.4.0+wasi-0.3.0-rc-2026-01-06 Adding wasm-encoder v0.244.0 Adding wasm-metadata v0.244.0 Adding wasmparser v0.244.0 Updating webpki-root-certs v1.0.5 -> v1.0.6 Removing webpki-roots v1.0.5 Adding wit-bindgen-core v0.51.0 Adding wit-bindgen-rust v0.51.0 Adding wit-bindgen-rust-macro v0.51.0 Adding wit-component v0.244.0 Adding wit-parser v0.244.0 Updating zerocopy v0.8.34 -> v0.8.39 Updating zerocopy-derive v0.8.34 -> v0.8.39 Updating zmij v1.0.17 -> v1.0.21 note: pass `--verbose` to see 7 unchanged dependencies behind latest ``` ACKs for top commit: josecelano: ACK f737ace Tree-SHA512: 7f20ff965409da9ec6c871584f2714a08b49351ed50948a2adb678595f64db93b045424e3c57843ec01328c3f82705ad58079754dc95459dff29317fca06511e
2 parents 93fc909 + f737ace commit 56429b9

8 files changed

Lines changed: 455 additions & 285 deletions

File tree

Cargo.lock

Lines changed: 444 additions & 277 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/test-helpers/src/random.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Random data generators for testing.
22
use rand::distr::Alphanumeric;
3-
use rand::{rng, Rng};
3+
use rand::{rng, RngExt};
44

55
/// Returns a random alphanumeric string of a certain size.
66
///

packages/tracker-core/src/authentication/key/peer_key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::time::Duration;
1313

1414
use derive_more::Display;
1515
use rand::distr::Alphanumeric;
16-
use rand::{rng, Rng};
16+
use rand::{rng, RngExt};
1717
use serde::{Deserialize, Serialize};
1818
use thiserror::Error;
1919
use torrust_tracker_clock::conv::convert_from_timestamp_to_datetime_utc;

packages/tracker-core/src/test_helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub(crate) mod tests {
77

88
use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
99
use bittorrent_primitives::info_hash::InfoHash;
10-
use rand::Rng;
10+
use rand::RngExt;
1111
use torrust_tracker_configuration::Configuration;
1212
#[cfg(test)]
1313
use torrust_tracker_configuration::Core;

packages/udp-tracker-core/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core"
2020
bittorrent-udp-tracker-protocol = { version = "3.0.0-develop", path = "../udp-protocol" }
2121
bloom = "0.3.2"
2222
blowfish = "0"
23-
cipher = "0"
23+
cipher = "0.4"
2424
criterion = { version = "0.5.1", features = ["async_tokio"] }
2525
futures = "0"
26+
generic-array = "0"
2627
lazy_static = "1"
2728
rand = "0"
2829
serde = "1.0.219"

packages/udp-tracker-core/src/crypto/ephemeral_instance_keys.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
//! application starts and are not persisted anywhere.
55
66
use blowfish::BlowfishLE;
7-
use cipher::generic_array::GenericArray;
87
use cipher::{BlockSizeUser, KeyInit};
8+
use generic_array::GenericArray;
99
use rand::rngs::ThreadRng;
10-
use rand::Rng;
10+
use rand::RngExt;
1111

1212
pub type Seed = [u8; 32];
1313
pub type CipherBlowfish = BlowfishLE;

packages/udp-tracker-core/src/crypto/keys.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
//!
66
//! It also provides the logic for the cipher for encryption and decryption.
77
8+
use cipher::{BlockDecrypt, BlockEncrypt};
9+
810
use self::detail_cipher::CURRENT_CIPHER;
911
use self::detail_seed::CURRENT_SEED;
1012
pub use crate::crypto::ephemeral_instance_keys::CipherArrayBlowfish;
@@ -13,7 +15,7 @@ use crate::crypto::ephemeral_instance_keys::{CipherBlowfish, Seed, RANDOM_CIPHER
1315
/// This trait is for structures that can keep and provide a seed.
1416
pub trait Keeper {
1517
type Seed: Sized + Default + AsMut<[u8]>;
16-
type Cipher: cipher::BlockCipher;
18+
type Cipher: BlockEncrypt + BlockDecrypt;
1719

1820
/// It returns a reference to the seed that is keeping.
1921
fn get_seed() -> &'static Self::Seed;

src/console/ci/e2e/tracker_container.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::time::Duration;
22

33
use rand::distr::Alphanumeric;
4-
use rand::Rng;
4+
use rand::RngExt;
55

66
use super::docker::{RunOptions, RunningContainer};
77
use super::logs_parser::RunningServices;

0 commit comments

Comments
 (0)