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

Avoid returning SessionState from the ratchet initializer functions

Browse Source 
These still need to be exposed for the Java tests but they only
need to see the SessionRecord not the SessionState.

The internal functions still need to return a SessionState due to how
these functions are used within the crate.
This commit is contained in:
Jack Lloyd
2020-12-10 08:30:42 -05:00
parent d9177ca951
commit f87c41b0d1
7 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/protocol/tests/support/mod.rs
View File

@@ -107,7 +107,7 @@ pub async fn create_pre_key_bundle<R: Rng + CryptoRng>(
}
#[allow(dead_code)]
pub fn initialize_sessions_v3() -> Result<(SessionState, SessionState), SignalProtocolError> {
pub fn initialize_sessions_v3() -> Result<(SessionRecord, SessionRecord), SignalProtocolError> {
let mut csprng = OsRng;
let alice_identity = IdentityKeyPair::generate(&mut csprng);
let bob_identity = IdentityKeyPair::generate(&mut csprng);
@@ -126,7 +126,7 @@ pub fn initialize_sessions_v3() -> Result<(SessionState, SessionState), SignalPr
bob_ephemeral_key.public_key,
);
let alice_session = initialize_alice_session(&alice_params, &mut csprng)?;
let alice_session = initialize_alice_session_record(&alice_params, &mut csprng)?;
let bob_params = BobSignalProtocolParameters::new(
bob_identity,
@@ -137,7 +137,7 @@ pub fn initialize_sessions_v3() -> Result<(SessionState, SessionState), SignalPr
alice_base_key.public_key,
);
let bob_session = initialize_bob_session(&bob_params)?;
let bob_session = initialize_bob_session_record(&bob_params)?;
Ok((alice_session, bob_session))
}