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 C104B62C34 for ; Tue, 24 Nov 2020 14:06:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BF0B9C7C5 for ; Tue, 24 Nov 2020 14:06:37 +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 44C4AC7B1 for ; Tue, 24 Nov 2020 14:06:37 +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 0EF3F404F6 for ; Tue, 24 Nov 2020 14:06:37 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 14:05:20 +0100 Message-Id: <20201124130520.1058725-4-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 2/2] fingerprint: rename variables 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:06:37 -0000 Signed-off-by: Fabian Grünbichler --- src/commands.rs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/commands.rs b/src/commands.rs index dcee5a1..cd81dae 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -23,7 +23,7 @@ lazy_static!{ Mutex::new(HashMap::new()) }; - static ref PREVIOUS_CRYPT_CONFIG_DIGEST: Mutex> = { + static ref PREVIOUS_KEY_FINGERPRINT: Mutex> = { Mutex::new(None) }; } @@ -40,16 +40,16 @@ pub struct ImageUploadInfo { pub(crate) fn serialize_state() -> Vec { let prev_csums = &*PREVIOUS_CSUMS.lock().unwrap(); - let prev_crypt_digest = &*PREVIOUS_CRYPT_CONFIG_DIGEST.lock().unwrap(); - bincode::serialize(&(prev_csums, prev_crypt_digest)).unwrap() + let prev_key_fingerprint = &*PREVIOUS_KEY_FINGERPRINT.lock().unwrap(); + bincode::serialize(&(prev_csums, prev_key_fingerprint)).unwrap() } pub(crate) fn deserialize_state(data: &[u8]) -> Result<(), Error> { - let (prev_csums, prev_crypt_digest) = bincode::deserialize(data)?; + let (prev_csums, prev_key_fingerprint) = bincode::deserialize(data)?; let mut prev_csums_guard = PREVIOUS_CSUMS.lock().unwrap(); - let mut prev_crypt_digest_guard = PREVIOUS_CRYPT_CONFIG_DIGEST.lock().unwrap(); + let mut prev_key_fingerprint_guard = PREVIOUS_KEY_FINGERPRINT.lock().unwrap(); *prev_csums_guard = prev_csums; - *prev_crypt_digest_guard = prev_crypt_digest; + *prev_key_fingerprint_guard = prev_key_fingerprint; Ok(()) } @@ -151,11 +151,11 @@ pub(crate) fn check_last_encryption_mode( pub(crate) fn check_last_encryption_key( config: Option>, ) -> bool { - let digest_guard = PREVIOUS_CRYPT_CONFIG_DIGEST.lock().unwrap(); - match (*digest_guard, config) { - (Some(last_digest), Some(current_config)) => { - current_config.fingerprint().bytes() == &last_digest - || crypt_config_digest(current_config) == last_digest + let fingerprint_guard = PREVIOUS_KEY_FINGERPRINT.lock().unwrap(); + match (*fingerprint_guard, config) { + (Some(last_fingerprint), Some(current_config)) => { + current_config.fingerprint().bytes() == &last_fingerprint + || crypt_config_digest(current_config) == last_fingerprint }, (None, None) => true, _ => false, @@ -442,7 +442,7 @@ pub(crate) async fn finish_backup( }; { - let crypt_config_digest = match crypt_config { + let key_fingerprint = match crypt_config { Some(current_config) => { let fp = current_config .fingerprint() @@ -453,8 +453,8 @@ pub(crate) async fn finish_backup( None => None, }; - let mut crypt_config_digest_guard = PREVIOUS_CRYPT_CONFIG_DIGEST.lock().unwrap(); - *crypt_config_digest_guard = crypt_config_digest; + let mut key_fingerprint_guard = PREVIOUS_KEY_FINGERPRINT.lock().unwrap(); + *key_fingerprint_guard = key_fingerprint; } client -- 2.20.1