Update base64 to 0.21.0 (#278)

* chore: update base64 to 0.21.0

Author: Alexey-N-Chernyshov

Cargo.toml

@@ -15,7 +15,7 @@ include = ["src/**/*", "benches/**/*", "tests/**/*", "LICENSE", "README.md", "CH
 serde_json = "1.0"
 serde = {version = "1.0", features = ["derive"] }
 ring = { version = "0.16.5", features = ["std"] }
-base64 = "0.13"
+base64 = "0.21.0"
 # For PEM decoding
 pem = {version = "1", optional = true}
 simple_asn1 = {version = "0.6", optional = true}

src/decoding.rs

@@ -1,3 +1,4 @@
+use base64::{engine::general_purpose::STANDARD, Engine};
 use serde::de::DeserializeOwned;
 
 use crate::algorithms::AlgorithmFamily;
@@ -56,7 +57,7 @@ impl DecodingKey {
 
     /// If you're using HMAC with a base64 encoded secret, use this.
     pub fn from_base64_secret(secret: &str) -> Result<Self> {
-        let out = base64::decode(secret)?;
+        let out = STANDARD.decode(secret)?;
         Ok(DecodingKey { family: AlgorithmFamily::Hmac, kind: DecodingKeyKind::SecretOrDer(out) })
     }
 

src/encoding.rs

@@ -1,3 +1,4 @@
+use base64::{engine::general_purpose::STANDARD, Engine};
 use serde::ser::Serialize;
 
 use crate::algorithms::AlgorithmFamily;
@@ -24,7 +25,7 @@ impl EncodingKey {
 
     /// If you have a base64 HMAC secret, use that.
     pub fn from_base64_secret(secret: &str) -> Result<Self> {
-        let out = base64::decode(secret)?;
+        let out = STANDARD.decode(secret)?;
         Ok(EncodingKey { family: AlgorithmFamily::Hmac, content: out })
     }
 

src/header.rs

@@ -1,5 +1,6 @@
 use std::result;
 
+use base64::{engine::general_purpose::STANDARD, Engine};
 use serde::{Deserialize, Serialize};
 
 use crate::algorithms::Algorithm;
@@ -93,7 +94,9 @@ impl Header {
         Ok(self
             .x5c
             .as_ref()
-            .map(|b64_certs| b64_certs.iter().map(base64::decode).collect::<result::Result<_, _>>())
+            .map(|b64_certs| {
+                b64_certs.iter().map(|x| STANDARD.decode(x)).collect::<result::Result<_, _>>()
+            })
             .transpose()?)
     }
 }

src/jwk.rs

@@ -370,13 +370,13 @@ impl JwkSet {
 #[cfg(test)]
 mod tests {
     use crate::jwk::{AlgorithmParameters, JwkSet, OctetKeyType};
+    use crate::serialization::b64_encode;
     use crate::Algorithm;
     use serde_json::json;
 
     #[test]
     fn check_hs256() {
-        let key =
-            base64::encode_config("abcdefghijklmnopqrstuvwxyz012345", base64::URL_SAFE_NO_PAD);
+        let key = b64_encode("abcdefghijklmnopqrstuvwxyz012345");
         let jwks_json = json!({
             "keys": [
                 {

src/serialization.rs

@@ -1,13 +1,14 @@
+use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
 use serde::{Deserialize, Serialize};
 
 use crate::errors::Result;
 
 pub(crate) fn b64_encode<T: AsRef<[u8]>>(input: T) -> String {
-    base64::encode_config(input, base64::URL_SAFE_NO_PAD)
+    URL_SAFE_NO_PAD.encode(input)
 }
 
 pub(crate) fn b64_decode<T: AsRef<[u8]>>(input: T) -> Result<Vec<u8>> {
-    base64::decode_config(input, base64::URL_SAFE_NO_PAD).map_err(|e| e.into())
+    URL_SAFE_NO_PAD.decode(input).map_err(|e| e.into())
 }
 
 /// Serializes a struct to JSON and encodes it in base64

tests/header/mod.rs

@@ -1,3 +1,4 @@
+use base64::{engine::general_purpose::STANDARD, Engine};
 use jsonwebtoken::Header;
 
 static CERT_CHAIN: [&str; 3] = include!("cert_chain.json");
@@ -14,7 +15,7 @@ fn x5c_der_empty_chain() {
 #[test]
 fn x5c_der_valid_chain() {
     let der_chain: Vec<Vec<u8>> =
-        CERT_CHAIN.iter().map(base64::decode).collect::<Result<_, _>>().unwrap();
+        CERT_CHAIN.iter().map(|x| STANDARD.decode(x)).collect::<Result<_, _>>().unwrap();
 
     let x5c = Some(CERT_CHAIN.iter().map(ToString::to_string).collect());
     let header = Header { x5c, ..Default::default() };