feat(rand): require CryptoRng

Author: kurnevsky

tox_core/src/dht/dht_friend.rs

@@ -4,7 +4,7 @@ Module for friend.
 
 use std::time::Instant;
 use std::net::SocketAddr;
-use rand::Rng;
+use rand::{CryptoRng, Rng};
 
 use crate::time::*;
 use crate::dht::kbucket::*;
@@ -41,7 +41,7 @@ pub struct DhtFriend {
 
 impl DhtFriend {
     /// Create new `DhtFriend`.
-    pub fn new<R: Rng>(rng: &mut R, pk: PublicKey) -> Self {
+    pub fn new<R: Rng + CryptoRng>(rng: &mut R, pk: PublicKey) -> Self {
         DhtFriend {
             pk,
             close_nodes: Kbucket::new(FRIEND_CLOSE_NODES_COUNT),

tox_core/src/dht/request_queue.rs

@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use std::time::{Duration, Instant};
-use rand::Rng;
+use rand::{CryptoRng, Rng};
 
 use crate::utils::gen_ping_id;
 use crate::time::*;
@@ -29,7 +29,7 @@ impl<T> RequestQueue<T> {
     }
 
     /// Generate unique non zero request ID.
-    fn generate_ping_id<R: Rng>(&self, rng: &mut R) -> u64 {
+    fn generate_ping_id<R: Rng + CryptoRng>(&self, rng: &mut R) -> u64 {
         loop {
             let ping_id = gen_ping_id(rng);
             if !self.ping_map.contains_key(&ping_id) {
@@ -40,7 +40,7 @@ impl<T> RequestQueue<T> {
 
     /// Generate and store unique non zero request ID. Later this request ID can
     /// be verified with `check_ping_id` function.
-    pub fn new_ping_id<R: Rng>(&mut self, rng: &mut R, data: T) -> u64 {
+    pub fn new_ping_id<R: Rng + CryptoRng>(&mut self, rng: &mut R, data: T) -> u64 {
         let ping_id = self.generate_ping_id(rng);
         self.ping_map.insert(ping_id, (clock_now(), data));
         ping_id

tox_core/src/dht/server/hole_punching.rs

@@ -7,7 +7,7 @@ https://zetok.github.io/tox-spec/#hole-punching
 use std::net::{IpAddr, SocketAddr};
 use std::time::{Duration, Instant};
 use std::collections::HashMap;
-use rand::Rng;
+use rand::{CryptoRng, Rng};
 
 use crate::dht::dht_friend::*;
 use crate::dht::server::*;
@@ -58,7 +58,7 @@ pub struct HolePunching {
 
 impl HolePunching {
     /// Create new `HolePunching` object.
-    pub fn new<R: Rng>(rng: &mut R) -> Self {
+    pub fn new<R: Rng + CryptoRng>(rng: &mut R) -> Self {
         HolePunching {
             is_punching_done: true,
             num_punch_tries: 0,

tox_core/src/net_crypto/mod.rs

@@ -1137,6 +1137,7 @@ mod tests {
     // https://github.com/rust-lang/rust/issues/61520
     use super::{*, Packet};
     use futures::{Future, StreamExt};
+    use rand::CryptoRng;
 
     impl NetCrypto {
         pub async fn has_friend(&self, pk: &PublicKey) -> bool {
@@ -1177,7 +1178,7 @@ mod tests {
             self.connections.write().await.insert(peer_real_pk, Arc::new(RwLock::new(connection)));
         }
 
-        pub fn get_cookie<R: Rng>(&self, rng: &mut R, real_pk: PublicKey, dht_pk: PublicKey) -> EncryptedCookie {
+        pub fn get_cookie<R: Rng + CryptoRng>(&self, rng: &mut R, real_pk: PublicKey, dht_pk: PublicKey) -> EncryptedCookie {
             let cookie = Cookie::new(real_pk, dht_pk);
             EncryptedCookie::new(rng, &self.symmetric_key, &cookie)
         }

tox_core/src/onion/onion_announce.rs

@@ -6,7 +6,7 @@ use std::net::{IpAddr, SocketAddr};
 use std::time::{Duration, Instant, SystemTime};
 use sha2::{Digest, Sha256};
 use sha2::digest::generic_array::typenum::marker_traits::Unsigned;
-use rand::Rng;
+use rand::{CryptoRng, Rng};
 
 use tox_binary_io::*;
 use tox_crypto::*;
@@ -165,7 +165,7 @@ pub struct OnionAnnounce {
 
 impl OnionAnnounce {
     /// Create new `OnionAnnounce` instance.
-    pub fn new<R: Rng>(rng: &mut R, dht_pk: PublicKey) -> OnionAnnounce {
+    pub fn new<R: Rng + CryptoRng>(rng: &mut R, dht_pk: PublicKey) -> OnionAnnounce {
         OnionAnnounce {
             secret_bytes: rng.gen(),
             entries: Vec::with_capacity(ONION_ANNOUNCE_MAX_ENTRIES),

tox_core/src/utils.rs

@@ -1,10 +1,10 @@
 /*! Common utility functions
 */
 
-use rand::Rng;
+use rand::{CryptoRng, Rng};
 
 /// Generate non-zero ping_id
-pub fn gen_ping_id<R: Rng>(rng: &mut R) -> u64 {
+pub fn gen_ping_id<R: Rng + CryptoRng>(rng: &mut R) -> u64 {
     let mut ping_id = 0;
     while ping_id == 0 {
         ping_id = rng.gen();

tox_packet/src/dht/cookie.rs

@@ -6,7 +6,7 @@ use nom::{AsBytes, map_opt, number::complete::be_u64};
 use sha2::{Digest, Sha512};
 use sha2::digest::generic_array::typenum::marker_traits::Unsigned;
 use xsalsa20poly1305::{XSalsa20Poly1305, aead::{Aead, Error as AeadError}};
-use rand::Rng;
+use rand::{CryptoRng, Rng};
 
 use std::{convert::TryInto, time::SystemTime};
 
@@ -131,7 +131,7 @@ impl ToBytes for EncryptedCookie {
 
 impl EncryptedCookie {
     /// Create `EncryptedCookie` from `Cookie` encrypting it with `symmetric_key`
-    pub fn new<R: Rng>(rng: &mut R, symmetric_key: &XSalsa20Poly1305, payload: &Cookie) -> EncryptedCookie {
+    pub fn new<R: Rng + CryptoRng>(rng: &mut R, symmetric_key: &XSalsa20Poly1305, payload: &Cookie) -> EncryptedCookie {
         let nonce = rng.gen::<[u8; xsalsa20poly1305::NONCE_SIZE]>().into();
         let mut buf = [0; 72];
         let (_, size) = payload.to_bytes((&mut buf, 0)).unwrap();

tox_packet/src/toxid.rs

@@ -12,7 +12,7 @@ use nom::{
     named,
     do_parse, map, call, take,
 };
-use rand::{Rng, distributions::{Distribution, Standard}};
+use rand::{CryptoRng, Rng, distributions::{Distribution, Standard}};
 use cookie_factory::{do_gen, gen_slice};
 
 use tox_binary_io::*;
@@ -178,7 +178,7 @@ impl ToxId {
     let _toxid = ToxId::new(&mut rng, pk);
     ```
     */
-    pub fn new<R: Rng>(rng: &mut R, pk: PublicKey) -> Self {
+    pub fn new<R: Rng + CryptoRng>(rng: &mut R, pk: PublicKey) -> Self {
         let nospam = rng.gen();
         let checksum = Self::checksum(&pk, nospam);
         ToxId { pk, nospam, checksum }
@@ -215,7 +215,7 @@ impl ToxId {
     */
     // TODO: more tests
     // TODO: ↓ split into `new_nospam()` and `set_nospam(NoSpam)` ?
-    pub fn new_nospam<R: Rng>(&mut self, rng: &mut R, nospam: Option<NoSpam>) {
+    pub fn new_nospam<R: Rng + CryptoRng>(&mut self, rng: &mut R, nospam: Option<NoSpam>) {
         if let Some(nospam) = nospam {
             self.nospam = nospam;
         } else {