Move JWS out of acme_proto

acmed/src/acme_proto.rs

@@ -1,9 +1,9 @@
 use crate::acme_proto::account::AccountManager;
-use crate::acme_proto::jws::encode_kid;
 use crate::acme_proto::structs::{
     ApiError, Authorization, AuthorizationStatus, NewOrder, Order, OrderStatus,
 };
 use crate::certificate::Certificate;
+use crate::jws::encode_kid;
 use crate::storage;
 use acme_common::crypto::Csr;
 use acme_common::error::Error;
@@ -13,7 +13,6 @@ use std::fmt;
 mod account;
 mod certificate;
 mod http;
-pub mod jws;
 pub mod structs;
 
 #[derive(Clone, Debug, PartialEq)]

acmed/src/acme_proto/account.rs

@@ -1,8 +1,8 @@
 use crate::acme_proto::http;
-use crate::acme_proto::jws::algorithms::SignatureAlgorithm;
-use crate::acme_proto::jws::encode_jwk;
 use crate::acme_proto::structs::{Account, AccountResponse, Directory};
 use crate::certificate::Certificate;
+use crate::jws::algorithms::SignatureAlgorithm;
+use crate::jws::encode_jwk;
 use crate::storage;
 use acme_common::crypto::KeyPair;
 use acme_common::error::Error;

acmed/src/acme_proto/jws.rs → acmed/src/jws.rs

@@ -1,4 +1,4 @@
-use crate::acme_proto::jws::algorithms::SignatureAlgorithm;
+use crate::jws::algorithms::SignatureAlgorithm;
 use acme_common::b64_encode;
 use acme_common::crypto::{sha256, KeyPair};
 use acme_common::error::Error;

acmed/src/main.rs

@@ -7,6 +7,7 @@ mod acme_proto;
 mod certificate;
 mod config;
 mod hooks;
+mod jws;
 mod main_event_loop;
 mod rate_limits;
 mod storage;