From 81a83dae90f2c92a32e6e41cc82c004e86e3609a Mon Sep 17 00:00:00 2001 From: Hugues de Valon Date: Thu, 29 Apr 2021 16:31:04 +0100 Subject: [PATCH] Fix latest clippy lints Signed-off-by: Hugues de Valon --- src/lib.rs | 8 +++---- src/operations/list_keys.rs | 4 ++-- src/operations/list_opcodes.rs | 4 ++-- src/operations/list_providers.rs | 4 ++-- src/operations_protobuf/convert_list_keys.rs | 18 +++++++------- .../convert_list_opcodes.rs | 6 ++--- .../convert_list_providers.rs | 14 +++++------ src/operations_protobuf/generated_ops.rs | 24 +++++++++---------- src/operations_protobuf/mod.rs | 2 +- src/requests/mod.rs | 18 +++++++------- src/requests/request/mod.rs | 6 ++--- src/requests/request/request_header.rs | 8 +++---- src/requests/response/mod.rs | 4 ++-- src/requests/response/response_header.rs | 8 +++---- src/requests/response_status.rs | 4 ++-- 15 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index d957ff0..7b33cf3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -107,7 +107,7 @@ //!# } //!# let mut stream = MockWrite { buffer: Vec::new() }; //!use parsec_interface::operations::{Convert, NativeResult, psa_generate_key::Result}; -//!use parsec_interface::requests::{ProviderID, Opcode, BodyType, Response, ResponseStatus}; +//!use parsec_interface::requests::{ProviderId, Opcode, BodyType, Response, ResponseStatus}; //!use parsec_interface::requests::response::ResponseHeader; //!use parsec_interface::operations_protobuf::ProtobufConverter; //! @@ -116,7 +116,7 @@ //!let result_body = converter.result_to_body(result).unwrap(); //!let response = Response { //! header: ResponseHeader { -//! provider: ProviderID::MbedCrypto, +//! provider: ProviderId::MbedCrypto, //! session: 0, //! content_type: BodyType::Protobuf, //! opcode: Opcode::PsaGenerateKey, @@ -157,7 +157,7 @@ //!# //!# let mut stream = MockWrite { buffer: Vec::new() }; //!use parsec_interface::operations::{Convert, NativeOperation}; -//!use parsec_interface::requests::{Request, ProviderID, BodyType, AuthType, Opcode}; +//!use parsec_interface::requests::{Request, ProviderId, BodyType, AuthType, Opcode}; //!use parsec_interface::requests::request::{RequestHeader, RequestAuth}; //!use parsec_interface::operations_protobuf::ProtobufConverter; //!use parsec_interface::operations::ping::Operation; @@ -166,7 +166,7 @@ //!let operation = NativeOperation::Ping(Operation {}); //!let request = Request { //! header: RequestHeader { -//! provider: ProviderID::Core, +//! provider: ProviderId::Core, //! session: 0, //! content_type: BodyType::Protobuf, //! accept_type: BodyType::Protobuf, diff --git a/src/operations/list_keys.rs b/src/operations/list_keys.rs index 2357227..68df991 100644 --- a/src/operations/list_keys.rs +++ b/src/operations/list_keys.rs @@ -4,13 +4,13 @@ //! //! Lists all keys belonging to the application. use super::psa_key_attributes::Attributes; -use crate::requests::ProviderID; +use crate::requests::ProviderId; /// Structure holding the basic information for a key in the application for client discovery. #[derive(Debug, Clone, PartialEq)] pub struct KeyInfo { /// The ID of the associated provider. - pub provider_id: ProviderID, + pub provider_id: ProviderId, /// The name of the key. pub name: String, /// The key attributes. diff --git a/src/operations/list_opcodes.rs b/src/operations/list_opcodes.rs index 5a0667e..d4554ee 100644 --- a/src/operations/list_opcodes.rs +++ b/src/operations/list_opcodes.rs @@ -4,14 +4,14 @@ //! //! List the opcodes supported by the provider. -use crate::requests::{Opcode, ProviderID}; +use crate::requests::{Opcode, ProviderId}; use std::collections::HashSet; /// Native object for opcode listing operation. #[derive(Copy, Clone, Debug)] pub struct Operation { /// Provider for which the supported opcodes are requsted. - pub provider_id: ProviderID, + pub provider_id: ProviderId, } /// Native object for opcode listing result. diff --git a/src/operations/list_providers.rs b/src/operations/list_providers.rs index 00736eb..e8699b4 100644 --- a/src/operations/list_providers.rs +++ b/src/operations/list_providers.rs @@ -3,7 +3,7 @@ //! # ListProviders operation //! //! List the providers available in the service, with some information. -use crate::requests::ProviderID; +use crate::requests::ProviderId; use std::cmp::Eq; pub use uuid::Uuid; @@ -24,7 +24,7 @@ pub struct ProviderInfo { /// Provider implementation version revision number. pub version_rev: u32, /// Provider ID to use on the wire protocol to communicate with this provider. - pub id: ProviderID, + pub id: ProviderId, } /// Native object for provider listing operation. diff --git a/src/operations_protobuf/convert_list_keys.rs b/src/operations_protobuf/convert_list_keys.rs index 4dedc51..a7ba35f 100644 --- a/src/operations_protobuf/convert_list_keys.rs +++ b/src/operations_protobuf/convert_list_keys.rs @@ -4,7 +4,7 @@ use super::generated_ops::list_keys::{ KeyInfo as KeyInfoProto, Operation as OperationProto, Result as ResultProto, }; use crate::operations::list_keys::{KeyInfo, Operation, Result}; -use crate::requests::{ProviderID, ResponseStatus}; +use crate::requests::{ProviderId, ResponseStatus}; use log::error; use num::FromPrimitive; use std::convert::{TryFrom, TryInto}; @@ -29,7 +29,7 @@ impl TryFrom for KeyInfo { type Error = ResponseStatus; fn try_from(proto_info: KeyInfoProto) -> std::result::Result { - let id: ProviderID = match FromPrimitive::from_u32(proto_info.provider_id) { + let id: ProviderId = match FromPrimitive::from_u32(proto_info.provider_id) { Some(id) => id, None => return Err(ResponseStatus::ProviderDoesNotExist), }; @@ -98,7 +98,7 @@ mod test { use crate::operations::psa_algorithm::{Algorithm, AsymmetricSignature, Hash}; use crate::operations::psa_key_attributes::{self, Attributes, Lifetime, Policy, UsageFlags}; use crate::operations::{NativeOperation, NativeResult}; - use crate::requests::{request::RequestBody, response::ResponseBody, Opcode, ProviderID}; + use crate::requests::{request::RequestBody, response::ResponseBody, Opcode, ProviderId}; use std::convert::TryInto; static CONVERTER: ProtobufConverter = ProtobufConverter {}; @@ -134,7 +134,7 @@ mod test { let key_attrs_proto: KeyAttributesProto = key_attrs.try_into().unwrap(); let key_info = KeyInfoProto { - provider_id: ProviderID::MbedCrypto as u32, + provider_id: ProviderId::MbedCrypto as u32, name: String::from("Some Key Name"), attributes: Some(key_attrs_proto), }; @@ -144,7 +144,7 @@ mod test { assert_eq!(resp.keys.len(), 1); assert_eq!(resp.keys[0].name, "Some Key Name"); - assert_eq!(resp.keys[0].provider_id, ProviderID::MbedCrypto); + assert_eq!(resp.keys[0].provider_id, ProviderId::MbedCrypto); assert_eq!(resp.keys[0].attributes, key_attrs); } @@ -176,7 +176,7 @@ mod test { }, }; let key_info = KeyInfo { - provider_id: ProviderID::MbedCrypto, + provider_id: ProviderId::MbedCrypto, name: String::from("Foo"), attributes: key_attributes, }; @@ -186,7 +186,7 @@ mod test { let key_attributes_proto: KeyAttributesProto = key_attributes.try_into().unwrap(); assert_eq!(proto.keys.len(), 1); - assert_eq!(proto.keys[0].provider_id, ProviderID::MbedCrypto as u32); + assert_eq!(proto.keys[0].provider_id, ProviderId::MbedCrypto as u32); assert_eq!(proto.keys[0].name, "Foo"); assert_eq!(proto.keys[0].attributes, Some(key_attributes_proto)); } @@ -242,7 +242,7 @@ mod test { fn result_list_keys_from_native() { let mut list_keys = Result { keys: Vec::new() }; let key_info = KeyInfo { - provider_id: ProviderID::MbedCrypto, + provider_id: ProviderId::MbedCrypto, name: String::from("Bar"), attributes: Attributes { lifetime: Lifetime::Persistent, @@ -281,7 +281,7 @@ mod test { fn list_keys_result_e2e() { let mut list_keys = Result { keys: Vec::new() }; let key_info = KeyInfo { - provider_id: ProviderID::MbedCrypto, + provider_id: ProviderId::MbedCrypto, name: String::from("Baz"), attributes: Attributes { lifetime: Lifetime::Persistent, diff --git a/src/operations_protobuf/convert_list_opcodes.rs b/src/operations_protobuf/convert_list_opcodes.rs index 26fb4f1..ee5dd1e 100644 --- a/src/operations_protobuf/convert_list_opcodes.rs +++ b/src/operations_protobuf/convert_list_opcodes.rs @@ -70,7 +70,7 @@ mod test { use crate::operations::{ list_opcodes::Operation, list_opcodes::Result, NativeOperation, NativeResult, }; - use crate::requests::{request::RequestBody, response::ResponseBody, Opcode, ProviderID}; + use crate::requests::{request::RequestBody, response::ResponseBody, Opcode, ProviderId}; use std::collections::HashSet; use std::convert::TryInto; @@ -109,7 +109,7 @@ mod test { #[test] fn op_list_opcodes_from_native() { let list_opcodes = Operation { - provider_id: ProviderID::Core, + provider_id: ProviderId::Core, }; let body = CONVERTER .operation_to_body(NativeOperation::ListOpcodes(list_opcodes)) @@ -120,7 +120,7 @@ mod test { #[test] fn op_list_opcodes_e2e() { let list_opcodes = Operation { - provider_id: ProviderID::Pkcs11, + provider_id: ProviderId::Pkcs11, }; let req_body = CONVERTER .operation_to_body(NativeOperation::ListOpcodes(list_opcodes)) diff --git a/src/operations_protobuf/convert_list_providers.rs b/src/operations_protobuf/convert_list_providers.rs index edeadc9..66c7bdc 100644 --- a/src/operations_protobuf/convert_list_providers.rs +++ b/src/operations_protobuf/convert_list_providers.rs @@ -4,7 +4,7 @@ use super::generated_ops::list_providers::{ Operation as OperationProto, ProviderInfo as ProviderInfoProto, Result as ResultProto, }; use crate::operations::list_providers::{Operation, ProviderInfo, Result}; -use crate::requests::{ProviderID, ResponseStatus}; +use crate::requests::{ProviderId, ResponseStatus}; use num::FromPrimitive; use std::convert::{TryFrom, TryInto}; use uuid::Uuid; @@ -35,7 +35,7 @@ impl TryFrom for ProviderInfo { Ok(provider_uuid) => provider_uuid, Err(_) => return Err(ResponseStatus::WrongProviderUuid), }; - let id: ProviderID = match FromPrimitive::from_u32(proto_info.id) { + let id: ProviderId = match FromPrimitive::from_u32(proto_info.id) { Some(id) => id, None => return Err(ResponseStatus::ProviderDoesNotExist), }; @@ -103,7 +103,7 @@ mod test { use super::super::{Convert, ProtobufConverter}; use crate::operations::list_providers::{Operation, ProviderInfo, Result}; use crate::operations::{NativeOperation, NativeResult}; - use crate::requests::{request::RequestBody, response::ResponseBody, Opcode, ProviderID}; + use crate::requests::{request::RequestBody, response::ResponseBody, Opcode, ProviderId}; use std::convert::TryInto; use uuid::Uuid; @@ -134,7 +134,7 @@ mod test { assert_eq!(resp.providers[0].version_maj, 0); assert_eq!(resp.providers[0].version_min, 1); assert_eq!(resp.providers[0].version_rev, 0); - assert_eq!(resp.providers[0].id, ProviderID::MbedCrypto); + assert_eq!(resp.providers[0].id, ProviderId::MbedCrypto); } #[test] @@ -149,7 +149,7 @@ mod test { version_maj: 0, version_min: 1, version_rev: 0, - id: ProviderID::MbedCrypto, + id: ProviderId::MbedCrypto, }; resp.providers.push(provider_info); @@ -226,7 +226,7 @@ mod test { version_maj: 0, version_min: 1, version_rev: 0, - id: ProviderID::MbedCrypto, + id: ProviderId::MbedCrypto, }; list_providers.providers.push(provider_info); @@ -248,7 +248,7 @@ mod test { version_maj: 0, version_min: 1, version_rev: 0, - id: ProviderID::MbedCrypto, + id: ProviderId::MbedCrypto, }; list_providers.providers.push(provider_info); diff --git a/src/operations_protobuf/generated_ops.rs b/src/operations_protobuf/generated_ops.rs index 7778b89..dfcdc46 100644 --- a/src/operations_protobuf/generated_ops.rs +++ b/src/operations_protobuf/generated_ops.rs @@ -49,78 +49,78 @@ use std::convert::TryFrom; impl TryFrom for Cipher { type Error = ResponseStatus; fn try_from(cipher_val: i32) -> Result { - Ok(Cipher::from_i32(cipher_val).ok_or_else(|| { + Cipher::from_i32(cipher_val).ok_or_else(|| { error!( "Value {} not recognised as a valid cipher algorithm encoding.", cipher_val ); ResponseStatus::InvalidEncoding - })?) + }) } } impl TryFrom for Hash { type Error = ResponseStatus; fn try_from(hash_val: i32) -> Result { - Ok(Hash::from_i32(hash_val).ok_or_else(|| { + Hash::from_i32(hash_val).ok_or_else(|| { error!( "Value {} not recognised as a valid hash algorithm encoding.", hash_val ); ResponseStatus::InvalidEncoding - })?) + }) } } impl TryFrom for AeadWithDefaultLengthTag { type Error = ResponseStatus; fn try_from(aead_val: i32) -> Result { - Ok(AeadWithDefaultLengthTag::from_i32(aead_val).ok_or_else(|| { + AeadWithDefaultLengthTag::from_i32(aead_val).ok_or_else(|| { error!( "Value {} not recognised as a valid AEAD with default tag length algorithm encoding.", aead_val ); ResponseStatus::InvalidEncoding - })?) + }) } } impl TryFrom for Raw { type Error = ResponseStatus; fn try_from(key_agreement_val: i32) -> Result { - Ok(Raw::from_i32(key_agreement_val).ok_or_else(|| { + Raw::from_i32(key_agreement_val).ok_or_else(|| { error!( "Value {} not recognised as a valid raw key agreement algorithm encoding.", key_agreement_val ); ResponseStatus::InvalidEncoding - })?) + }) } } impl TryFrom for EccFamily { type Error = ResponseStatus; fn try_from(ecc_family_val: i32) -> Result { - Ok(EccFamily::from_i32(ecc_family_val).ok_or_else(|| { + EccFamily::from_i32(ecc_family_val).ok_or_else(|| { error!( "Value {} not recognised as a valid ECC family encoding.", ecc_family_val ); ResponseStatus::InvalidEncoding - })?) + }) } } impl TryFrom for DhFamily { type Error = ResponseStatus; fn try_from(dh_family_val: i32) -> Result { - Ok(DhFamily::from_i32(dh_family_val).ok_or_else(|| { + DhFamily::from_i32(dh_family_val).ok_or_else(|| { error!( "Value {} not recognised as a valid DH family encoding.", dh_family_val ); ResponseStatus::InvalidEncoding - })?) + }) } } diff --git a/src/operations_protobuf/mod.rs b/src/operations_protobuf/mod.rs index 965ee81..1b2e1c7 100644 --- a/src/operations_protobuf/mod.rs +++ b/src/operations_protobuf/mod.rs @@ -29,7 +29,7 @@ mod convert_psa_generate_random; mod convert_psa_raw_key_agreement; #[rustfmt::skip] -#[allow(unused_qualifications, missing_copy_implementations, clippy::pedantic, clippy::module_inception)] +#[allow(unused_qualifications, missing_copy_implementations, clippy::pedantic, clippy::module_inception, clippy::upper_case_acronyms)] mod generated_ops; use crate::operations::{Convert, NativeOperation, NativeResult}; diff --git a/src/requests/mod.rs b/src/requests/mod.rs index ebe3ab8..6a1d1b6 100644 --- a/src/requests/mod.rs +++ b/src/requests/mod.rs @@ -26,7 +26,7 @@ use std::fmt; #[cfg_attr(feature = "fuzz", derive(Arbitrary))] #[derive(FromPrimitive, PartialEq, Eq, Hash, Copy, Clone, Debug)] #[repr(u8)] -pub enum ProviderID { +pub enum ProviderId { /// Provider to use for core Parsec operations. Core = 0, /// Provider using Mbed Crypto software library. @@ -41,20 +41,20 @@ pub enum ProviderID { CryptoAuthLib = 5, } -impl fmt::Display for ProviderID { +impl fmt::Display for ProviderId { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - ProviderID::Core => write!(f, "Core provider"), - ProviderID::MbedCrypto => write!(f, "Mbed Crypto provider"), - ProviderID::Pkcs11 => write!(f, "PKCS #11 provider"), - ProviderID::Tpm => write!(f, "TPM provider"), - ProviderID::TrustedService => write!(f, "Trusted Service provider"), - ProviderID::CryptoAuthLib => write!(f, "CryptoAuthentication Library provider"), + ProviderId::Core => write!(f, "Core provider"), + ProviderId::MbedCrypto => write!(f, "Mbed Crypto provider"), + ProviderId::Pkcs11 => write!(f, "PKCS #11 provider"), + ProviderId::Tpm => write!(f, "TPM provider"), + ProviderId::TrustedService => write!(f, "Trusted Service provider"), + ProviderId::CryptoAuthLib => write!(f, "CryptoAuthentication Library provider"), } } } -impl TryFrom for ProviderID { +impl TryFrom for ProviderId { type Error = ResponseStatus; fn try_from(provider_id: u8) -> ::std::result::Result { diff --git a/src/requests/request/mod.rs b/src/requests/request/mod.rs index 3ae720d..58c786b 100644 --- a/src/requests/request/mod.rs +++ b/src/requests/request/mod.rs @@ -131,7 +131,7 @@ impl From for ResponseHeader { #[cfg(test)] mod tests { use super::super::utils::tests as test_utils; - use super::super::{AuthType, BodyType, Opcode, ProviderID, ResponseStatus}; + use super::super::{AuthType, BodyType, Opcode, ProviderId, ResponseStatus}; use super::*; #[test] @@ -198,7 +198,7 @@ mod tests { let resp_hdr: ResponseHeader = req_hdr.into(); let mut resp_hdr_exp = ResponseHeader::new(); - resp_hdr_exp.provider = ProviderID::Core; + resp_hdr_exp.provider = ProviderId::Core; resp_hdr_exp.session = 0x11_22_33_44_55_66_77_88; resp_hdr_exp.content_type = BodyType::Protobuf; resp_hdr_exp.opcode = Opcode::Ping; @@ -230,7 +230,7 @@ mod tests { let body = RequestBody::from_bytes(vec![0x70, 0x80, 0x90]); let auth = RequestAuth::new(vec![0xa0, 0xb0, 0xc0]); let header = RequestHeader { - provider: ProviderID::Core, + provider: ProviderId::Core, session: 0x11_22_33_44_55_66_77_88, content_type: BodyType::Protobuf, accept_type: BodyType::Protobuf, diff --git a/src/requests/request/request_header.rs b/src/requests/request/request_header.rs index aa7fdc8..b757f8d 100644 --- a/src/requests/request/request_header.rs +++ b/src/requests/request/request_header.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::requests::common::wire_header_1_0::WireHeader as Raw; use crate::requests::ResponseStatus; -use crate::requests::{AuthType, BodyType, Opcode, ProviderID}; +use crate::requests::{AuthType, BodyType, Opcode, ProviderId}; #[cfg(feature = "fuzz")] use arbitrary::Arbitrary; use num::FromPrimitive; @@ -16,7 +16,7 @@ use std::convert::TryFrom; #[derive(Copy, Clone, Debug, PartialEq)] pub struct RequestHeader { /// Provider ID value - pub provider: ProviderID, + pub provider: ProviderId, /// Session handle pub session: u64, /// Content type: defines how the request body should be processed. @@ -35,7 +35,7 @@ impl RequestHeader { #[cfg(feature = "testing")] pub(crate) fn new() -> RequestHeader { RequestHeader { - provider: ProviderID::Core, + provider: ProviderId::Core, session: 0, content_type: BodyType::Protobuf, accept_type: BodyType::Protobuf, @@ -73,7 +73,7 @@ impl TryFrom for RequestHeader { }; Ok(RequestHeader { - provider: ProviderID::try_from(header.provider)?, + provider: ProviderId::try_from(header.provider)?, session: header.session, content_type, accept_type, diff --git a/src/requests/response/mod.rs b/src/requests/response/mod.rs index 919a85a..034bbe2 100644 --- a/src/requests/response/mod.rs +++ b/src/requests/response/mod.rs @@ -110,7 +110,7 @@ impl Response { #[cfg(test)] mod tests { use super::super::utils::tests as test_utils; - use super::super::{BodyType, Opcode, ProviderID, ResponseStatus}; + use super::super::{BodyType, Opcode, ProviderId, ResponseStatus}; use super::*; #[test] @@ -188,7 +188,7 @@ mod tests { fn get_response() -> Response { let body = ResponseBody::from_bytes(vec![0x70, 0x80, 0x90]); let header = ResponseHeader { - provider: ProviderID::Core, + provider: ProviderId::Core, session: 0x11_22_33_44_55_66_77_88, content_type: BodyType::Protobuf, opcode: Opcode::Ping, diff --git a/src/requests/response/response_header.rs b/src/requests/response/response_header.rs index ce798d6..4866f42 100644 --- a/src/requests/response/response_header.rs +++ b/src/requests/response/response_header.rs @@ -1,7 +1,7 @@ // Copyright 2019 Contributors to the Parsec project. // SPDX-License-Identifier: Apache-2.0 use crate::requests::common::wire_header_1_0::WireHeader as Raw; -use crate::requests::{BodyType, Opcode, ProviderID, ResponseStatus, Result}; +use crate::requests::{BodyType, Opcode, ProviderId, ResponseStatus, Result}; use num::FromPrimitive; use std::convert::TryFrom; @@ -12,7 +12,7 @@ use std::convert::TryFrom; #[derive(Copy, Clone, Debug, PartialEq)] pub struct ResponseHeader { /// Provider ID value - pub provider: ProviderID, + pub provider: ProviderId, /// Session handle pub session: u64, /// Content type: defines how the request body should be processed. @@ -27,7 +27,7 @@ impl ResponseHeader { /// Create a new response header with default field values. pub(crate) fn new() -> ResponseHeader { ResponseHeader { - provider: ProviderID::Core, + provider: ProviderId::Core, session: 0, content_type: BodyType::Protobuf, opcode: Opcode::Ping, @@ -43,7 +43,7 @@ impl TryFrom for ResponseHeader { type Error = ResponseStatus; fn try_from(header: Raw) -> Result { - let provider: ProviderID = match FromPrimitive::from_u8(header.provider) { + let provider: ProviderId = match FromPrimitive::from_u8(header.provider) { Some(provider_id) => provider_id, None => return Err(ResponseStatus::ProviderDoesNotExist), }; diff --git a/src/requests/response_status.rs b/src/requests/response_status.rs index 783272c..b75a277 100644 --- a/src/requests/response_status.rs +++ b/src/requests/response_status.rs @@ -17,7 +17,7 @@ pub enum ResponseStatus { /// Successful operation Success = 0, /// Requested provider ID does not match that of the backend - WrongProviderID = 1, + WrongProviderId = 1, /// Requested content type is not supported by the backend ContentTypeNotSupported = 2, /// Requested accept type is not supported by the backend @@ -120,7 +120,7 @@ impl fmt::Display for ResponseStatus { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { ResponseStatus::Success => write!(f, "successful operation"), - ResponseStatus::WrongProviderID => write!( + ResponseStatus::WrongProviderId => write!( f, "requested provider ID does not match that of the backend" ),