From bf8e0e5f69aa897e8d1fc109853042db651e85aa Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Sat, 25 Nov 2023 19:43:33 -0600
Subject: [PATCH] Update dependencies - ring is public

---
 actix/Cargo.toml         | 10 +++++-----
 actix/src/digest/ring.rs |  6 ++++--
 actix/src/digest/sha2.rs |  6 ++++--
 actix/src/digest/sha3.rs |  6 ++++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/actix/Cargo.toml b/actix/Cargo.toml
index 2a408ba..98defa7 100644
--- a/actix/Cargo.toml
+++ b/actix/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "http-signature-normalization-actix"
 description = "An HTTP Signatures library that leaves the signing to you"
-version = "0.10.4"
+version = "0.11.0"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"
@@ -32,13 +32,13 @@ actix-http = { version = "3.0.2", default-features = false }
 actix-rt = "2.6.0"
 actix-web = { version = "4.0.0", default-features = false, optional = true }
 awc = { version = "3.0.0", default-features = false, optional = true }
-base64 = { version = "0.13", optional = true }
+base64 = { version = "0.21", optional = true }
 futures-core = "0.3.28"
 http-signature-normalization = { version = "0.7.0", path = ".." }
-ring = { version = "0.16.20", optional = true }
+ring = { version = "0.17.5", optional = true }
 sha2 = { version = "0.10", optional = true }
 sha3 = { version = "0.10", optional = true }
-streem = "0.1.1"
+streem = "0.2.0"
 thiserror = "1.0"
 tokio = { version = "1", default-features = false, features = ["sync"] }
 tracing = "0.1"
@@ -47,7 +47,7 @@ tracing-futures = "0.2"
 
 [dev-dependencies]
 actix-rt = "2.6.0"
-tracing-actix-web = { version = "0.6.0" }
+tracing-actix-web = { version = "0.7.0" }
 tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [package.metadata.docs.rs]
diff --git a/actix/src/digest/ring.rs b/actix/src/digest/ring.rs
index 1a637b4..e345518 100644
--- a/actix/src/digest/ring.rs
+++ b/actix/src/digest/ring.rs
@@ -96,11 +96,12 @@ impl DigestName for Sha512 {
 mod client {
     use super::*;
     use crate::digest::DigestCreate;
+    use base64::prelude::*;
 
     fn create(mut context: ring::digest::Context, input: &[u8]) -> String {
         context.update(input);
         let digest = context.finish();
-        base64::encode(digest.as_ref())
+        BASE64_STANDARD.encode(digest.as_ref())
     }
 
     impl DigestCreate for Sha256 {
@@ -126,6 +127,7 @@ mod client {
 mod server {
     use super::*;
     use crate::digest::{DigestPart, DigestVerify};
+    use base64::prelude::*;
     use tracing::{debug, warn};
 
     fn verify(context: ring::digest::Context, name: &str, parts: &[DigestPart]) -> bool {
@@ -135,7 +137,7 @@ mod server {
         {
             debug!("Verifying digest type, {}", name);
             let digest = context.finish();
-            let encoded = base64::encode(digest.as_ref());
+            let encoded = BASE64_STANDARD.encode(digest.as_ref());
 
             return part.digest == encoded;
         }
diff --git a/actix/src/digest/sha2.rs b/actix/src/digest/sha2.rs
index 56dfb90..af2a63d 100644
--- a/actix/src/digest/sha2.rs
+++ b/actix/src/digest/sha2.rs
@@ -21,13 +21,14 @@ impl DigestName for Sha512 {
 mod client {
     use super::*;
     use crate::digest::DigestCreate;
+    use base64::prelude::*;
 
     fn create<D: sha2::Digest + sha2::digest::FixedOutputReset>(
         digest: &mut D,
         input: &[u8],
     ) -> String {
         sha2::Digest::update(digest, input);
-        base64::encode(&digest.finalize_reset())
+        BASE64_STANDARD.encode(&digest.finalize_reset())
     }
 
     impl DigestCreate for Sha224 {
@@ -59,6 +60,7 @@ mod client {
 mod server {
     use super::*;
     use crate::digest::{DigestPart, DigestVerify};
+    use base64::prelude::*;
     use tracing::{debug, warn};
 
     fn verify<D: sha2::Digest + sha2::digest::FixedOutputReset>(
@@ -71,7 +73,7 @@ mod server {
             .find(|p| p.algorithm.to_lowercase() == name.to_lowercase())
         {
             debug!("Verifying digest type, {}", name);
-            let encoded = base64::encode(&digest.finalize_reset());
+            let encoded = BASE64_STANDARD.encode(&digest.finalize_reset());
 
             return part.digest == encoded;
         }
diff --git a/actix/src/digest/sha3.rs b/actix/src/digest/sha3.rs
index a889f0d..a103525 100644
--- a/actix/src/digest/sha3.rs
+++ b/actix/src/digest/sha3.rs
@@ -44,13 +44,14 @@ impl DigestName for Sha3_512 {
 mod client {
     use super::*;
     use crate::digest::DigestCreate;
+    use base64::prelude::*;
 
     fn create<D: sha3::Digest + sha3::digest::FixedOutputReset>(
         digest: &mut D,
         input: &[u8],
     ) -> String {
         digest.update(input);
-        base64::encode(&digest.finalize_reset())
+        BASE64_STANDARD.encode(&digest.finalize_reset())
     }
 
     impl DigestCreate for Sha3_224 {
@@ -112,6 +113,7 @@ mod client {
 mod server {
     use super::*;
     use crate::digest::{DigestPart, DigestVerify};
+    use base64::prelude::*;
     use tracing::{debug, warn};
 
     fn verify<D: sha3::Digest + sha3::digest::FixedOutputReset>(
@@ -124,7 +126,7 @@ mod server {
             .find(|p| p.algorithm.to_lowercase() == name.to_lowercase())
         {
             debug!("Verifying digest type, {}", name);
-            let encoded = base64::encode(&digest.finalize_reset());
+            let encoded = BASE64_STANDARD.encode(&digest.finalize_reset());
 
             return part.digest == encoded;
         }