trussed/usbd-ctaphid
0
0
Fork 0
mirror of https://github.com/trussed-dev/usbd-ctaphid.git synced 2026-06-20 04:16:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Support invalid CTAPHID commands

Browse Source 
Previously, we just ignored invalid CTAPHID commands.  With this patch,
we return a CTAPHID_INVALID_COMMAND error.
This commit is contained in:
Robin Krahl
2024-02-22 13:31:39 +01:00
parent 3f24df2f8b
commit eda9b76c36
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pipe.rs
+12 -3
View File
@@ -70,8 +70,12 @@ impl Response {
}
pub fn error_from_request(request: Request) -> Self {
Self::error_on_channel(request.channel)
}
pub fn error_on_channel(channel: u32) -> Self {
Self {
channel: request.channel,
channel,
command: ctaphid_dispatch::command::Command::Error,
length: 1,
}
@@ -292,7 +296,8 @@ impl<'alloc, 'pipe, 'interrupt, Bus: UsbBus> Pipe<'alloc, 'pipe, 'interrupt, Bus
Ok(command) => command,
// `solo ls` crashes here as it uses command 0x86
Err(_) => {
info!("Ignoring invalid command.");
info!("Received invalid command.");
self.start_sending_error_on_channel(channel, AuthenticatorError::InvalidCommand);
return;
}
};
@@ -616,8 +621,12 @@ impl<'alloc, 'pipe, 'interrupt, Bus: UsbBus> Pipe<'alloc, 'pipe, 'interrupt, Bus
}
fn start_sending_error(&mut self, request: Request, error: AuthenticatorError) {
self.start_sending_error_on_channel(request.channel, error);
}
fn start_sending_error_on_channel(&mut self, channel: u32, error: AuthenticatorError) {
self.buffer[0] = error as u8;
let response = Response::error_from_request(request);
let response = Response::error_on_channel(channel);
self.start_sending(response);
}