From 6f2626ae1993d8bc4a58d3b3c43394a94dac96a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 20 Nov 2020 17:38:33 +0100 Subject: [PATCH] client: print key fingerprint and master key MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit for operations where it makes sense. Signed-off-by: Fabian Grünbichler --- src/bin/proxmox-backup-client.rs | 8 ++++++-- src/bin/proxmox_backup_client/mount.rs | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index c63c7eb6..c1dbdc30 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -1069,7 +1069,8 @@ async fn create_backup( let (crypt_config, rsa_encrypted_key) = match keydata { None => (None, None), Some(key) => { - let (key, created, _fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; + let (key, created, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; + println!("Encryption key fingerprint: {}", fingerprint); let crypt_config = CryptConfig::new(key)?; @@ -1078,6 +1079,8 @@ async fn create_backup( let pem_data = file_get_contents(path)?; let rsa = openssl::rsa::Rsa::public_key_from_pem(&pem_data)?; let enc_key = crypt_config.generate_rsa_encoded_key(rsa, created)?; + println!("Master key '{:?}'", path); + (Some(Arc::new(crypt_config)), Some(enc_key)) } _ => (Some(Arc::new(crypt_config)), None), @@ -1380,7 +1383,8 @@ async fn restore(param: Value) -> Result { let crypt_config = match keydata { None => None, Some(key) => { - let (key, _, _) = decrypt_key(&key, &key::get_encryption_key_password)?; + let (key, _, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; + println!("Encryption key fingerprint: '{}'", fingerprint); Some(Arc::new(CryptConfig::new(key)?)) } }; diff --git a/src/bin/proxmox_backup_client/mount.rs b/src/bin/proxmox_backup_client/mount.rs index 6283961e..187deab5 100644 --- a/src/bin/proxmox_backup_client/mount.rs +++ b/src/bin/proxmox_backup_client/mount.rs @@ -182,7 +182,9 @@ async fn mount_do(param: Value, pipe: Option) -> Result { let crypt_config = match keyfile { None => None, Some(path) => { - let (key, _, _) = load_and_decrypt_key(&path, &crate::key::get_encryption_key_password)?; + println!("Encryption key file: '{:?}'", path); + let (key, _, fingerprint) = load_and_decrypt_key(&path, &crate::key::get_encryption_key_password)?; + println!("Encryption key fingerprint: '{}'", fingerprint); Some(Arc::new(CryptConfig::new(key)?)) } }; -- 2.39.2