Revert "Make sure we really use thread_rng everywhere (#341)"

This reverts commit b0fcd8b.

src/account_manager.rs

@@ -1,6 +1,5 @@
 use base64::prelude::*;
 use phonenumber::PhoneNumber;
-use rand::Rng;
 use reqwest::Method;
 use std::collections::HashMap;
 use std::convert::{TryFrom, TryInto};
@@ -642,7 +641,7 @@ impl AccountManager {
     /// Should be called as the primary device to migrate from pre-PNI to PNI.
     ///
     /// This is the equivalent of Android's PnpInitializeDevicesJob or iOS' PniHelloWorldManager.
-    #[tracing::instrument(skip(self, aci_protocol_store, pni_protocol_store, sender, local_aci), fields(local_aci = %local_aci))]
+    #[tracing::instrument(skip(self, aci_protocol_store, pni_protocol_store, sender, local_aci, csprng), fields(local_aci = %local_aci))]
     pub async fn pnp_initialize_devices<
         // XXX So many constraints here, all imposed by the MessageSender
         R: rand::Rng + rand::CryptoRng,
@@ -653,11 +652,11 @@ impl AccountManager {
         &mut self,
         aci_protocol_store: &mut Aci,
         pni_protocol_store: &mut Pni,
-        mut sender: MessageSender<AciOrPni>,
+        mut sender: MessageSender<AciOrPni, R>,
         local_aci: ServiceAddress,
         e164: PhoneNumber,
+        csprng: &mut R,
     ) -> Result<(), MessageSenderError> {
-        let mut csprng = rand::thread_rng();
         let pni_identity_key_pair =
             pni_protocol_store.get_identity_key_pair().await?;
 
@@ -714,20 +713,20 @@ impl AccountManager {
                 crate::pre_keys::replenish_pre_keys(
                     pni_protocol_store,
                     &pni_identity_key_pair,
-                    &mut csprng,
+                    csprng,
                     true,
                     0,
                     0,
                 )
                 .await?
             } else {
                 // Generate a signed prekey
-                let signed_pre_key_pair = KeyPair::generate(&mut csprng);
+                let signed_pre_key_pair = KeyPair::generate(csprng);
                 let signed_pre_key_public = signed_pre_key_pair.public_key;
                 let signed_pre_key_signature =
                     pni_identity_key_pair.private_key().calculate_signature(
                         &signed_pre_key_public.serialize(),
-                        &mut csprng,
+                        csprng,
                     )?;
 
                 let signed_prekey_record = SignedPreKeyRecord::new(
@@ -755,7 +754,7 @@ impl AccountManager {
                 pni_protocol_store.get_local_registration_id().await?
             } else {
                 loop {
-                    let regid = generate_registration_id(&mut csprng);
+                    let regid = generate_registration_id(csprng);
                     if !pni_registration_ids.iter().any(|(_k, v)| *v == regid) {
                         break regid;
                     }
@@ -803,7 +802,7 @@ impl AccountManager {
                         e164.format().mode(phonenumber::Mode::E164).to_string(),
                     ),
                 }),
-                padding: Some(random_length_padding(&mut csprng, 512)),
+                padding: Some(random_length_padding(csprng, 512)),
                 ..SyncMessage::default()
             };
             let content: ContentBody = msg.into();

src/cipher.rs

@@ -13,6 +13,7 @@ use libsignal_protocol::{
     SignalProtocolError, SignedPreKeyStore, Timestamp,
 };
 use prost::Message;
+use rand::{CryptoRng, Rng};
 use uuid::Uuid;
 
 use crate::{
@@ -28,14 +29,15 @@ use crate::{
 ///
 /// Equivalent of SignalServiceCipher in Java.
 #[derive(Clone)]
-pub struct ServiceCipher<S> {
+pub struct ServiceCipher<S, R> {
     protocol_store: S,
+    csprng: R,
     trust_root: PublicKey,
     local_uuid: Uuid,
     local_device_id: u32,
 }
 
-impl<S> fmt::Debug for ServiceCipher<S> {
+impl<S, R> fmt::Debug for ServiceCipher<S, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("ServiceCipher")
             .field("protocol_store", &"...")
@@ -68,18 +70,21 @@ fn debug_envelope(envelope: &Envelope) -> String {
     }
 }
 
-impl<S> ServiceCipher<S>
+impl<S, R> ServiceCipher<S, R>
 where
     S: ProtocolStore + SenderKeyStore + SessionStoreExt + Clone,
+    R: Rng + CryptoRng,
 {
     pub fn new(
         protocol_store: S,
+        csprng: R,
         trust_root: PublicKey,
         local_uuid: Uuid,
         local_device_id: u32,
     ) -> Self {
         Self {
             protocol_store,
+            csprng,
             trust_root,
             local_uuid,
             local_device_id,
@@ -175,7 +180,7 @@ where
                     &mut self.protocol_store.clone(),
                     &self.protocol_store.clone(),
                     &mut self.protocol_store.clone(),
-                    &mut rand::thread_rng(),
+                    &mut self.csprng,
                 )
                 .await?
                 .as_slice()
@@ -231,7 +236,7 @@ where
                     &sender,
                     &mut self.protocol_store.clone(),
                     &mut self.protocol_store.clone(),
-                    &mut rand::thread_rng(),
+                    &mut self.csprng,
                 )
                 .await?
                 .as_slice()
@@ -349,7 +354,7 @@ where
                 &mut self.protocol_store.clone(),
                 &mut self.protocol_store,
                 SystemTime::now(),
-                &mut rand::thread_rng(),
+                &mut self.csprng,
             )
             .await?;
 

src/sender.rs

@@ -5,6 +5,7 @@ use libsignal_protocol::{
     process_prekey_bundle, DeviceId, IdentityKey, IdentityKeyPair,
     ProtocolStore, SenderCertificate, SenderKeyStore, SignalProtocolError,
 };
+use rand::{CryptoRng, Rng};
 use tracing::{debug, error, info, trace, warn};
 use tracing_futures::Instrument;
 use uuid::Uuid;
@@ -82,11 +83,12 @@ pub struct AttachmentSpec {
 }
 
 #[derive(Clone)]
-pub struct MessageSender<S> {
+pub struct MessageSender<S, R> {
     identified_ws: SignalWebSocket,
     unidentified_ws: SignalWebSocket,
     service: PushService,
-    cipher: ServiceCipher<S>,
+    cipher: ServiceCipher<S, R>,
+    csprng: R,
     protocol_store: S,
     local_aci: ServiceAddress,
     local_pni: ServiceAddress,
@@ -148,16 +150,18 @@ pub struct EncryptedMessages {
     used_identity_key: IdentityKey,
 }
 
-impl<S> MessageSender<S>
+impl<S, R> MessageSender<S, R>
 where
     S: ProtocolStore + SenderKeyStore + SessionStoreExt + Sync + Clone,
+    R: Rng + CryptoRng,
 {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         identified_ws: SignalWebSocket,
         unidentified_ws: SignalWebSocket,
         service: PushService,
-        cipher: ServiceCipher<S>,
+        cipher: ServiceCipher<S, R>,
+        csprng: R,
         protocol_store: S,
         local_aci: impl Into<ServiceAddress>,
         local_pni: impl Into<ServiceAddress>,
@@ -170,6 +174,7 @@ where
             identified_ws,
             unidentified_ws,
             cipher,
+            csprng,
             protocol_store,
             local_aci: local_aci.into(),
             local_pni: local_pni.into(),
@@ -620,7 +625,7 @@ where
                             &mut self.protocol_store,
                             &pre_key,
                             SystemTime::now(),
-                            &mut rand::thread_rng(),
+                            &mut self.csprng,
                         )
                         .await
                         .map_err(|e| {
@@ -833,7 +838,7 @@ where
             .expect("PNI key set when PNI signature requested")
             .sign_alternate_identity(
                 self.aci_identity.identity_key(),
-                &mut rand::thread_rng(),
+                &mut self.csprng,
             )?;
         Ok(crate::proto::PniSignatureMessage {
             pni: Some(self.local_pni.uuid.as_bytes().to_vec()),
@@ -1020,7 +1025,7 @@ where
                     &mut self.protocol_store,
                     &pre_key_bundle,
                     SystemTime::now(),
-                    &mut rand::thread_rng(),
+                    &mut self.csprng,
                 )
                 .await?;
             }