From 875078366799ad2ce8ca55230d1d7852f17783e3 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Fri, 4 Aug 2023 18:01:41 -0500
Subject: [PATCH] Update examples to use ring

---
 actix/Cargo.toml         | 4 ++--
 actix/examples/client.rs | 9 +++++++--
 actix/examples/server.rs | 3 +--
 actix/src/digest/ring.rs | 3 +++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/actix/Cargo.toml b/actix/Cargo.toml
index 431778d..05c3b45 100644
--- a/actix/Cargo.toml
+++ b/actix/Cargo.toml
@@ -21,11 +21,11 @@ ring = ["digest", "dep:ring"]
 
 [[example]]
 name = "server"
-required-features = ["server", "sha-2"]
+required-features = ["server", "ring"]
 
 [[example]]
 name = "client"
-required-features = ["client", "sha-2"]
+required-features = ["client", "ring"]
 
 [dependencies]
 actix-http = { version = "3.0.2", default-features = false }
diff --git a/actix/examples/client.rs b/actix/examples/client.rs
index 02099ce..bf380fa 100644
--- a/actix/examples/client.rs
+++ b/actix/examples/client.rs
@@ -1,7 +1,6 @@
 use actix_rt::task::JoinError;
 use awc::Client;
-use http_signature_normalization_actix::prelude::*;
-use sha2::{Digest, Sha256};
+use http_signature_normalization_actix::{digest::ring::Sha256, prelude::*, Canceled};
 use tracing::{error, info};
 use tracing_error::ErrorLayer;
 use tracing_subscriber::{layer::SubscriberExt, EnvFilter};
@@ -75,3 +74,9 @@ impl From<JoinError> for MyError {
         MyError::Canceled
     }
 }
+
+impl From<Canceled> for MyError {
+    fn from(_: Canceled) -> Self {
+        MyError::Canceled
+    }
+}
diff --git a/actix/examples/server.rs b/actix/examples/server.rs
index c296551..3bb46da 100644
--- a/actix/examples/server.rs
+++ b/actix/examples/server.rs
@@ -1,6 +1,5 @@
 use actix_web::{http::StatusCode, web, App, HttpRequest, HttpResponse, HttpServer, ResponseError};
-use http_signature_normalization_actix::prelude::*;
-use sha2::{Digest, Sha256};
+use http_signature_normalization_actix::{digest::ring::Sha256, prelude::*};
 use std::future::{ready, Ready};
 use tracing::info;
 use tracing_actix_web::TracingLogger;
diff --git a/actix/src/digest/ring.rs b/actix/src/digest/ring.rs
index 8a30ace..1a637b4 100644
--- a/actix/src/digest/ring.rs
+++ b/actix/src/digest/ring.rs
@@ -3,16 +3,19 @@
 use crate::digest::DigestName;
 
 /// A Sha256 digest backed by ring
+#[derive(Clone)]
 pub struct Sha256 {
     ctx: ring::digest::Context,
 }
 
 /// A Sha384 digest backed by ring
+#[derive(Clone)]
 pub struct Sha384 {
     ctx: ring::digest::Context,
 }
 
 /// A Sha512 digest backed by ring
+#[derive(Clone)]
 pub struct Sha512 {
     ctx: ring::digest::Context,
 }