Skip to content

Commit 30ceeec

Browse files
authored
Merge pull request #252 from LedgerHQ/y333/fix_pin_lock_nbgl_apdu_filter
When calling detect_apdu(), returns DeviceLocked when pin locked
2 parents bd21972 + abaa3ae commit 30ceeec

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ledger_device_sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ledger_device_sdk"
3-
version = "1.21.4"
3+
version = "1.21.5"
44
authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
55
edition = "2021"
66
license.workspace = true

ledger_device_sdk/src/io.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,14 +451,14 @@ impl Comm {
451451
T: TryFrom<ApduHeader>,
452452
Reply: From<<T as TryFrom<ApduHeader>>::Error>,
453453
{
454-
let _: Option<Event<T>> = self.decode_event(spi_buffer);
455-
456-
if unsafe { G_io_app.apdu_state } != APDU_IDLE && unsafe { G_io_app.apdu_length } > 0 {
457-
self.rx = unsafe { G_io_app.apdu_length as usize };
458-
self.event_pending = true;
459-
return true;
454+
match self.decode_event::<T>(spi_buffer) {
455+
Some(Event::Command(_)) => {
456+
self.rx = unsafe { G_io_app.apdu_length as usize };
457+
self.event_pending = true;
458+
return true;
459+
}
460+
_ => return false,
460461
}
461-
false
462462
}
463463

464464
/// Wait for the next Command event. Discards received button events.

0 commit comments

Comments
 (0)