From fcb323d7721fec7020c0c3260af4b9369db2d6e5 Mon Sep 17 00:00:00 2001
From: Cameron Pickett <pickett@meta.com>
Date: Wed, 28 Aug 2024 11:18:04 -0700
Subject: [PATCH] Upgrade base64 to 0.21 (#123)

Summary: Pull Request resolved: https://github.com/facebookresearch/Private-ID/pull/123

Reviewed By: zertosh

Differential Revision: D61737689

fbshipit-source-id: dc98887dd6b346f11d8efe7ffa085311f6110c37
---
 protocol/Cargo.toml          | 2 +-
 protocol/src/dpmc/helper.rs  | 4 +++-
 protocol/src/dpmc/partner.rs | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index b31027e..fd11f9d 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2021"
 common = {path = "../common", version = "0.1.0"}
 crypto = {path = "../crypto", version = "0.1.0"}
 
-base64 = "0.13"
+base64 = "0.21.7"
 csv = "1.1.1"
 fernet = "0.2.1"
 hex = "0.4.2"
diff --git a/protocol/src/dpmc/helper.rs b/protocol/src/dpmc/helper.rs
index 20877a5..93162c3 100644
--- a/protocol/src/dpmc/helper.rs
+++ b/protocol/src/dpmc/helper.rs
@@ -10,6 +10,8 @@ use std::path::Path;
 use std::sync::Arc;
 use std::sync::RwLock;
 
+use base64::engine::general_purpose::URL_SAFE;
+use base64::Engine;
 use common::permutations::gen_permute_pattern;
 use common::permutations::permute;
 use common::permutations::undo_permute;
@@ -162,7 +164,7 @@ impl HelperDpmcProtocol for HelperDpmc {
                         let y = self.ec_cipher.to_bytes(&x);
                         y[0].buffer.clone()
                     };
-                    base64::encode_config(aes_key_bytes, base64::URL_SAFE)
+                    URL_SAFE.encode(aes_key_bytes)
                 };
 
                 let alpha_t = {
diff --git a/protocol/src/dpmc/partner.rs b/protocol/src/dpmc/partner.rs
index 6ffaa15..e3b2ecb 100644
--- a/protocol/src/dpmc/partner.rs
+++ b/protocol/src/dpmc/partner.rs
@@ -5,6 +5,8 @@ use std::convert::TryInto;
 use std::sync::Arc;
 use std::sync::RwLock;
 
+use base64::engine::general_purpose::URL_SAFE;
+use base64::Engine;
 use common::permutations::gen_permute_pattern;
 use common::permutations::permute;
 use common::timer;
@@ -120,7 +122,7 @@ impl PartnerDpmc {
                         .ec_cipher
                         .to_bytes(&[self.partner_scalar * (*helper_pk)]);
                     let aes_key_bytes = x[0].buffer.clone();
-                    base64::encode_config(aes_key_bytes, base64::URL_SAFE)
+                    URL_SAFE.encode(aes_key_bytes)
                 };
                 Ok(())
             }