From 5f76ac37b5e52fd67078ecbd2b1cdae95216a5e5 Mon Sep 17 00:00:00 2001 From: Dylan Whyte Date: Thu, 6 Aug 2020 09:13:40 +0200 Subject: [PATCH] fix: master-key: upload RSA encoded key with backup When uploading an RSA encoded key alongside the backup, the backup would fail with the error message: "wrong blob file extension". Adding the '.blob' extension to rsa-encrypted.key before the the call to upload_blob_from_data(), rather than after, fixes the issue. Signed-off-by: Dylan Whyte --- src/bin/proxmox-backup-client.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index 16c6ec66..a7056685 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -1120,12 +1120,12 @@ async fn create_backup( } if let Some(rsa_encrypted_key) = rsa_encrypted_key { - let target = "rsa-encrypted.key"; + let target = "rsa-encrypted.key.blob"; println!("Upload RSA encoded key to '{:?}' as {}", repo, target); let stats = client .upload_blob_from_data(rsa_encrypted_key, target, false, false) .await?; - manifest.add_file(format!("{}.blob", target), stats.size, stats.csum, crypt_mode)?; + manifest.add_file(target.to_string(), stats.size, stats.csum, crypt_mode)?; // openssl rsautl -decrypt -inkey master-private.pem -in rsa-encrypted.key -out t /* @@ -1136,7 +1136,6 @@ async fn create_backup( println!("TEST {} {:?}", len, buffer2); */ } - // create manifest (index.json) // manifests are never encrypted, but include a signature let manifest = manifest.to_string(crypt_config.as_ref().map(Arc::as_ref))