From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/4] client: improve fingerprint variable names
Date: Mon, 10 May 2021 10:52:32 +0200 [thread overview]
Message-ID: <20210510085234.775062-2-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20210510085234.775062-1-f.gruenbichler@proxmox.com>
and pass as reference instead of cloning.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
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<String>,
+ valid: bool,
+ ctx: &mut X509StoreContextRef,
+ expected_fingerprint: Option<&String>,
interactive: bool,
) -> (bool, Option<String>) {
if valid { return (true, None); }
--
2.20.1
next prev parent reply other threads:[~2021-05-10 8:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 8:52 [pbs-devel] [PATCH proxmox-backup 1/4] fix #3391: improve mismatched fingerprint handling Fabian Grünbichler
2021-05-10 8:52 ` Fabian Grünbichler [this message]
2021-05-10 8:52 ` [pbs-devel] [PATCH proxmox-backup 3/4] client: refactor verification callback Fabian Grünbichler
2021-05-10 8:52 ` [pbs-devel] [PATCH proxmox-backup 4/4] client: use stderr for all fingerprint confirm msgs Fabian Grünbichler
2021-05-11 11:14 ` [pbs-devel] applied-series: [PATCH proxmox-backup 1/4] fix #3391: improve mismatched fingerprint handling Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510085234.775062-2-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox