yetangitu/ffsend
1
0
Fork 0
mirror of https://github.com/timvisee/ffsend.git synced 2025-10-05 10:19:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix writing large encrypted files, remove slow truncates

Browse source
This commit is contained in:
timvisee 2018-03-20 23:23:39 +01:00
parent a7da14ec2c
commit 2d1c669cef
No known key found for this signature in database
GPG key ID: 109CBA0BF74036C2
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/src/crypto/b64.rs
View file

@ -8,7 +8,8 @@ extern crate base64;
pub use self::base64::{Config, DecodeError}; pub use self::base64::{Config, DecodeError};
/// Encode the given byte slice using base64, in an URL-safe manner. /// Encode the given byte slice using base64,
/// in an URL-safe manner without padding.
pub fn encode(input: &[u8]) -> String { pub fn encode(input: &[u8]) -> String {
base64::encode_config(input, base64::URL_SAFE_NO_PAD) base64::encode_config(input, base64::URL_SAFE_NO_PAD)
} }

13
api/src/reader.rs
View file

@ -135,10 +135,9 @@ impl EncryptedFileReader {
// Create an encrypted buffer, truncate the data buffer // Create an encrypted buffer, truncate the data buffer
let mut encrypted = vec![0u8; len + block_size]; let mut encrypted = vec![0u8; len + block_size];
data.truncate(len);
// Encrypt the data that was read // Encrypt the data that was read
let len = self.crypter.update(&data, &mut encrypted)?; let len = self.crypter.update(&data[..len], &mut encrypted)?;
// Calculate how many bytes will be copied to the reader // Calculate how many bytes will be copied to the reader
let out_len = min(buf.len(), len); let out_len = min(buf.len(), len);
@ -472,10 +471,9 @@ impl Write for EncryptedFileWriter {
file_buf, file_buf,
&mut decrypted, &mut decrypted,
)?; )?;
decrypted.truncate(len);
// Write to the file // Write to the file
self.file.write_all(&decrypted)?; self.file.write_all(&decrypted[..len])?;
} }
// Read from the tag part to fill the tag buffer // Read from the tag part to fill the tag buffer
@ -494,15 +492,16 @@ impl Write for EncryptedFileWriter {
// Finalize, write all remaining data // Finalize, write all remaining data
let len = self.crypter.finalize(&mut extra)?; let len = self.crypter.finalize(&mut extra)?;
extra.truncate(len); self.file.write_all(&extra[..len])?;
self.file.write_all(&extra)?;
// Set the verified flag // Set the verified flag
self.verified = true; self.verified = true;
} }
// Compute how many bytes were written // Compute how many bytes were written
Ok(file_buf.len() + tag_buf.len()) let len = file_buf.len() + min(tag_buf.len(), TAG_LEN);
self.cur += len;
Ok(len)
} }
fn flush(&mut self) -> Result<(), io::Error> { fn flush(&mut self) -> Result<(), io::Error> {