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

KeyConfig: always calculate fingerprint

Browse Source 
and warn if stored and calculated fingerprint don't match.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-12-16 14:41:11 +01:00 committed by Dietmar Maurer
parent 73b5011786
commit e0af222ec3
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/backup/key_derivation.rs
View File

@ -235,13 +235,16 @@ pub fn decrypt_key(
let mut result = [0u8; 32]; let mut result = [0u8; 32];
result.copy_from_slice(&key); result.copy_from_slice(&key);
let fingerprint = match key_config.fingerprint { let crypt_config = CryptConfig::new(result.clone())?;
Some(fingerprint) => fingerprint, let fingerprint = crypt_config.fingerprint();
None => { if let Some(stored_fingerprint) = key_config.fingerprint {
let crypt_config = CryptConfig::new(result.clone())?; if fingerprint != stored_fingerprint {
crypt_config.fingerprint() eprintln!(
}, "KeyConfig contains wrong fingerprint {}, contained key has fingerprint {}",
}; stored_fingerprint, fingerprint
);
}
}
Ok((result, created, fingerprint)) Ok((result, created, fingerprint))
} }
@ -313,5 +316,22 @@ fn encrypt_decrypt_test() -> Result<(), Error> {
assert_eq!(key.data, decrypted); assert_eq!(key.data, decrypted);
assert_eq!(key.fingerprint, Some(fingerprint)); assert_eq!(key.fingerprint, Some(fingerprint));
let key = KeyConfig {
kdf: None,
created: proxmox::tools::time::epoch_i64(),
modified: proxmox::tools::time::epoch_i64(),
data: (0u8..32u8).collect(),
fingerprint: Some(Fingerprint::new([0u8; 32])), // wrong FP
};
let encrypted = rsa_encrypt_key_config(public.clone(), &key).expect("encryption failed");
let (decrypted, created, fingerprint) =
rsa_decrypt_key_config(private.clone(), &encrypted, &passphrase)
.expect("decryption failed");
assert_eq!(key.created, created);
assert_eq!(key.data, decrypted);
// wrong FP update by round-trip through encrypt/decrypt
assert_ne!(key.fingerprint, Some(fingerprint));
Ok(()) Ok(())
} }