From f85878c89af95395e5e8b2101dc11df2a50290c6 Mon Sep 17 00:00:00 2001
From: onyinyang <onyinyang@torproject.org>
Date: Tue, 12 Sep 2023 18:24:48 -0400
Subject: [PATCH] Change base64 generator to match updates

---
 crates/lox-distributor/src/request_handler.rs | 3 ++-
 crates/lox-library/src/bridge_table.rs        | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/lox-distributor/src/request_handler.rs b/crates/lox-distributor/src/request_handler.rs
index c236a52..260923a 100644
--- a/crates/lox-distributor/src/request_handler.rs
+++ b/crates/lox-distributor/src/request_handler.rs
@@ -71,6 +71,7 @@ mod tests {
 
     use super::*;
 
+    use base64::{engine::general_purpose, Engine as _};
     use chrono::{Duration, Utc};
     use julianday::JulianDay;
     use lox_library::{
@@ -292,7 +293,7 @@ mod tests {
         rng.fill_bytes(&mut cert);
         let infostr: String = format!(
             "obfs4 cert={}, iat-mode=0",
-            base64::encode_config(cert, base64::STANDARD_NO_PAD)
+            general_purpose::STANDARD_NO_PAD.encode(cert)
         );
         res.info[..infostr.len()].copy_from_slice(infostr.as_bytes());
         res
diff --git a/crates/lox-library/src/bridge_table.rs b/crates/lox-library/src/bridge_table.rs
index d820bd0..434d2f5 100644
--- a/crates/lox-library/src/bridge_table.rs
+++ b/crates/lox-library/src/bridge_table.rs
@@ -13,6 +13,7 @@ use super::CMZ_B_TABLE;
 use aes_gcm::aead;
 use aes_gcm::aead::{generic_array::GenericArray, Aead, NewAead};
 use aes_gcm::Aes128Gcm;
+use base64::{engine::general_purpose, Engine as _};
 use curve25519_dalek::ristretto::CompressedRistretto;
 use curve25519_dalek::ristretto::RistrettoBasepointTable;
 use curve25519_dalek::scalar::Scalar;
@@ -170,6 +171,7 @@ impl BridgeLine {
             (bridges, None)
         }
     }
+
     /// Create a random BridgeLine for testing
     #[cfg(test)]
     pub fn random() -> Self {
@@ -197,7 +199,7 @@ impl BridgeLine {
         rng.fill_bytes(&mut cert);
         let infostr: String = format!(
             "obfs4 cert={}, iat-mode=0",
-            base64::encode_config(cert, base64::STANDARD_NO_PAD)
+            general_purpose::STANDARD_NO_PAD.encode(cert)
         );
         res.info[..infostr.len()].copy_from_slice(infostr.as_bytes());
         res