Combined Dependabot Updates 10/2024 (#72)

jmwample · Oct 13, 2024 · 1e79d2d · 1e79d2d
1 parent 808cadc
commit 1e79d2d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -104,7 +104,7 @@ jobs:
     - run: cargo update -Z minimal-versions
     # Now check that `cargo build` works with respect to the oldest possible
     # deps and the stated MSRV. 1.70 should work for all
-    - uses: dtolnay/rust-toolchain@1.75.0
+    - uses: dtolnay/rust-toolchain@1.77.0
     - run: cargo test --workspace --all-targets --all-features
     # Also make sure the AVX2 build works
     - run: cargo build --target x86_64-unknown-linux-gnu

diff --git a/crates/lyrebird/Cargo.toml b/crates/lyrebird/Cargo.toml
@@ -38,7 +38,7 @@ anyhow = "1.0"
 clap = { version = "4.4", features = ["derive"]}
 fast-socks5 = "0.9.1"
 futures = "0.3.29"
-safelog = "0.3.5"
+safelog = "0.4.0"
 thiserror = "1.0.56"
 tokio = { version = "1.34", features = ["io-util", "net", "macros", "sync", "signal"] }
 tokio-util = "0.7.10"

diff --git a/crates/obfs4/Cargo.toml b/crates/obfs4/Cargo.toml
@@ -53,10 +53,10 @@ tokio-util = { version = "0.7.10", features = ["codec", "io"]}
 bytes = "1.5.0"
 
 ## ntor_arti
-tor-cell = "0.22.0"
-tor-llcrypto = "0.22.0"
-tor-error = "0.22.0"
-tor-bytes = "0.22.0"
+tor-cell = "0.23.0"
+tor-llcrypto = "0.23.0"
+tor-error = "0.23.0"
+tor-bytes = "0.23.0"
 cipher = "0.4.4"
 zeroize = "1.7.0"
 thiserror = "1.0.56"
@@ -80,7 +80,7 @@ filetime = {version="0.2.25", optional=true}
 [dev-dependencies]
 tracing-subscriber = "0.3.18"
 hex-literal = "0.4.1"
-tor-basic-utils = "0.22.0"
+tor-basic-utils = "0.23.0"
 
 # benches
 # criterion = "0.5"

diff --git a/crates/obfs4/src/handshake/handshake_server.rs b/crates/obfs4/src/handshake/handshake_server.rs
@@ -20,21 +20,18 @@ pub(crate) struct HandshakeMaterials {
     pub(crate) len_seed: [u8; SEED_LENGTH],
 }
 
-impl<'a> HandshakeMaterials {
+impl HandshakeMaterials {
     pub fn get_hmac(&self) -> HmacSha256 {
         let mut key = self.identity_keys.pk.pk.as_bytes().to_vec();
         key.append(&mut self.identity_keys.pk.id.as_bytes().to_vec());
         HmacSha256::new_from_slice(&key[..]).unwrap()
     }
 
-    pub fn new<'b>(
-        identity_keys: &'b Obfs4NtorSecretKey,
+    pub fn new(
+        identity_keys: &Obfs4NtorSecretKey,
         session_id: String,
         len_seed: [u8; SEED_LENGTH],
-    ) -> Self
-    where
-        'b: 'a,
-    {
+    ) -> Self {
         HandshakeMaterials {
             identity_keys: identity_keys.clone(),
             session_id,

diff --git a/crates/obfs4/src/test_utils/fake_prng.rs b/crates/obfs4/src/test_utils/fake_prng.rs
@@ -6,7 +6,7 @@ impl<'a> FakePRNG<'a> {
         Self { bytes }
     }
 }
-impl<'a> rand_core::RngCore for FakePRNG<'a> {
+impl rand_core::RngCore for FakePRNG<'_> {
     fn next_u32(&mut self) -> u32 {
         rand_core::impls::next_u32_via_fill(self)
     }