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 936337AB07 for ; Mon, 10 May 2021 10:53:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 89D49158F0 for ; Mon, 10 May 2021 10:52:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 1456A158E5 for ; Mon, 10 May 2021 10:52:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E0AEB459E3 for ; Mon, 10 May 2021 10:52:45 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 10 May 2021 10:52:32 +0200 Message-Id: <20210510085234.775062-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510085234.775062-1-f.gruenbichler@proxmox.com> References: <20210510085234.775062-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.019 Adjusted score from AWL reputation of From: address 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 Subject: [pbs-devel] [PATCH proxmox-backup 2/4] client: improve fingerprint variable names 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, 10 May 2021 08:53:16 -0000 and pass as reference instead of cloning. Signed-off-by: Fabian Grünbichler --- src/client/http_client.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/http_client.rs b/src/client/http_client.rs index 1df22dc9..59162c76 100644 --- a/src/client/http_client.rs +++ b/src/client/http_client.rs @@ -298,13 +298,13 @@ impl HttpClient { let verified_fingerprint = Arc::new(Mutex::new(None)); - let mut fingerprint = options.fingerprint.take(); + let mut expected_fingerprint = options.fingerprint.take(); - if fingerprint.is_some() { + if expected_fingerprint.is_some() { // do not store fingerprints passed via options in cache options.fingerprint_cache = false; } else if options.fingerprint_cache && options.prefix.is_some() { - fingerprint = load_fingerprint(options.prefix.as_ref().unwrap(), server); + expected_fingerprint = load_fingerprint(options.prefix.as_ref().unwrap(), server); } let mut ssl_connector_builder = SslConnector::builder(SslMethod::tls()).unwrap(); @@ -316,7 +316,7 @@ impl HttpClient { let fingerprint_cache = options.fingerprint_cache; let prefix = options.prefix.clone(); ssl_connector_builder.set_verify_callback(openssl::ssl::SslVerifyMode::PEER, move |valid, ctx| { - let (valid, fingerprint) = Self::verify_callback(valid, ctx, fingerprint.clone(), interactive); + let (valid, fingerprint) = Self::verify_callback(valid, ctx, expected_fingerprint.as_ref(), interactive); if valid { if let Some(fingerprint) = fingerprint { if fingerprint_cache && prefix.is_some() { @@ -474,9 +474,9 @@ impl HttpClient { } fn verify_callback( - valid: bool, ctx: - &mut X509StoreContextRef, - expected_fingerprint: Option, + valid: bool, + ctx: &mut X509StoreContextRef, + expected_fingerprint: Option<&String>, interactive: bool, ) -> (bool, Option) { if valid { return (true, None); } -- 2.20.1