mirror of
https://github.com/signalapp/libsignal.git
synced 2024-09-19 19:42:19 +02:00
backup: Reference libsignal_core directly
This commit is contained in:
parent
31001cdfb2
commit
c1551667ec
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -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",
|
||||
|
@ -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"] }
|
||||
|
@ -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];
|
||||
|
@ -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]);
|
||||
|
@ -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<const N: usize> {
|
||||
|
@ -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};
|
||||
|
@ -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};
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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};
|
||||
|
||||
|
@ -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};
|
||||
|
@ -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;
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user