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

crypto: Rename the uploaded key count variable.

master
Damir Jelić 2020-02-26 09:36:52 +01:00
parent b171f64f1d
commit 8181d96bfb
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/crypto/machine.rs
View File

@ -32,11 +32,11 @@ struct OlmMachine {
device_id: String, device_id: String,
/// Our underlying Olm Account holding our identity keys. /// Our underlying Olm Account holding our identity keys.
account: Account, account: Account,
/// The number of one-time keys we have uploaded to the server. If this is /// The number of signed one-time keys we have uploaded to the server. If
/// None, no action will be taken. After a sync request the client needs to /// this is None, no action will be taken. After a sync request the client
/// set this for us, depending on the count we will suggest the client /// needs to set this for us, depending on the count we will suggest the
/// to upload new keys. /// client to upload new keys.
uploaded_key_count: Option<u64>, uploaded_signed_key_count: Option<u64>,
} }
impl OlmMachine { impl OlmMachine {
@ -54,7 +54,7 @@ impl OlmMachine {
user_id: user_id.to_owned(), user_id: user_id.to_owned(),
device_id: device_id.to_owned(), device_id: device_id.to_owned(),
account: Account::new(), account: Account::new(),
uploaded_key_count: None, uploaded_signed_key_count: None,
} }
} }
@ -66,7 +66,7 @@ impl OlmMachine {
// If we have a known key count, check that we have more than // If we have a known key count, check that we have more than
// max_one_time_Keys() / 2, otherwise tell the client to upload more. // max_one_time_Keys() / 2, otherwise tell the client to upload more.
match self.uploaded_key_count { match self.uploaded_signed_key_count {
Some(count) => { Some(count) => {
let max_keys = self.account.max_one_time_keys() as u64; let max_keys = self.account.max_one_time_keys() as u64;
let key_count = (max_keys / 2) - count; let key_count = (max_keys / 2) - count;
@ -90,7 +90,7 @@ impl OlmMachine {
if let Some(c) = one_time_key_count { if let Some(c) = one_time_key_count {
let count: u64 = (*c).into(); let count: u64 = (*c).into();
self.uploaded_key_count = Some(count); self.uploaded_signed_key_count = Some(count);
} }
self.account.mark_keys_as_published(); self.account.mark_keys_as_published();
@ -102,7 +102,7 @@ impl OlmMachine {
/// Returns the number of newly generated one-time keys. If no keys can be /// Returns the number of newly generated one-time keys. If no keys can be
/// generated returns an empty error. /// generated returns an empty error.
fn generate_one_time_keys(&self) -> Result<u64, ()> { fn generate_one_time_keys(&self) -> Result<u64, ()> {
match self.uploaded_key_count { match self.uploaded_signed_key_count {
Some(count) => { Some(count) => {
let max_keys = self.account.max_one_time_keys() as u64; let max_keys = self.account.max_one_time_keys() as u64;
let max_on_server = max_keys / 2; let max_on_server = max_keys / 2;
@ -238,10 +238,11 @@ mod test {
use http::Response; use http::Response;
fn response_from_file(path: &str) -> Response<Vec<u8>> { fn response_from_file(path: &str) -> Response<Vec<u8>> {
let mut file = File::open(path).expect(&format!("No such data file found {}", path)); let mut file = File::open(path)
.unwrap_or_else(|_| panic!(format!("No such data file found {}", path)));
let mut contents = Vec::new(); let mut contents = Vec::new();
file.read_to_end(&mut contents) file.read_to_end(&mut contents)
.expect(&format!("Can't read data file {}", path)); .unwrap_or_else(|_| panic!(format!("Can't read data file {}", path)));
Response::builder().status(200).body(contents).unwrap() Response::builder().status(200).body(contents).unwrap()
} }