Update libsignal to v0.86.6 (#382)

Also replace derivative (unmaintained) by derive_more

Author: gferon

Cargo.toml

@@ -7,9 +7,9 @@ license = "AGPL-3.0-only"
 readme = "README.md"
 
 [dependencies]
-libsignal-protocol = { git = "https://github.com/signalapp/libsignal", tag = "v0.83.0" }
-libsignal-core = { git = "https://github.com/signalapp/libsignal", tag = "v0.83.0" }
-zkgroup = { git = "https://github.com/signalapp/libsignal", tag = "v0.83.0" }
+libsignal-protocol = { git = "https://github.com/signalapp/libsignal", tag = "v0.86.6" }
+libsignal-core = { git = "https://github.com/signalapp/libsignal", tag = "v0.86.6" }
+zkgroup = { git = "https://github.com/signalapp/libsignal", tag = "v0.86.6" }
 
 aes = "0.8"
 aes-gcm = "0.10"
@@ -20,7 +20,7 @@ base64 = "0.22"
 bincode = "1.3"
 bytes = "1"
 chrono = { version = "0.4", features = ["serde", "clock"], default-features = false }
-derivative = "2.2"
+derive_more = { version = "2.1", features = ["debug"] }
 futures = "0.3"
 hex = "0.4"
 hkdf = "0.12"

src/groups_v2/model.rs

@@ -1,6 +1,5 @@
 use std::{convert::TryFrom, convert::TryInto};
 
-use derivative::Derivative;
 use libsignal_protocol::{Aci, Pni, ServiceId};
 use serde::{Deserialize, Serialize};
 use zkgroup::profiles::ProfileKey;
@@ -16,13 +15,12 @@ pub enum Role {
     Administrator,
 }
 
-#[derive(Derivative, Clone, Deserialize, Serialize)]
-#[derivative(Debug)]
+#[derive(derive_more::Debug, Clone, Deserialize, Serialize)]
 pub struct Member {
     #[serde(with = "aci_serde")]
     pub aci: Aci,
     pub role: Role,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub profile_key: ProfileKey,
     pub joined_at_revision: u32,
 }
@@ -66,11 +64,10 @@ pub struct PendingMember {
     pub timestamp: u64,
 }
 
-#[derive(Derivative, Clone)]
-#[derivative(Debug)]
+#[derive(derive_more::Debug, Clone)]
 pub struct RequestingMember {
     pub aci: Aci,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub profile_key: ProfileKey,
     pub timestamp: u64,
 }
@@ -81,8 +78,7 @@ impl PartialEq for RequestingMember {
     }
 }
 
-#[derive(Derivative, Clone)]
-#[derivative(Debug)]
+#[derive(Debug, Clone)]
 pub struct BannedMember {
     pub service_id: ServiceId,
     pub timestamp: u64,
@@ -94,12 +90,11 @@ impl PartialEq for BannedMember {
     }
 }
 
-#[derive(Derivative, Clone)]
-#[derivative(Debug)]
+#[derive(derive_more::Debug, Clone)]
 pub struct PromotedMember {
     pub aci: Aci,
     pub pni: Pni,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub profile_key: ProfileKey,
 }
 
@@ -150,8 +145,7 @@ pub struct GroupChanges {
     pub change_epoch: u32,
 }
 
-#[derive(Derivative, Clone)]
-#[derivative(Debug)]
+#[derive(derive_more::Debug, Clone)]
 pub enum GroupChange {
     NewMember(Member),
     DeleteMember(Aci),
@@ -161,14 +155,14 @@ pub enum GroupChange {
     },
     ModifyMemberProfileKey {
         aci: Aci,
-        #[derivative(Debug = "ignore")]
+        #[debug(ignore)]
         profile_key: ProfileKey,
     },
     NewPendingMember(PendingMember),
     DeletePendingMember(ServiceId),
     PromotePendingMember {
         address: ServiceId,
-        #[derivative(Debug = "ignore")]
+        #[debug(ignore)]
         profile_key: ProfileKey,
     },
     Title(String),

src/provisioning/mod.rs

@@ -7,7 +7,6 @@ use std::convert::TryInto;
 pub use cipher::ProvisioningCipher;
 
 use base64::Engine;
-use derivative::Derivative;
 use futures::StreamExt;
 use futures::{channel::mpsc::Sender, pin_mut, SinkExt};
 use libsignal_core::curve::CurveError;
@@ -129,21 +128,20 @@ pub enum SecondaryDeviceProvisioning {
     NewDeviceRegistration(NewDeviceRegistration),
 }
 
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(derive_more::Debug)]
 pub struct NewDeviceRegistration {
     pub phone_number: phonenumber::PhoneNumber,
     pub device_id: DeviceId,
     pub registration_id: u32,
     pub pni_registration_id: u32,
     pub service_ids: ServiceIds,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub aci_private_key: PrivateKey,
     pub aci_public_key: IdentityKey,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub pni_private_key: PrivateKey,
     pub pni_public_key: IdentityKey,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub profile_key: ProfileKey,
 }
 

src/push_service/mod.rs

@@ -8,7 +8,6 @@ use crate::{
     websocket::SignalWebSocket,
 };
 
-use derivative::Derivative;
 use libsignal_protocol::{
     error::SignalProtocolError,
     kem::{Key, Public},
@@ -49,11 +48,10 @@ pub struct ProofRequired {
     pub options: Vec<String>,
 }
 
-#[derive(Derivative, Clone, Serialize, Deserialize)]
-#[derivative(Debug)]
+#[derive(derive_more::Debug, Clone, Serialize, Deserialize)]
 pub struct HttpAuth {
     pub username: String,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub password: String,
 }
 

src/push_service/registration.rs

@@ -1,4 +1,3 @@
-use derivative::Derivative;
 use libsignal_protocol::IdentityKey;
 use reqwest::Method;
 use serde::{Deserialize, Serialize};
@@ -14,11 +13,10 @@ use crate::{
 
 /// This type is used in registration lock handling.
 /// It's identical with HttpAuth, but used to avoid type confusion.
-#[derive(Derivative, Clone, Serialize, Deserialize)]
-#[derivative(Debug)]
+#[derive(derive_more::Debug, Clone, Serialize, Deserialize)]
 pub struct AuthCredentials {
     pub username: String,
-    #[derivative(Debug = "ignore")]
+    #[debug(ignore)]
     pub password: String,
 }