bump base64 to 0.22

Author: bridiver

ppoprf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ppoprf"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Alex Davidson <coela@alxdavids.xyz>", "Ralph Ankele <rankele@brave.com>"]
 description = "Puncturable Partially-Oblivious Pseudo-Random Function"
 documentation = "https://docs.rs/ppoprf"
@@ -16,7 +16,7 @@ bitvec = { version = "1.0.1", features = ["serde"] }
 curve25519-dalek =  { version = "4.0.0", features = [ "rand_core", "serde" ] }
 serde = { version = "1.0.147", features = ["derive"] }
 strobe-rs = "0.10.0"
-base64 = "0.13.0"
+base64 = "0.22"
 bincode = "1.3.3"
 derive_more = "0.99"
 zeroize = { version = "1.5.5", features = [ "derive" ] }

ppoprf/examples/client.rs

@@ -13,6 +13,7 @@
 //! cargo run --example client
 //! ```
 
+use base64::{engine::Engine as _, prelude::BASE64_STANDARD};
 use env_logger::Env;
 use log::info;
 use ppoprf::ppoprf;
@@ -86,7 +87,7 @@ fn fetch_randomness(url: &str) -> reqwest::Result<()> {
     // used, which we don't currently coordinate, so skip this step.
     //let mut out = vec![0u8; ppoprf::COMPRESSED_POINT_LEN];
     //ppoprf::Client::finalize(message.as_bytes(), &md, &unblinded, &mut out);
-    let point = base64::encode(unblinded.as_bytes());
+    let point = BASE64_STANDARD.encode(unblinded.as_bytes());
     let proof = result.proof.is_some();
     let meta = if proof { " proof" } else { "" };
     info!("  {}{}", &point, &meta);

ppoprf/src/ppoprf.rs

@@ -11,6 +11,7 @@
 //! This construction is primarily used in the STAR protocol for
 //! providing secure randomness to clients.
 
+use base64::{engine::Engine as _, prelude::BASE64_STANDARD};
 use curve25519_dalek::traits::Identity;
 use rand::{rngs::OsRng, Rng};
 
@@ -288,15 +289,15 @@ fn point_serialize<S>(p: &Point, s: S) -> Result<S::Ok, S::Error>
 where
   S: ser::Serializer,
 {
-  s.serialize_str(&base64::encode(p.0 .0))
+  s.serialize_str(&BASE64_STANDARD.encode(p.0 .0))
 }
 
 fn point_deserialize<'de, D>(d: D) -> Result<Point, D::Error>
 where
   D: de::Deserializer<'de>,
 {
   let s: &str = de::Deserialize::deserialize(d)?;
-  let data = base64::decode(s).map_err(de::Error::custom)?;
+  let data = BASE64_STANDARD.decode(s).map_err(de::Error::custom)?;
   let fixed_data: [u8; 32] = data
     .try_into()
     .map_err(|_| de::Error::custom("Ristretto must be 32 bytes"))?;
@@ -623,7 +624,7 @@ mod tests {
       .expect("Should serialize to bincode");
 
     let expected = "qvgkBOX3v6c1LOCT5Kq+gkNThdZKqHAJClbRqjYWmAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH21zz6BGKHRL9pORR/hTW+FKDvE+OrKUQTF3tUHwjaCQJ4y7Cc0Y+Qgk+M41esYWMnb7xw31kKOFOtBW9K8W9mKwMMGFZGUxdw8a0YR+AcaR4oHwziNgXQOiYl9+HURiPWKgSC7x8pf72mezXiE73bnAQ+Ydwj1TiaXpObtvV73UFFQQXqHR1+dcom/BojKL4hyvKQwXEyjBip91w+Akrlxwv8NAaOL9VPRsgI/LJ+qWvbblaC1onIB9giUBNgnKk4P5juHAfkpVyW6kyQjufMFaegMpo9P47w84s4Bo4AtMizA3rcPw==";
-    assert_eq!(base64::encode(&pk_bincode), expected);
+    assert_eq!(BASE64_STANDARD.encode(&pk_bincode), expected);
 
     ServerPublicKey::load_from_bincode(&pk_bincode)
       .expect("Should load bincode");
@@ -651,7 +652,7 @@ mod tests {
       .expect("Should serialize to bincode");
 
     let expected = "BwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcPDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw==";
-    assert_eq!(base64::encode(&proof_bincode), expected);
+    assert_eq!(BASE64_STANDARD.encode(&proof_bincode), expected);
 
     ProofDLEQ::load_from_bincode(&proof_bincode).expect("Should load bincode");
   }

star-wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "star-wasm"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Rémi Berson <remi@brave.com>"]
 description = "WASM bindings for the STAR protocol"
 repository = "https://github.com/brave/sta-rs"
@@ -19,7 +19,7 @@ default = []
 sta-rs = { path = "../star", default-features = false }
 getrandom = { version = "0.2", features = ["js"] }
 wasm-bindgen = "0.2"
-base64 = "0.20"
+base64 = "0.22"
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]

star-wasm/src/lib.rs

@@ -7,7 +7,7 @@
 
 use wasm_bindgen::prelude::*;
 
-use base64::{decode, encode};
+use base64::{engine::Engine as _, prelude::BASE64_STANDARD};
 
 use sta_rs::{
   derive_ske_key, share_recover, MessageGenerator, Share, SingleMeasurement,
@@ -50,9 +50,9 @@ pub fn create_share(measurement: &[u8], threshold: u32, epoch: &str) -> String {
   }
   let WASMSharingMaterial { key, share, tag } = share_result.unwrap();
 
-  let key_b64 = encode(key);
-  let share_b64 = encode(share.to_bytes());
-  let tag_b64 = encode(tag);
+  let key_b64 = BASE64_STANDARD.encode(key);
+  let share_b64 = BASE64_STANDARD.encode(share.to_bytes());
+  let tag_b64 = BASE64_STANDARD.encode(tag);
 
   format!(
     r#"{{"key": "{key_b64}", "share": "{share_b64}", "tag": "{tag_b64}"}}"#
@@ -67,7 +67,9 @@ pub fn group_shares(serialized_shares: &str, epoch: &str) -> Option<String> {
   // 1. deserialize shares into Vec<Share>
   let shares: Vec<Share> = serialized_shares
     .split('\n')
-    .map(|chunk| Share::from_bytes(&decode(chunk).unwrap()).unwrap())
+    .map(|chunk| {
+      Share::from_bytes(&BASE64_STANDARD.decode(chunk).unwrap()).unwrap()
+    })
     .collect();
 
   // 2. call recover(shares)
@@ -81,5 +83,5 @@ pub fn group_shares(serialized_shares: &str, epoch: &str) -> Option<String> {
   let mut enc_key = vec![0u8; 16];
   derive_ske_key(&message, epoch.as_bytes(), &mut enc_key);
 
-  Some(encode(&enc_key))
+  Some(BASE64_STANDARD.encode(&enc_key))
 }