char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Fix a bunch of clippy warnings.

master
Damir Jelić 2020-09-10 16:07:28 +02:00
parent e3f4c1849c
commit 7790c3db8f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix_sdk_crypto/src/key_export.rs
View File

@ -34,8 +34,8 @@ const MAC_SIZE: usize = 32;
const KEY_SIZE: usize = 32; const KEY_SIZE: usize = 32;
const VERSION: u8 = 1; const VERSION: u8 = 1;
const HEADER: &'static str = "-----BEGIN MEGOLM SESSION DATA-----"; const HEADER: &str = "-----BEGIN MEGOLM SESSION DATA-----";
const FOOTER: &'static str = "-----END MEGOLM SESSION DATA-----"; const FOOTER: &str = "-----END MEGOLM SESSION DATA-----";
fn decode(input: impl AsRef<[u8]>) -> Result<Vec<u8>, DecodeError> { fn decode(input: impl AsRef<[u8]>) -> Result<Vec<u8>, DecodeError> {
decode_config(input, STANDARD_NO_PAD) decode_config(input, STANDARD_NO_PAD)
@ -113,7 +113,7 @@ pub fn decrypt_key_export(
/// let encrypted_export = encrypt_key_export(&exported_keys, "1234", 1); /// let encrypted_export = encrypt_key_export(&exported_keys, "1234", 1);
/// # }); /// # });
/// ``` /// ```
pub fn encrypt_key_export(keys: &Vec<ExportedRoomKey>, passphrase: &str, rounds: u32) -> String { pub fn encrypt_key_export(keys: &[ExportedRoomKey], passphrase: &str, rounds: u32) -> String {
let mut plaintext = serde_json::to_string(keys).unwrap().into_bytes(); let mut plaintext = serde_json::to_string(keys).unwrap().into_bytes();
let ciphertext = encrypt_helper(&mut plaintext, passphrase, rounds); let ciphertext = encrypt_helper(&mut plaintext, passphrase, rounds);
[HEADER.to_owned(), ciphertext, FOOTER.to_owned()].join("\n") [HEADER.to_owned(), ciphertext, FOOTER.to_owned()].join("\n")
@ -246,7 +246,7 @@ mod test {
let mut plaintext_bytes = plaintext.clone().into_bytes(); let mut plaintext_bytes = plaintext.clone().into_bytes();
let ciphertext = encrypt_helper(&mut plaintext_bytes, "test", 1); let ciphertext = encrypt_helper(&mut plaintext_bytes, "test", 1);
let decrypted = decrypt_helper(&mut ciphertext.clone(), "test").unwrap(); let decrypted = decrypt_helper(&ciphertext, "test").unwrap();
prop_assert!(plaintext == decrypted); prop_assert!(plaintext == decrypted);
} }

5
matrix_sdk_crypto/src/machine.rs
View File

@ -1572,7 +1572,10 @@ impl OlmMachine {
) )
.await? .await?
{ {
if session.first_known_index().await < existing_session.first_known_index().await { let first_index = session.first_known_index().await;
let existing_index = existing_session.first_known_index().await;
if first_index < existing_index {
sessions.push(session) sessions.push(session)
} }
} else { } else {