From c1551667ec520778571ff1d939b36cb3f6e782d1 Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Wed, 14 Aug 2024 18:06:08 -0700 Subject: [PATCH] backup: Reference libsignal_core directly --- Cargo.lock | 2 +- rust/message-backup/Cargo.toml | 2 +- rust/message-backup/examples/decrypt_backup.rs | 2 +- rust/message-backup/examples/encrypt_backup.rs | 2 +- rust/message-backup/src/args.rs | 2 +- rust/message-backup/src/backup.rs | 2 +- rust/message-backup/src/backup/chat/group.rs | 2 +- rust/message-backup/src/backup/chat/text.rs | 2 +- rust/message-backup/src/backup/recipient.rs | 2 +- rust/message-backup/src/backup/serialize.rs | 2 +- rust/message-backup/src/bin/validator/main.rs | 2 +- rust/message-backup/src/key.rs | 2 +- rust/message-backup/tests/test_cases.rs | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 57b37025..5f8b675c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2174,9 +2174,9 @@ dependencies = [ "hmac", "itertools 0.13.0", "json5", + "libsignal-core", "libsignal-message-backup", "libsignal-message-backup-macros", - "libsignal-protocol", "log", "macro_rules_attribute", "mediasan-common", diff --git a/rust/message-backup/Cargo.toml b/rust/message-backup/Cargo.toml index 0deece9d..bc5f2b97 100644 --- a/rust/message-backup/Cargo.toml +++ b/rust/message-backup/Cargo.toml @@ -22,8 +22,8 @@ name = "binproto_to_json" required-features = ["json"] [dependencies] +libsignal-core = { path = "../core" } libsignal-message-backup-macros = { path = "macros" } -libsignal-protocol = { path = "../protocol" } signal-crypto = { path = "../crypto" } usernames = { path = "../usernames" } zkcredential = { path = "../zkcredential", features = ["rayon"] } diff --git a/rust/message-backup/examples/decrypt_backup.rs b/rust/message-backup/examples/decrypt_backup.rs index b9c5f41b..bb8ecf84 100644 --- a/rust/message-backup/examples/decrypt_backup.rs +++ b/rust/message-backup/examples/decrypt_backup.rs @@ -9,10 +9,10 @@ use std::io::Read as _; use clap::builder::TypedValueParser; use clap::Parser; use clap_stdin::FileOrStdin; +use libsignal_core::Aci; use libsignal_message_backup::args::{parse_aci, parse_hex_bytes}; use libsignal_message_backup::frame::{CursorFactory, FramesReader}; use libsignal_message_backup::key::{BackupKey, MessageBackupKey}; -use libsignal_protocol::Aci; const DEFAULT_ACI: Aci = Aci::from_uuid_bytes([0x11; 16]); const DEFAULT_MASTER_KEY: [u8; 32] = [b'M'; 32]; diff --git a/rust/message-backup/examples/encrypt_backup.rs b/rust/message-backup/examples/encrypt_backup.rs index e3d09c3c..47b6c880 100644 --- a/rust/message-backup/examples/encrypt_backup.rs +++ b/rust/message-backup/examples/encrypt_backup.rs @@ -17,9 +17,9 @@ use clap_stdin::FileOrStdin; use futures::io::Cursor; use futures::AsyncReadExt; use hmac::Mac; +use libsignal_core::Aci; use libsignal_message_backup::args::{parse_aci, parse_hex_bytes}; use libsignal_message_backup::key::{BackupKey, MessageBackupKey}; -use libsignal_protocol::Aci; use sha2::Sha256; const DEFAULT_ACI: Aci = Aci::from_uuid_bytes([0x11; 16]); diff --git a/rust/message-backup/src/args.rs b/rust/message-backup/src/args.rs index fe328868..c12589bb 100644 --- a/rust/message-backup/src/args.rs +++ b/rust/message-backup/src/args.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0-only // -use libsignal_protocol::Aci; +use libsignal_core::Aci; #[derive(Debug, thiserror::Error)] pub enum ParseHexError { diff --git a/rust/message-backup/src/backup.rs b/rust/message-backup/src/backup.rs index db328245..938431f0 100644 --- a/rust/message-backup/src/backup.rs +++ b/rust/message-backup/src/backup.rs @@ -8,7 +8,7 @@ use std::fmt::Debug; use std::sync::Arc; use derive_where::derive_where; -use libsignal_protocol::Aci; +use libsignal_core::Aci; pub(crate) use crate::backup::account_data::{AccountData, AccountDataError}; use crate::backup::call::{AdHocCall, CallError}; diff --git a/rust/message-backup/src/backup/chat/group.rs b/rust/message-backup/src/backup/chat/group.rs index b354d105..026ba107 100644 --- a/rust/message-backup/src/backup/chat/group.rs +++ b/rust/message-backup/src/backup/chat/group.rs @@ -10,7 +10,7 @@ use std::fmt::Debug; use itertools::Itertools as _; -use libsignal_protocol::{Aci, Pni, ServiceId}; +use libsignal_core::{Aci, Pni, ServiceId}; use macro_rules_attribute::macro_rules_derive; use protobuf::{EnumOrUnknown, Message}; diff --git a/rust/message-backup/src/backup/chat/text.rs b/rust/message-backup/src/backup/chat/text.rs index 37a5ad50..8554c3fb 100644 --- a/rust/message-backup/src/backup/chat/text.rs +++ b/rust/message-backup/src/backup/chat/text.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0-only // -use libsignal_protocol::Aci; +use libsignal_core::Aci; use crate::backup::serialize::{self, UnorderedList}; use crate::backup::uuid_bytes_to_aci; diff --git a/rust/message-backup/src/backup/recipient.rs b/rust/message-backup/src/backup/recipient.rs index 62df81ce..60599e6a 100644 --- a/rust/message-backup/src/backup/recipient.rs +++ b/rust/message-backup/src/backup/recipient.rs @@ -9,7 +9,7 @@ use std::sync::Arc; use derive_where::derive_where; use itertools::Itertools as _; -use libsignal_protocol::{Aci, Pni, ServiceIdKind}; +use libsignal_core::{Aci, Pni, ServiceIdKind}; use uuid::Uuid; use zkgroup::{GroupMasterKeyBytes, ProfileKeyBytes}; diff --git a/rust/message-backup/src/backup/serialize.rs b/rust/message-backup/src/backup/serialize.rs index d28858de..29aa6027 100644 --- a/rust/message-backup/src/backup/serialize.rs +++ b/rust/message-backup/src/backup/serialize.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0-only // -use libsignal_protocol::ServiceId; +use libsignal_core::ServiceId; use protobuf::Enum as _; use serde::ser::{SerializeStruct as _, SerializeTupleVariant as _}; use serde::{Serialize, Serializer}; diff --git a/rust/message-backup/src/bin/validator/main.rs b/rust/message-backup/src/bin/validator/main.rs index 35786f33..4891dd44 100644 --- a/rust/message-backup/src/bin/validator/main.rs +++ b/rust/message-backup/src/bin/validator/main.rs @@ -9,6 +9,7 @@ use clap::{Args, Parser}; use futures::io::AllowStdIo; use futures::AsyncRead; +use libsignal_core::Aci; use libsignal_message_backup::args::{parse_aci, parse_hex_bytes}; use libsignal_message_backup::backup::Purpose; use libsignal_message_backup::frame::{ @@ -17,7 +18,6 @@ use libsignal_message_backup::frame::{ }; use libsignal_message_backup::key::{BackupKey, MessageBackupKey}; use libsignal_message_backup::{BackupReader, Error, FoundUnknownField, ReadResult}; -use libsignal_protocol::Aci; use mediasan_common::SeekSkipAdapter; use crate::args::ParseVerbosity; diff --git a/rust/message-backup/src/key.rs b/rust/message-backup/src/key.rs index 9ff8210a..a82967cd 100644 --- a/rust/message-backup/src/key.rs +++ b/rust/message-backup/src/key.rs @@ -11,7 +11,7 @@ //! SVR, so that a restorer can reconstruct the `BackupId`. use hkdf::Hkdf; -use libsignal_protocol::Aci; +use libsignal_core::Aci; use sha2::Sha256; /// Primary key for backups that is used to derive other keys. diff --git a/rust/message-backup/tests/test_cases.rs b/rust/message-backup/tests/test_cases.rs index 9f106c2a..81741436 100644 --- a/rust/message-backup/tests/test_cases.rs +++ b/rust/message-backup/tests/test_cases.rs @@ -10,11 +10,11 @@ use assert_matches::assert_matches; use dir_test::{dir_test, Fixture}; use futures::io::Cursor; use futures::AsyncRead; +use libsignal_core::Aci; use libsignal_message_backup::backup::Purpose; use libsignal_message_backup::frame::{FileReaderFactory, VerifyHmac}; use libsignal_message_backup::key::{BackupKey, MessageBackupKey}; use libsignal_message_backup::{BackupReader, ReadResult}; -use libsignal_protocol::Aci; const BACKUP_PURPOSE: Purpose = Purpose::RemoteBackup;