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

resolves old TODO unlocked by new compiler and spec (#634)

Browse Source
This commit is contained in:
kaczmarczyck
2023-06-13 15:31:54 +02:00
committed by GitHub
parent 3813cacea7
commit f0e87ee813
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/opensk/src/ctap/credential_management.rs
View File

@@ -138,16 +138,14 @@ fn process_enumerate_rps_begin<E: Env>(
stateful_command_permission: &mut StatefulPermission<E>, stateful_command_permission: &mut StatefulPermission<E>,
channel: Channel, channel: Channel,
) -> Result<AuthenticatorCredentialManagementResponse, Ctap2StatusCode> { ) -> Result<AuthenticatorCredentialManagementResponse, Ctap2StatusCode> {
let rp_set = get_stored_rp_ids(env)?; let mut rp_set = get_stored_rp_ids(env)?;
let total_rps = rp_set.len(); let total_rps = rp_set.len();
if total_rps > 1 { if total_rps > 1 {
stateful_command_permission.set_command(env, StatefulCommand::EnumerateRps(1), channel); stateful_command_permission.set_command(env, StatefulCommand::EnumerateRps(1), channel);
} }
// TODO https://github.com/rust-lang/rust/issues/62924 replace with pop_first()
let rp_id = rp_set let rp_id = rp_set
.into_iter() .pop_first()
.next()
.ok_or(Ctap2StatusCode::CTAP2_ERR_NO_CREDENTIALS)?; .ok_or(Ctap2StatusCode::CTAP2_ERR_NO_CREDENTIALS)?;
enumerate_rps_response::<E>(rp_id, Some(total_rps as u64)) enumerate_rps_response::<E>(rp_id, Some(total_rps as u64))
} }

1
libraries/opensk/src/ctap/mod.rs
View File

@@ -97,7 +97,6 @@ const MAX_CBOR_NESTING_DEPTH: i8 = 4;
pub const KEEPALIVE_DELAY_MS: usize = 100; pub const KEEPALIVE_DELAY_MS: usize = 100;
pub const TOUCH_TIMEOUT_MS: usize = 30000; pub const TOUCH_TIMEOUT_MS: usize = 30000;
// TODO(kaczmarczyck) 2.1 allows Reset after Reset and 15 seconds?
const RESET_TIMEOUT_DURATION_MS: usize = 10000; const RESET_TIMEOUT_DURATION_MS: usize = 10000;
const STATEFUL_COMMAND_TIMEOUT_DURATION_MS: usize = 30000; const STATEFUL_COMMAND_TIMEOUT_DURATION_MS: usize = 30000;