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

move data_blob encode/decode from crypt_config.rs to data_blob.rs

Browse Source
This commit is contained in:
Dietmar Maurer
2021-09-06 11:48:08 +02:00
parent 45d5d873ce
commit ed2080762c
4 changed files with 138 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxmox-backup-client/src/benchmark.rs
View File

@ -22,7 +22,7 @@ use proxmox::api::{
use pbs_client::tools::key_source::get_encryption_key_password;
use pbs_client::{BackupRepository, BackupWriter};
use pbs_datastore::{CryptConfig, KeyDerivationConfig, load_and_decrypt_key};
use pbs_datastore::data_blob::DataChunkBuilder;
use pbs_datastore::data_blob::{DataBlob, DataChunkBuilder};
use crate::{
KEYFILE_SCHEMA, REPO_URL_SCHEMA,
@ -333,7 +333,7 @@ fn test_crypt_speed(
let mut bytes = 0;
loop {
let mut out = Vec::new();
crypt_config.encrypt_to(&random_data, &mut out)?;
DataBlob::encrypt_benchmark(&crypt_config, &random_data, &mut out)?;
bytes += random_data.len();
if start_time.elapsed().as_micros() > 1_000_000 { break; }
}

4
proxmox-backup-client/src/key.rs
View File

@ -14,8 +14,8 @@ use proxmox::api::schema::ApiType;
use proxmox::sys::linux::tty;
use proxmox::tools::fs::{file_get_contents, replace_file, CreateOptions};
use pbs_api_types::{RsaPubKeyInfo, PASSWORD_HINT_SCHEMA};
use pbs_datastore::{KeyConfig, KeyInfo, Kdf, rsa_decrypt_key_config};
use pbs_api_types::{RsaPubKeyInfo, PASSWORD_HINT_SCHEMA, Kdf, KeyInfo};
use pbs_datastore::{KeyConfig, rsa_decrypt_key_config};
use pbs_datastore::paperkey::{generate_paper_key, PaperkeyFormat};
use pbs_client::tools::key_source::{
find_default_encryption_key, find_default_master_pubkey, get_encryption_key_password,