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

src/bin/proxmox-backup-client.rs: fix parameters for get_encryption_key_password

Browse Source
This commit is contained in:
Dietmar Maurer 2019-10-17 10:28:21 +02:00
parent 40c9ff9d81
commit a8f10f849e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/proxmox-backup-client.rs
View File

@ -471,7 +471,7 @@ fn dump_catalog(
let crypt_config = match keyfile { let crypt_config = match keyfile {
None => None, None => None,
Some(path) => { Some(path) => {
let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?; let (key, _) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
Some(Arc::new(CryptConfig::new(key)?)) Some(Arc::new(CryptConfig::new(key)?))
} }
}; };
@ -706,7 +706,7 @@ fn create_backup(
let (crypt_config, rsa_encrypted_key) = match keyfile { let (crypt_config, rsa_encrypted_key) = match keyfile {
None => (None, None), None => (None, None),
Some(path) => { Some(path) => {
let (key, created) = load_and_decrtypt_key(&path, get_encryption_key_password)?; let (key, created) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
let crypt_config = CryptConfig::new(key)?; let crypt_config = CryptConfig::new(key)?;
@ -967,7 +967,7 @@ async fn restore_do(param: Value) -> Result<Value, Error> {
let crypt_config = match keyfile { let crypt_config = match keyfile {
None => None, None => None,
Some(path) => { Some(path) => {
let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?; let (key, _) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
Some(Arc::new(CryptConfig::new(key)?)) Some(Arc::new(CryptConfig::new(key)?))
} }
}; };
@ -1122,7 +1122,7 @@ fn upload_log(
let crypt_config = match keyfile { let crypt_config = match keyfile {
None => None, None => None,
Some(path) => { Some(path) => {
let (key, _created) = load_and_decrtypt_key(&path, get_encryption_key_password)?; let (key, _created) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
let crypt_config = CryptConfig::new(key)?; let crypt_config = CryptConfig::new(key)?;
Some(Arc::new(crypt_config)) Some(Arc::new(crypt_config))
} }
@ -1534,7 +1534,7 @@ fn key_change_passphrase(
bail!("unable to change passphrase - no tty"); bail!("unable to change passphrase - no tty");
} }
let (key, created) = load_and_decrtypt_key(&path, get_encryption_key_password)?; let (key, created) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
if kdf == "scrypt" { if kdf == "scrypt" {
@ -1691,7 +1691,7 @@ async fn mount_do(param: Value, pipe: Option<RawFd>) -> Result<Value, Error> {
let crypt_config = match keyfile { let crypt_config = match keyfile {
None => None, None => None,
Some(path) => { Some(path) => {
let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?; let (key, _) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
Some(Arc::new(CryptConfig::new(key)?)) Some(Arc::new(CryptConfig::new(key)?))
} }
}; };