kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #450 from ia0/add_doc

Browse Source 
Add documentation for #[cfg] work-around on expressions
This commit is contained in:
Julien Cretin
2022-03-28 17:24:08 +02:00
committed by GitHub
parent 8331aa1378 990c2b3ea6
commit 742e5f149f
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ctap/mod.rs
View File

@@ -542,6 +542,8 @@ impl CtapState {
// Correct behavior between CTAP1 and CTAP2 isn't defined yet. Just a guess. // Correct behavior between CTAP1 and CTAP2 isn't defined yet. Just a guess.
#[cfg(feature = "with_ctap1")] #[cfg(feature = "with_ctap1")]
{ {
// We create a block statement to wrap this assignment expression, because attributes
// (like #[cfg]) are not supported on expressions.
self.u2f_up_state = U2fUserPresenceState::new(U2F_UP_PROMPT_TIMEOUT, TOUCH_TIMEOUT); self.u2f_up_state = U2fUserPresenceState::new(U2F_UP_PROMPT_TIMEOUT, TOUCH_TIMEOUT);
} }
self.stateful_command_permission self.stateful_command_permission
@@ -1173,11 +1175,9 @@ impl CtapState {
String::from(FIDO2_1_VERSION_STRING), String::from(FIDO2_1_VERSION_STRING),
]; ];
#[cfg(feature = "with_ctap1")] #[cfg(feature = "with_ctap1")]
{
if !has_always_uv { if !has_always_uv {
versions.insert(0, String::from(U2F_VERSION_STRING)) versions.insert(0, String::from(U2F_VERSION_STRING))
} }
}
let mut options = vec![]; let mut options = vec![];
if ENTERPRISE_ATTESTATION_MODE.is_some() { if ENTERPRISE_ATTESTATION_MODE.is_some() {
options.push((String::from("ep"), storage::enterprise_attestation(env)?)); options.push((String::from("ep"), storage::enterprise_attestation(env)?));
@@ -1246,6 +1246,8 @@ impl CtapState {
self.client_pin.reset(env.rng()); self.client_pin.reset(env.rng());
#[cfg(feature = "with_ctap1")] #[cfg(feature = "with_ctap1")]
{ {
// We create a block statement to wrap this assignment expression, because attributes
// (like #[cfg]) are not supported on expressions.
self.u2f_up_state = U2fUserPresenceState::new(U2F_UP_PROMPT_TIMEOUT, TOUCH_TIMEOUT); self.u2f_up_state = U2fUserPresenceState::new(U2F_UP_PROMPT_TIMEOUT, TOUCH_TIMEOUT);
} }
Ok(ResponseData::AuthenticatorReset) Ok(ResponseData::AuthenticatorReset)

4
src/main.rs
View File

@@ -82,8 +82,8 @@ fn main() {
}); });
#[cfg(feature = "with_ctap1")] #[cfg(feature = "with_ctap1")]
let mut buttons = buttons_callback.init().flex_unwrap(); let mut buttons = buttons_callback.init().flex_unwrap();
#[cfg(feature = "with_ctap1")]
// At the moment, all buttons are accepted. You can customize your setup here. // At the moment, all buttons are accepted. You can customize your setup here.
#[cfg(feature = "with_ctap1")]
for mut button in &mut buttons { for mut button in &mut buttons {
button.enable().flex_unwrap(); button.enable().flex_unwrap();
} }
@@ -168,7 +168,6 @@ fn main() {
#[cfg(not(feature = "with_ctap1"))] #[cfg(not(feature = "with_ctap1"))]
switch_off_leds(); switch_off_leds();
#[cfg(feature = "with_ctap1")] #[cfg(feature = "with_ctap1")]
{
if ctap.state().u2f_needs_user_presence(now) { if ctap.state().u2f_needs_user_presence(now) {
// Flash the LEDs with an almost regular pattern. The inaccuracy comes from // Flash the LEDs with an almost regular pattern. The inaccuracy comes from
// delay caused by processing and sending of packets. // delay caused by processing and sending of packets.
@@ -178,7 +177,6 @@ fn main() {
} }
} }
} }
}
} }
#[cfg(feature = "debug_ctap")] #[cfg(feature = "debug_ctap")]

4
third_party/libtock-drivers/src/usb_ctap_hid.rs vendored
View File

@@ -188,11 +188,9 @@ pub fn recv_with_timeout(
let result = recv_with_timeout_detail(buf, timeout_delay); let result = recv_with_timeout_detail(buf, timeout_delay);
#[cfg(feature = "verbose_usb")] #[cfg(feature = "verbose_usb")]
{
if let Some(SendOrRecvStatus::Received) = result { if let Some(SendOrRecvStatus::Received) = result {
writeln!(Console::new(), "Received packet = {:02x?}", buf as &[u8]).unwrap(); writeln!(Console::new(), "Received packet = {:02x?}", buf as &[u8]).unwrap();
} }
}
result result
} }
@@ -216,11 +214,9 @@ pub fn send_or_recv_with_timeout(
let result = send_or_recv_with_timeout_detail(buf, timeout_delay); let result = send_or_recv_with_timeout_detail(buf, timeout_delay);
#[cfg(feature = "verbose_usb")] #[cfg(feature = "verbose_usb")]
{
if let Some(SendOrRecvStatus::Received) = result { if let Some(SendOrRecvStatus::Received) = result {
writeln!(Console::new(), "Received packet = {:02x?}", buf as &[u8]).unwrap(); writeln!(Console::new(), "Received packet = {:02x?}", buf as &[u8]).unwrap();
} }
}
result result
} }