Update to base64 0.22 (#1500)

Co-authored-by: Abraham Egnor <[email protected]>

Author: tottoto

Cargo.lock

@@ -79,7 +79,7 @@ tracing-unstable = ["dep:tracing", "dep:log", "bson3?/serde_json-1"]
 text-indexes-unstable = []
 
 [dependencies]
-base64 = "0.13.0"
+base64 = "0.22"
 bitflags = "2"
 chrono = { version = "0.4.32", default-features = false, features = [
     "now",

Cargo.toml

@@ -0,0 +1,9 @@
+use base64::{engine::general_purpose::STANDARD, DecodeError, Engine as _};
+
+pub(crate) fn encode<T: AsRef<[u8]>>(input: T) -> String {
+    STANDARD.encode(input)
+}
+
+pub(crate) fn decode<T: AsRef<[u8]>>(input: T) -> Result<Vec<u8>, DecodeError> {
+    STANDARD.decode(input)
+}

src/base64.rs

@@ -15,7 +15,7 @@ mod x509;
 
 use std::{borrow::Cow, fmt::Debug, str::FromStr};
 
-use crate::{bson::RawDocumentBuf, bson_compat::cstr, options::ClientOptions};
+use crate::{base64, bson::RawDocumentBuf, bson_compat::cstr, options::ClientOptions};
 use derive_where::derive_where;
 use hmac::{digest::KeyInit, Mac};
 use rand::Rng;

src/client/auth.rs

@@ -9,6 +9,7 @@ use http::Request;
 use serde::Deserialize;
 
 use crate::{
+    base64,
     bson::{doc, spec::BinarySubtype, Binary, Bson, Document},
     client::{
         auth::{

src/client/auth/aws.rs

@@ -18,6 +18,7 @@ use std::sync::LazyLock;
 use tokio::sync::RwLock;
 
 use crate::{
+    base64,
     bson::{Bson, Document},
     bson_compat::cstr,
     client::{

src/client/auth/scram.rs

@@ -25,6 +25,7 @@ pub use ::mongocrypt;
 
 pub mod action;
 pub mod atlas_search;
+mod base64;
 pub(crate) mod bson_compat;
 mod bson_util;
 pub mod change_stream;

src/lib.rs

@@ -26,6 +26,7 @@ use mongocrypt::ctx::{Algorithm, KmsProvider, KmsProviderType};
 use std::sync::LazyLock;
 
 use crate::{
+    base64,
     client_encryption::{ClientEncryption, EncryptKey},
     options::{CollectionOptions, ReadConcern, TlsOptions, WriteConcern},
     Client,

src/test/csfle.rs

@@ -13,6 +13,7 @@ use mongocrypt::ctx::Algorithm;
 use tokio::net::TcpListener;
 
 use crate::{
+    base64,
     bson::{
         doc,
         rawdoc,