diff --git a/src/decoding.rs b/src/decoding.rs index 9974b42f..6f87fe61 100644 --- a/src/decoding.rs +++ b/src/decoding.rs @@ -229,7 +229,7 @@ fn verify_signature_body( return Err(new_error(ErrorKind::InvalidSignature)); } - return Ok(()); + Ok(()) } /// Verify signature of a JWT, and return header object and raw payload diff --git a/src/encoding.rs b/src/encoding.rs index d57ec541..dda26c4c 100644 --- a/src/encoding.rs +++ b/src/encoding.rs @@ -153,7 +153,7 @@ pub fn encode_jws( Ok(Jws { protected: encoded_header, payload: encoded_claims, - signature: signature, + signature, _pd: Default::default(), }) } diff --git a/src/header.rs b/src/header.rs index 4ec2dfd1..16e7bde3 100644 --- a/src/header.rs +++ b/src/header.rs @@ -8,13 +8,13 @@ use crate::errors::Result; use crate::jwk::Jwk; use crate::serialization::b64_decode; -const ZIP_SERIAL_DEFLATE: &'static str = "DEF"; -const ENC_A128CBC_HS256: &'static str = "A128CBC-HS256"; -const ENC_A192CBC_HS384: &'static str = "A192CBC-HS384"; -const ENC_A256CBC_HS512: &'static str = "A256CBC-HS512"; -const ENC_A128GCM: &'static str = "A128GCM"; -const ENC_A192GCM: &'static str = "A192GCM"; -const ENC_A256GCM: &'static str = "A256GCM"; +const ZIP_SERIAL_DEFLATE: &str = "DEF"; +const ENC_A128CBC_HS256: &str = "A128CBC-HS256"; +const ENC_A192CBC_HS384: &str = "A192CBC-HS384"; +const ENC_A256CBC_HS512: &str = "A256CBC-HS512"; +const ENC_A128GCM: &str = "A128GCM"; +const ENC_A192GCM: &str = "A192GCM"; +const ENC_A256GCM: &str = "A256GCM"; /// Encryption algorithm for encrypted payloads. /// @@ -22,7 +22,7 @@ const ENC_A256GCM: &'static str = "A256GCM"; /// /// Values defined in [RFC7518#5.1](https://datatracker.ietf.org/doc/html/rfc7518#section-5.1). #[derive(Debug, Clone, PartialEq, Eq, Hash)] -#[allow(clippy::upper_case_acronyms)] +#[allow(clippy::upper_case_acronyms, non_camel_case_types)] pub enum Enc { A128CBC_HS256, A192CBC_HS384, @@ -98,10 +98,9 @@ impl<'de> Deserialize<'de> for Zip { { let s = String::deserialize(deserializer)?; match s.as_str() { - ZIP_SERIAL_DEFLATE => return Ok(Zip::Deflate), - _ => (), + ZIP_SERIAL_DEFLATE => Ok(Zip::Deflate), + _ => Ok(Zip::Other(s)), } - Ok(Zip::Other(s)) } }