From b0552e04d1426d9c02e07607222bdcd86bc72c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sosth=C3=A8ne=20Gu=C3=A9don?= Date: Wed, 30 Aug 2023 17:13:28 +0200 Subject: [PATCH] Fix clippy lints --- tests/command_response.rs | 1 + tests/pivy.rs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/command_response.rs b/tests/command_response.rs index 71c0dde..d1ba96b 100644 --- a/tests/command_response.rs +++ b/tests/command_response.rs @@ -103,6 +103,7 @@ fn serialize_len(len: usize) -> heapless::Vec { let arr = len.to_be_bytes(); buf.extend_from_slice(&[0x82, arr[0], arr[1]]).ok(); } else { + panic!("Length is too long to be serialized"); } buf } diff --git a/tests/pivy.rs b/tests/pivy.rs index ea9b15b..f4cdc79 100644 --- a/tests/pivy.rs +++ b/tests/pivy.rs @@ -89,7 +89,7 @@ fn ecdh() { #[test_log::test] fn sign() { let test_rsa = || { - let mut p = spawn(&format!("pivy-tool -A 3des -K 010203040506070801020304050607080102030405060708 generate 9A -a rsa2048 -P 123456")).unwrap(); + let mut p = spawn("pivy-tool -A 3des -K 010203040506070801020304050607080102030405060708 generate 9A -a rsa2048 -P 123456").unwrap(); p.expect(Regex("ssh-rsa (?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)? PIV_slot_9A@[A-F0-9]{20}")).unwrap(); p.expect(Eof).unwrap(); assert_eq!(p.wait().unwrap(), WaitStatus::Exited(p.pid(), 0)); @@ -108,7 +108,7 @@ fn sign() { }; let test_p256 = || { - let mut p = spawn(&format!("pivy-tool -A 3des -K 010203040506070801020304050607080102030405060708 generate 9A -a eccp256 -P 123456")).unwrap(); + let mut p = spawn("pivy-tool -A 3des -K 010203040506070801020304050607080102030405060708 generate 9A -a eccp256 -P 123456").unwrap(); p.expect(Regex("ecdsa-sha2-nistp256 (?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)? PIV_slot_9A@[A-F0-9]{20}")).unwrap(); p.expect(Eof).unwrap(); assert_eq!(p.wait().unwrap(), WaitStatus::Exited(p.pid(), 0)); @@ -128,11 +128,11 @@ fn sign() { stdout.read_to_end(&mut out).unwrap(); // Check that the signature is an asn.1 sequence let res: asn1::ParseResult<_> = asn1::parse(&out, |d| { - return d.read_element::()?.parse(|d| { + d.read_element::()?.parse(|d| { d.read_element::()?; d.read_element::()?; - return Ok(()); - }); + Ok(()) + }) }); res.unwrap();