From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <f.gruenbichler@proxmox.com> 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 1502A6118F for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0C0B71C963 for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:18 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8FFCA1C959 for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:17 +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 5CF7D451FF for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:17 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Wed, 16 Dec 2020 14:41:04 +0100 Message-Id: <20201216134111.445581-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 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. [key.rs, manifest.rs, proxmox-backup-client.rs] Subject: [pbs-devel] [PATCH proxmox-backup 0/7] master key improvements X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Wed, 16 Dec 2020 13:41:48 -0000 this series fixes a bug preventing encrypted-key-restore that got introduced with fingerprint checks when restoring files, and further improves master key handling by providing an import command that takes a restored encrypted key and a private master key to create a PBS keyfile. Fabian Grünbichler (7): master key: store blob name in constant fix #3197: skip fingerprint check when restoring key key: move RSA-encryption to KeyConfig client: add 'import-with-master-key' command docs: replace openssl command with client KeyConfig: add encrypt/decrypt test KeyConfig: always calculate fingerprint docs/backup-client.rst | 6 +- src/backup/crypt_config.rs | 26 +------ src/backup/key_derivation.rs | 104 +++++++++++++++++++++++++-- src/backup/manifest.rs | 1 + src/bin/proxmox-backup-client.rs | 33 +++++---- src/bin/proxmox_backup_client/key.rs | 95 ++++++++++++++++++++++++ 6 files changed, 218 insertions(+), 47 deletions(-) -- 2.20.1