chore(deps): update dependencies

Author: kurnevsky

examples/Cargo.toml

@@ -19,12 +19,12 @@ rand = "0.8"
 anyhow = "1.0"
 
 [dev-dependencies.tokio]
-version = "1.12"
+version = "1.20"
 default-features = false
 features = ["macros", "test-util", "net", "rt", "rt-multi-thread", "sync", "time"]
 
 [dev-dependencies.tokio-util]
-version = "0.6"
+version = "0.7"
 features = ["codec", "net"]
 
 [[example]]

tox_binary_io/Cargo.toml

@@ -15,9 +15,9 @@ license = "GPL-3.0+"
 edition = "2021"
 
 [dependencies]
-nom = "7.0"
+nom = "7.1"
 cookie-factory = "0.3"
-crypto_box = { version = "0.7", optional = true }
+crypto_box = { version = "0.8", optional = true }
 
 [features]
 default = []

tox_binary_io/src/crypto.rs

@@ -51,6 +51,6 @@ mod tests {
         let bytes = [42; KEY_SIZE];
         let (_rest, sk) = SecretKey::from_bytes(&bytes).unwrap();
 
-        assert_eq!(&sk.to_bytes()[..], &bytes as &[u8]);
+        assert_eq!(sk.as_bytes(), &bytes as &[u8]);
     }
 }

tox_core/Cargo.toml

@@ -21,31 +21,31 @@ tox_binary_io = { version = "0.1.1", path = "../tox_binary_io" }
 tox_crypto = { version = "0.1.1", path = "../tox_crypto" }
 tox_packet = { version = "0.1.1", path = "../tox_packet" }
 
-bytes = "1.0"
+bytes = "1.2"
 futures = { version = "0.3", default-features = false, features = ["std", "async-await"] }
 log = "0.4"
-nom = "7.0"
+nom = "7.1"
 cookie-factory = "0.3"
 get_if_addrs = "0.5"
 thiserror = "1.0"
-lru = "0.6"
+lru = "0.7"
 bitflags = "1.3"
 itertools = "0.10"
 rand = "0.8"
 sha2 = "0.9"
-xsalsa20poly1305 = "0.8"
-crypto_box = "0.7"
+xsalsa20poly1305 = "0.9"
+crypto_box = "0.8"
 
 [dependencies.tokio]
-version = "1.12"
+version = "1.20"
 default-features = false
 features = ["net", "sync", "time"]
 
 [dependencies.tokio-util]
-version = "0.6"
+version = "0.7"
 features = ["codec", "net"]
 
 [dev-dependencies.tokio]
-version = "1.0"
+version = "1.20"
 default-features = false
 features = ["macros", "test-util", "net", "rt", "rt-multi-thread", "sync", "time"]

tox_core/src/dht/server/mod.rs

@@ -16,7 +16,7 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use std::{iter, mem};
-use xsalsa20poly1305::{XSalsa20Poly1305, aead::NewAead};
+use xsalsa20poly1305::{XSalsa20Poly1305, KeyInit};
 
 use crate::time::*;
 use tox_crypto::*;
