From 855b1ad050dc486cf6e8a9c35854264740222df7 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 28 Feb 2023 15:55:19 -0600 Subject: [PATCH] chore: Update base64 This removes one of cargo's duplicate dependencies --- Cargo.toml | 2 +- src/cargo/sources/git/known_hosts.rs | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c6d470a2f52..c3900408dc7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ path = "src/cargo/lib.rs" [dependencies] anyhow = "1.0.47" -base64 = "0.13.1" +base64 = "0.21.0" bytesize = "1.0" cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } cargo-util = { path = "crates/cargo-util", version = "0.2.3" } diff --git a/src/cargo/sources/git/known_hosts.rs b/src/cargo/sources/git/known_hosts.rs index 7916b07f595..e4d073470ca 100644 --- a/src/cargo/sources/git/known_hosts.rs +++ b/src/cargo/sources/git/known_hosts.rs @@ -20,6 +20,9 @@ //! and revoked markers. See "FIXME" comments littered in this file. use crate::util::config::{Config, Definition, Value}; +use base64::engine::general_purpose::STANDARD; +use base64::engine::general_purpose::STANDARD_NO_PAD; +use base64::Engine as _; use git2::cert::{Cert, SshHostKeyType}; use git2::CertificateCheckStatus; use hmac::Mac; @@ -344,7 +347,7 @@ fn check_ssh_known_hosts( .collect(); for (patterns, key_type, key) in BUNDLED_KEYS { if !configured_hosts.contains(*patterns) { - let key = base64::decode(key).unwrap(); + let key = STANDARD.decode(key).unwrap(); known_hosts.push(KnownHost { location: KnownHostLocation::Bundled, patterns: patterns.to_string(), @@ -382,9 +385,8 @@ fn check_ssh_known_hosts_loaded( // support SHA256. let mut remote_fingerprint = cargo_util::Sha256::new(); remote_fingerprint.update(remote_host_key.clone()); - let remote_fingerprint = - base64::encode_config(remote_fingerprint.finish(), base64::STANDARD_NO_PAD); - let remote_host_key_encoded = base64::encode(remote_host_key); + let remote_fingerprint = STANDARD_NO_PAD.encode(remote_fingerprint.finish()); + let remote_host_key_encoded = STANDARD.encode(remote_host_key); for known_host in known_hosts { // The key type from libgit2 needs to match the key type from the host file. @@ -583,8 +585,8 @@ impl KnownHost { fn hashed_hostname_matches(host: &str, hashed: &str) -> bool { let Some((b64_salt, b64_host)) = hashed.split_once('|') else { return false; }; - let Ok(salt) = base64::decode(b64_salt) else { return false; }; - let Ok(hashed_host) = base64::decode(b64_host) else { return false; }; + let Ok(salt) = STANDARD.decode(b64_salt) else { return false; }; + let Ok(hashed_host) = STANDARD.decode(b64_host) else { return false; }; let Ok(mut mac) = hmac::Hmac::::new_from_slice(&salt) else { return false; }; mac.update(host.as_bytes()); let result = mac.finalize().into_bytes(); @@ -636,7 +638,7 @@ fn parse_known_hosts_line(line: &str, location: KnownHostLocation) -> Option