Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix clippy warnings #35

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Fix clippy warnings #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions src/core_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,9 +828,8 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> Se050Backend<Twi, D> {
};
let data = se050_keystore
.load_key(Secrecy::Secret, Some(kind), &req.base_key)
.map_err(|err| {
error!("Failed to load RSA key: {err:?}");
err
.inspect_err(|_err| {
error!("Failed to load RSA key: {_err:?}");
})?;
let data: VolatileRsaKey = cbor_deserialize(&data.material).or(Err(Error::CborError))?;
let buf = &mut [0; 550];
Expand Down Expand Up @@ -1498,9 +1497,8 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> Se050Backend<Twi, D> {
};
let material = core_keystore
.load_key(Secrecy::Public, Some(kind), &req.key)
.map_err(|err| {
error!("Failed to load key for decrypt: {err:?}");
err
.inspect_err(|_err| {
error!("Failed to load key for decrypt: {_err:?}");
})?;
let parsed = RsaPublicParts::deserialize(&material.material).map_err(|_err| {
error!("Failed to parse volatile rsa key data: {_err:?}");
Expand Down Expand Up @@ -1947,9 +1945,8 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> Se050Backend<Twi, D> {
) -> Result<reply::Verify, Error> {
let material = core_keystore
.load_key(Secrecy::Public, Some(kind), &req.key)
.map_err(|err| {
debug!("Failed to load key for verify: {err:?}");
err
.inspect_err(|_err| {
debug!("Failed to load key for verify: {_err:?}");
})?;
let buf = &mut [0; 1024];
let id = generate_object_id_ns(core_keystore.rng(), ns, ObjectKind::PublicTemporary);
Expand Down Expand Up @@ -2011,9 +2008,8 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> Se050Backend<Twi, D> {
) -> Result<reply::Verify, Error> {
let material = core_keystore
.load_key(Secrecy::Public, Some(kind), &req.key)
.map_err(|err| {
debug!("Failed to load key for verify: {err:?}");
err
.inspect_err(|_err| {
debug!("Failed to load key for verify: {_err:?}");
})?;
let buf = &mut [0; 1024];
let id = generate_object_id_ns(core_keystore.rng(), ns, ObjectKind::PublicTemporary);
Expand Down Expand Up @@ -2079,9 +2075,8 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> Se050Backend<Twi, D> {
) -> Result<reply::Verify, Error> {
let material = core_keystore
.load_key(Secrecy::Public, Some(kind), &req.key)
.map_err(|err| {
debug!("Failed to load key for rsa sign: {err:?}");
err
.inspect_err(|_err| {
debug!("Failed to load key for rsa sign: {_err:?}");
})?;
let parsed = RsaPublicParts::deserialize(&material.material).map_err(|_err| {
error!("Failed to parse public rsa key data: {_err:?}");
Expand Down
3 changes: 1 addition & 2 deletions src/trussed_auth_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,8 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> ExtensionImpl<trussed_auth::AuthExtension>
let keystore = &mut keystore(resources, core_ctx)?;

let pin_data =
PinData::load(request.id, fs, self.metadata_location).map_err(|_err| {
PinData::load(request.id, fs, self.metadata_location).inspect_err(|_err| {
debug!("Failed to get pin data: {_err:?}");
_err
})?;
let app_key = self.get_app_key(client_id, global_fs, auth_ctx, keystore.rng())?;
let key = pin_data.check_and_get_key(
Expand Down
32 changes: 12 additions & 20 deletions src/trussed_auth_impl/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,13 @@ impl PinData {
let session_id = res.session_id;
let res = se050
.authenticate_aes128_session(session_id, &pin_aes_key_value, rng)
.map_err(|err| {
error!("Failed to authenticate pin: {err:?}");
err
.inspect_err(|_err| {
error!("Failed to authenticate pin: {_err:?}");
})?;
se050
.run_session_command(session_id, &CloseSession {}, buf)
.map_err(|err| {
error!("Failed to close session: {err:?}");
err
.inspect_err(|_err| {
error!("Failed to close session: {_err:?}");
})?;
debug!("Check succeeded with {res:?}");
Ok(res)
Expand Down Expand Up @@ -450,9 +448,8 @@ impl PinData {
},
buf,
)
.map_err(|_err| {
.inspect_err(|_err| {
debug!("Failed existence check: {_err:?}");
_err
})?
.result;
if exists == Se05XResult::Success {
Expand All @@ -464,9 +461,8 @@ impl PinData {
},
buf,
)
.map_err(|_err| {
.inspect_err(|_err| {
debug!("Failed deletion: {_err:?}");
_err
})?;
count += 1;
}
Expand Down Expand Up @@ -526,9 +522,8 @@ impl PinData {
},
buf,
)
.map_err(|_err| {
.inspect_err(|_err| {
error!("Failed to delete auth: {_err:?}");
_err
})?;
debug!("Closing sess");
se050.run_session_command(session_id, &CloseSession {}, buf)?;
Expand All @@ -540,9 +535,8 @@ impl PinData {
},
buf,
)
.map_err(|err| {
error!("Failed to delete user id: {err:?}");
err
.inspect_err(|_err| {
error!("Failed to delete user id: {_err:?}");
})?;
count += 1;
Ok(count)
Expand Down Expand Up @@ -590,9 +584,8 @@ impl PinData {
.build(),
buf,
)
.map_err(|err| {
error!("Got err reading attempts: {err:?}");
err
.inspect_err(|_err| {
error!("Got err reading attempts: {_err:?}");
})?
.attributes;
let max = attrs.max_authentication_attempts();
Expand All @@ -618,9 +611,8 @@ fn delete_from_path<Twi: I2CForT1, D: DelayUs<u32>>(
debug!("Parsing name failed: {_err:?}");
Error::DeserializationFailed
})?;
let pin = PinData::load(id, fs, location).map_err(|_err| {
let pin = PinData::load(id, fs, location).inspect_err(|_err| {
debug!("Failed loading: {_err:?}");
_err
})?;
pin.delete(fs, location, se050)?;
Ok(())
Expand Down