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.

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

Add FIDO alliance page #69

Merged
merged 2 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions macros/src/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ pub fn try_resolve_constant(key_name: String, path: String) -> Option<u32> {
("usage_page", "DIGITIZER") => Some(0x0D),
("usage_page", "ALPHANUMERIC_DISPLAY") => Some(0x14),
("usage_page", "BARCODE_SCANNER") => Some(0x8C),
("usage_page", "FIDO_ALLIANCE") => Some(0xF1D0),
("usage_page", "VENDOR_DEFINED_START") => Some(0xFF00),
("usage_page", "VENDOR_DEFINED_END") => Some(0xFFFF),

Expand Down Expand Up @@ -228,6 +229,11 @@ pub fn try_resolve_constant(key_name: String, path: String) -> Option<u32> {
("usage", "GRAPHIC_EQUALIZER") => Some(0x06),
("usage", "AC_PAN") => Some(0x0238),

// FIDO Alliance usage_page
("usage", "U2F_AUTHENTICATOR_DEVICE") => Some(0x1),
("usage", "INPUT_REPORT_DATA") => Some(0x20),
("usage", "OUTPUT_REPORT_DATA") => Some(0x21),

(_, _) => None,
}
}
Expand Down
18 changes: 18 additions & 0 deletions src/descriptor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -978,3 +978,21 @@ impl From<u8> for SystemControlKey {
}
}
}

/// CtapReport describes a report and its companion descriptor that can be
/// used to present a FIDO-compatible authenticator device to the host.
#[gen_hid_descriptor(
(collection = APPLICATION, usage_page = FIDO_ALLIANCE, usage = U2F_AUTHENTICATOR_DEVICE) = {
(usage = INPUT_REPORT_DATA, logical_min = 0x0) = {
#[item_settings data,variable,absolute] data_in=input;
};
(usage = OUTPUT_REPORT_DATA, logical_min = 0x0) = {
#[item_settings data,variable,absolute] data_out=output;
};
}
)]
#[allow(dead_code)]
pub struct CtapReport {
pub data_in: [u8; 64],
pub data_out: [u8; 64],
}
Loading