From 2d1c669cef6d0238c7fc4ed1491ed1ec40b04e69 Mon Sep 17 00:00:00 2001
From: timvisee <timvisee@gmail.com>
Date: Tue, 20 Mar 2018 23:23:39 +0100
Subject: [PATCH] Fix writing large encrypted files, remove slow truncates

---
 api/src/crypto/b64.rs |  3 ++-
 api/src/reader.rs     | 13 ++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/src/crypto/b64.rs b/api/src/crypto/b64.rs
index 75a62a1..121ede8 100644
--- a/api/src/crypto/b64.rs
+++ b/api/src/crypto/b64.rs
@@ -8,7 +8,8 @@ extern crate base64;
 
 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 {
     base64::encode_config(input, base64::URL_SAFE_NO_PAD)
 }
diff --git a/api/src/reader.rs b/api/src/reader.rs
index 6f35f23..ccf1837 100644
--- a/api/src/reader.rs
+++ b/api/src/reader.rs
@@ -135,10 +135,9 @@ impl EncryptedFileReader {
 
         // Create an encrypted buffer, truncate the data buffer
         let mut encrypted = vec![0u8; len + block_size];
-        data.truncate(len);
 
         // 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
         let out_len = min(buf.len(), len);
@@ -472,10 +471,9 @@ impl Write for EncryptedFileWriter {
                 file_buf,
                 &mut decrypted,
             )?;
-            decrypted.truncate(len);
 
             // 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
@@ -494,15 +492,16 @@ impl Write for EncryptedFileWriter {
 
             // Finalize, write all remaining data
             let len = self.crypter.finalize(&mut extra)?;
-            extra.truncate(len);
-            self.file.write_all(&extra)?;
+            self.file.write_all(&extra[..len])?;
 
             // Set the verified flag
             self.verified = true;
         }
 
         // 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> {