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

Merge branch 'develop' into add_doc

Browse Source
This commit is contained in:
kaczmarczyck
2022-03-28 16:50:50 +02:00
committed by GitHub
parent f862d4cc18 8331aa1378
commit 990c2b3ea6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ctap/mod.rs
View File

@@ -307,7 +307,7 @@ impl StatefulPermission {
// However, interleaving (stateless) commands could delete credentials or change the PIN, // However, interleaving (stateless) commands could delete credentials or change the PIN,
// which chould make invalidate our access. Some read-only commands should be okay to run, // which chould make invalidate our access. Some read-only commands should be okay to run,
// but (A) is the safest and easiest solution. // but (A) is the safest and easiest solution.
if let Some(c) = self.channel.as_ref() { if let Some(c) = &self.channel {
if c != channel { if c != channel {
self.clear(); self.clear();
} }
@@ -556,6 +556,8 @@ impl CtapState {
| (Command::AuthenticatorGetInfo, Ok(StatefulCommand::Reset)) | (Command::AuthenticatorGetInfo, Ok(StatefulCommand::Reset))
// AuthenticatorSelection still allows Reset. // AuthenticatorSelection still allows Reset.
| (Command::AuthenticatorSelection, Ok(StatefulCommand::Reset)) | (Command::AuthenticatorSelection, Ok(StatefulCommand::Reset))
// AuthenticatorMakeCredential is used like AuthenticatorSelection in 2.0.
| (Command::AuthenticatorMakeCredential(_), Ok(StatefulCommand::Reset))
// AuthenticatorCredentialManagement handles its subcommands later. // AuthenticatorCredentialManagement handles its subcommands later.
| ( | (
Command::AuthenticatorCredentialManagement(_), Command::AuthenticatorCredentialManagement(_),