refactor(jwa): move algorithm types into jose-jwa

jose-jwa/Cargo.toml

@@ -16,6 +16,9 @@ readme = "README.md"
 edition = "2021"
 rust-version = "1.63"
 
+[dependencies]
+serde = { version = "1.0.136", default-features = false, features = ["alloc", "derive"] }
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]

jose-jwa/src/lib.rs

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 #![doc = include_str!("../README.md")]
 #![no_std]
 #![cfg_attr(docsrs, feature(doc_cfg))]
@@ -15,3 +18,88 @@
     unused_lifetimes,
     unused_qualifications
 )]
+
+use serde::{Deserialize, Serialize};
+
+/// Algorithms
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[allow(missing_docs)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum Algorithm {
+    Signing(Signing),
+}
+
+impl From<Signing> for Algorithm {
+    #[inline(always)]
+    fn from(alg: Signing) -> Self {
+        Self::Signing(alg)
+    }
+}
+
+/// Signing Algorithms
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub enum Signing {
+    /// EdDSA signature algorithms (Optional)
+    #[serde(rename = "EdDSA")]
+    EdDsa,
+
+    /// ECDSA using P-256 and SHA-256 (Recommended+)
+    #[serde(rename = "ES256")]
+    Es256,
+
+    /// ECDSA using secp256k1 curve and SHA-256 (Optional)
+    #[serde(rename = "ES256K")]
+    Es256K,
+
+    /// ECDSA using P-384 and SHA-384 (Optional)
+    #[serde(rename = "ES384")]
+    Es384,
+
+    /// ECDSA using P-521 and SHA-512 (Optional)
+    #[serde(rename = "ES512")]
+    Es512,
+
+    /// HMAC using SHA-256 (Required)
+    #[serde(rename = "HS256")]
+    Hs256,
+
+    /// HMAC using SHA-384 (Optional)
+    #[serde(rename = "HS384")]
+    Hs384,
+
+    /// HMAC using SHA-512 (Optional)
+    #[serde(rename = "HS512")]
+    Hs512,
+
+    /// RSASSA-PSS using SHA-256 and MGF1 with SHA-256 (Optional)
+    #[serde(rename = "PS256")]
+    Ps256,
+
+    /// RSASSA-PSS using SHA-384 and MGF1 with SHA-384 (Optional)
+    #[serde(rename = "PS384")]
+    Ps384,
+
+    /// RSASSA-PSS using SHA-512 and MGF1 with SHA-512 (Optional)
+    #[serde(rename = "PS512")]
+    Ps512,
+
+    /// RSASSA-PKCS1-v1_5 using SHA-256 (Recommended)
+    #[serde(rename = "RS256")]
+    Rs256,
+
+    /// RSASSA-PKCS1-v1_5 using SHA-384 (Optional)
+    #[serde(rename = "RS384")]
+    Rs384,
+
+    /// RSASSA-PKCS1-v1_5 using SHA-512 (Optional)
+    #[serde(rename = "RS512")]
+    Rs512,
+
+    /// No digital signature or MAC performed (Optional)
+    ///
+    /// This variant is renamed as `Null` to avoid colliding with `Option::None`.
+    #[serde(rename = "none")]
+    Null,
+}

jose/Cargo.toml

@@ -16,6 +16,7 @@ rsa = ["dep:rand_core", "dep:rsa"]
 serde = { version = "1.0.136", default-features = false, features = ["alloc", "derive"] }
 zeroize = { version = "1.5.7", default-features = false, features = ["alloc", "serde"] }
 subtle = { version = "2.4.1", default-features = false }
+jose-jwa = { path = "../jose-jwa" }
 
 # Optional Dependencies
 url = { version = "2.2.2", default-features = false, optional = true, features = ["serde"] }

jose/src/alg.rs

@@ -1,90 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! IANA-Defined Algorithms
 
-use serde::{Deserialize, Serialize};
-
-/// Algorithms
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[allow(missing_docs)]
-#[serde(untagged)]
-#[non_exhaustive]
-pub enum Algorithm {
-    Signing(Signing),
-    Unknown(alloc::string::String),
-}
-
-impl From<Signing> for Algorithm {
-    #[inline(always)]
-    fn from(alg: Signing) -> Self {
-        Self::Signing(alg)
-    }
-}
-
-/// Signing Algorithms
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum Signing {
-    /// EdDSA signature algorithms (Optional)
-    #[serde(rename = "EdDSA")]
-    EdDsa,
-
-    /// ECDSA using P-256 and SHA-256 (Recommended+)
-    #[serde(rename = "ES256")]
-    Es256,
-
-    /// ECDSA using secp256k1 curve and SHA-256 (Optional)
-    #[serde(rename = "ES256K")]
-    Es256K,
-
-    /// ECDSA using P-384 and SHA-384 (Optional)
-    #[serde(rename = "ES384")]
-    Es384,
-
-    /// ECDSA using P-521 and SHA-512 (Optional)
-    #[serde(rename = "ES512")]
-    Es512,
-
-    /// HMAC using SHA-256 (Required)
-    #[serde(rename = "HS256")]
-    Hs256,
-
-    /// HMAC using SHA-384 (Optional)
-    #[serde(rename = "HS384")]
-    Hs384,
-
-    /// HMAC using SHA-512 (Optional)
-    #[serde(rename = "HS512")]
-    Hs512,
-
-    /// RSASSA-PSS using SHA-256 and MGF1 with SHA-256 (Optional)
-    #[serde(rename = "PS256")]
-    Ps256,
-
-    /// RSASSA-PSS using SHA-384 and MGF1 with SHA-384 (Optional)
-    #[serde(rename = "PS384")]
-    Ps384,
-
-    /// RSASSA-PSS using SHA-512 and MGF1 with SHA-512 (Optional)
-    #[serde(rename = "PS512")]
-    Ps512,
-
-    /// RSASSA-PKCS1-v1_5 using SHA-256 (Recommended)
-    #[serde(rename = "RS256")]
-    Rs256,
-
-    /// RSASSA-PKCS1-v1_5 using SHA-384 (Optional)
-    #[serde(rename = "RS384")]
-    Rs384,
-
-    /// RSASSA-PKCS1-v1_5 using SHA-512 (Optional)
-    #[serde(rename = "RS512")]
-    Rs512,
-
-    /// No digital signature or MAC performed (Optional)
-    ///
-    /// This variant is renamed as `Null` to avoid colliding with `Option::None`.
-    #[serde(rename = "none")]
-    Null,
-}
+pub use jose_jwa::{Algorithm, Signing};

jose/src/b64/bytes.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use alloc::boxed::Box;
 use alloc::string::String;

jose/src/b64/codec/dec.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use core::convert::Infallible;
 use core::marker::PhantomData;

jose/src/b64/codec/enc.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use core::marker::PhantomData;
 use zeroize::Zeroizing;

jose/src/b64/codec/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 mod dec;
 mod enc;

jose/src/b64/json.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 #![cfg(feature = "jws")]
 

jose/src/b64/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! Base64 Conversion Utilities
 

jose/src/b64/optional.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use super::{Config, Encoder, Update, UrlSafe};
 

jose/src/b64/secret.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use alloc::boxed::Box;
 use core::fmt::Debug;

jose/src/jwk/crypto/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK Cryptographic Implementation
 

jose/src/jwk/crypto/rcrypto/key.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use super::super::super::*;
 use crate::key::rcrypto::{Key, Type};

jose/src/jwk/crypto/rcrypto/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK integrations with RustCrypto types
 

jose/src/jwk/crypto/rcrypto/p256.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 #![cfg(feature = "p256")]
 

jose/src/jwk/crypto/rcrypto/p384.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 #![cfg(feature = "p384")]
 

jose/src/jwk/crypto/rcrypto/rsa.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 #![cfg(feature = "rsa")]
 

jose/src/jwk/key/ec.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK elliptic-curve key material.
 

jose/src/jwk/key/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK key material.
 

jose/src/jwk/key/oct.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK symmetric key material.
 

jose/src/jwk/key/okp.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK CFRG-curve key material.
 

jose/src/jwk/key/rsa.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK RSA key material.
 

jose/src/jwk/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK: JSON Web Key
 

jose/src/jwk/prm.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWK parameter types.
 
@@ -55,8 +55,7 @@ impl<T: Into<Algorithm>> From<T> for Parameters {
 
         let cls = match alg {
             Some(Algorithm::Signing(..)) => Some(Class::Signing),
-            Some(Algorithm::Unknown(..)) => None,
-            None => None,
+            _ => None,
         };
 
         Self {

jose/src/jws/crypto/core.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use alloc::vec::Vec;
 

jose/src/jws/crypto/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWS Cryptographic Implementation
 

jose/src/jws/crypto/rcrypto/hmac.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 #![cfg(feature = "hmac")]
 

jose/src/jws/crypto/rcrypto/key.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use alloc::boxed::Box;
 

jose/src/jws/crypto/rcrypto/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! JWS integrations with RustCrypto types