From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 83DD11FF396 for ; Thu, 20 Jun 2024 13:51:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F2C5E153F6; Thu, 20 Jun 2024 13:51:26 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 20 Jun 2024 13:50:14 +0200 Message-Id: <20240620115021.313662-8-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240620115021.313662-1-l.wagner@proxmox.com> References: <20240620115021.313662-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox-perl-rs 08/15] pve-rs: tfa: clippy: stripping a prefix manually X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Lukas Wagner --- pve-rs/src/tfa.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pve-rs/src/tfa.rs b/pve-rs/src/tfa.rs index 1054169..66dca3d 100644 --- a/pve-rs/src/tfa.rs +++ b/pve-rs/src/tfa.rs @@ -736,10 +736,10 @@ fn decode_old_oath_entry( let key = unsafe { std::str::from_utf8_unchecked(key) }; // See PVE::OTP::oath_verify_otp - let key = if key.starts_with("v2-0x") { - hex::decode(&key[5..]).map_err(|_| format_err!("bad v2 hex key in oath entry"))? - } else if key.starts_with("v2-") { - base32::decode(base32::Alphabet::RFC4648 { padding: true }, &key[3..]) + let key = if let Some(key) = key.strip_prefix("v2-0x") { + hex::decode(key).map_err(|_| format_err!("bad v2 hex key in oath entry"))? + } else if let Some(key) = key.strip_prefix("v2-") { + base32::decode(base32::Alphabet::RFC4648 { padding: true }, key) .ok_or_else(|| format_err!("bad v2 base32 key in oath entry"))? } else if key.len() == 16 { base32::decode(base32::Alphabet::RFC4648 { padding: true }, key) -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel