eliott/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2026-04-25 17:25:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

swift: Remove sealedSenderEncrypt/Decrypt convenience functions

Browse Source 
...in favor of the more general functions using
UnidentifiedSenderMessageContent, which the iOS app is already using.
(sealedSenderDecrypt in particular was never updated to support
PQXDH.)
This commit is contained in:
Jordan Rose
2025-05-05 16:59:51 -04:00
parent afe710164c
commit 1458b6ffa2
13 changed files with 55 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
rust/bridge/ffi/src/lib.rs
View File

@@ -6,10 +6,9 @@
#![allow(clippy::missing_safety_doc)]
#![warn(clippy::unwrap_used)]
use std::ffi::{c_char, c_uchar, c_uint, CString};
use std::ffi::{c_char, c_uchar, CString};
use std::panic::AssertUnwindSafe;
use futures_util::FutureExt;
use libsignal_bridge::ffi::*;
#[cfg(feature = "libsignal-bridge-testing")]
#[allow(unused_imports)]
@@ -197,68 +196,6 @@ pub unsafe extern "C" fn signal_identitykeypair_deserialize(
})
}
#[no_mangle]
pub unsafe extern "C" fn signal_sealed_session_cipher_decrypt(
out: *mut OwnedBufferOf<c_uchar>,
sender_e164: *mut *const c_char,
sender_uuid: *mut *const c_char,
sender_device_id: *mut u32,
ctext: BorrowedSliceOf<c_uchar>,
trust_root: ConstPointer<PublicKey>,
timestamp: u64,
local_e164: *const c_char,
local_uuid: *const c_char,
local_device_id: c_uint,
session_store: ConstPointer<FfiSessionStoreStruct>,
identity_store: ConstPointer<FfiIdentityKeyStoreStruct>,
prekey_store: ConstPointer<FfiPreKeyStoreStruct>,
signed_prekey_store: ConstPointer<FfiSignedPreKeyStoreStruct>,
) -> *mut SignalFfiError {
run_ffi_safe(|| {
let mut kyber_pre_key_store = InMemKyberPreKeyStore::new();
let ctext = ctext.as_slice()?;
let trust_root = native_handle_cast::<PublicKey>(trust_root.into_inner())?;
let mut identity_store = identity_store
.into_inner()
.as_ref()
.ok_or(NullPointerError)?;
let mut session_store = session_store
.into_inner()
.as_ref()
.ok_or(NullPointerError)?;
let mut prekey_store = prekey_store.into_inner().as_ref().ok_or(NullPointerError)?;
let signed_prekey_store = signed_prekey_store
.into_inner()
.as_ref()
.ok_or(NullPointerError)?;
let local_e164 = Option::convert_from(local_e164)?;
let local_uuid = Option::convert_from(local_uuid)?.ok_or(NullPointerError)?;
let decrypted = sealed_sender_decrypt(
ctext,
trust_root,
Timestamp::from_epoch_millis(timestamp),
local_e164,
local_uuid,
local_device_id.into(),
&mut identity_store,
&mut session_store,
&mut prekey_store,
&signed_prekey_store,
&mut kyber_pre_key_store,
)
.now_or_never()
.expect("synchronous")?;
write_result_to(sender_e164, decrypted.sender_e164)?;
write_result_to(sender_uuid, decrypted.sender_uuid)?;
write_result_to(sender_device_id, u32::from(decrypted.device_id))?;
write_result_to(out, decrypted.message)?;
Ok(())
})
}
#[no_mangle]
pub unsafe extern "C" fn signal_hex_encode(
output: *mut c_char,