Merge pull request #451 from a-wing/master

update base64 version to 0.21.2

Author: yngrtc

examples/examples/signal/Cargo.toml

@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 tokio = { version = "1.15.0", features = ["full"] }
 anyhow = "1.0.52"
-base64 = "0.13.0"
+base64 = "0.21.2"
 lazy_static = "1.4"
 hyper = { version = "0.14.16", features = ["full"] }

examples/examples/signal/src/lib.rs

@@ -2,6 +2,8 @@
 #![allow(dead_code)]
 
 use anyhow::Result;
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Method, Request, Response, Server, StatusCode};
 use std::net::SocketAddr;
@@ -92,13 +94,13 @@ pub fn encode(b: &str) -> String {
     //    b = zip(b)
     //}
 
-    base64::encode(b)
+    BASE64_STANDARD.encode(b)
 }
 
 /// decode decodes the input from base64
 /// It can optionally unzip the input after decoding
 pub fn decode(s: &str) -> Result<String> {
-    let b = base64::decode(s)?;
+    let b = BASE64_STANDARD.decode(s)?;
 
     //if COMPRESS {
     //    b = unzip(b)

stun/Cargo.toml

@@ -21,7 +21,7 @@ tokio = { version = "1.19", features = ["full"] }
 lazy_static = "1.4"
 url = "2.2"
 rand = "0.8.5"
-base64 = "0.13.0"
+base64 = "0.21.2"
 subtle = "2.4"
 crc = "3.0"
 ring = "0.16.20"

stun/benches/bench.rs

@@ -1,3 +1,5 @@
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use criterion::{criterion_group, criterion_main, Criterion};
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
@@ -623,7 +625,7 @@ fn benchmark_xoraddr(c: &mut Criterion) {
 
     {
         let mut m = Message::new();
-        let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+        let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
 
         m.transaction_id.0.copy_from_slice(&transaction_id);
         let addr_value = [0, 1, 156, 213, 244, 159, 56, 174]; //hex.DecodeString("00019cd5f49f38ae")

stun/examples/stun_decode.rs

@@ -1,3 +1,5 @@
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use clap::{App, Arg};
 
 use stun::message::Message;
@@ -28,7 +30,7 @@ fn main() {
     }
 
     let encoded_data = matches.value_of("data").unwrap();
-    let decoded_data = match base64::decode(encoded_data) {
+    let decoded_data = match BASE64_STANDARD.decode(encoded_data) {
         Ok(d) => d,
         Err(e) => panic!("Unable to decode base64 value: {e}"),
     };

stun/src/message.rs

@@ -5,6 +5,8 @@ use crate::agent::*;
 use crate::attributes::*;
 use crate::error::*;
 
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use rand::Rng;
 use std::fmt;
 use std::io::{Read, Write};
@@ -64,7 +66,7 @@ pub struct Message {
 
 impl fmt::Display for Message {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let t_id = base64::encode(self.transaction_id.0);
+        let t_id = BASE64_STANDARD.encode(self.transaction_id.0);
         write!(
             f,
             "{} l={} attrs={} id={}",

stun/src/xoraddr/xoraddr_test.rs

@@ -1,6 +1,8 @@
 use super::*;
 use crate::checks::*;
 
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use std::io::BufReader;
 
 #[test]
@@ -36,7 +38,7 @@ fn test_xor_safe_bsmaller() -> Result<()> {
 #[test]
 fn test_xormapped_address_get_from() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let addr_value = vec![0x00, 0x01, 0x9c, 0xd5, 0xf4, 0x9f, 0x38, 0xae];
     m.add(ATTR_XORMAPPED_ADDRESS, &addr_value);
@@ -104,7 +106,7 @@ fn test_xormapped_address_get_from() -> Result<()> {
 #[test]
 fn test_xormapped_address_get_from_invalid() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let expected_ip: IpAddr = "213.141.156.236".parse().unwrap();
     let expected_port = 21254u16;
@@ -134,7 +136,7 @@ fn test_xormapped_address_get_from_invalid() -> Result<()> {
 #[test]
 fn test_xormapped_address_add_to() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let expected_ip: IpAddr = "213.141.156.236".parse().unwrap();
     let expected_port = 21254u16;
@@ -166,7 +168,7 @@ fn test_xormapped_address_add_to() -> Result<()> {
 #[test]
 fn test_xormapped_address_add_to_ipv6() -> Result<()> {
     let mut m = Message::new();
-    let transaction_id = base64::decode("jxhBARZwX+rsC6er").unwrap();
+    let transaction_id = BASE64_STANDARD.decode("jxhBARZwX+rsC6er").unwrap();
     m.transaction_id.0.copy_from_slice(&transaction_id);
     let expected_ip: IpAddr = "fe80::dc2b:44ff:fe20:6009".parse().unwrap();
     let expected_port = 21254u16;

turn/Cargo.toml

@@ -20,7 +20,7 @@ stun = { version = "0.4.3", path = "../stun" }
 tokio = { version = "1.19", features = ["full"] }
 async-trait = "0.1.56"
 log = "0.4.16"
-base64 = "0.13.0"
+base64 = "0.21.2"
 rand = "0.8.5"
 ring = "0.16.20"
 md-5 = "0.10.1"

turn/src/auth/mod.rs

@@ -6,6 +6,8 @@ use crate::error::*;
 use std::net::SocketAddr;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use md5::{Digest, Md5};
 use ring::hmac;
 
@@ -30,7 +32,7 @@ fn long_term_credentials(username: &str, shared_secret: &str) -> String {
         shared_secret.as_bytes(),
     );
     let password = hmac::sign(&mac, username.as_bytes()).as_ref().to_vec();
-    base64::encode(password)
+    BASE64_STANDARD.encode(password)
 }
 
 // generate_auth_key is a convenience function to easily generate keys in the format used by AuthHandler

turn/src/client/mod.rs

@@ -11,6 +11,8 @@ use crate::error::*;
 use crate::proto::{
     chandata::*, data::*, lifetime::*, peeraddr::*, relayaddr::*, reqtrans::*, PROTO_UDP,
 };
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use binding::*;
 use relay_conn::*;
 use transaction::*;
@@ -103,7 +105,7 @@ impl RelayConnObserver for ClientInternal {
         to: &str,
         ignore_result: bool,
     ) -> Result<TransactionResult> {
-        let tr_key = base64::encode(msg.transaction_id.0);
+        let tr_key = BASE64_STANDARD.encode(msg.transaction_id.0);
 
         let mut tr = Transaction::new(TransactionConfig {
             key: tr_key.clone(),
@@ -341,7 +343,7 @@ impl ClientInternal {
         // - stun.ClassSuccessResponse
         // - stun.ClassErrorResponse
 
-        let tr_key = base64::encode(msg.transaction_id.0);
+        let tr_key = BASE64_STANDARD.encode(msg.transaction_id.0);
 
         let mut tm = tr_map.lock().await;
         if tm.find(&tr_key).is_none() {