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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 756286C86C for ; Mon, 1 Feb 2021 14:06:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 67ACC2483A for ; Mon, 1 Feb 2021 14:06:32 +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 CF1872482D for ; Mon, 1 Feb 2021 14:06: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 987CF45796 for ; Mon, 1 Feb 2021 14:06:31 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 1 Feb 2021 14:06:18 +0100 Message-Id: <20210201130618.800923-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210201130618.800923-1-f.gruenbichler@proxmox.com> References: <20210201130618.800923-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.027 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 Subject: [pbs-devel] [PATCH proxmox-backup 3/3] paperkey: rustfmt 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: Mon, 01 Feb 2021 13:06:32 -0000 Signed-off-by: Fabian Grünbichler --- src/tools/paperkey.rs | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/tools/paperkey.rs b/src/tools/paperkey.rs index 3c1f7c91..2dc185a8 100644 --- a/src/tools/paperkey.rs +++ b/src/tools/paperkey.rs @@ -1,5 +1,5 @@ use std::io::Write; -use std::process::{Stdio, Command}; +use std::process::{Command, Stdio}; use anyhow::{bail, format_err, Error}; use serde::{Deserialize, Serialize}; @@ -61,11 +61,11 @@ pub fn generate_paper_key( .collect(); (lines, false) - }, + } Err(err) => { eprintln!("Couldn't parse data as KeyConfig - {}", err); bail!("Neither a PEM-formatted private key, nor a PBS key file."); - }, + } } }; @@ -83,14 +83,16 @@ fn paperkey_html( subject: Option, is_master: bool, ) -> Result<(), Error> { - let img_size_pt = 500; writeln!(output, "")?; writeln!(output, "")?; writeln!(output, "")?; writeln!(output, "")?; - writeln!(output, "")?; + writeln!( + output, + "" + )?; writeln!(output, "Proxmox Backup Paperkey")?; writeln!(output, "