tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/backup/data_blob.rs: avoid Arc<CryptConfig>

Browse Source 
use simple reference instead.
This commit is contained in:
Dietmar Maurer
2019-10-07 11:36:39 +02:00
parent 4ee8f53d07
commit 7123ff7d43
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/http_client.rs
View File

@ -674,7 +674,7 @@ impl BackupClient {
sign_only: bool,
) -> Result<BackupStats, Error> {
let blob = if let Some(crypt_config) = crypt_config {
let blob = if let Some(ref crypt_config) = crypt_config {
if sign_only {
DataBlob::create_signed(&data, crypt_config, compress)?
} else {
@ -713,7 +713,7 @@ impl BackupClient {
.await
.map_err(|err| format_err!("unable to read file {:?} - {}", src_path, err))?;
let blob = DataBlob::encode(&contents, crypt_config, compress)?;
let blob = DataBlob::encode(&contents, crypt_config.as_ref().map(AsRef::as_ref), compress)?;
let raw_data = blob.into_inner();
let size = raw_data.len() as u64;
let csum = openssl::sha::sha256(&raw_data);
@ -936,7 +936,7 @@ impl BackupClient {
.compress(true);
if let Some(ref crypt_config) = crypt_config {
chunk_builder = chunk_builder.crypt_config(crypt_config.clone());
chunk_builder = chunk_builder.crypt_config(crypt_config);
}
let mut known_chunks = known_chunks.lock().unwrap();

2
src/client/remote_chunk_reader.rs
View File

@ -46,7 +46,7 @@ impl ReadChunk for RemoteChunkReader {
let chunk = DataBlob::from_raw(chunk_data)?;
chunk.verify_crc()?;
let raw_data = chunk.decode(self.crypt_config.clone())?;
let raw_data = chunk.decode(self.crypt_config.as_ref().map(Arc::as_ref))?;
// fixme: verify chunk digest