From 38e4da690f281cae3ee257604369e43619640978 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@microsoft.com>
Date: Fri, 3 Feb 2023 20:11:44 +0000
Subject: [PATCH 1/2] Update base64 to 0.21.0

---
 Cargo.lock              | 4 ++--
 crates/cache/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 36c5914e8609..8641a916fc3e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -153,9 +153,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.13.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 
 [[package]]
 name = "base64ct"
diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml
index 3ebd15bdbac9..b7fb059880d1 100644
--- a/crates/cache/Cargo.toml
+++ b/crates/cache/Cargo.toml
@@ -10,7 +10,7 @@ edition.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-base64 = "0.13.0"
+base64 = "0.21.0"
 bincode = "1.1.4"
 directories-next = "2.0"
 file-per-thread-logger = "0.1.1"

From 1b26b37a47e1dffcfc2f196ead0d354a1e4b2361 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@microsoft.com>
Date: Wed, 1 Feb 2023 04:59:55 +0000
Subject: [PATCH 2/2] Update code for base64 0.21.0

---
 crates/cache/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/cache/src/lib.rs b/crates/cache/src/lib.rs
index 64f7d8e26267..a997846c1af1 100644
--- a/crates/cache/src/lib.rs
+++ b/crates/cache/src/lib.rs
@@ -1,3 +1,4 @@
+use base64::Engine;
 use log::{debug, trace, warn};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -86,7 +87,7 @@ impl<'config> ModuleCacheEntry<'config> {
         state.hash(&mut hasher);
         let hash: [u8; 32] = hasher.0.finalize().into();
         // standard encoding uses '/' which can't be used for filename
-        let hash = base64::encode_config(&hash, base64::URL_SAFE_NO_PAD);
+        let hash = base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(&hash);
 
         if let Some(cached_val) = inner.get_data(&hash) {
             if let Some(val) = deserialize(state, cached_val) {