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 7535861A88 for ; Fri, 20 Nov 2020 17:41:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C23C15440 for ; Fri, 20 Nov 2020 17:40:31 +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 060FF15436 for ; Fri, 20 Nov 2020 17:40:31 +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 C707643D4B for ; Fri, 20 Nov 2020 17:40:30 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 20 Nov 2020 17:38:44 +0100 Message-Id: <20201120163845.1225080-15-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201120163845.1225080-1-f.gruenbichler@proxmox.com> References: <20201120163845.1225080-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. [backup.rs, restore.rs] Subject: [pbs-devel] [PATCH proxmox-backup-qemu 1/2] adapt to proxmox-backup fingerprint changes 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: Fri, 20 Nov 2020 16:41:01 -0000 Signed-off-by: Fabian Grünbichler --- requires proxmox-backup with other patches from this series applied src/backup.rs | 2 +- src/restore.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backup.rs b/src/backup.rs index 184ac64..c3a7c11 100644 --- a/src/backup.rs +++ b/src/backup.rs @@ -47,7 +47,7 @@ impl BackupTask { let crypt_config = match setup.keyfile { None => None, Some(ref path) => { - let (key, _) = load_and_decrypt_key(path, & || { + let (key, _, _) = load_and_decrypt_key(path, & || { match setup.key_password { Some(ref key_password) => Ok(key_password.as_bytes().to_vec()), None => bail!("no key_password specified"), diff --git a/src/restore.rs b/src/restore.rs index ad825bd..6cba71f 100644 --- a/src/restore.rs +++ b/src/restore.rs @@ -41,7 +41,7 @@ impl RestoreTask { let crypt_config = match setup.keyfile { None => None, Some(ref path) => { - let (key, _) = load_and_decrypt_key(path, & || { + let (key, _, _) = load_and_decrypt_key(path, & || { match setup.key_password { Some(ref key_password) => Ok(key_password.as_bytes().to_vec()), None => bail!("no key_password specified"), -- 2.20.1