From 3849b2959414feae3e984d4cae0a0cfcb529006d Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Mon, 4 Sep 2023 14:18:50 +0200 Subject: [PATCH] rust/**/*.rs: fix `cargo clippy` findings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automatically fixed by the command `cargo clippy --fix` and `cargo fmt`. Reviewed-by: Steffen Eiden Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- rust/pv/src/brcb.rs | 4 +- rust/pv/src/crypto.rs | 2 +- rust/pv/src/req.rs | 2 +- rust/pv/src/uvsecret/guest_secret.rs | 2 +- rust/pv/src/uvsecret/secret_list.rs | 2 +- rust/pv/src/verify/helper.rs | 10 ++-- rust/pv/src/verify/test.rs | 72 ++++++++++++---------------- rust/pv/tests/add_secret_request.rs | 17 ++----- 8 files changed, 47 insertions(+), 64 deletions(-) diff --git a/rust/pv/src/brcb.rs b/rust/pv/src/brcb.rs index 4bf5f161..9ef58e2d 100644 --- a/rust/pv/src/brcb.rs +++ b/rust/pv/src/brcb.rs @@ -205,7 +205,7 @@ mod tests { #[test] fn from_se_image_hdr() { let bin_hdr = get_test_asset!("exp/secure_guest.hdr"); - let hdr_tags = BootHdrTags::from_se_image(&mut Cursor::new(bin_hdr.clone())).unwrap(); + let hdr_tags = BootHdrTags::from_se_image(&mut Cursor::new(*bin_hdr)).unwrap(); assert_eq!(hdr_tags, EXP_HDR); } @@ -220,7 +220,7 @@ mod tests { )); // mess up magic - let mut bin_hdr_copy = bin_hdr.clone(); + let mut bin_hdr_copy = *bin_hdr; bin_hdr_copy.swap(0, 1); assert!(matches!( BootHdrTags::from_se_image(&mut Cursor::new(bin_hdr_copy)), diff --git a/rust/pv/src/crypto.rs b/rust/pv/src/crypto.rs index 910419e5..8132e9de 100644 --- a/rust/pv/src/crypto.rs +++ b/rust/pv/src/crypto.rs @@ -315,7 +315,7 @@ mod tests { ]; let res = encrypt_aes( - &&SymKey::Aes256(aes_gcm_key.into()), + &SymKey::Aes256(aes_gcm_key.into()), &aes_gcm_iv, &aes_gcm_plain, ) diff --git a/rust/pv/src/req.rs b/rust/pv/src/req.rs index cda448bf..b9acd732 100644 --- a/rust/pv/src/req.rs +++ b/rust/pv/src/req.rs @@ -451,7 +451,7 @@ mod tests { let ks = vec![ Keyslot::new(host_key.clone()), Keyslot::new(host_key.clone()), - Keyslot::new(host_key.clone()), + Keyslot::new(host_key), ]; let mut aad = Vec::::new(); ks.iter().for_each(|ks| aad.push(Aad::Ks(ks))); diff --git a/rust/pv/src/uvsecret/guest_secret.rs b/rust/pv/src/uvsecret/guest_secret.rs index 8ad4fa55..8c444211 100644 --- a/rust/pv/src/uvsecret/guest_secret.rs +++ b/rust/pv/src/uvsecret/guest_secret.rs @@ -105,7 +105,7 @@ mod test { 0xef, 0xc7, 0x3c, 0x62, ]; let name = "association secret".to_string(); - let secret = GuestSecret::association("association secret", secret_value.clone()).unwrap(); + let secret = GuestSecret::association("association secret", secret_value).unwrap(); let exp = GuestSecret::Association { name, id: exp_id, diff --git a/rust/pv/src/uvsecret/secret_list.rs b/rust/pv/src/uvsecret/secret_list.rs index 724702a1..6943bd31 100644 --- a/rust/pv/src/uvsecret/secret_list.rs +++ b/rust/pv/src/uvsecret/secret_list.rs @@ -117,7 +117,7 @@ impl Display for SecretEntry { writeln!(f, "{} {}:", self.index, stype_str(self.stype.get()))?; write!(f, " ")?; for b in self.id { - write!(f, "{:02x}", b)?; + write!(f, "{b:02x}")?; } Ok(()) } diff --git a/rust/pv/src/verify/helper.rs b/rust/pv/src/verify/helper.rs index 89f92b87..a2f313b0 100644 --- a/rust/pv/src/verify/helper.rs +++ b/rust/pv/src/verify/helper.rs @@ -484,20 +484,20 @@ mod test { let ibm_wrong_subj = load_gen_cert("ibm_wrong_subject.crt"); let no_sign_crt = load_gen_cert("inter_ca.crt"); - assert!(super::get_ibm_z_sign_key(&vec!(ibm_crt.clone())).is_ok()); + assert!(super::get_ibm_z_sign_key(&[ibm_crt.clone()]).is_ok()); assert!(matches!( - super::get_ibm_z_sign_key(&vec!(ibm_crt.clone(), ibm_crt.clone())), + super::get_ibm_z_sign_key(&[ibm_crt.clone(), ibm_crt.clone()]), Err(Error::HkdVerify(ManyIbmSignKeys)) )); assert!(matches!( - super::get_ibm_z_sign_key(&vec!(ibm_wrong_subj)), + super::get_ibm_z_sign_key(&[ibm_wrong_subj]), Err(Error::HkdVerify(NoIbmSignKey)) )); assert!(matches!( - super::get_ibm_z_sign_key(&vec!(no_sign_crt.clone())), + super::get_ibm_z_sign_key(&[no_sign_crt.clone()]), Err(Error::HkdVerify(NoIbmSignKey)) )); - assert!(super::get_ibm_z_sign_key(&vec!(ibm_crt.clone(), no_sign_crt.clone())).is_ok(),); + assert!(super::get_ibm_z_sign_key(&[ibm_crt, no_sign_crt]).is_ok(),); } #[test] diff --git a/rust/pv/src/verify/test.rs b/rust/pv/src/verify/test.rs index 8a6258da..1c0d2b56 100644 --- a/rust/pv/src/verify/test.rs +++ b/rust/pv/src/verify/test.rs @@ -26,7 +26,7 @@ fn verify_sign_error(exp_raw: libc::c_int, obs: Error) { } fn verify_sign_error_slice(exp_raw: &[libc::c_int], obs: Error) { if exp_raw - .into_iter() + .iter() .filter(|e| match &obs { Error::HkdVerify(ty) => match ty { IbmSignInvalid(err, _d) => &&err.as_raw() == e, @@ -51,7 +51,7 @@ fn store_setup() { let ibm_str = get_cert_asset_path_string("ibm.crt"); let inter_str = get_cert_asset_path_string("inter.crt"); - let store = helper::store_setup(&None, &vec![], &vec![ibm_str, inter_str]); + let store = helper::store_setup(&None, &[], &[ibm_str, inter_str]); assert!(store.is_ok()); } @@ -63,7 +63,7 @@ fn verify_chain_online() { let mock_inter = mock_endpt("inter_ca.crl"); - let mut store = helper::store_setup(&Some(root_crt), &vec![], &vec![]).unwrap(); + let mut store = helper::store_setup(&Some(root_crt), &[], &[]).unwrap(); download_crls_into_store(&mut store, slice::from_ref(&ibm_crt)).unwrap(); let store = store.build(); @@ -71,8 +71,8 @@ fn verify_chain_online() { let mut sk = Stack::::new().unwrap(); sk.push(inter_crt).unwrap(); - verify_chain(&store, &sk, &vec![ibm_crt.clone()]).unwrap(); - assert!(verify_chain(&store, &sk, &vec!(ibm_crt)).is_ok()); + verify_chain(&store, &sk, &[ibm_crt.clone()]).unwrap(); + assert!(verify_chain(&store, &sk, &[ibm_crt]).is_ok()); } #[test] @@ -82,13 +82,13 @@ fn verify_chain_offline() { let inter_crt = load_gen_cert("inter_ca.crt"); let root_crt = get_cert_asset_path_string("root_ca.chained.crt"); - let store = helper::store_setup(&Some(root_crt), &vec![inter_crl], &vec![]) + let store = helper::store_setup(&Some(root_crt), &[inter_crl], &[]) .unwrap() .build(); let mut sk = Stack::::new().unwrap(); sk.push(inter_crt).unwrap(); - assert!(verify_chain(&store, &sk, &vec![ibm_crt]).is_ok()); + assert!(verify_chain(&store, &sk, &[ibm_crt]).is_ok()); } #[test] @@ -107,8 +107,8 @@ fn verify_online() { let inter_crl = get_cert_asset_path_string("inter_ca.crl"); let ibm_crl = get_cert_asset_path_string("ibm.crl"); let verifier = CertVerifier::new( - &vec![ibm_crt, inter_crt], - &vec![ibm_crl, inter_crl], + &[ibm_crt, inter_crt], + &[ibm_crl, inter_crl], &Some(root_crt), false, ) @@ -148,8 +148,8 @@ fn verify_offline() { let hkd = load_gen_cert("host.crt"); let verifier = CertVerifier::new( - &vec![ibm_crt, inter_crt], - &vec![ibm_crl, inter_crl], + &[ibm_crt, inter_crt], + &[ibm_crl, inter_crl], &Some(root_crt), true, ) @@ -186,25 +186,20 @@ fn verifier_new() { let ibm_rev_crt = get_cert_asset_path_string("ibm_rev.crt"); // To many signing keys - let verifier = CertVerifier::new( - &vec![ibm_crt.clone(), ibm_rev_crt.clone()], - &vec![], - &None, - true, - ); + let verifier = CertVerifier::new(&[ibm_crt.clone(), ibm_rev_crt.clone()], &[], &None, true); assert!(matches!(verifier, Err(Error::HkdVerify(ManyIbmSignKeys)))); // no CRL for each X509 let verifier = CertVerifier::new( - &vec![inter_crt.clone(), ibm_crt.clone()], - &vec![inter_crl.clone()], - &Some(root_crt.clone()), + &[inter_crt.clone(), ibm_crt.clone()], + &[inter_crl.clone()], + &Some(root_crt), false, ); verify_sign_error(3, verifier.unwrap_err()); let verifier = CertVerifier::new( - &vec![inter_crt.clone(), ibm_crt.clone()], - &vec![], + &[inter_crt.clone(), ibm_crt.clone()], + &[], &Some(root_chn_crt.clone()), false, ); @@ -212,8 +207,8 @@ fn verifier_new() { // wrong intermediate (or ibm key) let verifier = CertVerifier::new( - &vec![inter_fake_crt, ibm_crt.clone()], - &vec![inter_fake_crl], + &[inter_fake_crt, ibm_crt.clone()], + &[inter_fake_crl], &Some(root_chn_crt.clone()), true, ); @@ -222,8 +217,8 @@ fn verifier_new() { //wrong root ca let verifier = CertVerifier::new( - &vec![inter_crt.clone(), ibm_crt.clone()], - &vec![inter_crl.clone()], + &[inter_crt.clone(), ibm_crt.clone()], + &[inter_crl.clone()], &None, true, ); @@ -231,33 +226,28 @@ fn verifier_new() { //correct signing key + intermediate cert let _verifier = CertVerifier::new( - &vec![inter_crt.clone(), ibm_crt.clone()], - &vec![inter_crl.clone()], + &[inter_crt.clone(), ibm_crt.clone()], + &[inter_crl.clone()], &Some(root_chn_crt.clone()), false, ) .unwrap(); // no intermediate key - let verifier = CertVerifier::new( - &vec![ibm_crt.clone()], - &vec![], - &Some(root_chn_crt.clone()), - false, - ); + let verifier = CertVerifier::new(&[ibm_crt], &[], &Some(root_chn_crt.clone()), false); verify_sign_error(20, verifier.unwrap_err()); //Ibm Sign outdated let verifier = CertVerifier::new( - &vec![inter_crt.clone(), ibm_early_crt.clone()], - &vec![inter_crl.clone()], + &[inter_crt.clone(), ibm_early_crt], + &[inter_crl.clone()], &Some(root_chn_crt.clone()), false, ); assert!(matches!(verifier, Err(Error::HkdVerify(NoIbmSignKey)))); let verifier = CertVerifier::new( - &vec![inter_crt.clone(), ibm_late_crt.clone()], - &vec![inter_crl.clone()], + &[inter_crt.clone(), ibm_late_crt], + &[inter_crl.clone()], &Some(root_chn_crt.clone()), false, ); @@ -265,9 +255,9 @@ fn verifier_new() { // revoked let verifier = CertVerifier::new( - &vec![inter_crt.clone(), ibm_rev_crt.clone()], - &vec![inter_crl.clone()], - &Some(root_chn_crt.clone()), + &[inter_crt, ibm_rev_crt], + &[inter_crl], + &Some(root_chn_crt), false, ); verify_sign_error(23, verifier.unwrap_err()); diff --git a/rust/pv/tests/add_secret_request.rs b/rust/pv/tests/add_secret_request.rs index 2b3e861e..bf491c61 100644 --- a/rust/pv/tests/add_secret_request.rs +++ b/rust/pv/tests/add_secret_request.rs @@ -18,7 +18,7 @@ use pv::{ const TAGS: BootHdrTags = BootHdrTags::new([1; 64], [2; 64], [3; 64], [4; 16]); const CUID: ConfigUid = [0x42u8; 16]; const ASSOC_SECRET: [u8; 32] = [0x11; 32]; -const ASSOC_ID: &'static str = "add_secret_request"; +const ASSOC_ID: &str = "add_secret_request"; fn create_asrcb( guest_secret: GuestSecret, @@ -38,7 +38,7 @@ fn create_asrcb( }; asrcb.add_hostkey(hkd); - Ok(asrcb.encrypt(ctx)?) + asrcb.encrypt(ctx) } fn get_crypto() -> (PKey, ReqEncrCtx) { @@ -63,17 +63,10 @@ where { let (host_key, ctx) = get_crypto(); let cuid = match cuid { - true => Some(CUID.into()), + true => Some(CUID), false => None, }; - create_asrcb( - guest_secret, - ext_secret.into(), - flags, - cuid.into(), - host_key, - &ctx, - ) + create_asrcb(guest_secret, ext_secret.into(), flags, cuid, host_key, &ctx) } fn association() -> GuestSecret { @@ -156,7 +149,7 @@ fn null_none_default_cuid_seven() { let mut asrcb = AddSecretRequest::new(AddSecretVersion::One, GuestSecret::Null, TAGS, no_flag()); (0..7).for_each(|_| asrcb.add_hostkey(hkd.clone())); - asrcb.set_cuid(CUID.into()); + asrcb.set_cuid(CUID); let asrcb = asrcb.encrypt(&ctx).unwrap(); let exp = get_test_asset!("exp/asrcb/null_none_default_cuid_seven");