@@ -2456,7 +2456,7 @@ mod tests {
 
         // send onion data request
 
-        let nonce = crypto_box::generate_nonce(&mut rng).into();
+        let nonce = SalsaBox::generate_nonce(&mut rng).into();
         let temporary_pk = SecretKey::generate(&mut rng).public_key();
         let payload = vec![42; 123];
         let inner = InnerOnionDataRequest {

tox_core/src/friend_connection/mod.rs

@@ -494,7 +494,7 @@ mod tests {
         let _ = friend_connections.tcp_connections.add_connection(relay_pk, friend_dht_pk.clone());
 
         let session_precomputed_key = SalsaBox::new(&SecretKey::generate(&mut rng).public_key(), &SecretKey::generate(&mut rng));
-        let sent_nonce = crypto_box::generate_nonce(&mut rng).into();
+        let sent_nonce = SalsaBox::generate_nonce(&mut rng).into();
         friend_connections.net_crypto.add_established_connection(
             SecretKey::generate(&mut rng).public_key(),
             friend_pk.clone(),
@@ -547,7 +547,7 @@ mod tests {
         let _ = friend_connections.tcp_connections.add_connection(relay_pk, friend_dht_pk.clone());
 
         let session_precomputed_key = SalsaBox::new(&SecretKey::generate(&mut rng).public_key(), &SecretKey::generate(&mut rng));
-        let sent_nonce = crypto_box::generate_nonce(&mut rng).into();
+        let sent_nonce = SalsaBox::generate_nonce(&mut rng).into();
         friend_connections.net_crypto.add_established_connection(
             SecretKey::generate(&mut rng).public_key(),
             friend_pk.clone(),
@@ -703,7 +703,7 @@ mod tests {
         friend_connections.friends.write().await.insert(friend_pk.clone(), friend);
 
         let session_precomputed_key = SalsaBox::new(&SecretKey::generate(&mut rng).public_key(), &SecretKey::generate(&mut rng));
-        let sent_nonce = crypto_box::generate_nonce(&mut rng).into();
+        let sent_nonce = SalsaBox::generate_nonce(&mut rng).into();
         friend_connections.net_crypto.add_established_connection(
             SecretKey::generate(&mut rng).public_key(),
             friend_pk.clone(),
@@ -750,7 +750,7 @@ mod tests {
         friend_connections.friends.write().await.insert(friend_pk.clone(), friend);
 
         let session_precomputed_key = SalsaBox::new(&SecretKey::generate(&mut rng).public_key(), &SecretKey::generate(&mut rng));
-        let sent_nonce = crypto_box::generate_nonce(&mut rng).into();
+        let sent_nonce = SalsaBox::generate_nonce(&mut rng).into();
         friend_connections.net_crypto.add_established_connection(
             SecretKey::generate(&mut rng).public_key(),
             friend_pk.clone(),
@@ -800,7 +800,7 @@ mod tests {
         friend_connections.friends.write().await.insert(friend_pk.clone(), friend);
 
         let session_precomputed_key = SalsaBox::new(&SecretKey::generate(&mut rng).public_key(), &SecretKey::generate(&mut rng));
-        let sent_nonce = crypto_box::generate_nonce(&mut rng).into();
+        let sent_nonce = SalsaBox::generate_nonce(&mut rng).into();
         friend_connections.net_crypto.add_established_connection(
             SecretKey::generate(&mut rng).public_key(),
             friend_pk.clone(),
@@ -963,7 +963,7 @@ mod tests {
 
         let precomputed_key = SalsaBox::new(&friend_connections.real_pk, &friend_sk);
         let cookie = friend_connections.net_crypto.get_cookie(&mut rng, friend_pk.clone(), friend_dht_pk);
-        let sent_nonce = crypto_box::generate_nonce(&mut rng).into();
+        let sent_nonce = SalsaBox::generate_nonce(&mut rng).into();
         let friend_session_sk = SecretKey::generate(&mut rng);
         let friend_session_pk = friend_session_sk.public_key();
         let our_cookie = EncryptedCookie {

tox_core/src/net_crypto/crypto_connection.rs

@@ -3,7 +3,7 @@
 use std::convert::Into;
 use std::net::{SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::time::{Duration, Instant};
-use crypto_box::SalsaBox;
+use crypto_box::{SalsaBox, aead::AeadCore};
 use rand::{thread_rng, Rng};
 use xsalsa20poly1305::XSalsa20Poly1305;
 
@@ -382,7 +382,7 @@ impl CryptoConnection {
         let mut rng = thread_rng();
         let session_sk = SecretKey::generate(&mut rng);
         let session_pk = session_sk.public_key();
-        let sent_nonce = crypto_box::generate_nonce(&mut rng);
+        let sent_nonce = SalsaBox::generate_nonce(&mut rng);
 
         let our_cookie = Cookie::new(peer_real_pk.clone(), peer_dht_pk.clone());
         let our_encrypted_cookie = EncryptedCookie::new(&mut rng, symmetric_key, &our_cookie);