From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4A6876117D for ; Wed, 16 Dec 2020 14:41:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CE121C96E for ; Wed, 16 Dec 2020 14:41:20 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C2DB31C964 for ; Wed, 16 Dec 2020 14:41:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8D9B6451FF for ; Wed, 16 Dec 2020 14:41:19 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Wed, 16 Dec 2020 14:41:05 +0100 Message-Id: <20201216134111.445581-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201216134111.445581-1-f.gruenbichler@proxmox.com> References: <20201216134111.445581-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [manifest.rs, proxmox-backup-client.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/7] master key: store blob name in constant X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2020 13:41:20 -0000 since we will use it in more than one place. Signed-off-by: Fabian Grünbichler --- src/backup/manifest.rs | 1 + src/bin/proxmox-backup-client.rs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backup/manifest.rs b/src/backup/manifest.rs index a64cbe15..8742cb0a 100644 --- a/src/backup/manifest.rs +++ b/src/backup/manifest.rs @@ -10,6 +10,7 @@ use crate::backup::{BackupDir, CryptMode, CryptConfig, Fingerprint}; pub const MANIFEST_BLOB_NAME: &str = "index.json.blob"; pub const MANIFEST_LOCK_NAME: &str = ".index.json.lck"; pub const CLIENT_LOG_BLOB_NAME: &str = "client.log.blob"; +pub const ENCRYPTED_KEY_BLOB_NAME: &str = "rsa-encrypted.key.blob"; mod hex_csum { use serde::{self, Deserialize, Serializer, Deserializer}; diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index 372ff268..1c456aab 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -54,6 +54,7 @@ use proxmox_backup::backup::{ CryptConfig, CryptMode, DynamicIndexReader, + ENCRYPTED_KEY_BLOB_NAME, FixedChunkStream, FixedIndexReader, IndexFile, @@ -1064,7 +1065,7 @@ async fn create_backup( } if let Some(rsa_encrypted_key) = rsa_encrypted_key { - let target = "rsa-encrypted.key.blob"; + let target = ENCRYPTED_KEY_BLOB_NAME; println!("Upload RSA encoded key to '{:?}' as {}", repo, target); let stats = client .upload_blob_from_data(rsa_encrypted_key, target, false, false) -- 2.20.1