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

src/bin/proxmox-backup-client.rs: add keyfile parameter for backup

Browse Source
This commit is contained in:
Dietmar Maurer
2019-06-19 17:16:41 +02:00
parent 181f097af9
commit 6d0983dbe1
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/backup/key_derivation.rs
View File

@ -142,7 +142,7 @@ pub fn store_key_with_passphrase(
})
}
pub fn load_and_decrtypt_key(path: &std::path::Path, passphrase: fn() -> Result<Vec<u8>, Error>) -> Result<Vec<u8>, Error> {
pub fn load_and_decrtypt_key(path: &std::path::Path, passphrase: fn() -> Result<Vec<u8>, Error>) -> Result<[u8;32], Error> {
let raw = crate::tools::file_get_contents(&path)?;
let data = String::from_utf8(raw)?;
@ -151,7 +151,7 @@ pub fn load_and_decrtypt_key(path: &std::path::Path, passphrase: fn() -> Result<
let raw_data = key_config.data;
if let Some(kdf) = key_config.kdf {
let key = if let Some(kdf) = key_config.kdf {
let passphrase = passphrase()?;
if passphrase.len() < 5 {
@ -178,8 +178,13 @@ pub fn load_and_decrtypt_key(path: &std::path::Path, passphrase: fn() -> Result<
&tag,
).map_err(|err| format_err!("Unable to decrypt key - {}", err))?;
Ok(decr_data)
decr_data
} else {
Ok(raw_data)
}
raw_data
};
let mut result = [0u8; 32];
result.copy_from_slice(&key);
Ok(result)
}