Merge branch 'upgrade-x25519-dalek'

9 files changed, 31 insertions, 41 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 0ecfb4eb00..ef59ab8fb0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -336,7 +336,7 @@ name = "classic-mceliece-rust"
 version = "1.0.1"
 source = "git+https://github.com/mullvad/classic-mceliece-rust?rev=5130d9e3bfbf54735177e15636a643366c250b78#5130d9e3bfbf54735177e15636a643366c250b78"
 dependencies = [
- "rand 0.8.4",
+ "rand 0.8.5",
  "sha3",
 ]
 
@@ -1571,7 +1571,7 @@ dependencies = [
  "mullvad-types",
  "nix 0.23.1",
  "parking_lot 0.11.2",
- "rand 0.7.3",
+ "rand 0.8.5",
  "regex",
  "serde",
  "serde_json",
@@ -1614,7 +1614,7 @@ dependencies = [
  "mullvad-problem-report",
  "mullvad-types",
  "nix 0.23.1",
- "rand 0.7.3",
+ "rand 0.8.5",
  "talpid-core",
  "talpid-types",
  "tokio",
@@ -1686,7 +1686,7 @@ dependencies = [
  "mullvad-api",
  "mullvad-types",
  "parking_lot 0.11.2",
- "rand 0.7.3",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "talpid-core",
@@ -2133,7 +2133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
 dependencies = [
  "phf_shared",
- "rand 0.8.4",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -2369,7 +2369,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
  "env_logger 0.8.4",
  "log",
- "rand 0.8.4",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -2412,19 +2412,18 @@ dependencies = [
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
- "rand_hc 0.2.0",
+ "rand_hc",
 ]
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
  "rand_core 0.6.3",
- "rand_hc 0.3.1",
 ]
 
 [[package]]
@@ -2475,15 +2474,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
-]
-
-[[package]]
 name = "redox_syscall"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2845,7 +2835,7 @@ dependencies = [
  "chacha20poly1305",
  "hkdf",
  "md-5",
- "rand 0.8.4",
+ "rand 0.8.5",
  "ring-compat",
  "sha1",
 ]
@@ -3078,7 +3068,7 @@ dependencies = [
  "prost 0.8.0",
  "quickcheck",
  "quickcheck_macros",
- "rand 0.7.3",
+ "rand 0.8.5",
  "regex",
  "resolv-conf",
  "rtnetlink",
@@ -3165,7 +3155,7 @@ dependencies = [
  "log",
  "prost 0.8.0",
  "prost-types 0.9.0",
- "rand 0.8.4",
+ "rand 0.8.5",
  "talpid-types",
  "tokio",
  "tonic",
@@ -3181,7 +3171,7 @@ dependencies = [
  "err-derive",
  "ipnetwork",
  "jnix",
- "rand 0.7.3",
+ "rand 0.8.5",
  "serde",
  "x25519-dalek",
 ]
@@ -3194,7 +3184,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
  "cfg-if",
  "libc",
- "rand 0.8.4",
+ "rand 0.8.5",
  "redox_syscall",
  "remove_dir_all",
  "winapi",
@@ -3425,7 +3415,7 @@ dependencies = [
  "futures-util",
  "indexmap",
  "pin-project",
- "rand 0.8.4",
+ "rand 0.8.5",
  "slab",
  "tokio",
  "tokio-stream",
@@ -3521,7 +3511,7 @@ dependencies = [
  "lazy_static",
  "log",
  "radix_trie",
- "rand 0.8.4",
+ "rand 0.8.5",
  "thiserror",
  "time 0.3.5",
  "tokio",
@@ -3545,7 +3535,7 @@ dependencies = [
  "ipnet",
  "lazy_static",
  "log",
- "rand 0.8.4",
+ "rand 0.8.5",
  "serde",
  "smallvec",
  "thiserror",
@@ -3990,12 +3980,12 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "1.2.0"
+version = "2.0.0-pre.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077"
+checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
 dependencies = [
  "curve25519-dalek",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
  "zeroize",
 ]
 
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 3025ccad74..17cdfc3198 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -21,7 +21,7 @@ libc = "0.2"
 log = "0.4"
 log-panics = "2.0.0"
 parking_lot = "0.11"
-rand = "0.7"
+rand = "0.8.5"
 regex = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index 51257988a4..f68e8a0ef7 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -19,7 +19,7 @@ lazy_static = "1"
 log = "0.4"
 log-panics = "2"
 nix = "0.23"
-rand = "0.7"
+rand = "0.8.5"
 tokio = "1.8"
 
 mullvad-daemon = { path = "../mullvad-daemon" }
diff --git a/mullvad-jni/src/talpid_vpn_service.rs b/mullvad-jni/src/talpid_vpn_service.rs
index e315b55e15..d2b1f00075 100644
--- a/mullvad-jni/src/talpid_vpn_service.rs
+++ b/mullvad-jni/src/talpid_vpn_service.rs
@@ -129,7 +129,7 @@ fn try_sending_random_udp(is_ipv6_enabled: bool) -> Result<(), SendRandomDataErr
 
         let socket = UdpSocket::bind(local_addr).map_err(SendRandomDataError::BindUdpSocket)?;
 
-        let mut buf = vec![0u8; thread_rng().gen_range(17, 214)];
+        let mut buf = vec![0u8; thread_rng().gen_range(17..214)];
         // fill buff with random data
         thread_rng().fill(buf.as_mut_slice());
         match socket.send_to(&buf, rand_dest_addr) {
diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
index 24e8491c3d..172e9c17e2 100644
--- a/mullvad-relay-selector/Cargo.toml
+++ b/mullvad-relay-selector/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3"
 ipnetwork = "0.16"
 log = "0.4"
 parking_lot = "0.11"
-rand = "0.7"
+rand = "0.8.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "1.8", features =  ["fs", "io-util", "time"] }
diff --git a/mullvad-relay-selector/src/lib.rs b/mullvad-relay-selector/src/lib.rs
index 2c01a60a31..d9a16ff748 100644
--- a/mullvad-relay-selector/src/lib.rs
+++ b/mullvad-relay-selector/src/lib.rs
@@ -16,7 +16,7 @@ use mullvad_types::{
     CustomTunnelEndpoint,
 };
 use parking_lot::{Mutex, MutexGuard};
-use rand::{self, seq::SliceRandom, Rng};
+use rand::{seq::SliceRandom, Rng};
 use std::{
     io,
     net::{IpAddr, SocketAddr},
@@ -1075,7 +1075,7 @@ impl RelaySelector {
         } else {
             // Pick a random number in the range 1..=total_weight. This choses the relay with a
             // non-zero weight.
-            let mut i: u64 = rng.gen_range(1, total_weight + 1);
+            let mut i: u64 = rng.gen_range(1..=total_weight);
             Some(
                 relays
                     .iter()
diff --git a/mullvad-relay-selector/src/matcher.rs b/mullvad-relay-selector/src/matcher.rs
index 260dc7e7db..ac3d573832 100644
--- a/mullvad-relay-selector/src/matcher.rs
+++ b/mullvad-relay-selector/src/matcher.rs
@@ -9,7 +9,7 @@ use mullvad_types::{
     },
 };
 use rand::{
-    prelude::{IteratorRandom, SliceRandom},
+    seq::{IteratorRandom, SliceRandom},
     Rng,
 };
 use std::net::{IpAddr, SocketAddr};
@@ -270,7 +270,7 @@ impl WireguardMatcher {
                     return None;
                 }
 
-                let mut port_index = rand::thread_rng().gen_range(0, port_amount);
+                let mut port_index = rand::thread_rng().gen_range(0..port_amount);
 
                 for range in data.port_ranges.iter() {
                     let ports_in_range = get_port_amount(range);
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 86f7951279..a83dff9c69 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -32,7 +32,7 @@ zeroize = "1"
 chrono = "0.4.19"
 tokio = { version = "1.8", features = ["process", "rt-multi-thread", "fs"] }
 tokio-stream = { version = "0.1", features = ["io-util"] }
-rand = "0.7"
+rand = "0.8.5"
 tunnel-obfuscation = { path = "../tunnel-obfuscation" }
 shadowsocks-service = { version = "1.14.3", default-features = false, features = ["local", "stream-cipher"] }
 
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index 0bc1f1c3b8..039ac6d66b 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -11,8 +11,8 @@ publish = false
 serde = { version = "1.0", features = ["derive"] }
 ipnetwork = "0.16"
 base64 = "0.13"
-x25519-dalek = { version = "1.1", features = ["std", "u64_backend"], default-features = false }
-rand = "0.7"
+x25519-dalek = { version = "2.0.0-pre.1" }
+rand = "0.8.5"
 err-derive = "0.3.1"
 
 [target.'cfg(target_os = "android")'.dependencies]