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

removes unused duplicate PIN protocol check helper

Browse Source
This commit is contained in:
Fabian Kaczmarczyck
2021-01-14 16:45:38 +01:00
parent 1f37ae50c5
commit 0bb6ee32fc
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ctap/credential_management.rs
View File

@@ -23,7 +23,10 @@ use super::response::{AuthenticatorCredentialManagementResponse, ResponseData};
use super::status_code::Ctap2StatusCode; use super::status_code::Ctap2StatusCode;
use super::storage::PersistentStore; use super::storage::PersistentStore;
use super::timed_permission::TimedPermission; use super::timed_permission::TimedPermission;
use super::{check_command_permission, StatefulCommand, STATEFUL_COMMAND_TIMEOUT_DURATION}; use super::{
check_command_permission, check_pin_uv_auth_protocol, StatefulCommand,
STATEFUL_COMMAND_TIMEOUT_DURATION,
};
use alloc::collections::BTreeSet; use alloc::collections::BTreeSet;
use alloc::string::String; use alloc::string::String;
use alloc::vec; use alloc::vec;
@@ -251,16 +254,6 @@ fn process_update_user_information(
persistent_store.update_credential(&credential_id, user) persistent_store.update_credential(&credential_id, user)
} }
/// Checks the PIN protocol.
///
/// TODO(#246) refactor after #246 is merged
fn pin_uv_auth_protocol_check(pin_uv_auth_protocol: Option<u64>) -> Result<(), Ctap2StatusCode> {
match pin_uv_auth_protocol {
Some(1) => Ok(()),
_ => Err(Ctap2StatusCode::CTAP2_ERR_PIN_AUTH_INVALID),
}
}
/// Processes the CredentialManagement command and all its subcommands. /// Processes the CredentialManagement command and all its subcommands.
pub fn process_credential_management( pub fn process_credential_management(
persistent_store: &mut PersistentStore, persistent_store: &mut PersistentStore,
@@ -297,7 +290,7 @@ pub fn process_credential_management(
| CredentialManagementSubCommand::DeleteCredential | CredentialManagementSubCommand::DeleteCredential
| CredentialManagementSubCommand::EnumerateCredentialsBegin | CredentialManagementSubCommand::EnumerateCredentialsBegin
| CredentialManagementSubCommand::UpdateUserInformation => { | CredentialManagementSubCommand::UpdateUserInformation => {
pin_uv_auth_protocol_check(pin_protocol)?; check_pin_uv_auth_protocol(pin_protocol)?;
persistent_store persistent_store
.pin_hash()? .pin_hash()?
.ok_or(Ctap2StatusCode::CTAP2_ERR_PUAT_REQUIRED)?; .ok_or(Ctap2StatusCode::CTAP2_ERR_PUAT_REQUIRED)?;