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 5D4F262C2C for ; Tue, 24 Nov 2020 14:05:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5B69BC7A9 for ; Tue, 24 Nov 2020 14:05:57 +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 E73BFC795 for ; Tue, 24 Nov 2020 14:05:56 +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 B0D41404F6 for ; Tue, 24 Nov 2020 14:05:56 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 14:05:18 +0100 Message-Id: <20201124130520.1058725-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201124130520.1058725-1-f.gruenbichler@proxmox.com> References: <20201124130520.1058725-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.024 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. [commands.rs] Subject: [pbs-devel] [PATCH proxmox-backup-qemu 1/2] encryption key tracking: use fingerprint 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: Tue, 24 Nov 2020 13:05:57 -0000 but accept old variant as well for now, to not invalidate bitmaps for freshly migrated VMs. Signed-off-by: Fabian Grünbichler --- Notes: needs proxmox-backup with Fingerprint::bytes() src/commands.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/commands.rs b/src/commands.rs index 7a24b7c..dcee5a1 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -108,6 +108,8 @@ fn archive_name(device_name: &str) -> String { const CRYPT_CONFIG_HASH_INPUT:&[u8] = b"this is just a static string to protect against key changes"; /// Create an identifying digest for the crypt config +/// legacy version for VMs freshly migrated from old version +/// TODO: remove in PVE 7.0 pub(crate) fn crypt_config_digest( config: Arc, ) -> [u8;32] { @@ -152,7 +154,8 @@ pub(crate) fn check_last_encryption_key( let digest_guard = PREVIOUS_CRYPT_CONFIG_DIGEST.lock().unwrap(); match (*digest_guard, config) { (Some(last_digest), Some(current_config)) => { - crypt_config_digest(current_config) == last_digest + current_config.fingerprint().bytes() == &last_digest + || crypt_config_digest(current_config) == last_digest }, (None, None) => true, _ => false, @@ -440,7 +443,13 @@ pub(crate) async fn finish_backup( { let crypt_config_digest = match crypt_config { - Some(current_config) => Some(crypt_config_digest(current_config)), + Some(current_config) => { + let fp = current_config + .fingerprint() + .bytes() + .to_owned(); + Some(fp) + }, None => None, }; -- 2.20.1