kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes new clippy lints on the latest nightly (#603)

Browse Source 
* Fixes new clippy lints on the latest nightly

We didn't see these before because of our old Rust toolchain.

* fixes nit
This commit is contained in:
kaczmarczyck
2023-03-09 12:08:34 +01:00
committed by GitHub
parent ca65902a8f
commit 752db8cc90
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/opensk/src/api/upgrade_storage/helper.rs
View File

@@ -150,15 +150,12 @@ impl ModRange {
} }
} }
#[derive(Default)]
pub struct Partition { pub struct Partition {
ranges: Vec<ModRange>, ranges: Vec<ModRange>,
} }
impl Partition { impl Partition {
pub fn new() -> Partition {
Partition { ranges: Vec::new() }
}
/// Total length of all ranges. /// Total length of all ranges.
pub fn length(&self) -> usize { pub fn length(&self) -> usize {
self.ranges.iter().map(|r| r.length()).sum() self.ranges.iter().map(|r| r.length()).sum()
@@ -339,7 +336,7 @@ mod tests {
#[test] #[test]
fn partition_append() { fn partition_append() {
let mut partition = Partition::new(); let mut partition = Partition::default();
partition.append(ModRange::new(0x4000, 0x1000)); partition.append(ModRange::new(0x4000, 0x1000));
partition.append(ModRange::new(0x20000, 0x20000)); partition.append(ModRange::new(0x20000, 0x20000));
partition.append(ModRange::new(0x40000, 0x20000)); partition.append(ModRange::new(0x40000, 0x20000));
@@ -349,7 +346,7 @@ mod tests {
#[test] #[test]
fn partition_find_address() { fn partition_find_address() {
let mut partition = Partition::new(); let mut partition = Partition::default();
partition.append(ModRange::new(0x4000, 0x1000)); partition.append(ModRange::new(0x4000, 0x1000));
partition.append(ModRange::new(0x20000, 0x20000)); partition.append(ModRange::new(0x20000, 0x20000));
partition.append(ModRange::new(0x40000, 0x20000)); partition.append(ModRange::new(0x40000, 0x20000));
@@ -364,7 +361,7 @@ mod tests {
#[test] #[test]
fn partition_ranges_from() { fn partition_ranges_from() {
let mut partition = Partition::new(); let mut partition = Partition::default();
partition.append(ModRange::new(0x4000, 0x1000)); partition.append(ModRange::new(0x4000, 0x1000));
partition.append(ModRange::new(0x20000, 0x20000)); partition.append(ModRange::new(0x20000, 0x20000));
partition.append(ModRange::new(0x40000, 0x20000)); partition.append(ModRange::new(0x40000, 0x20000));

2
libraries/opensk/src/ctap/apdu.rs
View File

@@ -118,7 +118,7 @@ impl TryFrom<&[u8]> for Apdu {
type Error = ApduStatusCode; type Error = ApduStatusCode;
fn try_from(frame: &[u8]) -> Result<Self, ApduStatusCode> { fn try_from(frame: &[u8]) -> Result<Self, ApduStatusCode> {
if frame.len() < APDU_HEADER_LEN as usize { if frame.len() < APDU_HEADER_LEN {
return Err(ApduStatusCode::SW_WRONG_DATA); return Err(ApduStatusCode::SW_WRONG_DATA);
} }
// +-----+-----+----+----+ // +-----+-----+----+----+

2
libraries/opensk/src/ctap/client_pin.rs
View File

@@ -1224,7 +1224,7 @@ mod test {
), ),
// Reject PIN "12'\0'4" (a zero byte at index 2). // Reject PIN "12'\0'4" (a zero byte at index 2).
( (
b"12\04".to_vec(), [b'1', b'2', 0, b'4'].to_vec(),
Err(Ctap2StatusCode::CTAP2_ERR_PIN_POLICY_VIOLATION), Err(Ctap2StatusCode::CTAP2_ERR_PIN_POLICY_VIOLATION),
), ),
// PINs must be at most 63 bytes long, to allow for a trailing 0u8 padding. // PINs must be at most 63 bytes long, to allow for a trailing 0u8 padding.

2
libraries/opensk/src/ctap/mod.rs
View File

@@ -1513,6 +1513,8 @@ mod test {
let mut ctap_state = CtapState::<TestEnv>::new(&mut env); let mut ctap_state = CtapState::<TestEnv>::new(&mut env);
let info_reponse = ctap_state.process_command(&mut env, &[0x04], DUMMY_CHANNEL); let info_reponse = ctap_state.process_command(&mut env, &[0x04], DUMMY_CHANNEL);
// Fails when removing `to_vec` for `SUPPORTED_CRED_PARAMS` as linted.
#[allow(clippy::unnecessary_to_owned)]
let expected_cbor = cbor_map_options! { let expected_cbor = cbor_map_options! {
0x01 => cbor_array_vec![vec![ 0x01 => cbor_array_vec![vec![
#[cfg(feature = "with_ctap1")] #[cfg(feature = "with_ctap1")]

2
src/env/tock/storage.rs vendored
View File

@@ -261,7 +261,7 @@ impl TockUpgradeStorage {
pub fn new() -> StorageResult<TockUpgradeStorage> { pub fn new() -> StorageResult<TockUpgradeStorage> {
let mut locations = TockUpgradeStorage { let mut locations = TockUpgradeStorage {
page_size: get_info(command_nr::get_info_nr::PAGE_SIZE, 0)?, page_size: get_info(command_nr::get_info_nr::PAGE_SIZE, 0)?,
partition: Partition::new(), partition: Partition::default(),
metadata: ModRange::new_empty(), metadata: ModRange::new_empty(),
running_metadata: ModRange::new_empty(), running_metadata: ModRange::new_empty(),
identifier: Self::PARTITION_ADDRESS_A as u32, identifier: Self::PARTITION_ADDRESS_A as u32,